Merge pull request #1610 from qri-io/transform-pkg

refactor(transform): Create transform package, move startf into it
qri-io · Jan 19, 2021 · 1401638 · 1401638
2 parents 6ede26b + 843e3d3
commit 1401638
Show file tree

Hide file tree

Showing 28 changed files with 12 additions and 10 deletions.
diff --git a/cmd/test_runner_test.go b/cmd/test_runner_test.go
@@ -29,7 +29,7 @@ import (
 	"github.com/qri-io/qri/repo/gen"
 	reporef "github.com/qri-io/qri/repo/ref"
 	repotest "github.com/qri-io/qri/repo/test"
-	"github.com/qri-io/qri/startf"
+	"github.com/qri-io/qri/transform/startf"
 	"github.com/spf13/cobra"
 )
 

diff --git a/lib/datasets.go b/lib/datasets.go
@@ -30,6 +30,7 @@ import (
 	"github.com/qri-io/qri/fsi/linkfile"
 	"github.com/qri-io/qri/repo"
 	reporef "github.com/qri-io/qri/repo/ref"
+	"github.com/qri-io/qri/transform"
 )
 
 // DatasetMethods encapsulates business logic for working with Datasets on Qri
@@ -623,7 +624,7 @@ func (m *DatasetMethods) Save(p *SaveParams, res *dataset.Dataset) error {
 		loader := NewParseResolveLoadFunc("", m.inst.defaultResolver(), m.inst)
 
 		// apply the transform
-		err := base.TransformApply(ctx, ds, r, loader, str, scriptOut, secrets)
+		err := transform.Apply(ctx, ds, r, loader, str, scriptOut, secrets)
 		if err != nil {
 			return err
 		}

diff --git a/lib/transform.go b/lib/transform.go
@@ -8,6 +8,7 @@ import (
 	"github.com/qri-io/dataset"
 	"github.com/qri-io/qri/base"
 	"github.com/qri-io/qri/dsref"
+	"github.com/qri-io/qri/transform"
 )
 
 // TransformMethods encapsulates business logic for transforms
@@ -88,7 +89,7 @@ func (m *TransformMethods) Apply(p *ApplyParams, res *ApplyResult) error {
 	loader := NewParseResolveLoadFunc("", m.inst.defaultResolver(), m.inst)
 
 	scriptOut := p.ScriptOutput
-	err = base.TransformApply(ctx, ds, r, loader, str, scriptOut, p.Secrets)
+	err = transform.Apply(ctx, ds, r, loader, str, scriptOut, p.Secrets)
 	if err != nil {
 		return err
 	}

diff --git a/base/transform_apply.go → transform/apply.go b/base/transform_apply.go → transform/apply.go
@@ -1,4 +1,4 @@
-package base
+package transform
 
 import (
 	"context"
@@ -10,13 +10,13 @@ import (
 	"github.com/qri-io/ioes"
 	"github.com/qri-io/qri/dsref"
 	"github.com/qri-io/qri/repo"
-	"github.com/qri-io/qri/startf"
+	"github.com/qri-io/qri/transform/startf"
 )
 
 // TODO(dustmop): Tests. Especially once the `apply` command exists.
 
-// TransformApply applies the transform script to order to modify the changing dataset
-func TransformApply(
+// Apply applies the transform script to order to modify the changing dataset
+func Apply(
 	ctx context.Context,
 	ds *dataset.Dataset,
 	r repo.Repo,

diff --git a/startf/README.md → transform/startf/README.md b/startf/README.md → transform/startf/README.md
diff --git a/startf/context/context.go → transform/startf/context/context.go b/startf/context/context.go → transform/startf/context/context.go
diff --git a/startf/context/context_test.go → transform/startf/context/context_test.go b/startf/context/context_test.go → transform/startf/context/context_test.go
diff --git a/startf/context/testdata/test.star → transform/startf/context/testdata/test.star b/startf/context/testdata/test.star → transform/startf/context/testdata/test.star
diff --git a/startf/ds/dataset.go → transform/startf/ds/dataset.go b/startf/ds/dataset.go → transform/startf/ds/dataset.go
diff --git a/startf/ds/dataset_test.go → transform/startf/ds/dataset_test.go b/startf/ds/dataset_test.go → transform/startf/ds/dataset_test.go
diff --git a/startf/ds/doc.go → transform/startf/ds/doc.go b/startf/ds/doc.go → transform/startf/ds/doc.go
diff --git a/startf/ds/entry_reader.go → transform/startf/ds/entry_reader.go b/startf/ds/entry_reader.go → transform/startf/ds/entry_reader.go
diff --git a/startf/ds/entry_reader_test.go → transform/startf/ds/entry_reader_test.go b/startf/ds/entry_reader_test.go → transform/startf/ds/entry_reader_test.go
diff --git a/startf/ds/entry_writer.go → transform/startf/ds/entry_writer.go b/startf/ds/entry_writer.go → transform/startf/ds/entry_writer.go
diff --git a/startf/ds/testdata/test.star → transform/startf/ds/testdata/test.star b/startf/ds/testdata/test.star → transform/startf/ds/testdata/test.star
diff --git a/startf/entry_reader.go → transform/startf/entry_reader.go b/startf/entry_reader.go → transform/startf/entry_reader.go
diff --git a/startf/entry_reader_test.go → transform/startf/entry_reader_test.go b/startf/entry_reader_test.go → transform/startf/entry_reader_test.go
diff --git a/startf/qri/entry_writer.go → transform/startf/qri/entry_writer.go b/startf/qri/entry_writer.go → transform/startf/qri/entry_writer.go
diff --git a/startf/qri/qri.go → transform/startf/qri/qri.go b/startf/qri/qri.go → transform/startf/qri/qri.go
diff --git a/startf/qri/qri_test.go → transform/startf/qri/qri_test.go b/startf/qri/qri_test.go → transform/startf/qri/qri_test.go
diff --git a/startf/qri/testdata/test.star → transform/startf/qri/testdata/test.star b/startf/qri/testdata/test.star → transform/startf/qri/testdata/test.star
diff --git a/startf/sandbox.go → transform/startf/sandbox.go b/startf/sandbox.go → transform/startf/sandbox.go
diff --git a/startf/testdata/fetch.star → transform/startf/testdata/fetch.star b/startf/testdata/fetch.star → transform/startf/testdata/fetch.star
diff --git a/startf/testdata/load_ds.star → transform/startf/testdata/load_ds.star b/startf/testdata/load_ds.star → transform/startf/testdata/load_ds.star
diff --git a/startf/testdata/meta_title.star → transform/startf/testdata/meta_title.star b/startf/testdata/meta_title.star → transform/startf/testdata/meta_title.star
diff --git a/startf/testdata/tf.star → transform/startf/testdata/tf.star b/startf/testdata/tf.star → transform/startf/testdata/tf.star
diff --git a/startf/transform.go → transform/startf/transform.go b/startf/transform.go → transform/startf/transform.go
@@ -13,9 +13,9 @@ import (
 	"github.com/qri-io/qfs"
 	"github.com/qri-io/qri/dsref"
 	"github.com/qri-io/qri/repo"
-	skyctx "github.com/qri-io/qri/startf/context"
-	skyds "github.com/qri-io/qri/startf/ds"
-	skyqri "github.com/qri-io/qri/startf/qri"
+	skyctx "github.com/qri-io/qri/transform/startf/context"
+	skyds "github.com/qri-io/qri/transform/startf/ds"
+	skyqri "github.com/qri-io/qri/transform/startf/qri"
 	"github.com/qri-io/qri/version"
 	"github.com/qri-io/starlib"
 	"go.starlark.net/resolve"

diff --git a/startf/transform_test.go → transform/startf/transform_test.go b/startf/transform_test.go → transform/startf/transform_test.go