From 49eeeb0e4852157ea7e9544357f1d6a41404c1a7 Mon Sep 17 00:00:00 2001 From: half-ogre Date: Fri, 3 Apr 2026 13:43:21 -0700 Subject: [PATCH 1/2] added support for multiple audiences and permissions in JWT --- echokit/auth0authenticator.go | 2 +- echokit/auth0jwtauthenticator.go | 2 +- echokit/authenticationmiddleware.go | 2 +- echokit/d3authjwtauthenticator.go | 25 +++- echokit/d3authjwtauthenticator_test.go | 116 +++++++++++++++++++ echokit/entraidjwtauthenticator.go | 4 +- echokit/requirepermissionsmiddleware.go | 11 +- echokit/requirepermissionsmiddleware_test.go | 56 ++++----- 8 files changed, 179 insertions(+), 39 deletions(-) create mode 100644 echokit/d3authjwtauthenticator_test.go diff --git a/echokit/auth0authenticator.go b/echokit/auth0authenticator.go index 2844e15..cab1d30 100644 --- a/echokit/auth0authenticator.go +++ b/echokit/auth0authenticator.go @@ -149,7 +149,7 @@ func (a *Auth0Authenticator) GetAuthenticatedUser(c echo.Context) (*Authenticate EmailVerified: emailVerified, Picture: picture, UpdatedAt: updatedAt, - Permissions: permissions, + Permissions: map[string][]string{a.config.Audience: permissions}, }, nil } } diff --git a/echokit/auth0jwtauthenticator.go b/echokit/auth0jwtauthenticator.go index 24a6952..5adaa49 100644 --- a/echokit/auth0jwtauthenticator.go +++ b/echokit/auth0jwtauthenticator.go @@ -114,7 +114,7 @@ func (a *Auth0JWTAuthenticator) AuthenticateRequest(c echo.Context) error { EmailVerified: customClaims.EmailVerified, Picture: customClaims.Picture, UpdatedAt: customClaims.UpdatedAt, - Permissions: customClaims.Permissions, + Permissions: map[string][]string{a.config.Audience: customClaims.Permissions}, } c.Set(auth0JWTAuthenticatorContextKey, &authenticatedUser) diff --git a/echokit/authenticationmiddleware.go b/echokit/authenticationmiddleware.go index 82746d7..60fe234 100644 --- a/echokit/authenticationmiddleware.go +++ b/echokit/authenticationmiddleware.go @@ -23,7 +23,7 @@ type AuthenticatedUser struct { EmailVerified bool Picture string UpdatedAt int64 - Permissions []string + Permissions map[string][]string } type Authenticator interface { diff --git a/echokit/d3authjwtauthenticator.go b/echokit/d3authjwtauthenticator.go index 2163534..bd87846 100644 --- a/echokit/d3authjwtauthenticator.go +++ b/echokit/d3authjwtauthenticator.go @@ -1,6 +1,7 @@ package echokit import ( + "context" "errors" "net/http" "net/url" @@ -22,6 +23,26 @@ type D3AuthConfig struct { Audience string } +// D3AuthCustomClaims represents the custom claims in a d3-auth JWT. +// Permissions are keyed by API audience identifier. +type D3AuthCustomClaims struct { + Name string `json:"name"` + GivenName string `json:"given_name"` + FamilyName string `json:"family_name"` + MiddleName string `json:"middle_name"` + Nickname string `json:"nickname"` + PreferredUsername string `json:"preferred_username"` + Email string `json:"email"` + EmailVerified bool `json:"email_verified"` + Picture string `json:"picture"` + UpdatedAt int64 `json:"updated_at"` + Permissions map[string][]string `json:"permissions"` +} + +func (c D3AuthCustomClaims) Validate(ctx context.Context) error { + return nil +} + type D3AuthJWTAuthenticator struct { config D3AuthConfig jwtValidator *validator.Validator @@ -44,7 +65,7 @@ func NewD3AuthJWTAuthenticator(config D3AuthConfig) (Authenticator, error) { []string{config.Audience}, validator.WithCustomClaims( func() validator.CustomClaims { - return &Auth0CustomClaims{} + return &D3AuthCustomClaims{} }, ), validator.WithAllowedClockSkew(time.Minute), @@ -80,7 +101,7 @@ func (a *D3AuthJWTAuthenticator) AuthenticateRequest(c echo.Context) error { return errors.New("failed to cast to ValidatedClaims") } - customClaims, ok := validatedClaims.CustomClaims.(*Auth0CustomClaims) + customClaims, ok := validatedClaims.CustomClaims.(*D3AuthCustomClaims) if !ok { return errors.New("failed to cast custom claims") } diff --git a/echokit/d3authjwtauthenticator_test.go b/echokit/d3authjwtauthenticator_test.go new file mode 100644 index 0000000..b64f543 --- /dev/null +++ b/echokit/d3authjwtauthenticator_test.go @@ -0,0 +1,116 @@ +package echokit + +import ( + "net/http" + "net/http/httptest" + "testing" + + "github.com/labstack/echo/v4" + "github.com/stretchr/testify/assert" +) + +func TestD3AuthJWTAuthenticator(t *testing.T) { + t.Run("returns_not_authenticated_when_no_authorization_header", func(t *testing.T) { + authenticator := &D3AuthJWTAuthenticator{} + + _, c, _ := makeD3AuthTestContext(http.MethodGet, "/") + + err := authenticator.AuthenticateRequest(c) + + assert.NoError(t, err) + isAuth, _ := authenticator.IsAuthenticated(c) + assert.False(t, isAuth) + }) + + t.Run("returns_not_authenticated_when_authorization_header_is_not_bearer", func(t *testing.T) { + authenticator := &D3AuthJWTAuthenticator{} + + _, c, _ := makeD3AuthTestContext(http.MethodGet, "/") + c.Request().Header.Set("Authorization", "Basic abc123") + + err := authenticator.AuthenticateRequest(c) + + assert.NoError(t, err) + isAuth, _ := authenticator.IsAuthenticated(c) + assert.False(t, isAuth) + }) + + t.Run("returns_authenticated_user_when_set_in_context", func(t *testing.T) { + authenticator := &D3AuthJWTAuthenticator{} + + _, c, _ := makeD3AuthTestContext(http.MethodGet, "/") + c.Set(d3AuthJWTAuthenticatorContextKey, &AuthenticatedUser{ + Sub: "theSubject", + Email: "theEmail@test.com", + }) + + isAuth, err := authenticator.IsAuthenticated(c) + + assert.NoError(t, err) + assert.True(t, isAuth) + + user, err := authenticator.GetAuthenticatedUser(c) + + assert.NoError(t, err) + assert.Equal(t, "theSubject", user.Sub) + assert.Equal(t, "theEmail@test.com", user.Email) + }) + + t.Run("returns_error_from_GetAuthenticatedUser_when_not_authenticated", func(t *testing.T) { + authenticator := &D3AuthJWTAuthenticator{} + + _, c, _ := makeD3AuthTestContext(http.MethodGet, "/") + + user, err := authenticator.GetAuthenticatedUser(c) + + assert.Error(t, err) + assert.Nil(t, user) + assert.Equal(t, "no authenticated user", err.Error()) + }) + + t.Run("HandleNotAuthenticated_returns_401", func(t *testing.T) { + authenticator := &D3AuthJWTAuthenticator{} + + _, c, rec := makeD3AuthTestContext(http.MethodGet, "/") + + err := authenticator.HandleNotAuthenticated(c) + + assert.NoError(t, err) + assert.Equal(t, http.StatusUnauthorized, rec.Code) + }) +} + +func TestNewD3AuthJWTAuthenticator(t *testing.T) { + t.Run("returns_an_error_when_base_url_is_invalid", func(t *testing.T) { + config := D3AuthConfig{ + BaseURL: "://invalid", + Audience: "anAudience", + } + + authenticator, err := NewD3AuthJWTAuthenticator(config) + + assert.Nil(t, authenticator) + assert.Error(t, err) + assert.Contains(t, err.Error(), "failed to parse d3-auth base URL") + }) + + t.Run("creates_authenticator_with_valid_config", func(t *testing.T) { + config := D3AuthConfig{ + BaseURL: "https://auth.example.com", + Audience: "https://api.example.com", + } + + authenticator, err := NewD3AuthJWTAuthenticator(config) + + assert.NoError(t, err) + assert.NotNil(t, authenticator) + }) +} + +func makeD3AuthTestContext(method, path string) (*echo.Echo, echo.Context, *httptest.ResponseRecorder) { + e := echo.New() + req := httptest.NewRequest(method, path, nil) + rec := httptest.NewRecorder() + c := e.NewContext(req, rec) + return e, c, rec +} diff --git a/echokit/entraidjwtauthenticator.go b/echokit/entraidjwtauthenticator.go index 9a7ec9c..03d2072 100644 --- a/echokit/entraidjwtauthenticator.go +++ b/echokit/entraidjwtauthenticator.go @@ -21,6 +21,7 @@ const ( type EntraIDJWTAuthenticator struct { tenantID string + audience string jwtValidator *validator.Validator } @@ -72,6 +73,7 @@ func NewEntraIDJWTAuthenticator(tenantID, audience string) (Authenticator, error return &EntraIDJWTAuthenticator{ tenantID: tenantID, + audience: audience, jwtValidator: jwtValidator, }, nil } @@ -120,7 +122,7 @@ func (a *EntraIDJWTAuthenticator) AuthenticateRequest(c echo.Context) error { EmailVerified: false, Picture: customClaims.Picture, UpdatedAt: customClaims.UpdatedAt, - Permissions: permissions, + Permissions: map[string][]string{a.audience: permissions}, } c.Set(entraIDJWTAuthenticatorContextKey, &authenticatedUser) diff --git a/echokit/requirepermissionsmiddleware.go b/echokit/requirepermissionsmiddleware.go index 75f10f0..18f3248 100644 --- a/echokit/requirepermissionsmiddleware.go +++ b/echokit/requirepermissionsmiddleware.go @@ -9,7 +9,7 @@ import ( "github.com/labstack/echo/v4" ) -func RequirePermissions(permissions []string, orPermissions ...[]string) echo.MiddlewareFunc { +func RequirePermissions(audience string, permissions []string, orPermissions ...[]string) echo.MiddlewareFunc { return func(next echo.HandlerFunc) echo.HandlerFunc { return func(c echo.Context) error { authenticator, err := GetAuthenticator(c) @@ -36,10 +36,11 @@ func RequirePermissions(permissions []string, orPermissions ...[]string) echo.Mi slog.Debug("checking user permissions", "user", authenticatedUser) - hasPermissions := checkPermissions(authenticatedUser.Permissions, permissions) + userPerms := authenticatedUser.Permissions[audience] + hasPermissions := checkPermissions(userPerms, permissions) if !hasPermissions { for _, orPerms := range orPermissions { - if checkPermissions(authenticatedUser.Permissions, orPerms) { + if checkPermissions(userPerms, orPerms) { hasPermissions = true break } @@ -56,13 +57,13 @@ func RequirePermissions(permissions []string, orPermissions ...[]string) echo.Mi } } -func RequirePermission(permission string, orPermission ...string) echo.MiddlewareFunc { +func RequirePermission(audience, permission string, orPermission ...string) echo.MiddlewareFunc { orPermissions := [][]string{} for _, orP := range orPermission { orPermissions = append(orPermissions, []string{orP}) } - return RequirePermissions([]string{permission}, orPermissions...) + return RequirePermissions(audience, []string{permission}, orPermissions...) } func checkPermissions(userPermissions []string, requiredPermissions []string) bool { diff --git a/echokit/requirepermissionsmiddleware_test.go b/echokit/requirepermissionsmiddleware_test.go index e20dced..74a8c29 100644 --- a/echokit/requirepermissionsmiddleware_test.go +++ b/echokit/requirepermissionsmiddleware_test.go @@ -13,7 +13,7 @@ func TestRequirePermissions(t *testing.T) { e := echo.New() c, rec := NewTestGetRequest(e, "/") - middleware := RequirePermissions([]string{"thePermission"}) + middleware := RequirePermissions("theAudience", []string{"thePermission"}) handler := middleware(func(c echo.Context) error { return c.String(http.StatusOK, "success") }) @@ -35,7 +35,7 @@ func TestRequirePermissions(t *testing.T) { c, rec := NewTestGetRequest(e, "/") c.Set(authenticatorContextKey, fakeAuthenticator) - middleware := RequirePermissions([]string{"thePermission"}) + middleware := RequirePermissions("theAudience", []string{"thePermission"}) handler := middleware(func(c echo.Context) error { return c.String(http.StatusOK, "success") }) @@ -64,7 +64,7 @@ func TestRequirePermissions(t *testing.T) { c.Set(authenticatorContextKey, fakeAuthenticator) - middleware := RequirePermissions([]string{"thePermission"}) + middleware := RequirePermissions("theAudience", []string{"thePermission"}) handler := middleware(func(c echo.Context) error { return c.String(http.StatusOK, "success") }) @@ -90,7 +90,7 @@ func TestRequirePermissions(t *testing.T) { c, rec := NewTestGetRequest(e, "/") c.Set(authenticatorContextKey, fakeAuthenticator) - middleware := RequirePermissions([]string{"thePermission"}) + middleware := RequirePermissions("theAudience", []string{"thePermission"}) handler := middleware(func(c echo.Context) error { return c.String(http.StatusOK, "success") }) @@ -110,7 +110,7 @@ func TestRequirePermissions(t *testing.T) { }, GetAuthenticatedUserFake: func(c echo.Context) (*AuthenticatedUser, error) { return &AuthenticatedUser{ - Permissions: []string{"aPermission"}, + Permissions: map[string][]string{"theAudience": {"aPermission"}}, }, nil }, HandleNotAuthenticatedFake: func(c echo.Context) error { @@ -124,7 +124,7 @@ func TestRequirePermissions(t *testing.T) { c.Set(authenticatorContextKey, fakeAuthenticator) - middleware := RequirePermissions([]string{"thePermission"}) + middleware := RequirePermissions("theAudience", []string{"thePermission"}) handler := middleware(func(c echo.Context) error { return c.String(http.StatusOK, "success") }) @@ -144,7 +144,7 @@ func TestRequirePermissions(t *testing.T) { }, GetAuthenticatedUserFake: func(c echo.Context) (*AuthenticatedUser, error) { return &AuthenticatedUser{ - Permissions: []string{"thePermission1"}, + Permissions: map[string][]string{"theAudience": {"thePermission1"}}, }, nil }, HandleNotAuthenticatedFake: func(c echo.Context) error { @@ -158,7 +158,7 @@ func TestRequirePermissions(t *testing.T) { c.Set(authenticatorContextKey, fakeAuthenticator) - middleware := RequirePermissions([]string{"thePermission1", "thePermission2"}) + middleware := RequirePermissions("theAudience", []string{"thePermission1", "thePermission2"}) handler := middleware(func(c echo.Context) error { return c.String(http.StatusOK, "success") }) @@ -178,7 +178,7 @@ func TestRequirePermissions(t *testing.T) { }, GetAuthenticatedUserFake: func(c echo.Context) (*AuthenticatedUser, error) { return &AuthenticatedUser{ - Permissions: []string{"thePermission"}, + Permissions: map[string][]string{"theAudience": {"thePermission"}}, }, nil }, } @@ -188,7 +188,7 @@ func TestRequirePermissions(t *testing.T) { c.Set(authenticatorContextKey, fakeAuthenticator) - middleware := RequirePermissions([]string{"thePermission"}) + middleware := RequirePermissions("theAudience", []string{"thePermission"}) handler := middleware(func(c echo.Context) error { nextHandlerCalled = true return c.String(http.StatusOK, "success") @@ -209,7 +209,7 @@ func TestRequirePermissions(t *testing.T) { }, GetAuthenticatedUserFake: func(c echo.Context) (*AuthenticatedUser, error) { return &AuthenticatedUser{ - Permissions: []string{"thePermission1", "thePermission2"}, + Permissions: map[string][]string{"theAudience": {"thePermission1", "thePermission2"}}, }, nil }, } @@ -219,7 +219,7 @@ func TestRequirePermissions(t *testing.T) { c.Set(authenticatorContextKey, fakeAuthenticator) - middleware := RequirePermissions([]string{"thePermission1", "thePermission2"}) + middleware := RequirePermissions("theAudience", []string{"thePermission1", "thePermission2"}) handler := middleware(func(c echo.Context) error { nextHandlerCalled = true return c.String(http.StatusOK, "success") @@ -240,7 +240,7 @@ func TestRequirePermissions(t *testing.T) { }, GetAuthenticatedUserFake: func(c echo.Context) (*AuthenticatedUser, error) { return &AuthenticatedUser{ - Permissions: []string{"thePermission1", "thePermission2", "aPermission3"}, + Permissions: map[string][]string{"theAudience": {"thePermission1", "thePermission2", "aPermission3"}}, }, nil }, } @@ -250,7 +250,7 @@ func TestRequirePermissions(t *testing.T) { c.Set(authenticatorContextKey, fakeAuthenticator) - middleware := RequirePermissions([]string{"thePermission1", "thePermission2"}) + middleware := RequirePermissions("theAudience", []string{"thePermission1", "thePermission2"}) handler := middleware(func(c echo.Context) error { nextHandlerCalled = true return c.String(http.StatusOK, "success") @@ -271,7 +271,7 @@ func TestRequirePermissions(t *testing.T) { }, GetAuthenticatedUserFake: func(c echo.Context) (*AuthenticatedUser, error) { return &AuthenticatedUser{ - Permissions: []string{"aPermission"}, + Permissions: map[string][]string{"theAudience": {"aPermission"}}, }, nil }, HandleNotAuthenticatedFake: func(c echo.Context) error { @@ -285,7 +285,7 @@ func TestRequirePermissions(t *testing.T) { c.Set(authenticatorContextKey, fakeAuthenticator) - middleware := RequirePermissions([]string{"thePermission1"}, []string{"thePermission2"}, []string{"thePermission3"}) + middleware := RequirePermissions("theAudience", []string{"thePermission1"}, []string{"thePermission2"}, []string{"thePermission3"}) handler := middleware(func(c echo.Context) error { return c.String(http.StatusOK, "success") }) @@ -305,7 +305,7 @@ func TestRequirePermissions(t *testing.T) { }, GetAuthenticatedUserFake: func(c echo.Context) (*AuthenticatedUser, error) { return &AuthenticatedUser{ - Permissions: []string{"thePermission2"}, + Permissions: map[string][]string{"theAudience": {"thePermission2"}}, }, nil }, } @@ -315,7 +315,7 @@ func TestRequirePermissions(t *testing.T) { c.Set(authenticatorContextKey, fakeAuthenticator) - middleware := RequirePermissions([]string{"thePermission1"}, []string{"thePermission2"}, []string{"thePermission3"}) + middleware := RequirePermissions("theAudience", []string{"thePermission1"}, []string{"thePermission2"}, []string{"thePermission3"}) handler := middleware(func(c echo.Context) error { nextHandlerCalled = true return c.String(http.StatusOK, "success") @@ -336,7 +336,7 @@ func TestRequirePermissions(t *testing.T) { }, GetAuthenticatedUserFake: func(c echo.Context) (*AuthenticatedUser, error) { return &AuthenticatedUser{ - Permissions: []string{"thePermission3"}, + Permissions: map[string][]string{"theAudience": {"thePermission3"}}, }, nil }, } @@ -346,7 +346,7 @@ func TestRequirePermissions(t *testing.T) { c.Set(authenticatorContextKey, fakeAuthenticator) - middleware := RequirePermissions([]string{"thePermission1"}, []string{"thePermission2"}, []string{"thePermission3"}) + middleware := RequirePermissions("theAudience", []string{"thePermission1"}, []string{"thePermission2"}, []string{"thePermission3"}) handler := middleware(func(c echo.Context) error { nextHandlerCalled = true return c.String(http.StatusOK, "success") @@ -367,7 +367,7 @@ func TestRequirePermissions(t *testing.T) { }, GetAuthenticatedUserFake: func(c echo.Context) (*AuthenticatedUser, error) { return &AuthenticatedUser{ - Permissions: []string{"thePermission2", "thePermission3"}, + Permissions: map[string][]string{"theAudience": {"thePermission2", "thePermission3"}}, }, nil }, } @@ -377,7 +377,7 @@ func TestRequirePermissions(t *testing.T) { c.Set(authenticatorContextKey, fakeAuthenticator) - middleware := RequirePermissions( + middleware := RequirePermissions("theAudience", []string{"thePermission1"}, []string{"thePermission2", "thePermission3"}, []string{"thePermission4"}, @@ -402,7 +402,7 @@ func TestRequirePermissions(t *testing.T) { }, GetAuthenticatedUserFake: func(c echo.Context) (*AuthenticatedUser, error) { return &AuthenticatedUser{ - Permissions: []string{"thePermission2"}, + Permissions: map[string][]string{"theAudience": {"thePermission2"}}, }, nil }, HandleNotAuthenticatedFake: func(c echo.Context) error { @@ -416,7 +416,7 @@ func TestRequirePermissions(t *testing.T) { c.Set(authenticatorContextKey, fakeAuthenticator) - middleware := RequirePermissions( + middleware := RequirePermissions("theAudience", []string{"thePermission1"}, []string{"thePermission2", "thePermission3"}, []string{"thePermission4"}, @@ -442,7 +442,7 @@ func TestRequirePermission(t *testing.T) { }, GetAuthenticatedUserFake: func(c echo.Context) (*AuthenticatedUser, error) { return &AuthenticatedUser{ - Permissions: []string{"thePermission"}, + Permissions: map[string][]string{"theAudience": {"thePermission"}}, }, nil }, } @@ -452,7 +452,7 @@ func TestRequirePermission(t *testing.T) { c.Set(authenticatorContextKey, fakeAuthenticator) - middleware := RequirePermission("thePermission") + middleware := RequirePermission("theAudience", "thePermission") handler := middleware(func(c echo.Context) error { nextHandlerCalled = true return c.String(http.StatusOK, "success") @@ -473,7 +473,7 @@ func TestRequirePermission(t *testing.T) { }, GetAuthenticatedUserFake: func(c echo.Context) (*AuthenticatedUser, error) { return &AuthenticatedUser{ - Permissions: []string{"thePermission2"}, + Permissions: map[string][]string{"theAudience": {"thePermission2"}}, }, nil }, } @@ -483,7 +483,7 @@ func TestRequirePermission(t *testing.T) { c.Set(authenticatorContextKey, fakeAuthenticator) - middleware := RequirePermission("thePermission1", "thePermission2", "thePermission3") + middleware := RequirePermission("theAudience", "thePermission1", "thePermission2", "thePermission3") handler := middleware(func(c echo.Context) error { nextHandlerCalled = true return c.String(http.StatusOK, "success") From 2926d3a79326d16aa577294c270b0ba9c40146b7 Mon Sep 17 00:00:00 2001 From: half-ogre Date: Fri, 3 Apr 2026 13:43:31 -0700 Subject: [PATCH 2/2] added test for jsdoc --- echokit/staticfiles_test.go | 105 ++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/echokit/staticfiles_test.go b/echokit/staticfiles_test.go index 665c3b4..5004a7b 100644 --- a/echokit/staticfiles_test.go +++ b/echokit/staticfiles_test.go @@ -539,6 +539,111 @@ func extractFingerprintedPath(html, prefix string) string { return html[start:end] } +func TestStaticFilesMiddleware_JSDocTypeImports(t *testing.T) { + t.Run("jsdoc_typedef_imports_do_not_create_circular_dependencies", func(t *testing.T) { + dir := t.TempDir() + os.MkdirAll(filepath.Join(dir, "views"), 0755) + os.MkdirAll(filepath.Join(dir, "shared"), 0755) + + // parent.js defines types and imports child.js + // child.js has a JSDoc @typedef {import('../views/parent.js').SomeType} — NOT a real import + os.WriteFile(filepath.Join(dir, "index.html"), []byte(``), 0644) + os.WriteFile(filepath.Join(dir, "views", "parent.js"), []byte(`import '../shared/child.js'; +export class SomeType {} +`), 0644) + os.WriteFile(filepath.Join(dir, "shared", "child.js"), []byte(`/** + * @typedef {import('../views/parent.js').SomeType} SomeType + */ +export class ChildComponent {} +`), 0644) + + var logBuf strings.Builder + oldLogger := slog.Default() + slog.SetDefault(slog.New(slog.NewTextHandler(&logBuf, &slog.HandlerOptions{Level: slog.LevelWarn}))) + defer slog.SetDefault(oldLogger) + + m := NewStaticFilesMiddleware(dir, false) + defer m.Close() + e := echo.New() + e.Use(m.Handler()) + + req := httptest.NewRequest(http.MethodGet, "/", nil) + rec := httptest.NewRecorder() + e.ServeHTTP(rec, req) + + assert.Equal(t, http.StatusOK, rec.Code) + assert.NotContains(t, logBuf.String(), "circular dependency", "JSDoc @typedef imports should not cause circular dependency warnings") + }) + + t.Run("jsdoc_typedef_imports_are_not_rewritten", func(t *testing.T) { + dir := t.TempDir() + os.MkdirAll(filepath.Join(dir, "views"), 0755) + os.MkdirAll(filepath.Join(dir, "shared"), 0755) + + os.WriteFile(filepath.Join(dir, "index.html"), []byte(``), 0644) + os.WriteFile(filepath.Join(dir, "views", "parent.js"), []byte(`export class SomeType {}`), 0644) + os.WriteFile(filepath.Join(dir, "shared", "child.js"), []byte(`/** + * @typedef {import('../views/parent.js').SomeType} SomeType + */ +export class ChildComponent {} +`), 0644) + + m := NewStaticFilesMiddleware(dir, false) + defer m.Close() + e := echo.New() + e.Use(m.Handler()) + + // Build + req := httptest.NewRequest(http.MethodGet, "/", nil) + rec := httptest.NewRecorder() + e.ServeHTTP(rec, req) + + // Get the fingerprinted child.js + html := rec.Body.String() + childFP := extractFingerprintedPath(html, "child.") + assert.NotEmpty(t, childFP) + + req = httptest.NewRequest(http.MethodGet, childFP, nil) + rec = httptest.NewRecorder() + e.ServeHTTP(rec, req) + + assert.Equal(t, http.StatusOK, rec.Code) + // JSDoc typedef import should remain unchanged (not fingerprinted) + assert.Contains(t, rec.Body.String(), `{import('../views/parent.js').SomeType}`) + }) + + t.Run("real_dynamic_imports_are_still_rewritten", func(t *testing.T) { + dir := t.TempDir() + os.MkdirAll(filepath.Join(dir, "lib"), 0755) + + os.WriteFile(filepath.Join(dir, "index.html"), []byte(``), 0644) + os.WriteFile(filepath.Join(dir, "lib", "lazy.js"), []byte("export const LAZY = 'v1';"), 0644) + os.WriteFile(filepath.Join(dir, "lib", "app.js"), []byte(`const m = import('./lazy.js');`), 0644) + + m := NewStaticFilesMiddleware(dir, false) + defer m.Close() + e := echo.New() + e.Use(m.Handler()) + + req := httptest.NewRequest(http.MethodGet, "/", nil) + rec := httptest.NewRecorder() + e.ServeHTTP(rec, req) + + html := rec.Body.String() + appFP := extractFingerprintedPath(html, "app.") + assert.NotEmpty(t, appFP) + + req = httptest.NewRequest(http.MethodGet, appFP, nil) + rec = httptest.NewRecorder() + e.ServeHTTP(rec, req) + + assert.Equal(t, http.StatusOK, rec.Code) + // Real dynamic import should be rewritten to fingerprinted path + assert.NotContains(t, rec.Body.String(), `'./lazy.js'`) + assert.Contains(t, rec.Body.String(), "./lazy.") + }) +} + func TestStaticFilesMiddleware_CircularDependencyWarning(t *testing.T) { t.Run("logs_warning_for_circular_imports", func(t *testing.T) { dir := t.TempDir()