vue-tsc 1.0.13 → 1.0.14

package/bin/vue-tsc.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 const fs = require('fs');
-
 const readFileSync = fs.readFileSync;
 const tscPath = require.resolve('typescript/lib/tsc');
-const proxyPath = require.resolve('../out/proxy');
+const proxyApiPath = require.resolve('../out/index');
+const { state } = require('../out/shared');
 
 fs.readFileSync = (...args) => {
 	if (args[0] === tscPath) {
@@ -15,10 +15,10 @@ fs.readFileSync = (...args) => {
 		tryReplace(/allSupportedExtensions = .*(?=;)/, s => s + '.concat([[".vue"]])');
 
 		// proxy startTracing, dumpTracingLegend
-		tryReplace(/ = tracingEnabled\./g, ` = require(${JSON.stringify(proxyPath)}).loadTsLib().`);
+		tryReplace(/ = tracingEnabled\./g, ` = require(${JSON.stringify(proxyApiPath)}).loadTsLib().`);
 
 		// proxy createProgram apis
-		tryReplace(/function createProgram\(.+\) {/, s => s + ` return require(${JSON.stringify(proxyPath)}).createProgramProxy(...arguments);`);
+		tryReplace(/function createProgram\(.+\) {/, s => s + ` return require(${JSON.stringify(proxyApiPath)}).createProgram(...arguments);`);
 
 		return tsc;
 
@@ -34,4 +34,16 @@ fs.readFileSync = (...args) => {
 	return readFileSync(...args);
 };
 
-require(tscPath);
+(function main() {
+	try {
+		require(tscPath);
+	}
+	catch (err) {
+		if (err === 'hook') {
+			state.hook.worker.then(main);
+		}
+		else {
+			throw err;
+		}
+	}
+})();

package/out/index.d.ts

@@ -0,0 +1,16 @@
+import * as ts from 'typescript/lib/tsserverlibrary';
+import * as vue from '@volar/vue-language-core';
+import * as vueTs from '@volar/vue-typescript';
+export type _Program = ts.Program & {
+    __vue: ProgramContext;
+};
+interface ProgramContext {
+    projectVersion: number;
+    options: ts.CreateProgramOptions;
+    languageServiceHost: vue.LanguageServiceHost;
+    languageService: ReturnType<typeof vueTs.createLanguageService>;
+}
+export declare function createProgram(options: ts.CreateProgramOptions, // rootNamesOrOptions: readonly string[] | CreateProgramOptions,
+_options?: ts.CompilerOptions, _host?: ts.CompilerHost, _oldProgram?: ts.Program, _configFileParsingDiagnostics?: readonly ts.Diagnostic[]): _Program;
+export declare function loadTsLib(): typeof ts;
+export {};

package/out/{proxy.js → index.js}

@@ -1,21 +1,42 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadTsLib = exports.createProgramProxy = void 0;
+exports.loadTsLib = exports.createProgram = void 0;
 const ts = require("typescript/lib/tsserverlibrary");
 const vue = require("@volar/vue-language-core");
 const vueTs = require("@volar/vue-typescript");
-function createProgramProxy(options, // rootNamesOrOptions: readonly string[] | CreateProgramOptions,
+const shared_1 = require("./shared");
+function createProgram(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 supported');
+        throw toThrow('js emit is not supported');
     if (!options.options.noEmit && options.options.noEmitOnError)
-        return doThrow('noEmitOnError is not supported');
+        throw toThrow('noEmitOnError is not supported');
     if (!options.host)
-        return doThrow('!options.host');
+        throw toThrow('!options.host');
     let program = options.oldProgram;
-    if (!program) {
+    if (shared_1.state.hook) {
+        program = shared_1.state.hook.program;
+        program.__vue.options = options;
+    }
+    else if (!program) {
         const ctx = {
             projectVersion: 0,
-            options: options,
+            options,
+            get languageServiceHost() {
+                return vueLsHost;
+            },
+            get languageService() {
+                return vueTsLs;
+            },
         };
         const vueCompilerOptions = getVueCompilerOptions();
         const scripts = new Map();
@@ -91,8 +112,24 @@ _options, _host, _oldProgram, _configFileParsingDiagnostics) {
         }
     }
     else {
-        program.__vue.options = options;
-        program.__vue.projectVersion++;
+        const ctx = program.__vue;
+        ctx.options = options;
+        ctx.projectVersion++;
+    }
+    const vueCompilerOptions = program.__vue.languageServiceHost.getVueCompilationSettings();
+    if (vueCompilerOptions.hooks) {
+        const index = ((_b = (_a = shared_1.state.hook) === null || _a === void 0 ? void 0 : _a.index) !== null && _b !== void 0 ? _b : -1) + 1;
+        if (index < vueCompilerOptions.hooks.length) {
+            const cbPath = vueCompilerOptions.hooks[index];
+            const dir = program.__vue.languageServiceHost.getCurrentDirectory();
+            const cb = require(require.resolve(cbPath, { paths: [dir] }));
+            shared_1.state.hook = {
+                program,
+                index,
+                worker: (() => __awaiter(this, void 0, void 0, function* () { return yield cb(program); }))(),
+            };
+            throw 'hook';
+        }
     }
     for (const rootName of options.rootNames) {
         // register file watchers
@@ -100,13 +137,13 @@ _options, _host, _oldProgram, _configFileParsingDiagnostics) {
     }
     return program;
 }
-exports.createProgramProxy = createProgramProxy;
+exports.createProgram = createProgram;
 function loadTsLib() {
     return ts;
 }
 exports.loadTsLib = loadTsLib;
-function doThrow(msg) {
+function toThrow(msg) {
     console.error(msg);
-    throw msg;
+    return msg;
 }
-//# sourceMappingURL=proxy.js.map
+//# sourceMappingURL=index.js.map

package/out/shared.d.ts

@@ -0,0 +1,8 @@
+import type { _Program } from './index';
+export declare const state: {
+    hook?: {
+        program: _Program;
+        index: number;
+        worker: Promise<any>;
+    };
+};

package/out/shared.js

@@ -0,0 +1,4 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.state = void 0;
+exports.state = {};
+//# sourceMappingURL=shared.js.map

package/package.json

@@ -1,6 +1,7 @@
 {
 	"name": "vue-tsc",
-	"version": "1.0.13",
+	"version": "1.0.14",
+	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
 		"bin",
@@ -16,11 +17,11 @@
 		"vue-tsc": "./bin/vue-tsc.js"
 	},
 	"dependencies": {
-		"@volar/vue-language-core": "1.0.13",
-		"@volar/vue-typescript": "1.0.13"
+		"@volar/vue-language-core": "1.0.14",
+		"@volar/vue-typescript": "1.0.14"
 	},
 	"peerDependencies": {
 		"typescript": "*"
 	},
-	"gitHead": "cba2eba187b2d82e1d45dd86b3edeab0ca7caad6"
+	"gitHead": "ce4d48b37db784400e15fe08282edc836e24d4cd"
 }

package/out/proxy.d.ts

@@ -1,4 +0,0 @@
-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[]): any;
-export declare function loadTsLib(): typeof ts;