vue-component-meta 2.1.8 → 2.2.0

package/lib/base.js

@@ -102,7 +102,7 @@ function baseCreate(ts, getCommandLine, checkerOptions, rootPath, globalComponen
     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 globalTypesSnapshot = {
-        getText: (start, end) => globalTypesContents.substring(start, end),
+        getText: (start, end) => globalTypesContents.slice(start, end),
         getLength: () => globalTypesContents.length,
         getChangeRange: () => undefined,
     };
@@ -174,11 +174,11 @@ function baseCreate(ts, getCommandLine, checkerOptions, rootPath, globalComponen
     function getMetaFileName(fileName) {
         return (commandLine.vueOptions.extensions.some(ext => fileName.endsWith(ext))
             ? fileName
-            : fileName.substring(0, fileName.lastIndexOf('.'))) + '.meta.ts';
+            : fileName.slice(0, fileName.lastIndexOf('.'))) + '.meta.ts';
     }
     function getMetaScriptContent(fileName) {
         let code = `
-import * as Components from '${fileName.substring(0, fileName.length - '.meta.ts'.length)}';
+import * as Components from '${fileName.slice(0, -'.meta.ts'.length)}';
 export default {} as { [K in keyof typeof Components]: ComponentMeta<typeof Components[K]>; };
 
 interface ComponentMeta<T> {
@@ -250,7 +250,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 => !prop.name.match(propEventRegex));
+                    .filter(prop => !propEventRegex.test(prop.name));
             }
             // fill global
             if (componentPath !== globalComponentName) {
@@ -266,7 +266,7 @@ ${commandLine.vueOptions.target < 3 ? vue2_1.code : vue_component_type_helpers_1
             const vueDefaults = vueFile && exportName === 'default'
                 ? (vueFile instanceof vue.VueVirtualCode ? readVueComponentDefaultProps(vueFile, printer, ts, commandLine.vueOptions) : {})
                 : {};
-            const tsDefaults = !vueFile ? readTsComponentDefaultProps(componentPath.substring(componentPath.lastIndexOf('.') + 1), // ts | js | tsx | jsx
+            const tsDefaults = !vueFile ? readTsComponentDefaultProps(componentPath.slice(componentPath.lastIndexOf('.') + 1), // ts | js | tsx | jsx
             snapshot.getText(0, snapshot.getLength()), exportName, printer, ts) : {};
             for (const [propName, defaultExp] of Object.entries({
                 ...vueDefaults,
@@ -566,8 +566,8 @@ function readVueComponentDefaultProps(vueSourceFile, printer, ts, vueCompilerOpt
     function scriptSetupWorker() {
         const descriptor = vueSourceFile._sfc;
         const scriptSetupRanges = descriptor.scriptSetup ? vue.parseScriptSetupRanges(ts, descriptor.scriptSetup.ast, vueCompilerOptions) : undefined;
-        if (descriptor.scriptSetup && scriptSetupRanges?.props.withDefaults?.arg) {
-            const defaultsText = descriptor.scriptSetup.content.substring(scriptSetupRanges.props.withDefaults.arg.start, scriptSetupRanges.props.withDefaults.arg.end);
+        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);
             if (obj) {
@@ -583,8 +583,8 @@ function readVueComponentDefaultProps(vueSourceFile, printer, ts, vueCompilerOpt
                 }
             }
         }
-        else if (descriptor.scriptSetup && scriptSetupRanges?.props.define?.arg) {
-            const defaultsText = descriptor.scriptSetup.content.substring(scriptSetupRanges.props.define.arg.start, scriptSetupRanges.props.define.arg.end);
+        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);
             if (obj) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vue-component-meta",
-	"version": "2.1.8",
+	"version": "2.2.0",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -13,10 +13,10 @@
 		"directory": "packages/component-meta"
 	},
 	"dependencies": {
-		"@volar/typescript": "~2.4.8",
-		"@vue/language-core": "2.1.8",
+		"@volar/typescript": "~2.4.11",
+		"@vue/language-core": "2.2.0",
 		"path-browserify": "^1.0.1",
-		"vue-component-type-helpers": "2.1.8"
+		"vue-component-type-helpers": "2.2.0"
 	},
 	"peerDependencies": {
 		"typescript": "*"
@@ -30,5 +30,5 @@
 		"@types/node": "latest",
 		"@types/path-browserify": "latest"
 	},
-	"gitHead": "25cccedc53e7361ed4e34296d6ecd43d7de2a095"
+	"gitHead": "5babca774658d4b9afbe877ac7c8cafdaecf2c3e"
 }