fix: include export statements when resolving imports (#3140)

supabase · Feb 13, 2025 · e7c11ec · e7c11ec
1 parent 4b1969f
commit e7c11ec
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/internal/functions/deploy/testdata/shared/whatever.ts b/internal/functions/deploy/testdata/shared/whatever.ts
@@ -1 +1,3 @@
-import * from '../nested/index.ts';
+import * as _ from "../nested/index.ts";
+
+export * from "./mod.ts";
diff --git a/internal/functions/deploy/upload.go b/internal/functions/deploy/upload.go
@@ -162,7 +162,7 @@ func writeForm(form *multipart.Writer, meta api.FunctionDeployMetadata, fsys afe
 }
 
 // Ref: https://regex101.com/r/DfBdJA/1
-var importPathPattern = regexp.MustCompile(`(?i)import\s+(?:{[^{}]+}|.*?)\s*(?:from)?\s*['"](.*?)['"]|import\(\s*['"](.*?)['"]\)`)
+var importPathPattern = regexp.MustCompile(`(?i)(?:import|export)\s+(?:{[^{}]+}|.*?)\s*(?:from)?\s*['"](.*?)['"]|import\(\s*['"](.*?)['"]\)`)
 
 func walkImportPaths(srcPath string, importMap utils.ImportMap, readFile func(curr string, w io.Writer) error) error {
 	seen := map[string]struct{}{}

diff --git a/internal/functions/deploy/upload_test.go b/internal/functions/deploy/upload_test.go
@@ -66,6 +66,7 @@ func TestImportPaths(t *testing.T) {
 		fsys.On("ReadFile", "testdata/modules/imports.ts").Once()
 		fsys.On("ReadFile", "testdata/geometries/Geometries.js").Once()
 		fsys.On("ReadFile", "testdata/shared/whatever.ts").Once()
+		fsys.On("ReadFile", "testdata/shared/mod.ts").Once()
 		fsys.On("ReadFile", "testdata/nested/index.ts").Once()
 		// Run test
 		im := utils.ImportMap{Imports: map[string]string{