vue-component-meta 0.39.5 → 0.40.2

package/out/index.d.ts

@@ -1,6 +1,17 @@
+import * as vue from '@volar/vue-language-core';
 import * 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 };
+export declare type ComponentMetaChecker = ReturnType<typeof createComponentMetaCheckerBase>;
+export declare function createComponentMetaCheckerByJsonConfig(root: string, json: any, checkerOptions?: MetaCheckerOptions): {
+    getExportNames: (componentPath: string) => string[];
+    getComponentMeta: (componentPath: string, exportName?: string) => ComponentMeta;
+    __internal__: {
+        program: ts.Program;
+        tsLs: ts.LanguageService;
+        typeChecker: ts.TypeChecker;
+    };
+};
 export declare function createComponentMetaChecker(tsconfigPath: string, checkerOptions?: MetaCheckerOptions): {
     getExportNames: (componentPath: string) => string[];
     getComponentMeta: (componentPath: string, exportName?: string) => ComponentMeta;
@@ -10,3 +21,12 @@ export declare function createComponentMetaChecker(tsconfigPath: string, checker
         typeChecker: ts.TypeChecker;
     };
 };
+declare function createComponentMetaCheckerBase(tsconfigPath: string, parsedCommandLine: vue.ParsedCommandLine, checkerOptions: MetaCheckerOptions): {
+    getExportNames: (componentPath: string) => string[];
+    getComponentMeta: (componentPath: string, exportName?: string) => ComponentMeta;
+    __internal__: {
+        program: ts.Program;
+        tsLs: ts.LanguageService;
+        typeChecker: ts.TypeChecker;
+    };
+};

package/out/index.js

@@ -1,16 +1,33 @@
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createComponentMetaChecker = void 0;
+exports.createComponentMetaChecker = exports.createComponentMetaCheckerByJsonConfig = void 0;
 const vue = require("@volar/vue-language-core");
+const vue_language_core_1 = require("@volar/vue-language-core");
 const ts = require("typescript/lib/tsserverlibrary");
+const parseConfigHost = {
+    useCaseSensitiveFileNames: ts.sys.useCaseSensitiveFileNames,
+    readDirectory: (path, extensions, exclude, include, depth) => {
+        return ts.sys.readDirectory(path, [...extensions, '.vue'], exclude, include, depth);
+    },
+    fileExists: ts.sys.fileExists,
+    readFile: ts.sys.readFile,
+};
+function createComponentMetaCheckerByJsonConfig(root, json, checkerOptions = {}) {
+    const parsedCommandLine = vue.createParsedCommandLineByJson(ts, parseConfigHost, root, json);
+    for (const error of parsedCommandLine.errors) {
+        console.error(error);
+    }
+    return createComponentMetaCheckerBase(root + '/jsconfig.json', parsedCommandLine, checkerOptions);
+}
+exports.createComponentMetaCheckerByJsonConfig = createComponentMetaCheckerByJsonConfig;
 function createComponentMetaChecker(tsconfigPath, checkerOptions = {}) {
-    const parsedCommandLine = vue.tsShared.createParsedCommandLine(ts, {
-        useCaseSensitiveFileNames: ts.sys.useCaseSensitiveFileNames,
-        readDirectory: (path, extensions, exclude, include, depth) => {
-            return ts.sys.readDirectory(path, [...extensions, '.vue'], exclude, include, depth);
-        },
-        fileExists: ts.sys.fileExists,
-        readFile: ts.sys.readFile,
-    }, tsconfigPath);
+    const parsedCommandLine = vue.createParsedCommandLine(ts, parseConfigHost, tsconfigPath);
+    for (const error of parsedCommandLine.errors) {
+        console.error(error);
+    }
+    return createComponentMetaCheckerBase(tsconfigPath, parsedCommandLine, checkerOptions);
+}
+exports.createComponentMetaChecker = createComponentMetaChecker;
+function createComponentMetaCheckerBase(tsconfigPath, parsedCommandLine, checkerOptions) {
     const scriptSnapshot = {};
     const globalComponentName = tsconfigPath.replace(/\\/g, '/') + '.global.ts';
     const host = Object.assign(Object.assign({}, ts.sys), { getDefaultLibFileName: (options) => ts.getDefaultLibFilePath(options), useCaseSensitiveFileNames: () => ts.sys.useCaseSensitiveFileNames, getCompilationSettings: () => parsedCommandLine.options, getScriptFileNames: () => {
@@ -23,7 +40,7 @@ function createComponentMetaChecker(tsconfigPath, checkerOptions = {}) {
         }, getProjectReferences: () => parsedCommandLine.projectReferences, getScriptVersion: (fileName) => '0', getScriptSnapshot: (fileName) => {
             if (!scriptSnapshot[fileName]) {
                 let fileText;
-                if (fileName.endsWith('.meta.ts')) {
+                if (isMetaFileName(fileName)) {
                     fileText = getMetaScriptContent(fileName);
                 }
                 else if (fileName === globalComponentName) {
@@ -75,6 +92,9 @@ function createComponentMetaChecker(tsconfigPath, checkerOptions = {}) {
             typeChecker,
         },
     };
+    function isMetaFileName(fileName) {
+        return fileName.endsWith('.meta.ts');
+    }
     function getMetaFileName(fileName) {
         return (fileName.endsWith('.vue') ? fileName : fileName.substring(0, fileName.lastIndexOf('.'))) + '.meta.ts';
     }
@@ -124,7 +144,7 @@ function createComponentMetaChecker(tsconfigPath, checkerOptions = {}) {
             const printer = checkerOptions.printer ? ts.createPrinter(checkerOptions.printer) : undefined;
             const snapshot = host.getScriptSnapshot(componentPath);
             const vueDefaults = componentPath.endsWith('.vue') && exportName === 'default'
-                ? readVueComponentDefaultProps(snapshot.getText(0, snapshot.getLength()), printer)
+                ? readVueComponentDefaultProps(core, snapshot, printer)
                 : {};
             const tsDefaults = !componentPath.endsWith('.vue') ? readTsComponentDefaultProps(componentPath.substring(componentPath.lastIndexOf('.') + 1), // ts | js | tsx | jsx
             snapshot.getText(0, snapshot.getLength()), exportName, printer) : {};
@@ -210,7 +230,6 @@ function createComponentMetaChecker(tsconfigPath, checkerOptions = {}) {
         };
     }
 }
-exports.createComponentMetaChecker = createComponentMetaChecker;
 function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: options }) {
     var _a;
     const enabled = !!options;
@@ -345,16 +364,16 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
         resolveSchema,
     };
 }
-function readVueComponentDefaultProps(vueFileText, printer) {
+function readVueComponentDefaultProps(core, vueFileScript, printer) {
     let result = {};
     scriptSetupWorker();
     scriptWorker();
     return result;
     function scriptSetupWorker() {
         var _a;
-        const vueSourceFile = vue.createSourceFile('/tmp.vue', vueFileText, {}, {}, ts);
-        const descriptor = vueSourceFile.getDescriptor();
-        const scriptSetupRanges = vueSourceFile.getScriptSetupRanges();
+        const vueSourceFile = vue.createSourceFile('/tmp.vue', vueFileScript, {}, ts, core.plugins);
+        const descriptor = vueSourceFile.sfc;
+        const scriptSetupRanges = descriptor.scriptSetupAst ? (0, vue_language_core_1.parseScriptSetupRanges)(ts, descriptor.scriptSetupAst) : 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);
@@ -394,8 +413,8 @@ function readVueComponentDefaultProps(vueFileText, printer) {
         }
     }
     function scriptWorker() {
-        const vueSourceFile = vue.createSourceFile('/tmp.vue', vueFileText, {}, {}, ts);
-        const descriptor = vueSourceFile.getDescriptor();
+        const vueSourceFile = vue.createSourceFile('/tmp.vue', vueFileScript, {}, ts, core.plugins);
+        const descriptor = vueSourceFile.sfc;
         if (descriptor.script) {
             const scriptResult = readTsComponentDefaultProps(descriptor.script.lang, descriptor.script.content, 'default', printer);
             for (const [key, value] of Object.entries(scriptResult)) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vue-component-meta",
-	"version": "0.39.5",
+	"version": "0.40.2",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,10 +13,10 @@
 		"directory": "packages/vue-component-meta"
 	},
 	"dependencies": {
-		"@volar/vue-language-core": "0.39.5"
+		"@volar/vue-language-core": "0.40.2"
 	},
 	"peerDependencies": {
 		"typescript": "*"
 	},
-	"gitHead": "b2efb244b43f24b3e351c72e731f31090e51a736"
+	"gitHead": "baa87a77b8cb56cf31dab158e5f76af42fe65b39"
 }