vue-component-meta 1.0.21 → 1.0.24

package/out/index.d.ts

@@ -1,7 +1,7 @@
 import * as vue from '@volar/vue-language-core';
 import type * as ts from 'typescript/lib/tsserverlibrary';
-import type { MetaCheckerOptions, ComponentMeta, EventMeta, ExposeMeta, MetaCheckerSchemaOptions, PropertyMeta, PropertyMetaSchema, SlotMeta } from './types';
-export type { MetaCheckerOptions, ComponentMeta, EventMeta, ExposeMeta, MetaCheckerSchemaOptions, PropertyMeta, PropertyMetaSchema, SlotMeta };
+import type { MetaCheckerOptions, ComponentMeta } from './types';
+export * from './types';
 export type ComponentMetaChecker = ReturnType<typeof baseCreate>;
 export declare function createComponentMetaCheckerByJsonConfig(root: string, json: any, checkerOptions?: MetaCheckerOptions, ts?: typeof import('typescript/lib/tsserverlibrary')): {
     updateFile(fileName: string, text: string): void;

package/out/index.js

@@ -1,8 +1,23 @@
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.baseCreate = exports.createComponentMetaChecker = exports.createComponentMetaCheckerByJsonConfig = void 0;
 const vue = require("@volar/vue-language-core");
 const embedded = require("@volar/language-core");
 const path = require("typesafe-path/posix");
+__exportStar(require("./types"), exports);
 const extraFileExtensions = [{
         extension: 'vue',
         isMixedContent: true,
@@ -57,9 +72,6 @@ function createComponentMetaCheckerWorker(loadParsedCommandLine, checkerOptions,
         } });
 }
 function baseCreate(_host, checkerOptions, globalComponentName, ts) {
-    /**
-     * Meta
-     */
     const globalComponentSnapshot = ts.ScriptSnapshot.fromString('<script setup lang="ts"></script>');
     const metaSnapshots = {};
     const host = new Proxy({
@@ -94,7 +106,8 @@ function baseCreate(_host, checkerOptions, globalComponentName, ts) {
             return _host[prop];
         },
     });
-    const vueLanguageModules = ts ? vue.createLanguageModules(ts, host.getCompilationSettings(), host.getVueCompilationSettings()) : [];
+    const vueCompilerOptions = vue.resolveVueCompilerOptions(host.getVueCompilationSettings());
+    const vueLanguageModules = ts ? vue.createLanguageModules(ts, host.getCompilationSettings(), vueCompilerOptions) : [];
     const core = embedded.createLanguageContext(host, vueLanguageModules);
     const proxyApis = checkerOptions.forceUseTs ? {
         getScriptKind: (fileName) => {
@@ -181,9 +194,9 @@ function baseCreate(_host, checkerOptions, globalComponentName, ts) {
             // fill defaults
             const printer = ts.createPrinter(checkerOptions.printer);
             const snapshot = host.getScriptSnapshot(componentPath);
-            const vueSourceFile = (_a = core.virtualFiles.get(componentPath)) === null || _a === void 0 ? void 0 : _a[1];
+            const vueSourceFile = (_a = core.virtualFiles.getSource(componentPath)) === null || _a === void 0 ? void 0 : _a.root;
             const vueDefaults = vueSourceFile && exportName === 'default'
-                ? (vueSourceFile instanceof vue.VueFile ? readVueComponentDefaultProps(vueSourceFile, printer, ts) : {})
+                ? (vueSourceFile instanceof vue.VueFile ? readVueComponentDefaultProps(vueSourceFile, printer, ts, vueCompilerOptions) : {})
                 : {};
             const tsDefaults = !vueSourceFile ? readTsComponentDefaultProps(componentPath.substring(componentPath.lastIndexOf('.') + 1), // ts | js | tsx | jsx
             snapshot.getText(0, snapshot.getLength()), exportName, printer, ts) : {};
@@ -214,9 +227,7 @@ function baseCreate(_host, checkerOptions, globalComponentName, ts) {
             return [];
         }
         function getSlots() {
-            var _a;
-            const target = (_a = _host.getVueCompilationSettings().target) !== null && _a !== void 0 ? _a : 3;
-            const propertyName = target < 3 ? '$scopedSlots' : '$slots';
+            const propertyName = vueCompilerOptions.target < 3 ? '$scopedSlots' : '$slots';
             const $slots = symbolProperties.find(prop => prop.escapedName === propertyName);
             if ($slots) {
                 const type = typeChecker.getTypeOfSymbolAtLocation($slots, symbolNode);
@@ -272,139 +283,149 @@ function baseCreate(_host, checkerOptions, globalComponentName, ts) {
 }
 exports.baseCreate = baseCreate;
 function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: options }, ts) {
-    var _a;
-    const enabled = !!options;
-    const ignore = typeof options === 'object' ? [...(_a = options === null || options === void 0 ? void 0 : options.ignore) !== null && _a !== void 0 ? _a : []] : [];
+    const visited = new Set();
+    ;
     function shouldIgnore(subtype) {
+        var _a;
         const name = typeChecker.typeToString(subtype);
         if (name === 'any') {
             return true;
         }
-        if (ignore.length === 0) {
-            return false;
+        if (visited.has(subtype)) {
+            return true;
         }
-        for (const item of ignore) {
-            if (typeof item === 'function') {
-                const result = item(name, subtype, typeChecker);
-                if (result != null)
-                    return result;
-            }
-            else if (name === item) {
-                return true;
+        if (typeof options === 'object') {
+            for (const item of (_a = options.ignore) !== null && _a !== void 0 ? _a : []) {
+                if (typeof item === 'function') {
+                    const result = item(name, subtype, typeChecker);
+                    if (typeof result === 'boolean')
+                        return result;
+                }
+                else if (name === item) {
+                    return true;
+                }
             }
         }
         return false;
     }
-    function setVisited(subtype) {
-        const type = typeChecker.typeToString(subtype);
-        ignore.push(type);
-    }
     function reducer(acc, cur) {
         acc[cur.name] = cur;
         return acc;
     }
     function resolveNestedProperties(prop) {
         const subtype = typeChecker.getTypeOfSymbolAtLocation(prop, symbolNode);
-        const schema = enabled ? resolveSchema(subtype) : undefined;
+        let schema;
         return {
             name: prop.getEscapedName().toString(),
             global: false,
             description: ts.displayPartsToString(prop.getDocumentationComment(typeChecker)),
-            tags: prop.getJsDocTags(typeChecker).map(tag => {
-                var _a;
-                return ({
-                    name: tag.name,
-                    text: (_a = tag.text) === null || _a === void 0 ? void 0 : _a.map(part => part.text).join(''),
-                });
-            }),
+            tags: prop.getJsDocTags(typeChecker).map(tag => ({
+                name: tag.name,
+                text: tag.text !== undefined ? ts.displayPartsToString(tag.text) : undefined,
+            })),
             required: !(prop.flags & ts.SymbolFlags.Optional),
             type: typeChecker.typeToString(subtype),
             rawType: rawType ? subtype : undefined,
-            schema,
+            get schema() {
+                return schema !== null && schema !== void 0 ? schema : (schema = resolveSchema(subtype));
+            },
         };
     }
     function resolveSlotProperties(prop) {
         const subtype = typeChecker.getTypeOfSymbolAtLocation(typeChecker.getTypeOfSymbolAtLocation(prop, symbolNode).getCallSignatures()[0].parameters[0], symbolNode);
-        const schema = enabled ? resolveSchema(subtype) : undefined;
+        let schema;
         return {
             name: prop.getName(),
             type: typeChecker.typeToString(subtype),
             rawType: rawType ? subtype : undefined,
             description: ts.displayPartsToString(prop.getDocumentationComment(typeChecker)),
-            schema,
+            get schema() {
+                return schema !== null && schema !== void 0 ? schema : (schema = resolveSchema(subtype));
+            },
         };
     }
     function resolveExposedProperties(expose) {
         const subtype = typeChecker.getTypeOfSymbolAtLocation(expose, symbolNode);
-        const schema = enabled ? resolveSchema(subtype) : undefined;
+        let schema;
         return {
             name: expose.getName(),
             type: typeChecker.typeToString(subtype),
             rawType: rawType ? subtype : undefined,
             description: ts.displayPartsToString(expose.getDocumentationComment(typeChecker)),
-            schema,
+            get schema() {
+                return schema !== null && schema !== void 0 ? schema : (schema = resolveSchema(subtype));
+            },
         };
     }
     function resolveEventSignature(call) {
         const subtype = typeChecker.getTypeOfSymbolAtLocation(call.parameters[1], symbolNode);
-        const schema = enabled
-            ? typeChecker.getTypeArguments(subtype).map(resolveSchema)
-            : undefined;
+        let schema;
         return {
             name: typeChecker.getTypeOfSymbolAtLocation(call.parameters[0], symbolNode).value,
             type: typeChecker.typeToString(subtype),
             rawType: rawType ? subtype : undefined,
             signature: typeChecker.signatureToString(call),
-            schema,
+            get schema() {
+                return schema !== null && schema !== void 0 ? schema : (schema = typeChecker.getTypeArguments(subtype).map(resolveSchema));
+            },
         };
     }
     function resolveCallbackSchema(signature) {
-        const schema = enabled && signature.parameters.length > 0
-            ? typeChecker
-                .getTypeArguments(typeChecker.getTypeOfSymbolAtLocation(signature.parameters[0], symbolNode))
-                .map(resolveSchema)
-            : undefined;
+        let schema;
         return {
             kind: 'event',
             type: typeChecker.signatureToString(signature),
-            schema,
+            get schema() {
+                return schema !== null && schema !== void 0 ? schema : (schema = signature.parameters.length > 0
+                    ? typeChecker
+                        .getTypeArguments(typeChecker.getTypeOfSymbolAtLocation(signature.parameters[0], symbolNode))
+                        .map(resolveSchema)
+                    : undefined);
+            },
         };
     }
     function resolveSchema(subtype) {
         const type = typeChecker.typeToString(subtype);
-        let schema = type;
         if (shouldIgnore(subtype)) {
             return type;
         }
-        setVisited(subtype);
+        visited.add(subtype);
         if (subtype.isUnion()) {
-            schema = {
+            let schema;
+            return {
                 kind: 'enum',
                 type,
-                schema: subtype.types.map(resolveSchema)
+                get schema() {
+                    return schema !== null && schema !== void 0 ? schema : (schema = subtype.types.map(resolveSchema));
+                },
             };
         }
         // @ts-ignore - typescript internal, isArrayLikeType exists
         else if (typeChecker.isArrayLikeType(subtype)) {
-            schema = {
+            let schema;
+            return {
                 kind: 'array',
                 type,
-                schema: typeChecker.getTypeArguments(subtype).map(resolveSchema)
+                get schema() {
+                    return schema !== null && schema !== void 0 ? schema : (schema = typeChecker.getTypeArguments(subtype).map(resolveSchema));
+                },
             };
         }
         else if (subtype.getCallSignatures().length === 0 &&
             (subtype.isClassOrInterface() || subtype.isIntersection() || subtype.objectFlags & ts.ObjectFlags.Anonymous)) {
-            // setVisited(subtype);
-            schema = {
+            let schema;
+            return {
                 kind: 'object',
                 type,
-                schema: subtype.getProperties().map(resolveNestedProperties).reduce(reducer, {})
+                get schema() {
+                    return schema !== null && schema !== void 0 ? schema : (schema = subtype.getProperties().map(resolveNestedProperties).reduce(reducer, {}));
+                },
             };
         }
         else if (subtype.getCallSignatures().length === 1) {
-            schema = resolveCallbackSchema(subtype.getCallSignatures()[0]);
+            return resolveCallbackSchema(subtype.getCallSignatures()[0]);
         }
-        return schema;
+        return type;
     }
     return {
         resolveNestedProperties,
@@ -414,7 +435,7 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
         resolveSchema,
     };
 }
-function readVueComponentDefaultProps(vueSourceFile, printer, ts) {
+function readVueComponentDefaultProps(vueSourceFile, printer, ts, vueCompilerOptions) {
     let result = {};
     scriptSetupWorker();
     scriptWorker();
@@ -422,7 +443,7 @@ function readVueComponentDefaultProps(vueSourceFile, printer, ts) {
     function scriptSetupWorker() {
         var _a;
         const descriptor = vueSourceFile.sfc;
-        const scriptSetupRanges = descriptor.scriptSetupAst ? vue.parseScriptSetupRanges(ts, descriptor.scriptSetupAst) : undefined;
+        const scriptSetupRanges = descriptor.scriptSetupAst ? vue.parseScriptSetupRanges(ts, descriptor.scriptSetupAst, vueCompilerOptions) : undefined;
         if (descriptor.scriptSetup && (scriptSetupRanges === null || scriptSetupRanges === void 0 ? void 0 : scriptSetupRanges.withDefaultsArg)) {
             const defaultsText = descriptor.scriptSetup.content.substring(scriptSetupRanges.withDefaultsArg.start, scriptSetupRanges.withDefaultsArg.end);
             const ast = ts.createSourceFile('/tmp.' + descriptor.scriptSetup.lang, '(' + defaultsText + ')', ts.ScriptTarget.Latest);

package/out/types.d.ts

@@ -17,28 +17,28 @@ export interface PropertyMeta {
         name: string;
         text?: string;
     }[];
-    schema?: PropertyMetaSchema;
+    schema: PropertyMetaSchema;
 }
 export interface EventMeta {
     name: string;
     type: string;
     rawType?: ts.Type;
     signature: string;
-    schema?: PropertyMetaSchema[];
+    schema: PropertyMetaSchema[];
 }
 export interface SlotMeta {
     name: string;
     type: string;
     rawType?: ts.Type;
     description: string;
-    schema?: PropertyMetaSchema;
+    schema: PropertyMetaSchema;
 }
 export interface ExposeMeta {
     name: string;
     description: string;
     type: string;
     rawType?: ts.Type;
-    schema?: PropertyMetaSchema;
+    schema: PropertyMetaSchema;
 }
 export type PropertyMetaSchema = string | {
     kind: 'enum';
@@ -67,6 +67,6 @@ export type MetaCheckerSchemaOptions = boolean | {
 export interface MetaCheckerOptions {
     schema?: MetaCheckerSchemaOptions;
     forceUseTs?: boolean;
-    printer?: import('typescript').PrinterOptions;
+    printer?: ts.PrinterOptions;
     rawType?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vue-component-meta",
-	"version": "1.0.21",
+	"version": "1.0.24",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,12 +13,12 @@
 		"directory": "vue-language-tools/vue-component-meta"
 	},
 	"dependencies": {
-		"@volar/language-core": "1.0.21",
-		"@volar/vue-language-core": "1.0.21",
+		"@volar/language-core": "1.0.24",
+		"@volar/vue-language-core": "1.0.24",
 		"typesafe-path": "^0.2.2"
 	},
 	"peerDependencies": {
 		"typescript": "*"
 	},
-	"gitHead": "72332760759e06eed18e62026185cbad70250367"
+	"gitHead": "46da609e8914e29642f4707dec31507ad51b03fc"
 }