Please run go run mage.go lint:go. diff --git a/pkg/composableschemadsl/compiler/importer.go b/pkg/composableschemadsl/compiler/importer.go index 0a86ced..dae9628 100644 --- a/pkg/composableschemadsl/compiler/importer.go +++ b/pkg/composableschemadsl/compiler/importer.go @@ -14,10 +14,10 @@ import ( ) type ImportContext struct { - pathSegments []string - sourceFolder string + pathSegments []string + sourceFolder string requestedDefinitions []string - names *mapz.Set[string] + names *mapz.Set[string] } const SchemaFileSuffix = ".zed" @@ -73,7 +73,7 @@ func filterDefinitionList[DefinitionType SchemaDefinition](requestedDefinitions } } }, - ) + ) } func constructFilePath(segments []string) string {

Please run go run mage.go lint:go. diff --git a/pkg/composableschemadsl/compiler/importer_test.go b/pkg/composableschemadsl/compiler/importer_test.go index 9ca0b1d..4d409e6 100644 --- a/pkg/composableschemadsl/compiler/importer_test.go +++ b/pkg/composableschemadsl/compiler/importer_test.go @@ -59,7 +59,7 @@ func TestImporter(t *testing.T) { {"nested local import", "nested-local"}, {"nested local import with transitive hop", "nested-local-with-hop"}, {"nested local two layers deep import", "nested-two-layer-local"}, - {"diamond-shaped imports are fine", "diamond-shaped"}, + {"diamond-shaped imports are fine", "diamond-shaped"}, } for _, test := range importerTests {

Please run go run mage.go lint:go. diff --git a/pkg/composableschemadsl/compiler/translator.go b/pkg/composableschemadsl/compiler/translator.go index a44216f..4ea423b 100644 --- a/pkg/composableschemadsl/compiler/translator.go +++ b/pkg/composableschemadsl/compiler/translator.go @@ -718,11 +718,10 @@ func translateImport(tctx translationContext, importNode *dslNode, names *mapz.S requestedDefinitions = append(requestedDefinitions, requested) } - return ImportFile(&ImportContext{ - names: names, - pathSegments: pathSegments, + names: names, + pathSegments: pathSegments, requestedDefinitions: requestedDefinitions, - sourceFolder: tctx.sourceFolder, + sourceFolder: tctx.sourceFolder, }) }