fix: don’t import ftl twice if pubsub and something else requires ftl (…

…#1795) fixes #1794
block · Jun 15, 2024 · bcf367c · bcf367c
1 parent fc13221
commit bcf367c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/go-runtime/compile/build.go b/go-runtime/compile/build.go
@@ -282,6 +282,10 @@ var scaffoldFuncs = scaffolder.FuncMap{
 			case *schema.Optional, *schema.Unit:
 				imports["github.com/TBD54566975/ftl/go-runtime/ftl"] = ""
 
+			case *schema.Topic:
+				if n.IsExported() {
+					imports["github.com/TBD54566975/ftl/go-runtime/ftl"] = ""
+				}
 			default:
 			}
 			return next()
@@ -368,15 +372,6 @@ var scaffoldFuncs = scaffolder.FuncMap{
 		}
 		return out
 	},
-	"needsFTLImport": func(m *schema.Module) bool {
-		for _, d := range m.Decls {
-			if topic, ok := d.(*schema.Topic); ok && topic.IsExported() {
-				// uses ftl.Topic(...) function calls
-				return true
-			}
-		}
-		return false
-	},
 }
 
 func schemaType(t schema.Type) string {

diff --git a/...go/modules/{{ range .NonMainModules }}{{ push .Name . }}{{ end }}/external_module.go.tmpl b/...go/modules/{{ range .NonMainModules }}{{ push .Name . }}{{ end }}/external_module.go.tmpl
@@ -12,10 +12,6 @@ import (
 
   "github.com/TBD54566975/ftl/go-runtime/ftl/reflection"
 {{- end}}
-{{- if $ | needsFTLImport }}
-
-  "github.com/TBD54566975/ftl/go-runtime/ftl"
-{{- end}}
 )
 
 var _ = context.Background