vue-component-meta 3.2.5 → 3.2.6

package/lib/checker.js

@@ -109,7 +109,7 @@ function createCheckerBase(ts, getConfigAndFiles, checkerOptions, rootPath) {
             }
             const checker = program.getTypeChecker();
             const componentType = checker.getTypeAtLocation(componentNode);
-            return (0, componentMeta_1.getComponentMeta)(ts, checker, printer, language, componentNode, componentType, checkerOptions.schema ?? false, {
+            return (0, componentMeta_1.getComponentMeta)(ts, checker, printer, language, fileName => language.scripts.get(fileName), componentNode, componentType, checkerOptions.schema ?? false, {
                 noDeclarations: checkerOptions.noDeclarations ?? true,
                 rawType: checkerOptions.rawType ?? false,
             });

package/lib/componentMeta.d.ts

@@ -1,7 +1,7 @@
 import * as core from '@vue/language-core';
 import type * as ts from 'typescript';
 import type { ComponentMeta, MetaCheckerSchemaOptions } from './types';
-export declare function getComponentMeta(ts: typeof import('typescript'), typeChecker: ts.TypeChecker, printer: ts.Printer, language: core.Language<string>, componentNode: ts.Node, componentType: ts.Type, options: MetaCheckerSchemaOptions, deprecatedOptions?: {
+export declare function getComponentMeta(ts: typeof import('typescript'), typeChecker: ts.TypeChecker, printer: ts.Printer, language: core.Language, getSourceScript: (fileName: string) => core.SourceScript | undefined, componentNode: ts.Node, componentType: ts.Type, options: MetaCheckerSchemaOptions, deprecatedOptions?: {
     noDeclarations: boolean;
     rawType: boolean;
 }): ComponentMeta;

package/lib/componentMeta.js

@@ -38,7 +38,7 @@ const core = __importStar(require("@vue/language-core"));
 const helpers_1 = require("./helpers");
 const schemaResolvers_1 = require("./schemaResolvers");
 const scriptSetup_1 = require("./scriptSetup");
-function getComponentMeta(ts, typeChecker, printer, language, componentNode, componentType, options, deprecatedOptions = { noDeclarations: true, rawType: false }) {
+function getComponentMeta(ts, typeChecker, printer, language, getSourceScript, componentNode, componentType, options, deprecatedOptions = { noDeclarations: true, rawType: false }) {
     const componentSymbol = typeChecker.getSymbolAtLocation(componentNode);
     let componentFile = componentNode.getSourceFile();
     if (componentSymbol) {
@@ -95,11 +95,11 @@ function getComponentMeta(ts, typeChecker, printer, language, componentNode, com
         const eventProps = new Set(meta.events.map(event => `on${event.name.charAt(0).toUpperCase()}${event.name.slice(1)}`));
         result = properties
             .map(prop => {
-            const { resolveNestedProperties, } = (0, schemaResolvers_1.createSchemaResolvers)(ts, typeChecker, printer, language, options, deprecatedOptions);
+            const { resolveNestedProperties, } = (0, schemaResolvers_1.createSchemaResolvers)(ts, typeChecker, printer, language, getSourceScript, options, deprecatedOptions);
             return resolveNestedProperties(prop);
         })
             .filter((prop) => !!prop && !eventProps.has(prop.name));
-        const defaults = (0, scriptSetup_1.getDefaultsFromScriptSetup)(ts, printer, language, componentFile.fileName);
+        const defaults = (0, scriptSetup_1.getDefaultsFromScriptSetup)(ts, printer, getSourceScript(componentFile.fileName));
         for (const prop of result) {
             if (prop.name.match(/^onVnode[A-Z]/)) {
                 prop.name = 'onVue:' + prop.name['onVnode'.length]?.toLowerCase() + prop.name.slice('onVnode'.length + 1);
@@ -113,7 +113,7 @@ function getComponentMeta(ts, typeChecker, printer, language, componentNode, com
         if (emitType) {
             const calls = emitType.getCallSignatures();
             return calls.map(call => {
-                const { resolveEventSignature, } = (0, schemaResolvers_1.createSchemaResolvers)(ts, typeChecker, printer, language, options, deprecatedOptions);
+                const { resolveEventSignature, } = (0, schemaResolvers_1.createSchemaResolvers)(ts, typeChecker, printer, language, getSourceScript, options, deprecatedOptions);
                 return resolveEventSignature(call);
             }).filter(event => event.name);
         }
@@ -124,7 +124,7 @@ function getComponentMeta(ts, typeChecker, printer, language, componentNode, com
         if (slotsType) {
             const properties = slotsType.getProperties();
             return properties.map(prop => {
-                const { resolveSlotProperties, } = (0, schemaResolvers_1.createSchemaResolvers)(ts, typeChecker, printer, language, options, deprecatedOptions);
+                const { resolveSlotProperties, } = (0, schemaResolvers_1.createSchemaResolvers)(ts, typeChecker, printer, language, getSourceScript, options, deprecatedOptions);
                 return resolveSlotProperties(prop);
             });
         }
@@ -144,7 +144,7 @@ function getComponentMeta(ts, typeChecker, printer, language, componentNode, com
                 // Exclude $slots
                 && prop.name !== '$slots');
             return properties.map(prop => {
-                const { resolveExposedProperties, } = (0, schemaResolvers_1.createSchemaResolvers)(ts, typeChecker, printer, language, options, deprecatedOptions);
+                const { resolveExposedProperties, } = (0, schemaResolvers_1.createSchemaResolvers)(ts, typeChecker, printer, language, getSourceScript, options, deprecatedOptions);
                 return resolveExposedProperties(prop);
             });
         }

package/lib/schemaResolvers.d.ts

@@ -1,7 +1,7 @@
 import type * as core from '@vue/language-core';
 import type * as ts from 'typescript';
 import type { EventMeta, ExposeMeta, PropertyMeta, PropertyMetaSchema, SlotMeta } from './types';
-export declare function createSchemaResolvers(ts: typeof import('typescript'), typeChecker: ts.TypeChecker, printer: ts.Printer, language: core.Language<string>, options: import('./types').MetaCheckerSchemaOptions, deprecatedOptions: {
+export declare function createSchemaResolvers(ts: typeof import('typescript'), typeChecker: ts.TypeChecker, printer: ts.Printer, language: core.Language, getSourceScript: (fileName: string) => core.SourceScript | undefined, options: import('./types').MetaCheckerSchemaOptions, deprecatedOptions: {
     noDeclarations: boolean;
     rawType: boolean;
 }): {

package/lib/schemaResolvers.js

@@ -8,7 +8,7 @@ const publicPropsInterfaces = new Set([
     'AllowedComponentProps',
     'ComponentCustomProps',
 ]);
-function createSchemaResolvers(ts, typeChecker, printer, language, options, deprecatedOptions) {
+function createSchemaResolvers(ts, typeChecker, printer, language, getSourceScript, options, deprecatedOptions) {
     const visited = new Set();
     function shouldIgnore(subtype) {
         const name = getFullyQualifiedName(subtype);
@@ -311,7 +311,7 @@ function createSchemaResolvers(ts, typeChecker, printer, language, options, depr
     }
     function getDeclaration(declaration) {
         const fileName = declaration.getSourceFile().fileName;
-        const sourceScript = language.scripts.get(fileName);
+        const sourceScript = getSourceScript(fileName);
         if (sourceScript?.generated) {
             const script = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
             if (script) {
@@ -319,7 +319,7 @@ function createSchemaResolvers(ts, typeChecker, printer, language, options, depr
                     for (const [start] of map.toSourceLocation(declaration.getStart())) {
                         for (const [end] of map.toSourceLocation(declaration.getEnd())) {
                             return {
-                                file: sourceScript.id,
+                                file: String(sourceScript.id),
                                 range: [start, end],
                             };
                         }

package/lib/scriptSetup.d.ts

@@ -1,4 +1,4 @@
 import * as core from '@vue/language-core';
 import type * as ts from 'typescript';
-export declare function getDefaultsFromScriptSetup(ts: typeof import('typescript'), printer: ts.Printer, language: core.Language<string>, componentPath: string): Map<string, string> | undefined;
+export declare function getDefaultsFromScriptSetup(ts: typeof import('typescript'), printer: ts.Printer, sourceScript: core.SourceScript | undefined): Map<string, string> | undefined;
 export declare function resolveDefaultOptionExpression(ts: typeof import('typescript'), _default: ts.Expression): ts.Expression;

package/lib/scriptSetup.js

@@ -36,8 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDefaultsFromScriptSetup = getDefaultsFromScriptSetup;
 exports.resolveDefaultOptionExpression = resolveDefaultOptionExpression;
 const core = __importStar(require("@vue/language-core"));
-function getDefaultsFromScriptSetup(ts, printer, language, componentPath) {
-    const sourceScript = language.scripts.get(componentPath);
+function getDefaultsFromScriptSetup(ts, printer, sourceScript) {
     const virtualCode = sourceScript?.generated?.root;
     if (!virtualCode) {
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vue-component-meta",
-	"version": "3.2.5",
+	"version": "3.2.6",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -14,7 +14,7 @@
 	},
 	"dependencies": {
 		"@volar/typescript": "2.4.28",
-		"@vue/language-core": "3.2.5",
+		"@vue/language-core": "3.2.6",
 		"path-browserify": "^1.0.1"
 	},
 	"devDependencies": {
@@ -29,5 +29,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "ee5041d27940cf6f9a5150635d3b13140a9dff54"
+	"gitHead": "94907be4f056f25867e46a117ab18d2782b425d7"
 }