fix(component-meta): attach namespace prefix correctly on generated types (#5326)

KazariEX · web-flow · commit 2a1a9b29e4b4 · 2025-04-26T19:34:42.000+08:00
diff --git a/packages/component-meta/lib/base.ts b/packages/component-meta/lib/base.ts
@@ -486,7 +486,7 @@ function createSchemaResolvers(
 	const visited = new Set<ts.Type>();
 
 	function shouldIgnore(subtype: ts.Type) {
-		const name = typeChecker.typeToString(subtype);
+		const name = getFullyQualifiedName(subtype);
 		if (name === 'any') {
 			return true;
 		}
@@ -531,7 +531,7 @@ function createSchemaResolvers(
 				text: tag.text !== undefined ? ts.displayPartsToString(tag.text) : undefined,
 			})),
 			required: !(prop.flags & ts.SymbolFlags.Optional),
-			type: typeChecker.typeToString(subtype),
+			type: getFullyQualifiedName(subtype),
 			rawType: rawType ? subtype : undefined,
 			get declarations() {
 				return declarations ??= getDeclarations(prop.declarations ?? []);
@@ -551,7 +551,7 @@ function createSchemaResolvers(
 
 		return {
 			name: prop.getName(),
-			type: typeChecker.typeToString(subtype),
+			type: getFullyQualifiedName(subtype),
 			rawType: rawType ? subtype : undefined,
 			description: ts.displayPartsToString(prop.getDocumentationComment(typeChecker)),
 			get declarations() {
@@ -569,7 +569,7 @@ function createSchemaResolvers(
 
 		return {
 			name: expose.getName(),
-			type: typeChecker.typeToString(subtype),
+			type: getFullyQualifiedName(subtype),
 			rawType: rawType ? subtype : undefined,
 			description: ts.displayPartsToString(expose.getDocumentationComment(typeChecker)),
 			get declarations() {
@@ -590,13 +590,13 @@ function createSchemaResolvers(
 		if (call.parameters.length >= 2) {
 			subtype = typeChecker.getTypeOfSymbolAtLocation(call.parameters[1], symbolNode);
 			if ((call.parameters[1].valueDeclaration as any)?.dotDotDotToken) {
-				subtypeStr = typeChecker.typeToString(subtype);
+				subtypeStr = getFullyQualifiedName(subtype);
 				getSchema = () => typeChecker.getTypeArguments(subtype! as ts.TypeReference).map(resolveSchema);
 			}
 			else {
 				subtypeStr = '[';
 				for (let i = 1; i < call.parameters.length; i++) {
-					subtypeStr += typeChecker.typeToString(typeChecker.getTypeOfSymbolAtLocation(call.parameters[i], symbolNode)) + ', ';
+					subtypeStr += getFullyQualifiedName(typeChecker.getTypeOfSymbolAtLocation(call.parameters[i], symbolNode)) + ', ';
 				}
 				subtypeStr = subtypeStr.slice(0, -2) + ']';
 				getSchema = () => {
@@ -643,7 +643,7 @@ function createSchemaResolvers(
 		};
 	}
 	function resolveSchema(subtype: ts.Type): PropertyMetaSchema {
-		const type = typeChecker.typeToString(subtype);
+		const type = getFullyQualifiedName(subtype);
 
 		if (shouldIgnore(subtype)) {
 			return type;
@@ -662,7 +662,6 @@ function createSchemaResolvers(
 			};
 		}
 
-		// @ts-ignore - typescript internal, isArrayLikeType exists
 		else if (typeChecker.isArrayLikeType(subtype)) {
 			let schema: PropertyMetaSchema[];
 			return {
@@ -694,6 +693,13 @@ function createSchemaResolvers(
 
 		return type;
 	}
+	function getFullyQualifiedName(type: ts.Type) {
+		const str = typeChecker.typeToString(type, undefined, ts.TypeFormatFlags.UseFullyQualifiedType | ts.TypeFormatFlags.NoTruncation);
+		if (str.includes('import(')) {
+			return str.replace(/import\(.*?\)\./g, '');
+		}
+		return str;
+	}
 	function getDeclarations(declaration: ts.Declaration[]) {
 		if (noDeclarations) {
 			return [];
diff --git a/packages/component-meta/tests/index.spec.ts b/packages/component-meta/tests/index.spec.ts
@@ -88,6 +88,7 @@ const worker = (checker: ComponentMetaChecker, withTsconfig: boolean) => describ
 		const array = meta.props.find(prop => prop.name === 'array');
 		const arrayOptional = meta.props.find(prop => prop.name === 'arrayOptional');
 		const enumValue = meta.props.find(prop => prop.name === 'enumValue');
+		const namespaceType = meta.props.find(prop => prop.name === 'namespaceType');
 		const literalFromContext = meta.props.find(prop => prop.name === 'literalFromContext');
 		const inlined = meta.props.find(prop => prop.name === 'inlined');
 		const recursive = meta.props.find(prop => prop.name === 'recursive');
@@ -331,6 +332,17 @@ const worker = (checker: ComponentMetaChecker, withTsconfig: boolean) => describ
 			schema: ['MyEnum.Small', 'MyEnum.Medium', 'MyEnum.Large']
 		});
 
+		expect(namespaceType).toBeDefined();
+		expect(namespaceType?.default).toBeUndefined();
+		expect(namespaceType?.required).toBeTruthy();
+		expect(namespaceType?.type).toEqual('MyNamespace.MyType');
+		expect(namespaceType?.description).toEqual('namespace type');
+		expect(namespaceType?.schema).toEqual({
+			kind: 'object',
+			type: 'MyNamespace.MyType',
+			schema: {}
+		});
+
 		expect(inlined).toBeDefined();
 		expect(inlined?.default).toBeUndefined();
 		expect(inlined?.required).toBeTruthy();
diff --git a/packages/tsc/tests/__snapshots__/dts.spec.ts.snap b/packages/tsc/tests/__snapshots__/dts.spec.ts.snap
@@ -620,6 +620,9 @@ declare enum MyEnum {
     Medium = 1,
     Large = 2
 }
+declare namespace MyNamespace {
+    type MyType = {};
+}
 declare const categories: readonly ["Uncategorized", "Content", "Interaction", "Display", "Forms", "Addons"];
 type MyCategories = typeof categories[number];
 export interface MyProps {
@@ -682,6 +685,10 @@ export interface MyProps {
      * enum value
      */
     enumValue: MyEnum;
+    /**
+     * namespace type
+     */
+    namespaceType: MyNamespace.MyType;
     /**
      * literal type alias that require context
      */
diff --git a/test-workspace/component-meta/reference-type-props/my-props.ts b/test-workspace/component-meta/reference-type-props/my-props.ts
@@ -19,6 +19,10 @@ enum MyEnum {
 	Large,
 }
 
+namespace MyNamespace {
+	export type MyType = {};
+}
+
 const categories = [
 	'Uncategorized',
 	'Content',
@@ -90,6 +94,10 @@ export interface MyProps {
 	 * enum value
 	 */
 	enumValue: MyEnum,
+	/**
+	 * namespace type
+	 */
+	namespaceType: MyNamespace.MyType,
 	/**
 	 * literal type alias that require context
 	 */
