vue-component-meta 2.0.7 → 2.0.11

package/lib/base.d.ts

@@ -24,7 +24,7 @@ export declare function createCheckerBase(ts: typeof import('typescript'), tscon
         tsLs: ts.LanguageService;
     };
 };
-export declare function baseCreate(ts: typeof import('typescript'), configFileName: string | undefined, host: vue.TypeScriptProjectHost, vueCompilerOptions: vue.VueCompilerOptions, checkerOptions: MetaCheckerOptions, globalComponentName: string): {
+export declare function baseCreate(ts: typeof import('typescript'), host: vue.TypeScriptProjectHost, vueCompilerOptions: vue.VueCompilerOptions, checkerOptions: MetaCheckerOptions, globalComponentName: string): {
     getExportNames: (componentPath: string) => string[];
     getComponentMeta: (componentPath: string, exportName?: string) => ComponentMeta;
     __internal__: {

package/lib/base.js

@@ -40,7 +40,9 @@ function createCheckerWorker(ts, loadParsedCommandLine, checkerOptions, rootPath
     let fileNames = parsedCommandLine.fileNames.map(path => path.replace(windowsPathReg, '/'));
     let projectVersion = 0;
     const scriptSnapshots = new Map();
-    const _host = {
+    const projectHost = {
+        ...ts.sys,
+        configFileName,
         getCurrentDirectory: () => rootPath,
         getProjectVersion: () => projectVersion.toString(),
         getCompilationSettings: () => parsedCommandLine.options,
@@ -61,9 +63,11 @@ function createCheckerWorker(ts, loadParsedCommandLine, checkerOptions, rootPath
             }
             return vue.resolveCommonLanguageId(fileName);
         },
+        scriptIdToFileName: id => id,
+        fileNameToScriptId: id => id,
     };
     return {
-        ...baseCreate(ts, configFileName, _host, parsedCommandLine.vueOptions, checkerOptions, globalComponentName),
+        ...baseCreate(ts, projectHost, parsedCommandLine.vueOptions, checkerOptions, globalComponentName),
         updateFile(fileName, text) {
             fileName = fileName.replace(windowsPathReg, '/');
             scriptSnapshots.set(fileName, ts.ScriptSnapshot.fromString(text));
@@ -85,7 +89,7 @@ function createCheckerWorker(ts, loadParsedCommandLine, checkerOptions, rootPath
         },
     };
 }
-function baseCreate(ts, configFileName, host, vueCompilerOptions, checkerOptions, globalComponentName) {
+function baseCreate(ts, host, vueCompilerOptions, checkerOptions, globalComponentName) {
     const globalComponentSnapshot = ts.ScriptSnapshot.fromString('<script setup lang="ts"></script>');
     const metaSnapshots = {};
     const getScriptFileNames = host.getScriptFileNames;
@@ -113,24 +117,8 @@ function baseCreate(ts, configFileName, host, vueCompilerOptions, checkerOptions
             return getScriptSnapshot(fileName);
         }
     };
-    const vueLanguagePlugin = vue.createVueLanguagePlugin(ts, id => id, fileName => {
-        if (ts.sys.useCaseSensitiveFileNames) {
-            return host.getScriptFileNames().includes(fileName) ?? false;
-        }
-        else {
-            const lowerFileName = fileName.toLowerCase();
-            for (const rootFile of host.getScriptFileNames()) {
-                if (rootFile.toLowerCase() === lowerFileName) {
-                    return true;
-                }
-            }
-            return false;
-        }
-    }, host.getCompilationSettings(), vueCompilerOptions);
-    const language = (0, typescript_1.createLanguage)(ts, ts.sys, [vueLanguagePlugin], configFileName, host, {
-        fileIdToFileName: id => id,
-        fileNameToFileId: id => id,
-    });
+    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 { languageServiceHost } = language.typescript;
     const tsLs = ts.createLanguageService(languageServiceHost);
     if (checkerOptions.forceUseTs) {
@@ -245,7 +233,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 vueFile = language.files.get(componentPath)?.generated?.code;
+            const vueFile = language.scripts.get(componentPath)?.generated?.root;
             const vueDefaults = vueFile && exportName === 'default'
                 ? (vueFile instanceof vue.VueGeneratedCode ? readVueComponentDefaultProps(vueFile, printer, ts, vueCompilerOptions) : {})
                 : {};
@@ -336,7 +324,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, context) {
+function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: options, noDeclarations }, ts, language) {
     const visited = new Set();
     function shouldIgnore(subtype) {
         const name = typeChecker.typeToString(subtype);
@@ -507,12 +495,11 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
     }
     function getDeclaration(declaration) {
         const fileName = declaration.getSourceFile().fileName;
-        const sourceFile = context.files.get(fileName);
+        const sourceFile = language.scripts.get(fileName);
         if (sourceFile?.generated) {
-            const script = sourceFile.generated.languagePlugin.typescript?.getScript(sourceFile.generated.code);
+            const script = sourceFile.generated.languagePlugin.typescript?.getServiceScript(sourceFile.generated.root);
             if (script) {
-                const maps = context.files.getMaps(script.code);
-                for (const [source, [_, map]] of maps) {
+                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) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vue-component-meta",
-	"version": "2.0.7",
+	"version": "2.0.11",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,10 +12,10 @@
 		"directory": "packages/component-meta"
 	},
 	"dependencies": {
-		"@volar/typescript": "~2.1.3",
-		"@vue/language-core": "2.0.7",
+		"@volar/typescript": "~2.2.0-alpha.6",
+		"@vue/language-core": "2.0.11",
 		"path-browserify": "^1.0.1",
-		"vue-component-type-helpers": "2.0.7"
+		"vue-component-type-helpers": "2.0.11"
 	},
 	"peerDependencies": {
 		"typescript": "*"
@@ -29,5 +29,5 @@
 		"@types/node": "latest",
 		"@types/path-browserify": "latest"
 	},
-	"gitHead": "4a37e8f3ebcf31ecfd2ea627f7611d5990ec5df6"
+	"gitHead": "c89f25ffc32c760130adeeac796b9a5d20585bf7"
 }