vue-tsc 0.33.7 → 0.33.9

package/out/apis.js

@@ -31,10 +31,10 @@ function register(ts, context) {
     }
     function getSourceFileDiagnosticsWorker(sourceFile, cancellationToken, api) {
         if (sourceFile) {
-            const maped = context.vueFiles.fromEmbeddedFileName('script', sourceFile.fileName);
-            if (maped) {
+            const mapped = context.vueFiles.fromEmbeddedFileName('script', sourceFile.fileName);
+            if (mapped) {
                 let results = [];
-                const embeddeds = maped.vueFile.getAllEmbeddeds();
+                const embeddeds = mapped.vueFile.getAllEmbeddeds();
                 for (const embedded of embeddeds) {
                     if (embedded.file.lsType === 'nonTs' || !embedded.file.capabilities.diagnostics)
                         continue;
@@ -81,13 +81,13 @@ function register(ts, context) {
                 for (const tsOrVueLoc of context.vueFiles.fromEmbeddedLocation(lsType, diagnostic.file.fileName, diagnostic.start, diagnostic.start + diagnostic.length, data => !!data.capabilities.diagnostic)) {
                     if (!context.vueLsHost.fileExists?.(tsOrVueLoc.fileName))
                         continue;
-                    if (!tsOrVueLoc.maped && lsType !== 'script')
+                    if (!tsOrVueLoc.mapped && lsType !== 'script')
                         continue;
                     let file = tsOrVueLoc.fileName === diagnostic.file.fileName
                         ? diagnostic.file
                         : undefined;
                     if (!file) {
-                        let docText = tsOrVueLoc.maped?.vueFile.getContent();
+                        let docText = tsOrVueLoc.mapped?.vueFile.getContent();
                         if (docText === undefined) {
                             const snapshot = context.vueLsHost.getScriptSnapshot(tsOrVueLoc.fileName);
                             if (snapshot) {

package/out/proxy.js

@@ -5,12 +5,14 @@ const ts = require("typescript/lib/tsserverlibrary");
 const apis = require("./apis");
 const vue_typescript_1 = require("@volar/vue-typescript");
 const vue_typescript_2 = require("@volar/vue-typescript");
+let projectVersion = 0;
 function createProgramProxy(options, // rootNamesOrOptions: readonly string[] | CreateProgramOptions,
 _options, _host, _oldProgram, _configFileParsingDiagnostics) {
     if (!options.options.noEmit && !options.options.emitDeclarationOnly)
         return doThrow('js emit is not support');
     if (!options.host)
         return doThrow('!options.host');
+    projectVersion++;
     const host = options.host;
     const vueCompilerOptions = getVueCompilerOptions();
     const scripts = new Map();
@@ -20,14 +22,20 @@ _options, _host, _oldProgram, _configFileParsingDiagnostics) {
         writeFile: undefined,
         getCompilationSettings: () => options.options,
         getVueCompilationSettings: () => vueCompilerOptions,
-        getScriptFileNames: () => options.rootNames,
-        getScriptVersion: (fileName) => scripts.get(fileName)?.version ?? '',
+        getScriptFileNames: () => {
+            return options.rootNames;
+        },
+        getScriptVersion,
         getScriptSnapshot,
-        getProjectVersion: () => '',
-        getVueProjectVersion: () => '',
+        getProjectVersion: () => {
+            return projectVersion.toString();
+        },
+        getVueProjectVersion: () => {
+            return projectVersion.toString();
+        },
         getProjectReferences: () => options.projectReferences,
     };
-    const tsRuntime = (0, vue_typescript_1.createTypeScriptRuntime)({
+    const tsRuntime = options.oldProgram?.__VLS_tsRuntime ?? (0, vue_typescript_1.createTypeScriptRuntime)({
         typescript: ts,
         baseCssModuleType: 'any',
         getCssClasses: () => ({}),
@@ -35,21 +43,23 @@ _options, _host, _oldProgram, _configFileParsingDiagnostics) {
         vueLsHost: vueLsHost,
         isVueTsc: true,
     });
+    tsRuntime.update(true); // must update before getProgram() to update virtual scripts
     const tsProgram = tsRuntime.getTsLs('script').getProgram();
     if (!tsProgram)
         throw '!tsProgram';
-    const tsProgramApis_2 = apis.register(ts, tsRuntime);
-    const tsProgramProxy = new Proxy(tsProgram, {
+    const proxyApis = apis.register(ts, tsRuntime);
+    const program = new Proxy(tsProgram, {
         get: (target, property) => {
             tsRuntime.update(true);
-            return tsProgramApis_2[property] || target[property];
+            return proxyApis[property] || target[property];
         },
     });
+    program.__VLS_tsRuntime = tsRuntime;
     for (const rootName of options.rootNames) {
         // register file watchers
         host.getSourceFile(rootName, ts.ScriptTarget.ESNext);
     }
-    return tsProgramProxy;
+    return program;
     function getVueCompilerOptions() {
         const tsConfig = options.options.configFilePath;
         if (typeof tsConfig === 'string') {
@@ -57,20 +67,32 @@ _options, _host, _oldProgram, _configFileParsingDiagnostics) {
         }
         return {};
     }
+    function getScriptVersion(fileName) {
+        return getScript(fileName)?.version ?? '';
+    }
     function getScriptSnapshot(fileName) {
+        return getScript(fileName)?.scriptSnapshot;
+    }
+    function getScript(fileName) {
         const script = scripts.get(fileName);
-        if (script) {
-            return script.scriptSnapshot;
+        if (script?.projectVersion === projectVersion) {
+            return script;
+        }
+        const modifiedTime = ts.sys.getModifiedTime?.(fileName)?.valueOf() ?? 0;
+        if (script?.modifiedTime === modifiedTime) {
+            return script;
         }
         if (host.fileExists(fileName)) {
             const fileContent = host.readFile(fileName);
             if (fileContent !== undefined) {
-                const scriptSnapshot = ts.ScriptSnapshot.fromString(fileContent);
-                scripts.set(fileName, {
-                    scriptSnapshot: scriptSnapshot,
-                    version: ts.sys.createHash?.(fileContent) ?? fileContent,
-                });
-                return scriptSnapshot;
+                const script = {
+                    projectVersion,
+                    modifiedTime,
+                    scriptSnapshot: ts.ScriptSnapshot.fromString(fileContent),
+                    version: host.createHash?.(fileContent) ?? fileContent,
+                };
+                scripts.set(fileName, script);
+                return script;
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-tsc",
-  "version": "0.33.7",
+  "version": "0.33.9",
   "license": "MIT",
   "files": [
     "bin",
@@ -16,10 +16,10 @@
     "vue-tsc": "./bin/vue-tsc.js"
   },
   "dependencies": {
-    "@volar/vue-typescript": "0.33.7"
+    "@volar/vue-typescript": "0.33.9"
   },
   "peerDependencies": {
     "typescript": "*"
   },
-  "gitHead": "1b89d4dc2fb0fa5b7c17aa9dbff4b0fc62a108f4"
+  "gitHead": "9031e662fe238df7ec385ddde6a91e1e363a4af4"
 }