vue-component-meta 2.0.19 → 2.0.20

package/index.d.ts

@@ -6,7 +6,7 @@ export * from './lib/types';
  */
 export declare const createComponentMetaCheckerByJsonConfig: typeof createCheckerByJson;
 /**
- * @deprecated Use `createCheckerByJson` instead.
+ * @deprecated Use `createChecker` instead.
  */
 export declare const createComponentMetaChecker: typeof createChecker;
 export declare function createCheckerByJson(rootPath: string, json: any, checkerOptions?: MetaCheckerOptions): {

package/index.js

@@ -23,7 +23,7 @@ __exportStar(require("./lib/types"), exports);
  */
 exports.createComponentMetaCheckerByJsonConfig = createCheckerByJson;
 /**
- * @deprecated Use `createCheckerByJson` instead.
+ * @deprecated Use `createChecker` instead.
  */
 exports.createComponentMetaChecker = createChecker;
 function createCheckerByJson(rootPath, json, checkerOptions = {}) {

package/lib/base.d.ts

@@ -1,5 +1,6 @@
 import * as vue from '@vue/language-core';
 import type * as ts from 'typescript';
+import { TypeScriptProjectHost } from '@volar/typescript';
 import type { MetaCheckerOptions, ComponentMeta } from './types';
 export * from './types';
 export declare function createCheckerByJsonConfigBase(ts: typeof import('typescript'), rootDir: string, json: any, checkerOptions?: MetaCheckerOptions): {
@@ -24,7 +25,7 @@ export declare function createCheckerBase(ts: typeof import('typescript'), tscon
         tsLs: ts.LanguageService;
     };
 };
-export declare function baseCreate(ts: typeof import('typescript'), host: vue.TypeScriptProjectHost, vueCompilerOptions: vue.VueCompilerOptions, checkerOptions: MetaCheckerOptions, globalComponentName: string): {
+export declare function baseCreate(ts: typeof import('typescript'), configFileName: string | undefined, projectHost: TypeScriptProjectHost, vueCompilerOptions: vue.VueCompilerOptions, checkerOptions: MetaCheckerOptions, globalComponentName: string): {
     getExportNames: (componentPath: string) => string[];
     getComponentMeta: (componentPath: string, exportName?: string) => ComponentMeta;
     __internal__: {

package/lib/base.js

@@ -41,8 +41,6 @@ function createCheckerWorker(ts, loadParsedCommandLine, checkerOptions, rootPath
     let projectVersion = 0;
     const scriptSnapshots = new Map();
     const projectHost = {
-        ...ts.sys,
-        configFileName,
         getCurrentDirectory: () => rootPath,
         getProjectVersion: () => projectVersion.toString(),
         getCompilationSettings: () => parsedCommandLine.options,
@@ -57,11 +55,9 @@ function createCheckerWorker(ts, loadParsedCommandLine, checkerOptions, rootPath
             }
             return scriptSnapshots.get(fileName);
         },
-        scriptIdToFileName: id => id,
-        fileNameToScriptId: id => id,
     };
     return {
-        ...baseCreate(ts, projectHost, parsedCommandLine.vueOptions, checkerOptions, globalComponentName),
+        ...baseCreate(ts, configFileName, projectHost, parsedCommandLine.vueOptions, checkerOptions, globalComponentName),
         updateFile(fileName, text) {
             fileName = fileName.replace(windowsPathReg, '/');
             scriptSnapshots.set(fileName, ts.ScriptSnapshot.fromString(text));
@@ -83,12 +79,12 @@ function createCheckerWorker(ts, loadParsedCommandLine, checkerOptions, rootPath
         },
     };
 }
-function baseCreate(ts, host, vueCompilerOptions, checkerOptions, globalComponentName) {
+function baseCreate(ts, configFileName, projectHost, vueCompilerOptions, checkerOptions, globalComponentName) {
     const globalComponentSnapshot = ts.ScriptSnapshot.fromString('<script setup lang="ts"></script>');
     const metaSnapshots = {};
-    const getScriptFileNames = host.getScriptFileNames;
-    const getScriptSnapshot = host.getScriptSnapshot;
-    host.getScriptFileNames = () => {
+    const getScriptFileNames = projectHost.getScriptFileNames;
+    const getScriptSnapshot = projectHost.getScriptSnapshot;
+    projectHost.getScriptFileNames = () => {
         const names = getScriptFileNames();
         return [
             ...names,
@@ -97,7 +93,7 @@ function baseCreate(ts, host, vueCompilerOptions, checkerOptions, globalComponen
             getMetaFileName(globalComponentName),
         ];
     };
-    host.getScriptSnapshot = fileName => {
+    projectHost.getScriptSnapshot = fileName => {
         if (isMetaFileName(fileName)) {
             if (!metaSnapshots[fileName]) {
                 metaSnapshots[fileName] = ts.ScriptSnapshot.fromString(getMetaScriptContent(fileName));
@@ -111,8 +107,36 @@ function baseCreate(ts, host, vueCompilerOptions, checkerOptions, globalComponen
             return getScriptSnapshot(fileName);
         }
     };
-    const vueLanguagePlugin = vue.createVueLanguagePlugin(ts, id => id, ts.sys.useCaseSensitiveFileNames, () => host.getProjectVersion?.() ?? '', () => host.getScriptFileNames(), host.getCompilationSettings(), vueCompilerOptions);
-    const language = (0, typescript_1.createTypeScriptLanguage)(ts, [vueLanguagePlugin], host);
+    const vueLanguagePlugin = vue.createVueLanguagePlugin(ts, id => id, () => projectHost.getProjectVersion?.() ?? '', fileName => {
+        const fileMap = new vue.FileMap(ts.sys.useCaseSensitiveFileNames);
+        for (const vueFileName of projectHost.getScriptFileNames()) {
+            fileMap.set(vueFileName, undefined);
+        }
+        return fileMap.has(fileName);
+    }, projectHost.getCompilationSettings(), vueCompilerOptions);
+    const language = vue.createLanguage([
+        vueLanguagePlugin,
+        {
+            getLanguageId(fileName) {
+                return (0, typescript_1.resolveFileLanguageId)(fileName);
+            },
+        },
+    ], new vue.FileMap(ts.sys.useCaseSensitiveFileNames), fileName => {
+        const snapshot = projectHost.getScriptSnapshot(fileName);
+        if (snapshot) {
+            language.scripts.set(fileName, snapshot);
+        }
+        else {
+            language.scripts.delete(fileName);
+        }
+    });
+    language.typescript = {
+        sys: ts.sys,
+        configFileName,
+        asFileName: s => s,
+        asScriptId: s => s,
+        ...(0, typescript_1.createLanguageServiceHost)(ts, ts.sys, language, s => s, projectHost),
+    };
     const { languageServiceHost } = language.typescript;
     const tsLs = ts.createLanguageService(languageServiceHost);
     if (checkerOptions.forceUseTs) {
@@ -231,7 +255,7 @@ ${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 snapshot = projectHost.getScriptSnapshot(componentPath);
             const vueFile = language.scripts.get(componentPath)?.generated?.root;
             const vueDefaults = vueFile && exportName === 'default'
                 ? (vueFile instanceof vue.VueVirtualCode ? readVueComponentDefaultProps(vueFile, printer, ts, vueCompilerOptions) : {})
@@ -503,16 +527,15 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
         if (sourceFile?.generated) {
             const script = sourceFile.generated.languagePlugin.typescript?.getServiceScript(sourceFile.generated.root);
             if (script) {
-                for (const [source, [_, map]] of language.maps.forEach(script.code)) {
-                    const start = map.getSourceOffset(declaration.getStart());
-                    const end = map.getSourceOffset(declaration.getEnd());
-                    if (start && end) {
-                        return {
-                            file: source,
-                            range: [start[0], end[0]],
-                        };
+                for (const [source, _, map] of language.maps.forEach(script.code)) {
+                    for (const [start] of map.getSourceOffsets(declaration.getStart())) {
+                        for (const [end] of map.getSourceOffsets(declaration.getEnd())) {
+                            return {
+                                file: source,
+                                range: [start, end],
+                            };
+                        }
                     }
-                    ;
                 }
             }
             return undefined;

package/lib/types.d.ts

@@ -1,5 +1,5 @@
 import type * as ts from 'typescript';
-export type ComponentMetaChecker = ReturnType<typeof import('./base')['baseCreate']>;
+export type ComponentMetaChecker = ReturnType<typeof import('./base')['createCheckerBase']>;
 export interface Declaration {
     file: string;
     range: [number, number];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vue-component-meta",
-	"version": "2.0.19",
+	"version": "2.0.20",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,10 +12,10 @@
 		"directory": "packages/component-meta"
 	},
 	"dependencies": {
-		"@volar/typescript": "~2.2.4",
-		"@vue/language-core": "2.0.19",
+		"@volar/typescript": "~2.3.0-alpha.14",
+		"@vue/language-core": "2.0.20",
 		"path-browserify": "^1.0.1",
-		"vue-component-type-helpers": "2.0.19"
+		"vue-component-type-helpers": "2.0.20"
 	},
 	"peerDependencies": {
 		"typescript": "*"
@@ -29,5 +29,5 @@
 		"@types/node": "latest",
 		"@types/path-browserify": "latest"
 	},
-	"gitHead": "a9fae154ad1efc4359866cfd10251d53e4b0faed"
+	"gitHead": "e1a5d2f136bf60a772c9655f9f5474c7f71a2ff9"
 }