vue-component-meta 1.9.0-alpha.3 → 2.0.1

package/{out/index.d.ts → index.d.ts}

@@ -1,14 +1,23 @@
-import type { MetaCheckerOptions } from './types';
-export * from './types';
+import * as ts from 'typescript';
+import type { MetaCheckerOptions } from './lib/types';
+export * from './lib/types';
+/**
+ * @deprecated Use `createCheckerByJson` instead.
+ */
+export declare const createComponentMetaCheckerByJsonConfig: typeof createCheckerByJson;
+/**
+ * @deprecated Use `createCheckerByJson` instead.
+ */
+export declare const createComponentMetaChecker: typeof createChecker;
 export declare function createCheckerByJson(rootPath: string, json: any, checkerOptions?: MetaCheckerOptions): {
     updateFile(fileName: string, text: string): void;
     deleteFile(fileName: string): void;
     reload(): void;
     clearCache(): void;
     getExportNames: (componentPath: string) => string[];
-    getComponentMeta: (componentPath: string, exportName?: string) => import("./types").ComponentMeta;
+    getComponentMeta: (componentPath: string, exportName?: string) => import("./lib/types").ComponentMeta;
     __internal__: {
-        tsLs: import("typescript/lib/tsserverlibrary").LanguageService;
+        tsLs: ts.LanguageService;
     };
 };
 export declare function createChecker(tsconfig: string, checkerOptions?: MetaCheckerOptions): {
@@ -17,9 +26,8 @@ export declare function createChecker(tsconfig: string, checkerOptions?: MetaChe
     reload(): void;
     clearCache(): void;
     getExportNames: (componentPath: string) => string[];
-    getComponentMeta: (componentPath: string, exportName?: string) => import("./types").ComponentMeta;
+    getComponentMeta: (componentPath: string, exportName?: string) => import("./lib/types").ComponentMeta;
     __internal__: {
-        tsLs: import("typescript/lib/tsserverlibrary").LanguageService;
+        tsLs: ts.LanguageService;
     };
 };
-//# sourceMappingURL=index.d.ts.map

package/{out/index.js → index.js}

@@ -14,12 +14,20 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createChecker = exports.createCheckerByJson = void 0;
+exports.createChecker = exports.createCheckerByJson = exports.createComponentMetaChecker = exports.createComponentMetaCheckerByJsonConfig = void 0;
 const ts = require("typescript");
-const base_1 = require("./base");
-__exportStar(require("./types"), exports);
+const base_1 = require("./lib/base");
+__exportStar(require("./lib/types"), exports);
+/**
+ * @deprecated Use `createCheckerByJson` instead.
+ */
+exports.createComponentMetaCheckerByJsonConfig = createCheckerByJson;
+/**
+ * @deprecated Use `createCheckerByJson` instead.
+ */
+exports.createComponentMetaChecker = createChecker;
 function createCheckerByJson(rootPath, json, checkerOptions = {}) {
-    return (0, base_1.createCheckerByJsonBase)(ts, rootPath, json, checkerOptions);
+    return (0, base_1.createCheckerByJsonConfigBase)(ts, rootPath, json, checkerOptions);
 }
 exports.createCheckerByJson = createCheckerByJson;
 function createChecker(tsconfig, checkerOptions = {}) {

package/{out → lib}/base.d.ts

@@ -1,8 +1,8 @@
 import * as vue from '@vue/language-core';
-import type * as ts from 'typescript/lib/tsserverlibrary';
+import type * as ts from 'typescript';
 import type { MetaCheckerOptions, ComponentMeta } from './types';
 export * from './types';
-export declare function createCheckerByJsonBase(ts: typeof import('typescript/lib/tsserverlibrary'), rootPath: string, json: any, checkerOptions?: MetaCheckerOptions): {
+export declare function createCheckerByJsonConfigBase(ts: typeof import('typescript'), rootDir: string, json: any, checkerOptions?: MetaCheckerOptions): {
     updateFile(fileName: string, text: string): void;
     deleteFile(fileName: string): void;
     reload(): void;
@@ -13,7 +13,7 @@ export declare function createCheckerByJsonBase(ts: typeof import('typescript/li
         tsLs: ts.LanguageService;
     };
 };
-export declare function createCheckerBase(ts: typeof import('typescript/lib/tsserverlibrary'), tsconfig: string, checkerOptions?: MetaCheckerOptions): {
+export declare function createCheckerBase(ts: typeof import('typescript'), tsconfig: string, checkerOptions?: MetaCheckerOptions): {
     updateFile(fileName: string, text: string): void;
     deleteFile(fileName: string): void;
     reload(): void;
@@ -24,11 +24,10 @@ export declare function createCheckerBase(ts: typeof import('typescript/lib/tsse
         tsLs: ts.LanguageService;
     };
 };
-export declare function baseCreate(ts: typeof import('typescript/lib/tsserverlibrary'), _host: vue.TypeScriptLanguageHost, vueCompilerOptions: vue.VueCompilerOptions, checkerOptions: MetaCheckerOptions, globalComponentName: string): {
+export declare function baseCreate(ts: typeof import('typescript'), configFileName: string | undefined, host: vue.TypeScriptProjectHost, vueCompilerOptions: vue.VueCompilerOptions, checkerOptions: MetaCheckerOptions, globalComponentName: string): {
     getExportNames: (componentPath: string) => string[];
     getComponentMeta: (componentPath: string, exportName?: string) => ComponentMeta;
     __internal__: {
         tsLs: ts.LanguageService;
     };
 };
-//# sourceMappingURL=base.d.ts.map

package/{out → lib}/base.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.baseCreate = exports.createCheckerBase = exports.createCheckerByJsonBase = void 0;
+exports.baseCreate = exports.createCheckerBase = exports.createCheckerByJsonConfigBase = void 0;
 const vue = require("@vue/language-core");
 const path = require("path-browserify");
 const vue_component_type_helpers_1 = require("vue-component-type-helpers");
@@ -22,17 +22,17 @@ const vue2_1 = require("vue-component-type-helpers/vue2");
 const typescript_1 = require("@volar/typescript");
 __exportStar(require("./types"), exports);
 const windowsPathReg = /\\/g;
-function createCheckerByJsonBase(ts, rootPath, json, checkerOptions = {}) {
-    rootPath = rootPath.replace(windowsPathReg, '/');
-    return createCheckerWorker(ts, () => vue.createParsedCommandLineByJson(ts, ts.sys, rootPath, json), checkerOptions, rootPath, path.join(rootPath, 'jsconfig.json.global.vue'));
+function createCheckerByJsonConfigBase(ts, rootDir, json, checkerOptions = {}) {
+    rootDir = rootDir.replace(windowsPathReg, '/');
+    return createCheckerWorker(ts, () => vue.createParsedCommandLineByJson(ts, ts.sys, rootDir, json), checkerOptions, rootDir, path.join(rootDir, 'jsconfig.json.global.vue'), undefined);
 }
-exports.createCheckerByJsonBase = createCheckerByJsonBase;
+exports.createCheckerByJsonConfigBase = createCheckerByJsonConfigBase;
 function createCheckerBase(ts, tsconfig, checkerOptions = {}) {
     tsconfig = tsconfig.replace(windowsPathReg, '/');
-    return createCheckerWorker(ts, () => vue.createParsedCommandLine(ts, ts.sys, tsconfig), checkerOptions, path.dirname(tsconfig), tsconfig + '.global.vue');
+    return createCheckerWorker(ts, () => vue.createParsedCommandLine(ts, ts.sys, tsconfig), checkerOptions, path.dirname(tsconfig), tsconfig + '.global.vue', tsconfig);
 }
 exports.createCheckerBase = createCheckerBase;
-function createCheckerWorker(ts, loadParsedCommandLine, checkerOptions, rootPath, globalComponentName) {
+function createCheckerWorker(ts, loadParsedCommandLine, checkerOptions, rootPath, globalComponentName, configFileName) {
     /**
      * Original Host
      */
@@ -41,8 +41,7 @@ function createCheckerWorker(ts, loadParsedCommandLine, checkerOptions, rootPath
     let projectVersion = 0;
     const scriptSnapshots = new Map();
     const _host = {
-        workspacePath: rootPath,
-        rootPath: rootPath,
+        getCurrentDirectory: () => rootPath,
         getProjectVersion: () => projectVersion.toString(),
         getCompilationSettings: () => parsedCommandLine.options,
         getScriptFileNames: () => fileNames,
@@ -56,9 +55,10 @@ function createCheckerWorker(ts, loadParsedCommandLine, checkerOptions, rootPath
             }
             return scriptSnapshots.get(fileName);
         },
+        getLanguageId: vue.resolveCommonLanguageId,
     };
     return {
-        ...baseCreate(ts, _host, vue.resolveVueCompilerOptions(parsedCommandLine.vueOptions), checkerOptions, globalComponentName),
+        ...baseCreate(ts, configFileName, _host, vue.resolveVueCompilerOptions(parsedCommandLine.vueOptions), checkerOptions, globalComponentName),
         updateFile(fileName, text) {
             fileName = fileName.replace(windowsPathReg, '/');
             scriptSnapshots.set(fileName, ts.ScriptSnapshot.fromString(text));
@@ -80,49 +80,44 @@ function createCheckerWorker(ts, loadParsedCommandLine, checkerOptions, rootPath
         },
     };
 }
-function baseCreate(ts, _host, vueCompilerOptions, checkerOptions, globalComponentName) {
+function baseCreate(ts, configFileName, host, vueCompilerOptions, checkerOptions, globalComponentName) {
     const globalComponentSnapshot = ts.ScriptSnapshot.fromString('<script setup lang="ts"></script>');
     const metaSnapshots = {};
-    const host = new Proxy({
-        getScriptFileNames: () => {
-            const names = _host.getScriptFileNames();
-            return [
-                ...names,
-                ...names.map(getMetaFileName),
-                globalComponentName,
-                getMetaFileName(globalComponentName),
-            ];
-        },
-        getScriptSnapshot: fileName => {
-            if (isMetaFileName(fileName)) {
-                if (!metaSnapshots[fileName]) {
-                    metaSnapshots[fileName] = ts.ScriptSnapshot.fromString(getMetaScriptContent(fileName));
-                }
-                return metaSnapshots[fileName];
-            }
-            else if (fileName === globalComponentName) {
-                return globalComponentSnapshot;
-            }
-            else {
-                return _host.getScriptSnapshot(fileName);
-            }
-        },
-    }, {
-        get(target, prop) {
-            if (prop in target) {
-                return target[prop];
+    const getScriptFileNames = host.getScriptFileNames;
+    const getScriptSnapshot = host.getScriptSnapshot;
+    host.getScriptFileNames = () => {
+        const names = getScriptFileNames();
+        return [
+            ...names,
+            ...names.map(getMetaFileName),
+            globalComponentName,
+            getMetaFileName(globalComponentName),
+        ];
+    };
+    host.getScriptSnapshot = (fileName) => {
+        if (isMetaFileName(fileName)) {
+            if (!metaSnapshots[fileName]) {
+                metaSnapshots[fileName] = ts.ScriptSnapshot.fromString(getMetaScriptContent(fileName));
             }
-            return _host[prop];
-        },
+            return metaSnapshots[fileName];
+        }
+        else if (fileName === globalComponentName) {
+            return globalComponentSnapshot;
+        }
+        else {
+            return getScriptSnapshot(fileName);
+        }
+    };
+    const vueLanguagePlugin = vue.createVueLanguagePlugin(ts, id => id, host.getCompilationSettings(), vueCompilerOptions);
+    const language = (0, typescript_1.createLanguage)(ts, ts.sys, [vueLanguagePlugin], configFileName, host, {
+        fileIdToFileName: id => id,
+        fileNameToFileId: id => id,
     });
-    const vueLanguages = vue.createLanguages(ts, host.getCompilationSettings(), vueCompilerOptions);
-    const core = vue.createLanguageContext(host, vueLanguages);
-    const tsLsHost = (0, typescript_1.createLanguageServiceHost)(core, ts, ts.sys);
-    const tsLs = ts.createLanguageService(tsLsHost);
-    (0, typescript_1.decorateLanguageService)(core.virtualFiles, tsLs, false);
+    const { languageServiceHost } = language.typescript;
+    const tsLs = ts.createLanguageService(languageServiceHost);
     if (checkerOptions.forceUseTs) {
-        const getScriptKind = tsLsHost.getScriptKind;
-        tsLsHost.getScriptKind = (fileName) => {
+        const getScriptKind = languageServiceHost.getScriptKind?.bind(languageServiceHost);
+        languageServiceHost.getScriptKind = (fileName) => {
             if (fileName.endsWith('.vue.js')) {
                 return ts.ScriptKind.TS;
             }
@@ -217,7 +212,7 @@ ${vueCompilerOptions.target < 3 ? vue2_1.code : vue_component_type_helpers_1.cod
                 const properties = type.getProperties();
                 result = properties
                     .map((prop) => {
-                    const { resolveNestedProperties, } = createSchemaResolvers(typeChecker, symbolNode, checkerOptions, ts, core);
+                    const { resolveNestedProperties, } = createSchemaResolvers(typeChecker, symbolNode, checkerOptions, ts, language);
                     return resolveNestedProperties(prop);
                 })
                     .filter((prop) => !prop.name.match(propEventRegex));
@@ -232,11 +227,11 @@ ${vueCompilerOptions.target < 3 ? vue2_1.code : vue_component_type_helpers_1.cod
             // fill defaults
             const printer = ts.createPrinter(checkerOptions.printer);
             const snapshot = host.getScriptSnapshot(componentPath);
-            const vueSourceFile = core.virtualFiles.getSource(componentPath)?.root;
-            const vueDefaults = vueSourceFile && exportName === 'default'
-                ? (vueSourceFile instanceof vue.VueFile ? readVueComponentDefaultProps(vueSourceFile, printer, ts, vueCompilerOptions) : {})
+            const vueFile = language.files.get(componentPath)?.generated?.code;
+            const vueDefaults = vueFile && exportName === 'default'
+                ? (vueFile instanceof vue.VueGeneratedCode ? readVueComponentDefaultProps(vueFile, printer, ts, vueCompilerOptions) : {})
                 : {};
-            const tsDefaults = !vueSourceFile ? readTsComponentDefaultProps(componentPath.substring(componentPath.lastIndexOf('.') + 1), // ts | js | tsx | jsx
+            const tsDefaults = !vueFile ? readTsComponentDefaultProps(componentPath.substring(componentPath.lastIndexOf('.') + 1), // ts | js | tsx | jsx
             snapshot.getText(0, snapshot.getLength()), exportName, printer, ts) : {};
             for (const [propName, defaultExp] of Object.entries({
                 ...vueDefaults,
@@ -261,7 +256,7 @@ ${vueCompilerOptions.target < 3 ? vue2_1.code : vue_component_type_helpers_1.cod
                 const type = typeChecker.getTypeOfSymbolAtLocation($emit, symbolNode);
                 const calls = type.getCallSignatures();
                 return calls.map((call) => {
-                    const { resolveEventSignature, } = createSchemaResolvers(typeChecker, symbolNode, checkerOptions, ts, core);
+                    const { resolveEventSignature, } = createSchemaResolvers(typeChecker, symbolNode, checkerOptions, ts, language);
                     return resolveEventSignature(call);
                 }).filter(event => event.name);
             }
@@ -273,7 +268,7 @@ ${vueCompilerOptions.target < 3 ? vue2_1.code : vue_component_type_helpers_1.cod
                 const type = typeChecker.getTypeOfSymbolAtLocation($slots, symbolNode);
                 const properties = type.getProperties();
                 return properties.map((prop) => {
-                    const { resolveSlotProperties, } = createSchemaResolvers(typeChecker, symbolNode, checkerOptions, ts, core);
+                    const { resolveSlotProperties, } = createSchemaResolvers(typeChecker, symbolNode, checkerOptions, ts, language);
                     return resolveSlotProperties(prop);
                 });
             }
@@ -287,7 +282,7 @@ ${vueCompilerOptions.target < 3 ? vue2_1.code : vue_component_type_helpers_1.cod
                 // only exposed props will not have a valueDeclaration
                 !prop.valueDeclaration);
                 return properties.map((prop) => {
-                    const { resolveExposedProperties, } = createSchemaResolvers(typeChecker, symbolNode, checkerOptions, ts, core);
+                    const { resolveExposedProperties, } = createSchemaResolvers(typeChecker, symbolNode, checkerOptions, ts, language);
                     return resolveExposedProperties(prop);
                 });
             }
@@ -323,7 +318,7 @@ ${vueCompilerOptions.target < 3 ? vue2_1.code : vue_component_type_helpers_1.cod
     }
 }
 exports.baseCreate = baseCreate;
-function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: options, noDeclarations }, ts, core) {
+function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: options, noDeclarations }, ts, context) {
     const visited = new Set();
     function shouldIgnore(subtype) {
         const name = typeChecker.typeToString(subtype);
@@ -493,19 +488,22 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
     }
     function getDeclaration(declaration) {
         const fileName = declaration.getSourceFile().fileName;
-        const [virtualFile] = core.virtualFiles.getVirtualFile(fileName);
-        if (virtualFile) {
-            const maps = core.virtualFiles.getMaps(virtualFile);
-            for (const [source, [_, map]] of maps) {
-                const start = map.toSourceOffset(declaration.getStart());
-                const end = map.toSourceOffset(declaration.getEnd());
-                if (start && end) {
-                    return {
-                        file: source,
-                        range: [start[0], end[0]],
-                    };
+        const sourceFile = context.files.get(fileName);
+        if (sourceFile?.generated) {
+            const script = sourceFile.generated.languagePlugin.typescript?.getScript(sourceFile.generated.code);
+            if (script) {
+                const maps = context.files.getMaps(script.code);
+                for (const [source, [_, map]] of maps) {
+                    const start = map.getSourceOffset(declaration.getStart());
+                    const end = map.getSourceOffset(declaration.getEnd());
+                    if (start && end) {
+                        return {
+                            file: source,
+                            range: [start[0], end[0]],
+                        };
+                    }
+                    ;
                 }
-                ;
             }
             return undefined;
         }

package/{out → lib}/types.d.ts

@@ -1,5 +1,5 @@
-import type * as ts from 'typescript/lib/tsserverlibrary';
-export type Checker = ReturnType<typeof import('./base')['baseCreate']>;
+import type * as ts from 'typescript';
+export type ComponentMetaChecker = ReturnType<typeof import('./base')['baseCreate']>;
 export interface Declaration {
     file: string;
     range: [number, number];
@@ -86,4 +86,3 @@ export interface MetaCheckerOptions {
     rawType?: boolean;
     noDeclarations?: boolean;
 }
-//# sourceMappingURL=types.d.ts.map

package/package.json

@@ -1,11 +1,10 @@
 {
 	"name": "vue-component-meta",
-	"version": "1.9.0-alpha.3",
-	"main": "out/index.js",
+	"version": "2.0.1",
 	"license": "MIT",
 	"files": [
-		"out/**/*.js",
-		"out/**/*.d.ts"
+		"**/*.js",
+		"**/*.d.ts"
 	],
 	"repository": {
 		"type": "git",
@@ -13,10 +12,10 @@
 		"directory": "packages/component-meta"
 	},
 	"dependencies": {
-		"@volar/typescript": "~1.11.0",
-		"@vue/language-core": "1.9.0-alpha.3",
+		"@volar/typescript": "~2.1.0",
+		"@vue/language-core": "2.0.1",
 		"path-browserify": "^1.0.1",
-		"vue-component-type-helpers": "1.9.0-alpha.3"
+		"vue-component-type-helpers": "2.0.1"
 	},
 	"peerDependencies": {
 		"typescript": "*"
@@ -30,5 +29,5 @@
 		"@types/node": "latest",
 		"@types/path-browserify": "latest"
 	},
-	"gitHead": "cf6564bc8c649151c2e72a93d0aa482d4a59a773"
+	"gitHead": "adedfd0983c910370d080e955702cca7d2275420"
 }