[bugfix] fix types referencing itself in imports

happens when there's a deep nesting of structtype globaltype etc will flesh this out later
lolopinto · Sep 27, 2023 · 13d26a0 · 13d26a0
1 parent b0f7348
commit 13d26a0
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/internal/tscode/custom_interface.tmpl b/internal/tscode/custom_interface.tmpl
@@ -4,11 +4,16 @@
 {{ $pkg := .Package }}
 {{ $cfg := .Config }}
 {{ $schema := .Schema }}
+{{ $root := .Root }} 
 
 
 {{ range $ci.GetAllCustomTypes -}}
   {{ if .IsCustomInterface -}}
-    {{ template "interface.tmpl" (dict "RootInterface" $ci "Interface" . "Package" $pkg "Config" $cfg)}}
+      {{ if $root -}}
+        {{ template "interface.tmpl" (dict "RootInterface" $root "Interface" . "Package" $pkg "Config" $cfg)}}
+      {{ else -}}
+        {{ template "interface.tmpl" (dict "RootInterface" $ci "Interface" . "Package" $pkg "Config" $cfg)}}
+      {{ end -}}
     {{ if .HasConvertFunction $cfg }}
       {{ if .Exported -}}
         export function {{.GetConvertMethod}}(input: any): {{.TSType}} {

diff --git a/internal/tscode/step.go b/internal/tscode/step.go
@@ -897,6 +897,28 @@ func writeLoadAnyFile(nodeData []*enum.Data, processor *codegen.Processor) error
 	})
 }
 
+type typesRoot struct {
+	s *schema.Schema
+	m map[string]bool
+}
+
+func (t *typesRoot) init() {
+	t.m = make(map[string]bool)
+	for _, ci := range t.s.CustomInterfaces {
+		for _, tt := range ci.GetAllCustomTypes() {
+			t.m[tt.GetTSType()] = true
+		}
+
+		for _, tt := range ci.GetAllEnums() {
+			t.m[tt.Name] = true
+		}
+	}
+}
+
+func (t *typesRoot) ForeignImport(name string) bool {
+	return !t.m[name]
+}
+
 func writeTypesFile(processor *codegen.Processor, nodeData []*enum.Data, edgeData []*enum.Data) error {
 	cfg := processor.Config
 	filePath := getFilePathForTypesFile(cfg)
@@ -910,6 +932,9 @@ func writeTypesFile(processor *codegen.Processor, nodeData []*enum.Data, edgeDat
 		return edgeData[i].Name < edgeData[j].Name
 	})
 
+	root := &typesRoot{s: processor.Schema}
+	root.init()
+
 	return file.Write(&file.TemplatedBasedFileWriter{
 		Config: processor.Config,
 		Data: struct {
@@ -918,6 +943,7 @@ func writeTypesFile(processor *codegen.Processor, nodeData []*enum.Data, edgeDat
 			Config   *codegen.Config
 			NodeType *enum.Enum
 			EdgeType *enum.Enum
+			Root     *typesRoot
 		}{
 			processor.Schema,
 			cfg.GetImportPackage(),
@@ -930,6 +956,9 @@ func writeTypesFile(processor *codegen.Processor, nodeData []*enum.Data, edgeDat
 				Name:   "EdgeType",
 				Values: edgeData,
 			},
+			// used to know if we should import a foreign type
+			// e.g. in types.tmpl, we don't wanna import types defined in that file
+			root,
 		},
 		AbsPathToTemplate: util.GetAbsolutePath("types.tmpl"),
 		OtherTemplateFiles: []string{

diff --git a/internal/tscode/types.tmpl b/internal/tscode/types.tmpl
@@ -12,6 +12,7 @@
 {{ $package := .Package }}
 {{ $config := .Config }}
 
+{{ $root := .Root }}
 {{ range .Schema.CustomInterfaces }}
-  {{ template "custom_interface.tmpl" (dict "Interface" .  "Package" $package "Schema" $schema  "Config" $config) }}
+  {{ template "custom_interface.tmpl" (dict "Interface" .  "Package" $package "Schema" $schema  "Config" $config "Root" $root) }}
 {{ end -}}