Format

pkg/composableschemadsl/compiler/importer.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"slices"
 
 	"github.com/rs/zerolog/log"
 
@@ -13,9 +14,10 @@ import (
 )
 
 type importContext struct {
-	pathSegments []string
-	sourceFolder string
-	names        *mapz.Set[string]
+	pathSegments         []string
+	sourceFolder         string
+	requestedDefinitions []string
+	names                *mapz.Set[string]
 }
 
 const SchemaFileSuffix = ".zed"
@@ -47,6 +49,28 @@ func importFile(importContext importContext) (*CompiledSchema, error) {
 	return compiled, nil
 }
 
+// TODO: is there a way to do this without mutating?
+func filterDefinitions(requestedDefinitions []string, schema *CompiledSchema) {
+	schema.CaveatDefinitions = filterDefinitionList(requestedDefinitions, schema.CaveatDefinitions)
+	schema.ObjectDefinitions = filterDefinitionList(requestedDefinitions, schema.ObjectDefinitions)
+	schema.OrderedDefinitions = filterDefinitionList(requestedDefinitions, schema.OrderedDefinitions)
+}
+
+func filterDefinitionList[DefinitionType SchemaDefinition](requestedDefinitions []string, definitionList []DefinitionType) []DefinitionType {
+	definitionSet := mapz.NewSet(requestedDefinitions...)
+	return slices.Collect(
+		func(yield func(DefinitionType) bool) {
+			for _, definition := range definitionList {
+				if definitionSet.Has(definition.GetName()) {
+					if !yield(definition) {
+						return
+					}
+				}
+			}
+		},
+	)
+}
+
 func constructFilePath(segments []string) string {
 	return path.Join(segments...) + SchemaFileSuffix
 }

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 {

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,
 	})
 }