vue-component-meta 3.0.0-alpha.2 → 3.0.0-alpha.6

package/lib/base.js

@@ -356,7 +356,7 @@ ${commandLine.vueOptions.target < 3 ? vue2_1.code : vue_component_type_helpers_1
 function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: options, noDeclarations }, ts, language) {
     const visited = new Set();
     function shouldIgnore(subtype) {
-        const name = typeChecker.typeToString(subtype);
+        const name = getFullyQualifiedName(subtype);
         if (name === 'any') {
             return true;
         }
@@ -395,7 +395,7 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
                 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 ?? []);
@@ -414,7 +414,7 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
         let declarations;
         return {
             name: prop.getName(),
-            type: typeChecker.typeToString(subtype),
+            type: getFullyQualifiedName(subtype),
             rawType: rawType ? subtype : undefined,
             description: ts.displayPartsToString(prop.getDocumentationComment(typeChecker)),
             get declarations() {
@@ -431,7 +431,7 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
         let declarations;
         return {
             name: expose.getName(),
-            type: typeChecker.typeToString(subtype),
+            type: getFullyQualifiedName(subtype),
             rawType: rawType ? subtype : undefined,
             description: ts.displayPartsToString(expose.getDocumentationComment(typeChecker)),
             get declarations() {
@@ -451,13 +451,13 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
         if (call.parameters.length >= 2) {
             subtype = typeChecker.getTypeOfSymbolAtLocation(call.parameters[1], symbolNode);
             if (call.parameters[1].valueDeclaration?.dotDotDotToken) {
-                subtypeStr = typeChecker.typeToString(subtype);
+                subtypeStr = getFullyQualifiedName(subtype);
                 getSchema = () => typeChecker.getTypeArguments(subtype).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 = () => {
@@ -502,7 +502,7 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
         };
     }
     function resolveSchema(subtype) {
-        const type = typeChecker.typeToString(subtype);
+        const type = getFullyQualifiedName(subtype);
         if (shouldIgnore(subtype)) {
             return type;
         }
@@ -517,7 +517,6 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
                 },
             };
         }
-        // @ts-ignore - typescript internal, isArrayLikeType exists
         else if (typeChecker.isArrayLikeType(subtype)) {
             let schema;
             return {
@@ -544,6 +543,13 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
         }
         return type;
     }
+    function getFullyQualifiedName(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) {
         if (noDeclarations) {
             return [];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vue-component-meta",
-	"version": "3.0.0-alpha.2",
+	"version": "3.0.0-alpha.6",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -13,10 +13,10 @@
 		"directory": "packages/component-meta"
 	},
 	"dependencies": {
-		"@volar/typescript": "~2.4.11",
-		"@vue/language-core": "3.0.0-alpha.2",
+		"@volar/typescript": "~2.4.13",
+		"@vue/language-core": "3.0.0-alpha.6",
 		"path-browserify": "^1.0.1",
-		"vue-component-type-helpers": "3.0.0-alpha.2"
+		"vue-component-type-helpers": "3.0.0-alpha.6"
 	},
 	"peerDependencies": {
 		"typescript": "*"
@@ -30,5 +30,5 @@
 		"@types/node": "^22.10.4",
 		"@types/path-browserify": "^1.0.1"
 	},
-	"gitHead": "79247b7c24b7202ec676723440fdb36c38e6d450"
+	"gitHead": "a7b5649ab4957cd2228f4bbc9205b2008bff58a2"
 }