Skip to content

fix(function): support multiline import type statements in import scanning #4872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lightstrike wants to merge 2 commits into
base: develop
Choose a base branch
from
+50 −1
Open

fix(function): support multiline import type statements in import scanning #4872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2b6377
fix(function): support multiline import type statements in import sca…
lightstrike Jan 10, 2026
93d8c8a
test(function): add non-braced default type import to fixture
lightstrike Feb 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkg/function/deno.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ func resolveHostPath(jsonPath, hostPath string) string {
}

// Ref: https://regex101.com/r/DfBdJA/1
var importPathPattern = regexp.MustCompile(`(?i)(?:import|export)\s+(?:{[^{}]+}|.*?)\s*(?:from)?\s*['"](.*?)['"]|import\(\s*['"](.*?)['"]\)`)
// Note: Using [\s\S]*? instead of .*? to match newlines in multiline import type statements
var importPathPattern = regexp.MustCompile(`(?i)(?:import|export)\s+(?:{[^{}]+}|[\s\S]*?)\s*(?:from)?\s*['"](.*?)['"]|import\(\s*['"](.*?)['"]\)`)
Copy link
Member

@avallete avallete Feb 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey, thanks for tracking this down! The [\s\S]*? change works, but I'm a little hesitant to widen the catch-all branch to match across newlines for everything — even with the lazy quantifier it feels like a broader change than what we need here.

The root issue is that import type { ... } doesn't hit the braced branch because type sits between the whitespace and {. What if we handled that more explicitly instead?

(?:import|export)\s+(?:type\s+)?(?:{[^{}]+}|.*?)\s*(?:from)?\s*['"](.*?)['"]

Adding (?:type\s+)? lets import type { Foo, Bar } fall into the {[^{}]+} branch, which already crosses line boundaries fine. That way .*? stays single-line and we're only changing the behavior for actual type imports rather than everything.

Happy to be wrong if there's a case I'm missing though do you have a test that the (?:type\s+)? approach wouldn't cover?


func (importMap *ImportMap) WalkImportPaths(srcPath string, readFile func(curr string, w io.Writer) error) error {
seen := map[string]struct{}{}
Expand Down
15 changes: 15 additions & 0 deletions pkg/function/deno_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,21 @@ func TestImportPaths(t *testing.T) {
assert.NoError(t, err)
fsys.AssertExpectations(t)
})

t.Run("iterates multiline import type statements", func(t *testing.T) {
// This test verifies that multiline import type statements are correctly parsed
// The regex must use [\s\S]*? instead of .*? to match newlines
// Setup in-memory fs
fsys := MockFS{}
fsys.On("ReadFile", "testdata/modules/import_types.ts").Once()
fsys.On("ReadFile", "testdata/types/database.ts").Once()
// Run test
im := ImportMap{}
err := im.WalkImportPaths("testdata/modules/import_types.ts", fsys.ReadFile)
// Check error
assert.NoError(t, err)
fsys.AssertExpectations(t)
})
}

func TestResolveImports(t *testing.T) {
Expand Down
22 changes: 22 additions & 0 deletions pkg/function/testdata/modules/import_types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// Test file for multiline import type statements
// This pattern was broken before the [\s\S]*? fix

// Multiline import type - should be matched by the regex
import type {
Database,
Json
} from '../types/database.ts'

// Single line import type - should also work
import type { Database as DB } from '../types/database.ts'

// Re-export type to verify export pattern
export type { Database } from '../types/database.ts'

// Multiline export type
export type {
Json
} from '../types/database.ts'

// Non-braced default type import - exercises the [\s\S]*? branch on single-line
import type Database from '../types/database.ts'
11 changes: 11 additions & 0 deletions pkg/function/testdata/types/database.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
export type Database = {
public: {
Tables: {
users: {
Row: { id: string; name: string }
}
}
}
}

export type Json = string | number | boolean | null | { [key: string]: Json } | Json[]
Loading