vue-component-meta 3.0.0-alpha.0 → 3.0.0-alpha.10

package/lib/base.js

@@ -21,7 +21,6 @@ const typescript_1 = require("@volar/typescript");
 const vue = require("@vue/language-core");
 const path_browserify_1 = require("path-browserify");
 const vue_component_type_helpers_1 = require("vue-component-type-helpers");
-const vue2_1 = require("vue-component-type-helpers/vue2");
 __exportStar(require("./types"), exports);
 const windowsPathReg = /\\/g;
 function createCheckerByJsonConfigBase(ts, rootDir, json, checkerOptions = {}) {
@@ -189,7 +188,7 @@ interface ComponentMeta<T> {
 	exposed: ComponentExposed<T>;
 };
 
-${commandLine.vueOptions.target < 3 ? vue2_1.code : vue_component_type_helpers_1.code}
+${vue_component_type_helpers_1.code}
 `.trim();
         return code;
     }
@@ -240,7 +239,7 @@ ${commandLine.vueOptions.target < 3 ? vue2_1.code : vue_component_type_helpers_1
         }
         function getProps() {
             const $props = symbolProperties.find(prop => prop.escapedName === 'props');
-            const propEventRegex = /^(on[A-Z])/;
+            const vnodeEventRegex = /^onVnode[A-Z]/;
             let result = [];
             if ($props) {
                 const type = typeChecker.getTypeOfSymbolAtLocation($props, symbolNode);
@@ -250,7 +249,7 @@ ${commandLine.vueOptions.target < 3 ? vue2_1.code : vue_component_type_helpers_1
                     const { resolveNestedProperties, } = createSchemaResolvers(typeChecker, symbolNode, checkerOptions, ts, language);
                     return resolveNestedProperties(prop);
                 })
-                    .filter(prop => !propEventRegex.test(prop.name));
+                    .filter(prop => !vnodeEventRegex.test(prop.name));
             }
             // fill global
             if (componentPath !== globalComponentName) {
@@ -356,7 +355,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 +394,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 +413,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 +430,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() {
@@ -443,9 +442,32 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
         };
     }
     function resolveEventSignature(call) {
-        const subtype = typeChecker.getTypeOfSymbolAtLocation(call.parameters[1], symbolNode);
         let schema;
         let declarations;
+        let subtype = undefined;
+        let subtypeStr = '[]';
+        let getSchema = () => [];
+        if (call.parameters.length >= 2) {
+            subtype = typeChecker.getTypeOfSymbolAtLocation(call.parameters[1], symbolNode);
+            if (call.parameters[1].valueDeclaration?.dotDotDotToken) {
+                subtypeStr = getFullyQualifiedName(subtype);
+                getSchema = () => typeChecker.getTypeArguments(subtype).map(resolveSchema);
+            }
+            else {
+                subtypeStr = '[';
+                for (let i = 1; i < call.parameters.length; i++) {
+                    subtypeStr += getFullyQualifiedName(typeChecker.getTypeOfSymbolAtLocation(call.parameters[i], symbolNode)) + ', ';
+                }
+                subtypeStr = subtypeStr.slice(0, -2) + ']';
+                getSchema = () => {
+                    const result = [];
+                    for (let i = 1; i < call.parameters.length; i++) {
+                        result.push(resolveSchema(typeChecker.getTypeOfSymbolAtLocation(call.parameters[i], symbolNode)));
+                    }
+                    return result;
+                };
+            }
+        }
         return {
             name: typeChecker.getTypeOfSymbolAtLocation(call.parameters[0], symbolNode).value,
             description: ts.displayPartsToString(call.getDocumentationComment(typeChecker)),
@@ -453,14 +475,14 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
                 name: tag.name,
                 text: tag.text !== undefined ? ts.displayPartsToString(tag.text) : undefined,
             })),
-            type: typeChecker.typeToString(subtype),
+            type: subtypeStr,
             rawType: rawType ? subtype : undefined,
             signature: typeChecker.signatureToString(call),
             get declarations() {
                 return declarations ??= call.declaration ? getDeclarations([call.declaration]) : [];
             },
             get schema() {
-                return schema ??= typeChecker.getTypeArguments(subtype).map(resolveSchema);
+                return schema ??= getSchema();
             },
         };
     }
@@ -479,7 +501,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;
         }
@@ -494,7 +516,6 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
                 },
             };
         }
-        // @ts-ignore - typescript internal, isArrayLikeType exists
         else if (typeChecker.isArrayLikeType(subtype)) {
             let schema;
             return {
@@ -521,6 +542,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 [];
@@ -676,7 +704,6 @@ function readTsComponentDefaultProps(ast, exportName, printer, ts) {
                 return component;
             }
             // export default defineComponent({ ... })
-            // export default Vue.extend({ ... })
             else if (ts.isCallExpression(component)) {
                 if (component.arguments.length) {
                     const arg = component.arguments[0];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vue-component-meta",
-	"version": "3.0.0-alpha.0",
+	"version": "3.0.0-alpha.10",
 	"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.0",
+		"@volar/typescript": "~2.4.13",
+		"@vue/language-core": "3.0.0-alpha.10",
 		"path-browserify": "^1.0.1",
-		"vue-component-type-helpers": "3.0.0-alpha.0"
+		"vue-component-type-helpers": "3.0.0-alpha.10"
 	},
 	"peerDependencies": {
 		"typescript": "*"
@@ -30,5 +30,5 @@
 		"@types/node": "^22.10.4",
 		"@types/path-browserify": "^1.0.1"
 	},
-	"gitHead": "4b49cbe09097e482def4603b90f6c3b93bb2e913"
+	"gitHead": "28308b4f76cc80c7632f39ae7e0944f1889661a2"
 }