vue-component-meta 2.2.2 → 2.2.6

package/lib/base.js

@@ -561,15 +561,16 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
 }
 function readVueComponentDefaultProps(root, printer, ts) {
     let result = {};
+    const { sfc } = root;
     scriptSetupWorker();
     scriptWorker();
     return result;
     function scriptSetupWorker() {
-        const ast = root._sfc.scriptSetup?.ast;
-        if (!ast) {
+        if (!sfc.scriptSetup) {
             return;
         }
-        const codegen = vue.tsCodegen.get(root._sfc);
+        const { ast } = sfc.scriptSetup;
+        const codegen = vue.tsCodegen.get(sfc);
         const scriptSetupRanges = codegen?.getScriptSetupRanges();
         if (scriptSetupRanges?.withDefaults?.argNode) {
             const obj = findObjectLiteralExpression(scriptSetupRanges.withDefaults.argNode);
@@ -596,10 +597,21 @@ function readVueComponentDefaultProps(root, printer, ts) {
             }
         }
         else if (scriptSetupRanges?.defineProps?.destructured) {
-            for (const [prop, initializer] of scriptSetupRanges.defineProps.destructured) {
+            for (const [name, initializer] of scriptSetupRanges.defineProps.destructured) {
                 if (initializer) {
                     const expText = printer?.printNode(ts.EmitHint.Expression, initializer, ast) ?? initializer.getText(ast);
-                    result[prop] = { default: expText };
+                    result[name] = {
+                        default: expText
+                    };
+                }
+            }
+        }
+        if (scriptSetupRanges?.defineProp) {
+            for (const defineProp of scriptSetupRanges.defineProp) {
+                const obj = defineProp.argNode ? findObjectLiteralExpression(defineProp.argNode) : undefined;
+                if (obj) {
+                    const name = defineProp.name ? sfc.scriptSetup.content.slice(defineProp.name.start, defineProp.name.end).slice(1, -1) : 'modelValue';
+                    result[name] = resolveModelOption(ast, obj, printer, ts);
                 }
             }
         }
@@ -617,12 +629,13 @@ function readVueComponentDefaultProps(root, printer, ts) {
         }
     }
     function scriptWorker() {
-        const sfc = root._sfc;
-        if (sfc.script) {
-            const scriptResult = readTsComponentDefaultProps(sfc.script.ast, 'default', printer, ts);
-            for (const [key, value] of Object.entries(scriptResult)) {
-                result[key] = value;
-            }
+        if (!sfc.script) {
+            return;
+        }
+        const { ast } = sfc.script;
+        const scriptResult = readTsComponentDefaultProps(ast, 'default', printer, ts);
+        for (const [key, value] of Object.entries(scriptResult)) {
+            result[key] = value;
         }
     }
 }
@@ -707,6 +720,20 @@ function resolvePropsOption(ast, props, printer, ts) {
     }
     return result;
 }
+function resolveModelOption(ast, options, printer, ts) {
+    const result = {};
+    for (const prop of options.properties) {
+        if (ts.isPropertyAssignment(prop)) {
+            const name = prop.name.getText(ast);
+            if (name === 'default') {
+                const expNode = resolveDefaultOptionExpression(prop.initializer, ts);
+                const expText = printer?.printNode(ts.EmitHint.Expression, expNode, ast) ?? expNode.getText(ast);
+                result.default = expText;
+            }
+        }
+    }
+    return result;
+}
 function resolveDefaultOptionExpression(_default, ts) {
     if (ts.isArrowFunction(_default)) {
         if (ts.isBlock(_default.body)) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vue-component-meta",
-	"version": "2.2.2",
+	"version": "2.2.6",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -14,9 +14,9 @@
 	},
 	"dependencies": {
 		"@volar/typescript": "~2.4.11",
-		"@vue/language-core": "2.2.2",
+		"@vue/language-core": "2.2.6",
 		"path-browserify": "^1.0.1",
-		"vue-component-type-helpers": "2.2.2"
+		"vue-component-type-helpers": "2.2.6"
 	},
 	"peerDependencies": {
 		"typescript": "*"
@@ -30,5 +30,5 @@
 		"@types/node": "^22.10.4",
 		"@types/path-browserify": "^1.0.1"
 	},
-	"gitHead": "30757908b67f40f779c36795665163634fb81868"
+	"gitHead": "f2088e256dc0220db9549d28d9f865a5711dcfbe"
 }