vue-tsc 0.38.5 → 0.38.9

package/bin/vue-tsc.js

@@ -24,10 +24,6 @@ fs.readFileSync = (...args) => {
         );
 
         // proxy createProgram apis
-        tsc = tsc.replace(
-            `function createIncrementalProgram(_a) {`,
-            `function createIncrementalProgram(_a) { console.error('incremental mode is not yet supported'); throw 'incremental mode is not yet supported';`,
-        );
         tsc = tsc.replace(
             `function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _configFileParsingDiagnostics) {`,
             `function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _configFileParsingDiagnostics) { return require(${JSON.stringify(proxyPath)}).createProgramProxy(...arguments);`,

package/out/apis.d.ts

@@ -3,8 +3,8 @@ import type * as vueTs from '@volar/vue-typescript';
 export declare function register(ts: typeof import('typescript/lib/tsserverlibrary'), vueLsCtx: vueTs.LanguageServiceContext): {
     getRootFileNames: () => string[];
     emit: (targetSourceFile?: ts.SourceFile, _writeFile?: ts.WriteFileCallback, cancellationToken?: ts.CancellationToken, emitOnlyDtsFiles?: boolean, customTransformers?: ts.CustomTransformers) => ts.EmitResult;
-    getSyntacticDiagnostics: (sourceFile?: ts.SourceFile, cancellationToken?: ts.CancellationToken) => readonly ts.DiagnosticWithLocation[] | readonly ts.Diagnostic[];
-    getSemanticDiagnostics: (sourceFile?: ts.SourceFile, cancellationToken?: ts.CancellationToken) => readonly ts.DiagnosticWithLocation[] | readonly ts.Diagnostic[];
+    getSyntacticDiagnostics: (sourceFile?: ts.SourceFile, cancellationToken?: ts.CancellationToken) => readonly ts.Diagnostic[] | readonly ts.DiagnosticWithLocation[];
+    getSemanticDiagnostics: (sourceFile?: ts.SourceFile, cancellationToken?: ts.CancellationToken) => readonly ts.Diagnostic[] | readonly ts.DiagnosticWithLocation[];
     getGlobalDiagnostics: (cancellationToken?: ts.CancellationToken) => readonly ts.Diagnostic[];
-    getBindAndCheckDiagnostics: (sourceFile?: ts.SourceFile, cancellationToken?: ts.CancellationToken) => readonly ts.DiagnosticWithLocation[] | readonly ts.Diagnostic[];
+    getBindAndCheckDiagnostics: (sourceFile?: ts.SourceFile, cancellationToken?: ts.CancellationToken) => readonly ts.Diagnostic[] | readonly ts.DiagnosticWithLocation[];
 };

package/out/proxy.d.ts

@@ -1,4 +1,4 @@
 import * as ts from 'typescript/lib/tsserverlibrary';
 export declare function createProgramProxy(options: ts.CreateProgramOptions, // rootNamesOrOptions: readonly string[] | CreateProgramOptions,
-_options?: ts.CompilerOptions, _host?: ts.CompilerHost, _oldProgram?: ts.Program, _configFileParsingDiagnostics?: readonly ts.Diagnostic[]): void | ts.Program;
+_options?: ts.CompilerOptions, _host?: ts.CompilerHost, _oldProgram?: ts.Program, _configFileParsingDiagnostics?: readonly ts.Diagnostic[]): any;
 export declare function loadTsLib(): typeof ts;

package/out/proxy.js

@@ -4,83 +4,108 @@ exports.loadTsLib = exports.createProgramProxy = void 0;
 const ts = require("typescript/lib/tsserverlibrary");
 const apis = require("./apis");
 const vueTs = require("@volar/vue-typescript");
-let projectVersion = 0;
 function createProgramProxy(options, // rootNamesOrOptions: readonly string[] | CreateProgramOptions,
 _options, _host, _oldProgram, _configFileParsingDiagnostics) {
-    var _a, _b;
     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();
-    const vueLsHost = Object.assign(Object.assign({}, host), { resolveModuleNames: undefined, writeFile: (fileName, content) => {
-            if (fileName.indexOf('__VLS_') === -1) {
-                host.writeFile(fileName, content, false);
+    let program = options.oldProgram;
+    if (!program) {
+        const ctx = {
+            projectVersion: 0,
+            options: options,
+        };
+        const vueCompilerOptions = getVueCompilerOptions();
+        const scripts = new Map();
+        const vueLsHost = new Proxy({
+            resolveModuleNames: undefined,
+            writeFile: (fileName, content) => {
+                if (fileName.indexOf('__VLS_') === -1) {
+                    ctx.options.host.writeFile(fileName, content, false);
+                }
+            },
+            getCompilationSettings: () => ctx.options.options,
+            getVueCompilationSettings: () => vueCompilerOptions,
+            getScriptFileNames: () => {
+                return ctx.options.rootNames;
+            },
+            getScriptVersion,
+            getScriptSnapshot,
+            getProjectVersion: () => {
+                return ctx.projectVersion.toString();
+            },
+            getProjectReferences: () => ctx.options.projectReferences,
+            isTsc: true,
+        }, {
+            get: (target, property) => {
+                if (property in target) {
+                    return target[property];
+                }
+                return ctx.options.host[property];
+            },
+        });
+        const vueLsCtx = vueTs.createLanguageServiceContext(ts, vueLsHost);
+        const proxyApis = apis.register(ts, vueLsCtx);
+        program = new Proxy({}, {
+            get: (target, property) => {
+                var _a;
+                if (property in proxyApis) {
+                    return proxyApis[property];
+                }
+                return (_a = vueLsCtx.typescriptLanguageService.getProgram()[property]) !== null && _a !== void 0 ? _a : target[property];
+            },
+        });
+        program.__VLS_ctx = ctx;
+        function getVueCompilerOptions() {
+            const tsConfig = ctx.options.options.configFilePath;
+            if (typeof tsConfig === 'string') {
+                return vueTs.tsShared.createParsedCommandLine(ts, ts.sys, tsConfig).vueOptions;
             }
-        }, getCompilationSettings: () => options.options, getVueCompilationSettings: () => vueCompilerOptions, getScriptFileNames: () => {
-            return options.rootNames;
-        }, getScriptVersion,
-        getScriptSnapshot, getProjectVersion: () => {
-            return projectVersion.toString();
-        }, getProjectReferences: () => options.projectReferences, isTsc: true });
-    const vueLsCtx = (_b = (_a = options.oldProgram) === null || _a === void 0 ? void 0 : _a.__VLS_vueCtx) !== null && _b !== void 0 ? _b : vueTs.createLanguageServiceContext(ts, vueLsHost);
-    const proxyApis = apis.register(ts, vueLsCtx);
-    const program = new Proxy({}, {
-        get: (_, property) => {
-            if (property in proxyApis) {
-                return proxyApis[property];
-            }
-            return vueLsCtx.typescriptLanguageService.getProgram()[property];
-        },
-    });
-    program.__VLS_vueCtx = vueLsCtx;
-    for (const rootName of options.rootNames) {
-        // register file watchers
-        host.getSourceFile(rootName, ts.ScriptTarget.ESNext);
-    }
-    return program;
-    function getVueCompilerOptions() {
-        const tsConfig = options.options.configFilePath;
-        if (typeof tsConfig === 'string') {
-            return vueTs.tsShared.createParsedCommandLine(ts, ts.sys, tsConfig).vueOptions;
+            return {};
         }
-        return {};
-    }
-    function getScriptVersion(fileName) {
-        var _a, _b;
-        return (_b = (_a = getScript(fileName)) === null || _a === void 0 ? void 0 : _a.version) !== null && _b !== void 0 ? _b : '';
-    }
-    function getScriptSnapshot(fileName) {
-        var _a;
-        return (_a = getScript(fileName)) === null || _a === void 0 ? void 0 : _a.scriptSnapshot;
-    }
-    function getScript(fileName) {
-        var _a, _b, _c, _d, _e, _f;
-        const script = scripts.get(fileName);
-        if ((script === null || script === void 0 ? void 0 : script.projectVersion) === projectVersion) {
-            return script;
+        function getScriptVersion(fileName) {
+            var _a, _b;
+            return (_b = (_a = getScript(fileName)) === null || _a === void 0 ? void 0 : _a.version) !== null && _b !== void 0 ? _b : '';
         }
-        const modifiedTime = (_d = (_c = (_b = (_a = ts.sys).getModifiedTime) === null || _b === void 0 ? void 0 : _b.call(_a, fileName)) === null || _c === void 0 ? void 0 : _c.valueOf()) !== null && _d !== void 0 ? _d : 0;
-        if ((script === null || script === void 0 ? void 0 : script.modifiedTime) === modifiedTime) {
-            return script;
+        function getScriptSnapshot(fileName) {
+            var _a;
+            return (_a = getScript(fileName)) === null || _a === void 0 ? void 0 : _a.scriptSnapshot;
         }
-        if (host.fileExists(fileName)) {
-            const fileContent = host.readFile(fileName);
-            if (fileContent !== undefined) {
-                const script = {
-                    projectVersion,
-                    modifiedTime,
-                    scriptSnapshot: ts.ScriptSnapshot.fromString(fileContent),
-                    version: (_f = (_e = host.createHash) === null || _e === void 0 ? void 0 : _e.call(host, fileContent)) !== null && _f !== void 0 ? _f : fileContent,
-                };
-                scripts.set(fileName, script);
+        function getScript(fileName) {
+            var _a, _b, _c, _d, _e, _f, _g;
+            const script = scripts.get(fileName);
+            if ((script === null || script === void 0 ? void 0 : script.projectVersion) === ctx.projectVersion) {
                 return script;
             }
+            const modifiedTime = (_d = (_c = (_b = (_a = ts.sys).getModifiedTime) === null || _b === void 0 ? void 0 : _b.call(_a, fileName)) === null || _c === void 0 ? void 0 : _c.valueOf()) !== null && _d !== void 0 ? _d : 0;
+            if ((script === null || script === void 0 ? void 0 : script.modifiedTime) === modifiedTime) {
+                return script;
+            }
+            if (ctx.options.host.fileExists(fileName)) {
+                const fileContent = ctx.options.host.readFile(fileName);
+                if (fileContent !== undefined) {
+                    const script = {
+                        projectVersion: ctx.projectVersion,
+                        modifiedTime,
+                        scriptSnapshot: ts.ScriptSnapshot.fromString(fileContent),
+                        version: (_g = (_f = (_e = ctx.options.host).createHash) === null || _f === void 0 ? void 0 : _f.call(_e, fileContent)) !== null && _g !== void 0 ? _g : fileContent,
+                    };
+                    scripts.set(fileName, script);
+                    return script;
+                }
+            }
         }
     }
+    else {
+        program.__VLS_ctx.options = options;
+        program.__VLS_ctx.projectVersion++;
+    }
+    for (const rootName of options.rootNames) {
+        // register file watchers
+        options.host.getSourceFile(rootName, ts.ScriptTarget.ESNext);
+    }
+    return program;
 }
 exports.createProgramProxy = createProgramProxy;
 function loadTsLib() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-tsc",
-  "version": "0.38.5",
+  "version": "0.38.9",
   "license": "MIT",
   "files": [
     "bin",
@@ -16,10 +16,10 @@
     "vue-tsc": "./bin/vue-tsc.js"
   },
   "dependencies": {
-    "@volar/vue-typescript": "0.38.5"
+    "@volar/vue-typescript": "0.38.9"
   },
   "peerDependencies": {
     "typescript": "*"
   },
-  "gitHead": "537550bae4ac9bcbe021f23dd6a3f7880031a32b"
+  "gitHead": "1c77a6212f055edf7c2ae11543be198201cd5b4f"
 }