wip

Author: jp-knj

internal/js_scanner/js_scanner.go

@@ -229,6 +229,12 @@ func isKeyword(value []byte) bool {
 	return js.Keywords[string(value)] != 0
 }
 
+// isPropsAliasing checks if we're in a Props aliasing context (import { Props as X })
+// rather than destructuring with 'as' property ({ as: Component })
+func isPropsAliasing(idents []string) bool {
+	return len(idents) > 0 && idents[len(idents)-1] == "Props"
+}
+
 func HoistImports(source []byte) HoistedScripts {
 	imports := make([][]byte, 0)
 	importLocs := make([]loc.Loc, 0)
@@ -340,7 +346,8 @@ outer:
 		if js.IsIdentifier(token) {
 			if isKeyword(value) {
 				// fix(#814): fix Props detection when using `{ Props as SomethingElse }`
-				if ident == "Props" && string(value) == "as" {
+				// fix(#927): only reset Props when 'as' follows 'Props' in the same context
+				if ident == "Props" && string(value) == "as" && isPropsAliasing(idents) {
 					start = 0
 					ident = defaultPropType
 					idents = make([]string, 0)

internal/js_scanner/js_scanner_test.go

@@ -775,3 +775,96 @@ func TestGetObjectKeys(t *testing.T) {
 		})
 	}
 }
+
+func TestGetPropsType(t *testing.T) {
+	tests := []struct {
+		name   string
+		source string
+		want   Props
+	}{
+		{
+			name:   "no props",
+			source: `const foo = "bar"`,
+			want: Props{
+				Ident:     "Record<string, any>",
+				Statement: "",
+				Generics:  "",
+			},
+		},
+		{
+			name: "interface Props",
+			source: `interface Props {
+				foo: string;
+			}`,
+			want: Props{
+				Ident:     "Props",
+				Statement: "",
+				Generics:  "",
+			},
+		},
+		{
+			name: "type Props",
+			source: `type Props = {
+				foo: string;
+			}`,
+			want: Props{
+				Ident:     "Props",
+				Statement: "",
+				Generics:  "",
+			},
+		},
+		{
+			name: "Props with generics",
+			source: `interface Props<T> {
+				foo: T;
+			}`,
+			want: Props{
+				Ident:     "Props",
+				Statement: "<T>",
+				Generics:  "<T>",
+			},
+		},
+		{
+			name: "destructuring with 'as' prop name without type assertion - issue #927",
+			source: `interface Props {
+				as?: string;
+				href?: string;
+			}
+			const { as: Component, href } = Astro.props;`,
+			want: Props{
+				Ident:     "Props",
+				Statement: "",
+				Generics:  "",
+			},
+		},
+		{
+			name: "destructuring with 'as' prop name with type assertion",
+			source: `interface Props {
+				as?: string;
+				href?: string;
+			}
+			const { as: Component, href } = Astro.props as Props;`,
+			want: Props{
+				Ident:     "Props",
+				Statement: "",
+				Generics:  "",
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := GetPropsType([]byte(tt.source))
+			if got.Ident != tt.want.Ident {
+				t.Errorf("Ident: got %q, want %q", got.Ident, tt.want.Ident)
+				t.Logf("Source:\n%s", tt.source)
+			}
+			if got.Statement != tt.want.Statement {
+				t.Errorf("Statement: got %q, want %q", got.Statement, tt.want.Statement)
+			}
+			if got.Generics != tt.want.Generics {
+				t.Errorf("Generics: got %q, want %q", got.Generics, tt.want.Generics)
+			}
+		})
+	}
+}