vue-tsc 0.35.2 → 0.37.0

package/bin/vue-tsc.js

@@ -12,15 +12,15 @@ fs.readFileSync = (...args) => {
         // add *.vue files to allow extensions
         tsc = tsc.replace(
             `ts.supportedTSExtensions = [[".ts", ".tsx", ".d.ts"], [".cts", ".d.cts"], [".mts", ".d.mts"]];`,
-            `ts.supportedTSExtensions = [[".ts", ".tsx", ".d.ts"], [".cts", ".d.cts"], [".mts", ".d.mts"], [".vue"]];`,
+            `ts.supportedTSExtensions = [[".ts", ".tsx", ".d.ts"], [".cts", ".d.cts"], [".mts", ".d.mts"], [".vue", ".md"]];`,
         );
         tsc = tsc.replace(
             `ts.supportedJSExtensions = [[".js", ".jsx"], [".mjs"], [".cjs"]];`,
-            `ts.supportedJSExtensions = [[".js", ".jsx"], [".mjs"], [".cjs"], [".vue"]];`,
+            `ts.supportedJSExtensions = [[".js", ".jsx"], [".mjs"], [".cjs"], [".vue", ".md"]];`,
         );
         tsc = tsc.replace(
             `var allSupportedExtensions = [[".ts", ".tsx", ".d.ts", ".js", ".jsx"], [".cts", ".d.cts", ".cjs"], [".mts", ".d.mts", ".mjs"]];`,
-            `var allSupportedExtensions = [[".ts", ".tsx", ".d.ts", ".js", ".jsx"], [".cts", ".d.cts", ".cjs"], [".mts", ".d.mts", ".mjs"], [".vue"]];`,
+            `var allSupportedExtensions = [[".ts", ".tsx", ".d.ts", ".js", ".jsx"], [".cts", ".d.cts", ".cjs"], [".mts", ".d.mts", ".mjs"], [".vue", ".md"]];`,
         );
 
         // proxy createProgram apis
@@ -32,6 +32,18 @@ fs.readFileSync = (...args) => {
             `function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _configFileParsingDiagnostics) {`,
             `function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _configFileParsingDiagnostics) { return require(${JSON.stringify(proxyPath)}).createProgramProxy(...arguments);`,
         );
+
+        // proxy tracing
+        tsc = tsc.replace(
+            `ts.startTracing = tracingEnabled.startTracing;`,
+            `ts.startTracing = require(${JSON.stringify(proxyPath)}).loadTsLib().startTracing;`,
+        );
+
+        tsc = tsc.replace(
+            `ts.dumpTracingLegend = tracingEnabled.dumpLegend;`,
+            `ts.dumpTracingLegend = require(${JSON.stringify(proxyPath)}).loadTsLib().dumpTracingLegend;`,
+        );
+
         return tsc;
     }
     return readFileSync(...args);

package/out/apis.js

@@ -56,37 +56,38 @@ function register(ts, context) {
     }
     // transform
     function transformDiagnostics(diagnostics) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         const result = [];
         for (const diagnostic of diagnostics) {
             if (diagnostic.file !== undefined
                 && diagnostic.start !== undefined
                 && diagnostic.length !== undefined) {
+                let founded = false;
                 for (const tsOrVueLoc of context.vueFiles.fromEmbeddedLocation(diagnostic.file.fileName, diagnostic.start, diagnostic.start + diagnostic.length, data => !!data.capabilities.diagnostic)) {
                     if (!((_b = (_a = context.vueLsHost).fileExists) === null || _b === void 0 ? void 0 : _b.call(_a, tsOrVueLoc.fileName)))
                         continue;
-                    let file = tsOrVueLoc.fileName === diagnostic.file.fileName
-                        ? diagnostic.file
-                        : undefined;
-                    if (!file) {
-                        let docText = (_c = tsOrVueLoc.mapped) === null || _c === void 0 ? void 0 : _c.vueFile.getContent();
-                        if (docText === undefined) {
-                            const snapshot = context.vueLsHost.getScriptSnapshot(tsOrVueLoc.fileName);
-                            if (snapshot) {
-                                docText = snapshot.getText(0, snapshot.getLength());
-                            }
+                    onMapping(diagnostic, tsOrVueLoc.fileName, tsOrVueLoc.range.start, tsOrVueLoc.range.end, (_c = tsOrVueLoc.mapped) === null || _c === void 0 ? void 0 : _c.vueFile.getContent());
+                    founded = true;
+                    break;
+                }
+                // fix https://github.com/johnsoncodehk/volar/issues/1372
+                if (!founded) {
+                    for (const start of context.vueFiles.fromEmbeddedLocation(diagnostic.file.fileName, diagnostic.start, diagnostic.start, data => !!data.capabilities.diagnostic)) {
+                        if (!((_e = (_d = context.vueLsHost).fileExists) === null || _e === void 0 ? void 0 : _e.call(_d, start.fileName)))
+                            continue;
+                        for (const end of context.vueFiles.fromEmbeddedLocation(diagnostic.file.fileName, diagnostic.start + diagnostic.length, diagnostic.start + diagnostic.length, data => !!data.capabilities.diagnostic)) {
+                            if (!((_g = (_f = context.vueLsHost).fileExists) === null || _g === void 0 ? void 0 : _g.call(_f, end.fileName)))
+                                continue;
+                            if (start.fileName !== end.fileName)
+                                continue;
+                            onMapping(diagnostic, start.fileName, start.range.start, end.range.end, (_h = start.mapped) === null || _h === void 0 ? void 0 : _h.vueFile.getContent());
+                            founded = true;
+                            break;
                         }
-                        else {
-                            file = ts.createSourceFile(tsOrVueLoc.fileName, docText, tsOrVueLoc.fileName.endsWith('.vue') ? ts.ScriptTarget.JSON : ts.ScriptTarget.Latest);
+                        if (founded) {
+                            break;
                         }
                     }
-                    const newDiagnostic = Object.assign(Object.assign({}, diagnostic), { file, start: tsOrVueLoc.range.start, length: tsOrVueLoc.range.end - tsOrVueLoc.range.start });
-                    const relatedInformation = diagnostic.relatedInformation;
-                    if (relatedInformation) {
-                        newDiagnostic.relatedInformation = transformDiagnostics(relatedInformation);
-                    }
-                    result.push(newDiagnostic);
-                    break;
                 }
             }
             else if (diagnostic.file === undefined) {
@@ -94,6 +95,29 @@ function register(ts, context) {
             }
         }
         return result;
+        function onMapping(diagnostic, fileName, start, end, docText) {
+            var _a;
+            let file = fileName === ((_a = diagnostic.file) === null || _a === void 0 ? void 0 : _a.fileName)
+                ? diagnostic.file
+                : undefined;
+            if (!file) {
+                if (docText === undefined) {
+                    const snapshot = context.vueLsHost.getScriptSnapshot(fileName);
+                    if (snapshot) {
+                        docText = snapshot.getText(0, snapshot.getLength());
+                    }
+                }
+                else {
+                    file = ts.createSourceFile(fileName, docText, fileName.endsWith('.vue') || fileName.endsWith('.md') ? ts.ScriptTarget.JSON : ts.ScriptTarget.Latest);
+                }
+            }
+            const newDiagnostic = Object.assign(Object.assign({}, diagnostic), { file, start: start, length: end - start });
+            const relatedInformation = diagnostic.relatedInformation;
+            if (relatedInformation) {
+                newDiagnostic.relatedInformation = transformDiagnostics(relatedInformation);
+            }
+            result.push(newDiagnostic);
+        }
     }
 }
 exports.register = register;

package/out/proxy.d.ts

@@ -1,3 +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;
+export declare function loadTsLib(): typeof ts;

package/out/proxy.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createProgramProxy = void 0;
+exports.loadTsLib = exports.createProgramProxy = void 0;
 const ts = require("typescript/lib/tsserverlibrary");
 const apis = require("./apis");
 const vue_typescript_1 = require("@volar/vue-typescript");
@@ -29,20 +29,18 @@ _options, _host, _oldProgram, _configFileParsingDiagnostics) {
         }, getProjectReferences: () => options.projectReferences });
     const tsRuntime = (_b = (_a = options.oldProgram) === null || _a === void 0 ? void 0 : _a.__VLS_tsRuntime) !== null && _b !== void 0 ? _b : (0, vue_typescript_1.createTypeScriptRuntime)({
         typescript: ts,
-        baseCssModuleType: 'any',
-        getCssClasses: () => ({}),
         vueLsHost: vueLsHost,
         isVueTsc: true,
     });
     tsRuntime.update(); // must update before getProgram() to update virtual scripts
-    const tsProgram = tsRuntime.getTsLs().getProgram();
-    if (!tsProgram)
-        throw '!tsProgram';
     const proxyApis = apis.register(ts, tsRuntime);
-    const program = new Proxy(tsProgram, {
-        get: (target, property) => {
+    const program = new Proxy({}, {
+        get: (_, property) => {
             tsRuntime.update();
-            return proxyApis[property] || target[property];
+            if (property in proxyApis) {
+                return proxyApis[property];
+            }
+            return tsRuntime.getTsLs().getProgram()[property];
         },
     });
     program.__VLS_tsRuntime = tsRuntime;
@@ -92,6 +90,10 @@ _options, _host, _oldProgram, _configFileParsingDiagnostics) {
     }
 }
 exports.createProgramProxy = createProgramProxy;
+function loadTsLib() {
+    return ts;
+}
+exports.loadTsLib = loadTsLib;
 function doThrow(msg) {
     console.error(msg);
     throw msg;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-tsc",
-  "version": "0.35.2",
+  "version": "0.37.0",
   "license": "MIT",
   "files": [
     "bin",
@@ -16,10 +16,10 @@
     "vue-tsc": "./bin/vue-tsc.js"
   },
   "dependencies": {
-    "@volar/vue-typescript": "0.35.2"
+    "@volar/vue-typescript": "0.37.0"
   },
   "peerDependencies": {
     "typescript": "*"
   },
-  "gitHead": "6cfa0323e56daa20ddd38b9b396aa4d027c7bfc1"
+  "gitHead": "e72a5db00ee63b1ebe239b22733cfc93e304fae6"
 }