vue-component-meta 1.5.3 → 1.6.0

package/out/index.d.ts

@@ -25,7 +25,7 @@ export declare function createComponentMetaChecker(tsconfigPath: string, checker
         tsLs: ts.LanguageService;
     };
 };
-export declare function baseCreate(_host: vue.VueLanguageServiceHost, checkerOptions: MetaCheckerOptions, globalComponentName: string, ts: typeof import('typescript/lib/tsserverlibrary'), embeddedTypes: boolean): {
+export declare function baseCreate(_host: vue.VueLanguageServiceHost, checkerOptions: MetaCheckerOptions, globalComponentName: string, ts: typeof import('typescript/lib/tsserverlibrary')): {
     getExportNames: (componentPath: string) => string[];
     getComponentMeta: (componentPath: string, exportName?: string) => ComponentMeta;
     __internal__: {

package/out/index.js

@@ -18,6 +18,7 @@ exports.baseCreate = exports.createComponentMetaChecker = exports.createComponen
 const vue = require("@volar/vue-language-core");
 const language_core_1 = require("@volar/language-core");
 const path = require("typesafe-path/posix");
+const vue_component_type_helpers_1 = require("vue-component-type-helpers");
 __exportStar(require("./types"), exports);
 const extraFileExtensions = [{
         extension: 'vue',
@@ -62,7 +63,7 @@ function createComponentMetaCheckerWorker(loadParsedCommandLine, checkerOptions,
         getVueCompilationSettings: () => parsedCommandLine.vueOptions,
     };
     return {
-        ...baseCreate(_host, checkerOptions, globalComponentName, ts, false),
+        ...baseCreate(_host, checkerOptions, globalComponentName, ts),
         updateFile(fileName, text) {
             fileName = fileName.replace(/\\/g, '/');
             scriptSnapshots.set(fileName, ts.ScriptSnapshot.fromString(text));
@@ -86,7 +87,7 @@ function createComponentMetaCheckerWorker(loadParsedCommandLine, checkerOptions,
         },
     };
 }
-function baseCreate(_host, checkerOptions, globalComponentName, ts, embeddedTypes) {
+function baseCreate(_host, checkerOptions, globalComponentName, ts) {
     const globalComponentSnapshot = ts.ScriptSnapshot.fromString('<script setup lang="ts"></script>');
     const metaSnapshots = {};
     const host = new Proxy({
@@ -102,7 +103,7 @@ function baseCreate(_host, checkerOptions, globalComponentName, ts, embeddedType
         getScriptSnapshot: fileName => {
             if (isMetaFileName(fileName)) {
                 if (!metaSnapshots[fileName]) {
-                    metaSnapshots[fileName] = ts.ScriptSnapshot.fromString(getMetaScriptContent(fileName, embeddedTypes));
+                    metaSnapshots[fileName] = ts.ScriptSnapshot.fromString(getMetaScriptContent(fileName));
                 }
                 return metaSnapshots[fileName];
             }
@@ -158,49 +159,20 @@ function baseCreate(_host, checkerOptions, globalComponentName, ts, embeddedType
     function getMetaFileName(fileName) {
         return (fileName.endsWith('.vue') ? fileName : fileName.substring(0, fileName.lastIndexOf('.'))) + '.meta.ts';
     }
-    function getMetaScriptContent(fileName, embeddedTypes) {
-        const importCode = embeddedTypes ? '' : `import('vue-component-type-helpers').`;
+    function getMetaScriptContent(fileName) {
         let code = `
 import * as Components from '${fileName.substring(0, fileName.length - '.meta.ts'.length)}';
 export default {} as { [K in keyof typeof Components]: ComponentMeta<typeof Components[K]>; };
 
 interface ComponentMeta<T> {
-	props: ${importCode}ComponentProps<T>;
-	emit: ${importCode}ComponentEmit<T>;
-	slots: ${importCode}${vueCompilerOptions.target < 3 ? 'Vue2ComponentSlots' : 'ComponentSlots'}<T>;
-	exposed: ${importCode}ComponentExposed<T>;
-};`.trim();
-        if (embeddedTypes) {
-            code += `
-type ComponentProps<T> =
-T extends new () => { $props: infer P } ? NonNullable<P> :
-T extends (props: infer P, ...args: any) => any ? P :
-{};
-
-type ComponentSlots<T> =
-T extends new () => { $slots: infer S } ? NonNullable<S> :
-T extends (props: any, ctx: { slots: infer S }, ...args: any) => any ? NonNullable<S> :
-{};
-
-type ComponentEmit<T> =
-T extends new () => { $emit: infer E } ? NonNullable<E> :
-T extends (props: any, ctx: { emit: infer E }, ...args: any) => any ? NonNullable<E> :
-{};
-
-type ComponentExposed<T> =
-T extends new () => infer E ? E :
-T extends (props: any, ctx: { expose(exposed: infer E): any }, ...args: any) => any ? NonNullable<E> :
-{};
-
-/**
-* Vue 2.x
-*/
+	props: ComponentProps<T>;
+	emit: ComponentEmit<T>;
+	slots: ${vueCompilerOptions.target < 3 ? 'Vue2ComponentSlots' : 'ComponentSlots'}<T>;
+	exposed: ComponentExposed<T>;
+};
 
-type Vue2ComponentSlots<T> =
-T extends new () => { $scopedSlots: infer S } ? NonNullable<S> :
-T extends (props: any, ctx: { slots: infer S }, ...args: any) => any ? NonNullable<S> :
-{};`;
-        }
+${vue_component_type_helpers_1.default}
+`.trim();
         return code;
     }
     function getExportNames(componentPath) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vue-component-meta",
-	"version": "1.5.3",
+	"version": "1.6.0",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -14,12 +14,12 @@
 	},
 	"dependencies": {
 		"@volar/language-core": "1.4.1",
-		"@volar/vue-language-core": "1.5.3",
-		"typesafe-path": "^0.2.2"
+		"@volar/vue-language-core": "1.6.0",
+		"typesafe-path": "^0.2.2",
+		"vue-component-type-helpers": "1.6.0"
 	},
 	"peerDependencies": {
-		"typescript": "*",
-		"vue-component-type-helpers": "1.3.12"
+		"typescript": "*"
 	},
-	"gitHead": "245e2a4db87c6ef9c33c92d161a380ca4da5c9ba"
+	"gitHead": "34b578e2c0fc23645b2f60e9206d91c1bd3833d0"
 }