vue-component-meta 1.7.8 → 1.7.9

package/out/index.d.ts

@@ -11,7 +11,13 @@ export declare function createComponentMetaCheckerByJsonConfig(root: string, jso
     getExportNames: (componentPath: string) => string[];
     getComponentMeta: (componentPath: string, exportName?: string) => ComponentMeta;
     __internal__: {
-        tsLs: ts.LanguageService;
+        tsLs: {
+            __internal__: {
+                languageServiceHost: ts.LanguageServiceHost;
+                languageService: ts.LanguageService;
+                context: vue.LanguageContext;
+            };
+        } & ts.LanguageService;
     };
 };
 export declare function createComponentMetaChecker(tsconfigPath: string, checkerOptions?: MetaCheckerOptions, ts?: typeof import('typescript/lib/tsserverlibrary')): {
@@ -22,13 +28,25 @@ export declare function createComponentMetaChecker(tsconfigPath: string, checker
     getExportNames: (componentPath: string) => string[];
     getComponentMeta: (componentPath: string, exportName?: string) => ComponentMeta;
     __internal__: {
-        tsLs: ts.LanguageService;
+        tsLs: {
+            __internal__: {
+                languageServiceHost: ts.LanguageServiceHost;
+                languageService: ts.LanguageService;
+                context: vue.LanguageContext;
+            };
+        } & ts.LanguageService;
     };
 };
-export declare function baseCreate(_host: vue.LanguageServiceHost, _vueCompilerOptions: Partial<vue.VueCompilerOptions>, checkerOptions: MetaCheckerOptions, globalComponentName: string, ts: typeof import('typescript/lib/tsserverlibrary')): {
+export declare function baseCreate(_host: vue.TypeScriptLanguageHost, _vueCompilerOptions: Partial<vue.VueCompilerOptions>, checkerOptions: MetaCheckerOptions, globalComponentName: string, ts: typeof import('typescript/lib/tsserverlibrary')): {
     getExportNames: (componentPath: string) => string[];
     getComponentMeta: (componentPath: string, exportName?: string) => ComponentMeta;
     __internal__: {
-        tsLs: ts.LanguageService;
+        tsLs: {
+            __internal__: {
+                languageServiceHost: ts.LanguageServiceHost;
+                languageService: ts.LanguageService;
+                context: vue.LanguageContext;
+            };
+        } & ts.LanguageService;
     };
 };

package/out/index.js

@@ -16,19 +16,21 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.baseCreate = exports.createComponentMetaChecker = exports.createComponentMetaCheckerByJsonConfig = void 0;
 const vue = require("@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");
+const typescript_1 = require("@volar/typescript");
 __exportStar(require("./types"), exports);
 function createComponentMetaCheckerByJsonConfig(root, json, checkerOptions = {}, ts = require('typescript')) {
-    return createComponentMetaCheckerWorker(() => vue.createParsedCommandLineByJson(ts, ts.sys, root, json), checkerOptions, path.join(root.replace(/\\/g, '/'), 'jsconfig.json.global.vue'), ts);
+    const rootPath = root.replace(/\\/g, '/');
+    return createComponentMetaCheckerWorker(() => vue.createParsedCommandLineByJson(ts, ts.sys, root, json), checkerOptions, rootPath, path.join(rootPath, 'jsconfig.json.global.vue'), ts);
 }
 exports.createComponentMetaCheckerByJsonConfig = createComponentMetaCheckerByJsonConfig;
 function createComponentMetaChecker(tsconfigPath, checkerOptions = {}, ts = require('typescript')) {
-    return createComponentMetaCheckerWorker(() => vue.createParsedCommandLine(ts, ts.sys, tsconfigPath), checkerOptions, tsconfigPath.replace(/\\/g, '/') + '.global.vue', ts);
+    const tsconfig = tsconfigPath.replace(/\\/g, '/');
+    return createComponentMetaCheckerWorker(() => vue.createParsedCommandLine(ts, ts.sys, tsconfigPath), checkerOptions, path.dirname(tsconfig), tsconfig + '.global.vue', ts);
 }
 exports.createComponentMetaChecker = createComponentMetaChecker;
-function createComponentMetaCheckerWorker(loadParsedCommandLine, checkerOptions, globalComponentName, ts) {
+function createComponentMetaCheckerWorker(loadParsedCommandLine, checkerOptions, rootPath, globalComponentName, ts) {
     /**
      * Original Host
      */
@@ -36,16 +38,12 @@ function createComponentMetaCheckerWorker(loadParsedCommandLine, checkerOptions,
     let fileNames = parsedCommandLine.fileNames.map(path => path.replace(/\\/g, '/'));
     let projectVersion = 0;
     const scriptSnapshots = new Map();
-    const scriptVersions = new Map();
     const _host = {
-        ...ts.sys,
-        getProjectVersion: () => projectVersion.toString(),
-        getDefaultLibFileName: (options) => ts.getDefaultLibFilePath(options),
-        useCaseSensitiveFileNames: () => ts.sys.useCaseSensitiveFileNames,
+        getCurrentDirectory: () => rootPath,
+        getProjectVersion: () => projectVersion,
         getCompilationSettings: () => parsedCommandLine.options,
         getScriptFileNames: () => fileNames,
         getProjectReferences: () => parsedCommandLine.projectReferences,
-        getScriptVersion: (fileName) => scriptVersions.get(fileName)?.toString() ?? '',
         getScriptSnapshot: (fileName) => {
             if (!scriptSnapshots.has(fileName)) {
                 const fileText = ts.sys.readFile(fileName);
@@ -61,7 +59,6 @@ function createComponentMetaCheckerWorker(loadParsedCommandLine, checkerOptions,
         updateFile(fileName, text) {
             fileName = fileName.replace(/\\/g, '/');
             scriptSnapshots.set(fileName, ts.ScriptSnapshot.fromString(text));
-            scriptVersions.set(fileName, scriptVersions.has(fileName) ? scriptVersions.get(fileName) + 1 : 1);
             projectVersion++;
         },
         deleteFile(fileName) {
@@ -76,7 +73,6 @@ function createComponentMetaCheckerWorker(loadParsedCommandLine, checkerOptions,
         },
         clearCache() {
             scriptSnapshots.clear();
-            scriptVersions.clear();
             projectVersion++;
         },
     };
@@ -118,27 +114,20 @@ function baseCreate(_host, _vueCompilerOptions, checkerOptions, globalComponentN
         },
     });
     const vueLanguages = ts ? vue.createLanguages(host.getCompilationSettings(), vueCompilerOptions, ts) : [];
-    const core = (0, language_core_1.createLanguageContext)({ typescript: ts }, host, vueLanguages);
-    const proxyApis = checkerOptions.forceUseTs ? {
-        getScriptKind: (fileName) => {
+    const core = vue.createLanguageContext(host, vueLanguages);
+    const tsLs = (0, typescript_1.createLanguageService)(core, ts, ts.sys);
+    if (checkerOptions.forceUseTs) {
+        const getScriptKind = tsLs.__internal__.languageServiceHost.getScriptKind;
+        tsLs.__internal__.languageServiceHost.getScriptKind = (fileName) => {
             if (fileName.endsWith('.vue.js')) {
                 return ts.ScriptKind.TS;
             }
             if (fileName.endsWith('.vue.jsx')) {
                 return ts.ScriptKind.TSX;
             }
-            return core.typescript.languageServiceHost.getScriptKind(fileName);
-        },
-    } : {};
-    const proxyHost = new Proxy(core.typescript.languageServiceHost, {
-        get(target, propKey) {
-            if (propKey in proxyApis) {
-                return proxyApis[propKey];
-            }
-            return target[propKey];
-        }
-    });
-    const tsLs = ts.createLanguageService(proxyHost);
+            return getScriptKind(fileName);
+        };
+    }
     let globalPropNames;
     return {
         getExportNames,
@@ -491,7 +480,7 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
         const [virtualFile] = core.virtualFiles.getVirtualFile(fileName);
         if (virtualFile) {
             const maps = core.virtualFiles.getMaps(virtualFile);
-            for (const [source, map] of maps) {
+            for (const [source, [_, map]] of maps) {
                 const start = map.toSourceOffset(declaration.getStart());
                 const end = map.toSourceOffset(declaration.getEnd());
                 if (start && end) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vue-component-meta",
-	"version": "1.7.8",
+	"version": "1.7.9",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,10 +13,10 @@
 		"directory": "packages/vue-component-meta"
 	},
 	"dependencies": {
-		"@volar/language-core": "1.6.9",
-		"@vue/language-core": "1.7.8",
+		"@volar/typescript": "1.7.3",
+		"@vue/language-core": "1.7.9",
 		"typesafe-path": "^0.2.2",
-		"vue-component-type-helpers": "1.7.8"
+		"vue-component-type-helpers": "1.7.9"
 	},
 	"peerDependencies": {
 		"typescript": "*"
@@ -26,5 +26,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "9841dc5c7b19c2b1d24fcc95a808f29af39710b8"
+	"gitHead": "70f9ebedbc55a8d342ec425cc483dfe39c4b7489"
 }