vue-component-meta 2.2.0 → 2.2.4

package/lib/base.js

@@ -99,8 +99,8 @@ function baseCreate(ts, getCommandLine, checkerOptions, rootPath, globalComponen
     const directoryExists = languageServiceHost.directoryExists?.bind(languageServiceHost);
     const fileExists = languageServiceHost.fileExists.bind(languageServiceHost);
     const getScriptSnapshot = languageServiceHost.getScriptSnapshot.bind(languageServiceHost);
-    const globalTypesName = `${commandLine.vueOptions.lib}_${commandLine.vueOptions.target}_${commandLine.vueOptions.strictTemplates}.d.ts`;
-    const globalTypesContents = `// @ts-nocheck\nexport {};\n` + vue.generateGlobalTypes(commandLine.vueOptions.lib, commandLine.vueOptions.target, commandLine.vueOptions.strictTemplates);
+    const globalTypesName = vue.getGlobalTypesFileName(commandLine.vueOptions);
+    const globalTypesContents = `// @ts-nocheck\nexport {};\n` + vue.generateGlobalTypes(commandLine.vueOptions);
     const globalTypesSnapshot = {
         getText: (start, end) => globalTypesContents.slice(start, end),
         getLength: () => globalTypesContents.length,
@@ -261,13 +261,14 @@ ${commandLine.vueOptions.target < 3 ? vue2_1.code : vue_component_type_helpers_1
             }
             // fill defaults
             const printer = ts.createPrinter(checkerOptions.printer);
-            const snapshot = language.scripts.get(componentPath)?.snapshot;
-            const vueFile = language.scripts.get(componentPath)?.generated?.root;
+            const sourceScript = language.scripts.get(componentPath);
+            const { snapshot } = sourceScript;
+            const vueFile = sourceScript.generated?.root;
             const vueDefaults = vueFile && exportName === 'default'
-                ? (vueFile instanceof vue.VueVirtualCode ? readVueComponentDefaultProps(vueFile, printer, ts, commandLine.vueOptions) : {})
+                ? (vueFile instanceof vue.VueVirtualCode ? readVueComponentDefaultProps(vueFile, printer, ts) : {})
                 : {};
-            const tsDefaults = !vueFile ? readTsComponentDefaultProps(componentPath.slice(componentPath.lastIndexOf('.') + 1), // ts | js | tsx | jsx
-            snapshot.getText(0, snapshot.getLength()), exportName, printer, ts) : {};
+            const tsDefaults = !vueFile ? readTsComponentDefaultProps(ts.createSourceFile('/tmp.' + componentPath.slice(componentPath.lastIndexOf('.') + 1), // ts | js | tsx | jsx
+            snapshot.getText(0, snapshot.getLength()), ts.ScriptTarget.Latest), exportName, printer, ts) : {};
             for (const [propName, defaultExp] of Object.entries({
                 ...vueDefaults,
                 ...tsDefaults,
@@ -528,9 +529,9 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
     }
     function getDeclaration(declaration) {
         const fileName = declaration.getSourceFile().fileName;
-        const sourceFile = language.scripts.get(fileName);
-        if (sourceFile?.generated) {
-            const script = sourceFile.generated.languagePlugin.typescript?.getServiceScript(sourceFile.generated.root);
+        const sourceScript = language.scripts.get(fileName);
+        if (sourceScript?.generated) {
+            const script = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
             if (script) {
                 for (const [sourceScript, map] of language.maps.forEach(script.code)) {
                     for (const [start] of map.toSourceLocation(declaration.getStart())) {
@@ -558,18 +559,21 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
         resolveSchema,
     };
 }
-function readVueComponentDefaultProps(vueSourceFile, printer, ts, vueCompilerOptions) {
+function readVueComponentDefaultProps(root, printer, ts) {
     let result = {};
+    const { sfc } = root;
     scriptSetupWorker();
     scriptWorker();
     return result;
     function scriptSetupWorker() {
-        const descriptor = vueSourceFile._sfc;
-        const scriptSetupRanges = descriptor.scriptSetup ? vue.parseScriptSetupRanges(ts, descriptor.scriptSetup.ast, vueCompilerOptions) : undefined;
-        if (descriptor.scriptSetup && scriptSetupRanges?.withDefaults?.arg) {
-            const defaultsText = descriptor.scriptSetup.content.slice(scriptSetupRanges.withDefaults.arg.start, scriptSetupRanges.withDefaults.arg.end);
-            const ast = ts.createSourceFile('/tmp.' + descriptor.scriptSetup.lang, '(' + defaultsText + ')', ts.ScriptTarget.Latest);
-            const obj = findObjectLiteralExpression(ast);
+        const ast = sfc.scriptSetup?.ast;
+        if (!ast) {
+            return;
+        }
+        const codegen = vue.tsCodegen.get(sfc);
+        const scriptSetupRanges = codegen?.getScriptSetupRanges();
+        if (scriptSetupRanges?.withDefaults?.argNode) {
+            const obj = findObjectLiteralExpression(scriptSetupRanges.withDefaults.argNode);
             if (obj) {
                 for (const prop of obj.properties) {
                     if (ts.isPropertyAssignment(prop)) {
@@ -583,10 +587,8 @@ function readVueComponentDefaultProps(vueSourceFile, printer, ts, vueCompilerOpt
                 }
             }
         }
-        else if (descriptor.scriptSetup && scriptSetupRanges?.defineProps?.arg) {
-            const defaultsText = descriptor.scriptSetup.content.slice(scriptSetupRanges.defineProps.arg.start, scriptSetupRanges.defineProps.arg.end);
-            const ast = ts.createSourceFile('/tmp.' + descriptor.scriptSetup.lang, '(' + defaultsText + ')', ts.ScriptTarget.Latest);
-            const obj = findObjectLiteralExpression(ast);
+        else if (scriptSetupRanges?.defineProps?.argNode) {
+            const obj = findObjectLiteralExpression(scriptSetupRanges.defineProps.argNode);
             if (obj) {
                 result = {
                     ...result,
@@ -594,6 +596,14 @@ function readVueComponentDefaultProps(vueSourceFile, printer, ts, vueCompilerOpt
                 };
             }
         }
+        else if (scriptSetupRanges?.defineProps?.destructured) {
+            for (const [prop, initializer] of scriptSetupRanges.defineProps.destructured) {
+                if (initializer) {
+                    const expText = printer?.printNode(ts.EmitHint.Expression, initializer, ast) ?? initializer.getText(ast);
+                    result[prop] = { default: expText };
+                }
+            }
+        }
         function findObjectLiteralExpression(node) {
             if (ts.isObjectLiteralExpression(node)) {
                 return node;
@@ -608,17 +618,17 @@ function readVueComponentDefaultProps(vueSourceFile, printer, ts, vueCompilerOpt
         }
     }
     function scriptWorker() {
-        const descriptor = vueSourceFile._sfc;
-        if (descriptor.script) {
-            const scriptResult = readTsComponentDefaultProps(descriptor.script.lang, descriptor.script.content, 'default', printer, ts);
-            for (const [key, value] of Object.entries(scriptResult)) {
-                result[key] = value;
-            }
+        const ast = sfc.script?.ast;
+        if (!ast) {
+            return;
+        }
+        const scriptResult = readTsComponentDefaultProps(ast, 'default', printer, ts);
+        for (const [key, value] of Object.entries(scriptResult)) {
+            result[key] = value;
         }
     }
 }
-function readTsComponentDefaultProps(lang, tsFileText, exportName, printer, ts) {
-    const ast = ts.createSourceFile('/tmp.' + lang, tsFileText, ts.ScriptTarget.Latest);
+function readTsComponentDefaultProps(ast, exportName, printer, ts) {
     const props = getPropsNode();
     if (props) {
         return resolvePropsOption(ast, props, printer, ts);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vue-component-meta",
-	"version": "2.2.0",
+	"version": "2.2.4",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -14,9 +14,9 @@
 	},
 	"dependencies": {
 		"@volar/typescript": "~2.4.11",
-		"@vue/language-core": "2.2.0",
+		"@vue/language-core": "2.2.4",
 		"path-browserify": "^1.0.1",
-		"vue-component-type-helpers": "2.2.0"
+		"vue-component-type-helpers": "2.2.4"
 	},
 	"peerDependencies": {
 		"typescript": "*"
@@ -27,8 +27,8 @@
 		}
 	},
 	"devDependencies": {
-		"@types/node": "latest",
-		"@types/path-browserify": "latest"
+		"@types/node": "^22.10.4",
+		"@types/path-browserify": "^1.0.1"
 	},
-	"gitHead": "5babca774658d4b9afbe877ac7c8cafdaecf2c3e"
+	"gitHead": "c28986596935cb43979c9d437c25f292bdb36cef"
 }