vue-component-meta 1.0.0-beta.8 → 1.0.0-rc.2

package/README.md

@@ -2,7 +2,7 @@
 
 ## Usage
 
-See https://github.com/johnsoncodehk/volar/blob/master/packages/vue-component-meta/tests/index.spec.ts.
+See https://github.com/johnsoncodehk/volar/blob/master/vue-language-tools/vue-component-meta/tests/index.spec.ts.
 
 ## Sponsors
 

package/out/index.d.ts

@@ -2,11 +2,16 @@ 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 type ComponentMetaChecker = ReturnType<typeof createComponentMetaCheckerBase>;
+export type ComponentMetaChecker = ReturnType<typeof baseCreate>;
 export declare function createComponentMetaCheckerByJsonConfig(root: string, json: any, checkerOptions?: MetaCheckerOptions): {
     getExportNames: (componentPath: string) => string[];
     getComponentMeta: (componentPath: string, exportName?: string) => ComponentMeta;
+    updateFile(fileName: string, text: string): void;
+    deleteFile(fileName: string): void;
+    reload(): void;
+    clearCache(): void;
     __internal__: {
+        parsedCommandLine: vue.ParsedCommandLine;
         program: ts.Program;
         tsLs: ts.LanguageService;
         typeChecker: ts.TypeChecker;
@@ -15,16 +20,26 @@ export declare function createComponentMetaCheckerByJsonConfig(root: string, jso
 export declare function createComponentMetaChecker(tsconfigPath: string, checkerOptions?: MetaCheckerOptions): {
     getExportNames: (componentPath: string) => string[];
     getComponentMeta: (componentPath: string, exportName?: string) => ComponentMeta;
+    updateFile(fileName: string, text: string): void;
+    deleteFile(fileName: string): void;
+    reload(): void;
+    clearCache(): void;
     __internal__: {
+        parsedCommandLine: vue.ParsedCommandLine;
         program: ts.Program;
         tsLs: ts.LanguageService;
         typeChecker: ts.TypeChecker;
     };
 };
-declare function createComponentMetaCheckerBase(tsconfigPath: string, parsedCommandLine: vue.ParsedCommandLine, checkerOptions: MetaCheckerOptions): {
+declare function baseCreate(loadParsedCommandLine: () => vue.ParsedCommandLine, checkerOptions: MetaCheckerOptions, globalComponentName: string): {
     getExportNames: (componentPath: string) => string[];
     getComponentMeta: (componentPath: string, exportName?: string) => ComponentMeta;
+    updateFile(fileName: string, text: string): void;
+    deleteFile(fileName: string): void;
+    reload(): void;
+    clearCache(): void;
     __internal__: {
+        parsedCommandLine: vue.ParsedCommandLine;
         program: ts.Program;
         tsLs: ts.LanguageService;
         typeChecker: ts.TypeChecker;

package/out/index.js

@@ -3,55 +3,75 @@ exports.createComponentMetaChecker = exports.createComponentMetaCheckerByJsonCon
 const vue = require("@volar/vue-language-core");
 const embedded = require("@volar/language-core");
 const ts = require("typescript/lib/tsserverlibrary");
+const path = require("typesafe-path/posix");
 const extraFileExtensions = [{
         extension: 'vue',
         isMixedContent: true,
         scriptKind: ts.ScriptKind.Deferred,
     }];
 function createComponentMetaCheckerByJsonConfig(root, json, checkerOptions = {}) {
-    const parsedCommandLine = vue.createParsedCommandLineByJson(ts, ts.sys, root, json, extraFileExtensions);
-    for (const error of parsedCommandLine.errors) {
-        console.error(error);
-    }
-    return createComponentMetaCheckerBase(root + '/jsconfig.json', parsedCommandLine, checkerOptions);
+    return baseCreate(() => vue.createParsedCommandLineByJson(ts, ts.sys, root, json, extraFileExtensions), checkerOptions, path.join(root.replace(/\\/g, '/'), 'jsconfig.json.global.vue'));
 }
 exports.createComponentMetaCheckerByJsonConfig = createComponentMetaCheckerByJsonConfig;
 function createComponentMetaChecker(tsconfigPath, checkerOptions = {}) {
-    const parsedCommandLine = vue.createParsedCommandLine(ts, ts.sys, tsconfigPath, extraFileExtensions);
-    for (const error of parsedCommandLine.errors) {
-        console.error(error);
-    }
-    return createComponentMetaCheckerBase(tsconfigPath, parsedCommandLine, checkerOptions);
+    return baseCreate(() => vue.createParsedCommandLine(ts, ts.sys, tsconfigPath, extraFileExtensions), checkerOptions, tsconfigPath.replace(/\\/g, '/') + '.global.vue');
 }
 exports.createComponentMetaChecker = createComponentMetaChecker;
-function createComponentMetaCheckerBase(tsconfigPath, parsedCommandLine, checkerOptions) {
-    const scriptSnapshot = {};
-    const globalComponentName = tsconfigPath.replace(/\\/g, '/') + '.global.vue';
-    const host = Object.assign(Object.assign({}, ts.sys), { getDefaultLibFileName: (options) => ts.getDefaultLibFilePath(options), useCaseSensitiveFileNames: () => ts.sys.useCaseSensitiveFileNames, getCompilationSettings: () => parsedCommandLine.options, getScriptFileNames: () => {
+function baseCreate(loadParsedCommandLine, checkerOptions, globalComponentName) {
+    /**
+     * Original Host
+     */
+    let parsedCommandLine = loadParsedCommandLine();
+    let fileNames = parsedCommandLine.fileNames.map(path => path.replace(/\\/g, '/'));
+    let projectVersion = 0;
+    const scriptSnapshots = new Map();
+    const scriptVersions = new Map();
+    const _host = Object.assign(Object.assign({}, ts.sys), { getProjectVersion: () => projectVersion.toString(), getDefaultLibFileName: (options) => ts.getDefaultLibFilePath(options), useCaseSensitiveFileNames: () => ts.sys.useCaseSensitiveFileNames, getCompilationSettings: () => parsedCommandLine.options, getScriptFileNames: () => fileNames, getProjectReferences: () => parsedCommandLine.projectReferences, getScriptVersion: (fileName) => { var _a, _b; return (_b = (_a = scriptVersions.get(fileName)) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : ''; }, getScriptSnapshot: (fileName) => {
+            if (!scriptSnapshots.has(fileName)) {
+                const fileText = ts.sys.readFile(fileName);
+                if (fileText !== undefined) {
+                    scriptSnapshots.set(fileName, ts.ScriptSnapshot.fromString(fileText));
+                }
+            }
+            return scriptSnapshots.get(fileName);
+        }, getTypeScriptModule: () => ts, getVueCompilationSettings: () => parsedCommandLine.vueOptions });
+    /**
+     * Meta
+     */
+    const globalComponentSnapshot = ts.ScriptSnapshot.fromString('<script setup lang="ts"></script>');
+    const metaSnapshots = {};
+    const host = new Proxy({
+        getScriptFileNames: () => {
+            const names = _host.getScriptFileNames();
             return [
-                ...parsedCommandLine.fileNames,
-                ...parsedCommandLine.fileNames.map(getMetaFileName),
+                ...names,
+                ...names.map(getMetaFileName),
                 globalComponentName,
                 getMetaFileName(globalComponentName),
             ];
-        }, getProjectReferences: () => parsedCommandLine.projectReferences, getScriptVersion: (fileName) => '0', getScriptSnapshot: (fileName) => {
-            if (!scriptSnapshot[fileName]) {
-                let fileText;
-                if (isMetaFileName(fileName)) {
-                    fileText = getMetaScriptContent(fileName);
-                }
-                else if (fileName === globalComponentName) {
-                    fileText = `<script setup lang="ts"></script>`;
-                }
-                else {
-                    fileText = ts.sys.readFile(fileName);
-                }
-                if (fileText !== undefined) {
-                    scriptSnapshot[fileName] = ts.ScriptSnapshot.fromString(fileText);
+        },
+        getScriptSnapshot: fileName => {
+            if (isMetaFileName(fileName)) {
+                if (!metaSnapshots[fileName]) {
+                    metaSnapshots[fileName] = ts.ScriptSnapshot.fromString(getMetaScriptContent(fileName));
                 }
+                return metaSnapshots[fileName];
             }
-            return scriptSnapshot[fileName];
-        }, getTypeScriptModule: () => ts, getVueCompilationSettings: () => parsedCommandLine.vueOptions });
+            else if (fileName === globalComponentName) {
+                return globalComponentSnapshot;
+            }
+            else {
+                return _host.getScriptSnapshot(fileName);
+            }
+        },
+    }, {
+        get(target, prop) {
+            if (prop in target) {
+                return target[prop];
+            }
+            return _host[prop];
+        },
+    });
     const vueLanguageModule = vue.createEmbeddedLanguageModule(host.getTypeScriptModule(), host.getCurrentDirectory(), host.getCompilationSettings(), host.getVueCompilationSettings(), ['.vue']);
     const core = embedded.createEmbeddedLanguageServiceHost(host, [vueLanguageModule]);
     const proxyApis = checkerOptions.forceUseTs ? {
@@ -81,7 +101,29 @@ function createComponentMetaCheckerBase(tsconfigPath, parsedCommandLine, checker
     return {
         getExportNames,
         getComponentMeta,
+        updateFile(fileName, text) {
+            fileName = fileName.replace(/\\/g, '/');
+            scriptSnapshots.set(fileName, ts.ScriptSnapshot.fromString(text));
+            scriptVersions.set(fileName, scriptVersions.has(fileName) ? scriptVersions.get(fileName) + 1 : 1);
+            projectVersion++;
+        },
+        deleteFile(fileName) {
+            fileName = fileName.replace(/\\/g, '/');
+            fileNames = fileNames.filter(f => f !== fileName);
+            projectVersion++;
+        },
+        reload() {
+            parsedCommandLine = loadParsedCommandLine();
+            fileNames = parsedCommandLine.fileNames.map(path => path.replace(/\\/g, '/'));
+            this.clearCache();
+        },
+        clearCache() {
+            scriptSnapshots.clear();
+            scriptVersions.clear();
+            projectVersion++;
+        },
         __internal__: {
+            parsedCommandLine,
             program,
             tsLs,
             typeChecker,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vue-component-meta",
-	"version": "1.0.0-beta.8",
+	"version": "1.0.0-rc.2",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,11 +13,12 @@
 		"directory": "vue-language-tools/vue-component-meta"
 	},
 	"dependencies": {
-		"@volar/language-core": "1.0.0-beta.8",
-		"@volar/vue-language-core": "1.0.0-beta.8"
+		"@volar/language-core": "1.0.0-rc.2",
+		"@volar/vue-language-core": "1.0.0-rc.2",
+		"typesafe-path": "^0.2.1"
 	},
 	"peerDependencies": {
 		"typescript": "*"
 	},
-	"gitHead": "7c437b60144d4160410eb96e644e09665daeee6d"
+	"gitHead": "f963241a38a0cc51ee8ff2a6aaa5a025e19fdfcb"
 }