vue-component-meta 2.0.6 → 2.0.10

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,14 +40,15 @@ function createCheckerWorker(ts, loadParsedCommandLine, checkerOptions, rootPath
     let fileNames = parsedCommandLine.fileNames.map(path => path.replace(windowsPathReg, '/'));
     let projectVersion = 0;
     const scriptSnapshots = new Map();
-    const resolvedVueOptions = vue.resolveVueCompilerOptions(parsedCommandLine.vueOptions);
-    const _host = {
+    const projectHost = {
+        ...ts.sys,
+        configFileName,
         getCurrentDirectory: () => rootPath,
         getProjectVersion: () => projectVersion.toString(),
         getCompilationSettings: () => parsedCommandLine.options,
         getScriptFileNames: () => fileNames,
         getProjectReferences: () => parsedCommandLine.projectReferences,
-        getScriptSnapshot: (fileName) => {
+        getScriptSnapshot: fileName => {
             if (!scriptSnapshots.has(fileName)) {
                 const fileText = ts.sys.readFile(fileName);
                 if (fileText !== undefined) {
@@ -57,14 +58,16 @@ function createCheckerWorker(ts, loadParsedCommandLine, checkerOptions, rootPath
             return scriptSnapshots.get(fileName);
         },
         getLanguageId: fileName => {
-            if (resolvedVueOptions.extensions.some(ext => fileName.endsWith(ext))) {
+            if (parsedCommandLine.vueOptions.extensions.some(ext => fileName.endsWith(ext))) {
                 return 'vue';
             }
             return vue.resolveCommonLanguageId(fileName);
         },
+        scriptIdToFileName: id => id,
+        fileNameToScriptId: id => id,
     };
     return {
-        ...baseCreate(ts, configFileName, _host, resolvedVueOptions, checkerOptions, globalComponentName),
+        ...baseCreate(ts, projectHost, parsedCommandLine.vueOptions, checkerOptions, globalComponentName),
         updateFile(fileName, text) {
             fileName = fileName.replace(windowsPathReg, '/');
             scriptSnapshots.set(fileName, ts.ScriptSnapshot.fromString(text));
@@ -86,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;
@@ -100,7 +103,7 @@ function baseCreate(ts, configFileName, host, vueCompilerOptions, checkerOptions
             getMetaFileName(globalComponentName),
         ];
     };
-    host.getScriptSnapshot = (fileName) => {
+    host.getScriptSnapshot = fileName => {
         if (isMetaFileName(fileName)) {
             if (!metaSnapshots[fileName]) {
                 metaSnapshots[fileName] = ts.ScriptSnapshot.fromString(getMetaScriptContent(fileName));
@@ -114,29 +117,13 @@ 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) {
         const getScriptKind = languageServiceHost.getScriptKind?.bind(languageServiceHost);
-        languageServiceHost.getScriptKind = (fileName) => {
+        languageServiceHost.getScriptKind = fileName => {
             if (fileName.endsWith('.vue.js')) {
                 return ts.ScriptKind.TS;
             }
@@ -186,7 +173,7 @@ ${vueCompilerOptions.target < 3 ? vue2_1.code : vue_component_type_helpers_1.cod
         const program = tsLs.getProgram();
         const typeChecker = program.getTypeChecker();
         const { symbolNode, exports } = _getExports(program, typeChecker, componentPath);
-        const _export = exports.find((property) => property.getName() === exportName);
+        const _export = exports.find(property => property.getName() === exportName);
         if (!_export) {
             throw `Could not find export ${exportName}`;
         }
@@ -230,11 +217,11 @@ ${vueCompilerOptions.target < 3 ? vue2_1.code : vue_component_type_helpers_1.cod
                 const type = typeChecker.getTypeOfSymbolAtLocation($props, symbolNode);
                 const properties = type.getProperties();
                 result = properties
-                    .map((prop) => {
+                    .map(prop => {
                     const { resolveNestedProperties, } = createSchemaResolvers(typeChecker, symbolNode, checkerOptions, ts, language);
                     return resolveNestedProperties(prop);
                 })
-                    .filter((prop) => !prop.name.match(propEventRegex));
+                    .filter(prop => !prop.name.match(propEventRegex));
             }
             // fill global
             if (componentPath !== globalComponentName) {
@@ -246,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) : {})
                 : {};
@@ -274,7 +261,7 @@ ${vueCompilerOptions.target < 3 ? vue2_1.code : vue_component_type_helpers_1.cod
             if ($emit) {
                 const type = typeChecker.getTypeOfSymbolAtLocation($emit, symbolNode);
                 const calls = type.getCallSignatures();
-                return calls.map((call) => {
+                return calls.map(call => {
                     const { resolveEventSignature, } = createSchemaResolvers(typeChecker, symbolNode, checkerOptions, ts, language);
                     return resolveEventSignature(call);
                 }).filter(event => event.name);
@@ -286,7 +273,7 @@ ${vueCompilerOptions.target < 3 ? vue2_1.code : vue_component_type_helpers_1.cod
             if ($slots) {
                 const type = typeChecker.getTypeOfSymbolAtLocation($slots, symbolNode);
                 const properties = type.getProperties();
-                return properties.map((prop) => {
+                return properties.map(prop => {
                     const { resolveSlotProperties, } = createSchemaResolvers(typeChecker, symbolNode, checkerOptions, ts, language);
                     return resolveSlotProperties(prop);
                 });
@@ -300,7 +287,7 @@ ${vueCompilerOptions.target < 3 ? vue2_1.code : vue_component_type_helpers_1.cod
                 const properties = type.getProperties().filter(prop => 
                 // only exposed props will not have a valueDeclaration
                 !prop.valueDeclaration);
-                return properties.map((prop) => {
+                return properties.map(prop => {
                     const { resolveExposedProperties, } = createSchemaResolvers(typeChecker, symbolNode, checkerOptions, ts, language);
                     return resolveExposedProperties(prop);
                 });
@@ -337,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);
@@ -351,8 +338,9 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
             for (const item of options.ignore ?? []) {
                 if (typeof item === 'function') {
                     const result = item(name, subtype, typeChecker);
-                    if (typeof result === 'boolean')
+                    if (typeof result === 'boolean') {
                         return result;
+                    }
                 }
                 else if (name === item) {
                     return true;
@@ -392,7 +380,7 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
         const propType = typeChecker.getNonNullableType(typeChecker.getTypeOfSymbolAtLocation(prop, symbolNode));
         const signatures = propType.getCallSignatures();
         const paramType = signatures[0].parameters[0];
-        const subtype = typeChecker.getTypeOfSymbolAtLocation(paramType, symbolNode);
+        const subtype = paramType ? typeChecker.getTypeOfSymbolAtLocation(paramType, symbolNode) : typeChecker.getAnyType();
         let schema;
         let declarations;
         return {
@@ -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.6",
+	"version": "2.0.10",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,10 +12,10 @@
 		"directory": "packages/component-meta"
 	},
 	"dependencies": {
-		"@volar/typescript": "~2.1.2",
-		"@vue/language-core": "2.0.6",
+		"@volar/typescript": "~2.2.0-alpha.5",
+		"@vue/language-core": "2.0.10",
 		"path-browserify": "^1.0.1",
-		"vue-component-type-helpers": "2.0.6"
+		"vue-component-type-helpers": "2.0.10"
 	},
 	"peerDependencies": {
 		"typescript": "*"
@@ -29,5 +29,5 @@
 		"@types/node": "latest",
 		"@types/path-browserify": "latest"
 	},
-	"gitHead": "feb990ccec85f6330bba37c8b1d1287f0980274c"
+	"gitHead": "a20a2ee950b63a949660b7e8faf0faed0e5bad33"
 }