vue-tsc 0.37.3 → 0.37.8

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", ".md"]];`,
+            `ts.supportedTSExtensions = [[".ts", ".tsx", ".d.ts"], [".cts", ".d.cts"], [".mts", ".d.mts"], [".vue", ".md", ".html"]];`,
         );
         tsc = tsc.replace(
             `ts.supportedJSExtensions = [[".js", ".jsx"], [".mjs"], [".cjs"]];`,
-            `ts.supportedJSExtensions = [[".js", ".jsx"], [".mjs"], [".cjs"], [".vue", ".md"]];`,
+            `ts.supportedJSExtensions = [[".js", ".jsx"], [".mjs"], [".cjs"], [".vue", ".md", ".html"]];`,
         );
         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", ".md"]];`,
+            `var allSupportedExtensions = [[".ts", ".tsx", ".d.ts", ".js", ".jsx"], [".cts", ".d.cts", ".cjs"], [".mts", ".d.mts", ".mjs"], [".vue", ".md", ".html"]];`,
         );
 
         // proxy createProgram apis

package/out/apis.d.ts

@@ -1,10 +1,10 @@
 import type * as ts from 'typescript/lib/tsserverlibrary';
-import type { TypeScriptRuntime, LanguageServiceHost } from '@volar/vue-typescript';
-export declare function register(ts: typeof import('typescript/lib/tsserverlibrary'), context: TypeScriptRuntime, vueLsHost: LanguageServiceHost): {
+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.Diagnostic[] | readonly ts.DiagnosticWithLocation[];
-    getSemanticDiagnostics: (sourceFile?: ts.SourceFile, cancellationToken?: ts.CancellationToken) => readonly ts.Diagnostic[] | readonly ts.DiagnosticWithLocation[];
+    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[];
     getGlobalDiagnostics: (cancellationToken?: ts.CancellationToken) => readonly ts.Diagnostic[];
-    getBindAndCheckDiagnostics: (sourceFile?: ts.SourceFile, cancellationToken?: ts.CancellationToken) => readonly ts.Diagnostic[] | readonly ts.DiagnosticWithLocation[];
+    getBindAndCheckDiagnostics: (sourceFile?: ts.SourceFile, cancellationToken?: ts.CancellationToken) => readonly ts.DiagnosticWithLocation[] | readonly ts.Diagnostic[];
 };

package/out/apis.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = void 0;
-function register(ts, context, vueLsHost) {
+function register(ts, vueLsCtx) {
     return {
         getRootFileNames,
         emit,
@@ -11,7 +11,7 @@ function register(ts, context, vueLsHost) {
         getBindAndCheckDiagnostics,
     };
     function getRootFileNames() {
-        return getProgram().getRootFileNames().filter(fileName => { var _a, _b; return (_b = (_a = context.getTsLsHost()).fileExists) === null || _b === void 0 ? void 0 : _b.call(_a, fileName); });
+        return getProgram().getRootFileNames().filter(fileName => { var _a, _b; return (_b = (_a = vueLsCtx.typescriptLanguageServiceHost).fileExists) === null || _b === void 0 ? void 0 : _b.call(_a, fileName); });
     }
     // for vue-tsc --noEmit --watch
     function getBindAndCheckDiagnostics(sourceFile, cancellationToken) {
@@ -27,7 +27,7 @@ function register(ts, context, vueLsHost) {
     function getSourceFileDiagnosticsWorker(sourceFile, cancellationToken, api) {
         var _a, _b;
         if (sourceFile) {
-            const mapped = context.vueFiles.fromEmbeddedFileName(sourceFile.fileName);
+            const mapped = vueLsCtx.sourceFiles.fromEmbeddedFileName(sourceFile.fileName);
             if (mapped) {
                 if (!mapped.embedded.file.capabilities.diagnostics)
                     return [];
@@ -44,7 +44,7 @@ function register(ts, context, vueLsHost) {
     }
     function emit(targetSourceFile, _writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
         var _a;
-        const scriptResult = getProgram().emit(targetSourceFile, ((_a = vueLsHost.writeFile) !== null && _a !== void 0 ? _a : ts.sys.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
+        const scriptResult = getProgram().emit(targetSourceFile, ((_a = vueLsCtx.typescriptLanguageServiceHost.writeFile) !== null && _a !== void 0 ? _a : ts.sys.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
         return {
             emitSkipped: scriptResult.emitSkipped,
             emittedFiles: scriptResult.emittedFiles,
@@ -52,35 +52,35 @@ function register(ts, context, vueLsHost) {
         };
     }
     function getProgram() {
-        return context.getTsLs().getProgram();
+        return vueLsCtx.typescriptLanguageService.getProgram();
     }
     // transform
     function transformDiagnostics(diagnostics) {
-        var _a, _b, _c, _d, _e;
+        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 (!((_a = vueLsHost.fileExists) === null || _a === void 0 ? void 0 : _a.call(vueLsHost, tsOrVueLoc.fileName)))
+                for (const tsOrVueLoc of vueLsCtx.sourceFiles.fromEmbeddedLocation(diagnostic.file.fileName, diagnostic.start, diagnostic.start + diagnostic.length, data => !!data.capabilities.diagnostic)) {
+                    if (!((_b = (_a = vueLsCtx.typescriptLanguageServiceHost).fileExists) === null || _b === void 0 ? void 0 : _b.call(_a, tsOrVueLoc.fileName)))
                         continue;
-                    onMapping(diagnostic, tsOrVueLoc.fileName, tsOrVueLoc.range.start, tsOrVueLoc.range.end, (_b = tsOrVueLoc.mapped) === null || _b === void 0 ? void 0 : _b.vueFile.getContent());
+                    onMapping(diagnostic, tsOrVueLoc.fileName, tsOrVueLoc.range.start, tsOrVueLoc.range.end, (_c = tsOrVueLoc.mapped) === null || _c === void 0 ? void 0 : _c.vueFile.text);
                     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 (!((_c = vueLsHost.fileExists) === null || _c === void 0 ? void 0 : _c.call(vueLsHost, start.fileName)))
+                    for (const start of vueLsCtx.sourceFiles.fromEmbeddedLocation(diagnostic.file.fileName, diagnostic.start, diagnostic.start, data => !!data.capabilities.diagnostic)) {
+                        if (!((_e = (_d = vueLsCtx.typescriptLanguageServiceHost).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 (!((_d = vueLsHost.fileExists) === null || _d === void 0 ? void 0 : _d.call(vueLsHost, end.fileName)))
+                        for (const end of vueLsCtx.sourceFiles.fromEmbeddedLocation(diagnostic.file.fileName, diagnostic.start + diagnostic.length, diagnostic.start + diagnostic.length, data => !!data.capabilities.diagnostic)) {
+                            if (!((_g = (_f = vueLsCtx.typescriptLanguageServiceHost).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, (_e = start.mapped) === null || _e === void 0 ? void 0 : _e.vueFile.getContent());
+                            onMapping(diagnostic, start.fileName, start.range.start, end.range.end, (_h = start.mapped) === null || _h === void 0 ? void 0 : _h.vueFile.text);
                             founded = true;
                             break;
                         }
@@ -102,13 +102,13 @@ function register(ts, context, vueLsHost) {
                 : undefined;
             if (!file) {
                 if (docText === undefined) {
-                    const snapshot = vueLsHost.getScriptSnapshot(fileName);
+                    const snapshot = vueLsCtx.typescriptLanguageServiceHost.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);
+                    file = ts.createSourceFile(fileName, docText, fileName.endsWith('.vue') || fileName.endsWith('.md') || fileName.endsWith('.html') ? ts.ScriptTarget.JSON : ts.ScriptTarget.Latest);
                 }
             }
             const newDiagnostic = Object.assign(Object.assign({}, diagnostic), { file, start: start, length: end - start });

package/out/proxy.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadTsLib = exports.createProgramProxy = void 0;
 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");
+const vueTs = require("@volar/vue-typescript");
 let projectVersion = 0;
 function createProgramProxy(options, // rootNamesOrOptions: readonly string[] | CreateProgramOptions,
 _options, _host, _oldProgram, _configFileParsingDiagnostics) {
@@ -26,24 +25,18 @@ _options, _host, _oldProgram, _configFileParsingDiagnostics) {
         }, getScriptVersion,
         getScriptSnapshot, getProjectVersion: () => {
             return projectVersion.toString();
-        }, 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,
-        vueLsHost: vueLsHost,
-        isVueTsc: true,
-    });
-    tsRuntime.update(); // must update before getProgram() to update virtual scripts
-    const proxyApis = apis.register(ts, tsRuntime, vueLsHost);
+        }, 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) => {
-            tsRuntime.update();
             if (property in proxyApis) {
                 return proxyApis[property];
             }
-            return tsRuntime.getTsLs().getProgram()[property];
+            return vueLsCtx.typescriptLanguageService.getProgram()[property];
         },
     });
-    program.__VLS_tsRuntime = tsRuntime;
+    program.__VLS_vueCtx = vueLsCtx;
     for (const rootName of options.rootNames) {
         // register file watchers
         host.getSourceFile(rootName, ts.ScriptTarget.ESNext);
@@ -52,7 +45,7 @@ _options, _host, _oldProgram, _configFileParsingDiagnostics) {
     function getVueCompilerOptions() {
         const tsConfig = options.options.configFilePath;
         if (typeof tsConfig === 'string') {
-            return vue_typescript_2.tsShared.createParsedCommandLine(ts, ts.sys, tsConfig).vueOptions;
+            return vueTs.tsShared.createParsedCommandLine(ts, ts.sys, tsConfig).vueOptions;
         }
         return {};
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-tsc",
-  "version": "0.37.3",
+  "version": "0.37.8",
   "license": "MIT",
   "files": [
     "bin",
@@ -16,10 +16,10 @@
     "vue-tsc": "./bin/vue-tsc.js"
   },
   "dependencies": {
-    "@volar/vue-typescript": "0.37.3"
+    "@volar/vue-typescript": "0.37.8"
   },
   "peerDependencies": {
     "typescript": "*"
   },
-  "gitHead": "279c94f5481893b177dd9b080627ccd79fed7f73"
+  "gitHead": "22fce979edb8cb2473ee46c2059b95611cf97e64"
 }