vue-component-meta 3.0.0-alpha.6 → 3.0.0-beta.1

package/lib/base.js

@@ -20,8 +20,6 @@ exports.baseCreate = baseCreate;
 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 = {}) {
@@ -178,7 +176,9 @@ function baseCreate(ts, getCommandLine, checkerOptions, rootPath, globalComponen
     }
     function getMetaScriptContent(fileName) {
         let code = `
+import type { ComponentType, ComponentProps, ComponentEmit, ComponentSlots, ComponentExposed } from 'vue-component-type-helpers';
 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> {
@@ -187,9 +187,7 @@ interface ComponentMeta<T> {
 	emit: ComponentEmit<T>;
 	slots: ComponentSlots<T>;
 	exposed: ComponentExposed<T>;
-};
-
-${commandLine.vueOptions.target < 3 ? vue2_1.code : vue_component_type_helpers_1.code}
+}
 `.trim();
         return code;
     }
@@ -240,7 +238,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 +248,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) {
@@ -635,11 +633,11 @@ function readVueComponentDefaultProps(root, printer, ts) {
                 }
             }
         }
-        if (scriptSetupRanges?.defineProp) {
-            for (const defineProp of scriptSetupRanges.defineProp) {
-                const obj = defineProp.argNode ? findObjectLiteralExpression(defineProp.argNode) : undefined;
+        if (scriptSetupRanges?.defineModel) {
+            for (const defineModel of scriptSetupRanges.defineModel) {
+                const obj = defineModel.argNode ? findObjectLiteralExpression(defineModel.argNode) : undefined;
                 if (obj) {
-                    const name = defineProp.name ? sfc.scriptSetup.content.slice(defineProp.name.start, defineProp.name.end).slice(1, -1) : 'modelValue';
+                    const name = defineModel.name ? sfc.scriptSetup.content.slice(defineModel.name.start, defineModel.name.end).slice(1, -1) : 'modelValue';
                     result[name] = resolveModelOption(ast, obj, printer, ts);
                 }
             }
@@ -705,7 +703,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.6",
+	"version": "3.0.0-beta.1",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -13,22 +13,18 @@
 		"directory": "packages/component-meta"
 	},
 	"dependencies": {
-		"@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.6"
+		"@volar/typescript": "2.4.14",
+		"@vue/language-core": "3.0.0-beta.1",
+		"path-browserify": "^1.0.1"
 	},
 	"peerDependencies": {
-		"typescript": "*"
-	},
-	"peerDependenciesMeta": {
-		"typescript": {
-			"optional": true
-		}
+		"typescript": "*",
+		"vue-component-type-helpers": "3.0.0-alpha.10"
 	},
 	"devDependencies": {
 		"@types/node": "^22.10.4",
-		"@types/path-browserify": "^1.0.1"
+		"@types/path-browserify": "^1.0.1",
+		"vue-component-type-helpers": "3.0.0-beta.1"
 	},
-	"gitHead": "a7b5649ab4957cd2228f4bbc9205b2008bff58a2"
+	"gitHead": "7a2ea48123679387d7095a81ac49cfc667aeeabb"
 }