vue-tsc 1.0.9 → 1.0.10

package/bin/vue-tsc.js

@@ -6,46 +6,32 @@ const tscPath = require.resolve('typescript/lib/tsc');
 const proxyPath = require.resolve('../out/proxy');
 
 fs.readFileSync = (...args) => {
-    if (args[0] === tscPath) {
-        let tsc = 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", ".html"]];`,
-            `ts.supportedTSExtensions = [[".ts", ".tsx", ".d.ts"], [".cts", ".d.cts"], [".mts", ".d.mts"], [".vue"]];`,
-        );
-        tsc = tsc.replace(
-            `ts.supportedJSExtensions = [[".js", ".jsx"], [".mjs"], [".cjs"]];`,
-            // `ts.supportedJSExtensions = [[".js", ".jsx"], [".mjs"], [".cjs"], [".vue", ".md", ".html"]];`,
-            `ts.supportedJSExtensions = [[".js", ".jsx"], [".mjs"], [".cjs"], [".vue"]];`,
-        );
-        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", ".html"]];`,
-            `var allSupportedExtensions = [[".ts", ".tsx", ".d.ts", ".js", ".jsx"], [".cts", ".d.cts", ".cjs"], [".mts", ".d.mts", ".mjs"], [".vue"]];`,
-        );
-
-        // proxy createProgram apis
-        tsc = tsc.replace(
-            `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);
+	if (args[0] === tscPath) {
+		let tsc = readFileSync(...args);
+
+		// add *.vue files to allow extensions
+		tryReplace(/supportedTSExtensions = .*(?=;)/, s => s + '.concat([[".vue"]])');
+		tryReplace(/supportedJSExtensions = .*(?=;)/, s => s + '.concat([[".vue"]])');
+		tryReplace(/allSupportedExtensions = .*(?=;)/, s => s + '.concat([[".vue"]])');
+
+		// proxy startTracing, dumpTracingLegend
+		tryReplace(/ = tracingEnabled\./g, ` = require(${JSON.stringify(proxyPath)}).loadTsLib().`);
+
+		// proxy createProgram apis
+		tryReplace(/function createProgram\(.+\) {/, s => s + ` return require(${JSON.stringify(proxyPath)}).createProgramProxy(...arguments);`);
+
+		return tsc;
+
+		function tryReplace(search, replace) {
+			const before = tsc;
+			tsc = tsc.replace(search, replace);
+			const after = tsc;
+			if (after === before) {
+				throw 'Search string not found: ' + JSON.stringify(search.toString());
+			}
+		}
+	}
+	return readFileSync(...args);
 };
 
 require(tscPath);

package/out/proxy.js

@@ -6,9 +6,9 @@ const vueTs = require("@volar/vue-typescript");
 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');
+        return doThrow('js emit is not supported');
     if (!options.options.noEmit && options.options.noEmitOnError)
-        return doThrow('noEmitOnError is not support');
+        return doThrow('noEmitOnError is not supported');
     if (!options.host)
         return doThrow('!options.host');
     let program = options.oldProgram;
@@ -49,7 +49,7 @@ _options, _host, _oldProgram, _configFileParsingDiagnostics) {
         });
         const vueTsLs = vueTs.createLanguageService(vueLsHost);
         program = vueTsLs.getProgram();
-        program.__VLS_ctx = ctx;
+        program.__vue = ctx;
         function getVueCompilerOptions() {
             const tsConfig = ctx.options.options.configFilePath;
             if (typeof tsConfig === 'string') {
@@ -91,8 +91,8 @@ _options, _host, _oldProgram, _configFileParsingDiagnostics) {
         }
     }
     else {
-        program.__VLS_ctx.options = options;
-        program.__VLS_ctx.projectVersion++;
+        program.__vue.options = options;
+        program.__vue.projectVersion++;
     }
     for (const rootName of options.rootNames) {
         // register file watchers

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vue-tsc",
-	"version": "1.0.9",
+	"version": "1.0.10",
 	"license": "MIT",
 	"files": [
 		"bin",
@@ -16,11 +16,11 @@
 		"vue-tsc": "./bin/vue-tsc.js"
 	},
 	"dependencies": {
-		"@volar/vue-language-core": "1.0.9",
-		"@volar/vue-typescript": "1.0.9"
+		"@volar/vue-language-core": "1.0.10",
+		"@volar/vue-typescript": "1.0.10"
 	},
 	"peerDependencies": {
 		"typescript": "*"
 	},
-	"gitHead": "be2081f56ce4608324795b8a0ae83c288a3a784d"
+	"gitHead": "89b82f92fdc30674b03941c5f17c60df8c46211c"
 }