vue-tsc 1.9.0-alpha.3 → 2.0.0

package/bin/vue-tsc.js

@@ -1,71 +1,3 @@
 #!/usr/bin/env node
-const semver = require('semver')
-const fs = require('fs');
-const tsPkg = require('typescript/package.json');
-const readFileSync = fs.readFileSync;
-const tscPath = require.resolve('typescript/lib/tsc');
-const proxyApiPath = require.resolve('../out/index');
-const { state } = require('../out/shared');
-
-fs.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 createProgram apis
-		tryReplace(/function createProgram\(.+\) {/, s => s + ` return require(${JSON.stringify(proxyApiPath)}).createProgram(...arguments);`);
-
-		// patches logic for checking root file extension in build program for incremental builds
-		if (semver.gt(tsPkg.version, '5.0.0')) {
-			tryReplace(
-				`for (const existingRoot of buildInfoVersionMap.roots) {`,
-				`for (const existingRoot of buildInfoVersionMap.roots
-					.filter(file => !file.toLowerCase().includes('__vls_'))
-					.map(file => file.replace(/\.vue\.(j|t)sx?$/i, '.vue'))
-				) {`
-			);
-			tryReplace(
-				`return [toFileId(key), toFileIdListId(state.exportedModulesMap.getValues(key))];`, 
-				`return [toFileId(key), toFileIdListId(new Set(arrayFrom(state.exportedModulesMap.getValues(key)).filter(file => file !== void 0)))];`
-			);
-		}
-		if (semver.gte(tsPkg.version, '5.0.4')) {
-			tryReplace(
-				`return createBuilderProgramUsingProgramBuildInfo(buildInfo, buildInfoPath, host);`,
-				s => `buildInfo.program.fileNames = buildInfo.program.fileNames
-					.filter(file => !file.toLowerCase().includes('__vls_'))
-					.map(file => file.replace(/\.vue\.(j|t)sx?$/i, '.vue'));\n` + s
-			);
-		}
-
-		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);
-};
-
-(function main() {
-	try {
-		require(tscPath);
-	}
-	catch (err) {
-		if (err === 'hook') {
-			state.hook.worker.then(main);
-		}
-		else {
-			throw err;
-		}
-	}
-})();
+// @ts-check
+require('../index.js').run();

package/package.json

@@ -1,7 +1,6 @@
 {
 	"name": "vue-tsc",
-	"version": "1.9.0-alpha.3",
-	"main": "out/index.js",
+	"version": "2.0.0",
 	"license": "MIT",
 	"files": [
 		"bin",
@@ -17,8 +16,8 @@
 		"vue-tsc": "./bin/vue-tsc.js"
 	},
 	"dependencies": {
-		"@volar/typescript": "~1.11.0",
-		"@vue/language-core": "1.9.0-alpha.3",
+		"@volar/typescript": "~2.1.0",
+		"@vue/language-core": "2.0.0",
 		"semver": "^7.5.4"
 	},
 	"peerDependencies": {
@@ -27,5 +26,5 @@
 	"devDependencies": {
 		"@types/node": "latest"
 	},
-	"gitHead": "cf6564bc8c649151c2e72a93d0aa482d4a59a773"
+	"gitHead": "aa47e5a7d8a6dae62cc80dbdb5db6a9bfa4f8715"
 }

package/out/index.d.ts

@@ -1,17 +0,0 @@
-import type * as ts from 'typescript/lib/tsserverlibrary';
-import * as vue from '@vue/language-core';
-export type Hook = (program: _Program) => void;
-export type _Program = ts.Program & {
-    __vue: ProgramContext;
-};
-interface ProgramContext {
-    projectVersion: number;
-    options: ts.CreateProgramOptions;
-    languageHost: vue.TypeScriptLanguageHost;
-    vueCompilerOptions: Partial<vue.VueCompilerOptions>;
-    langaugeContext: vue.LanguageContext;
-    languageService: ts.LanguageService;
-}
-export declare function createProgram(options: ts.CreateProgramOptions): _Program;
-export {};
-//# sourceMappingURL=index.d.ts.map

package/out/index.js

@@ -1,126 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createProgram = void 0;
-const vue = require("@vue/language-core");
-const volarTs = require("@volar/typescript");
-const shared_1 = require("./shared");
-const windowsPathReg = /\\/g;
-function createProgram(options) {
-    if (!options.options.noEmit && !options.options.emitDeclarationOnly)
-        throw toThrow('js emit is not supported');
-    if (!options.options.noEmit && options.options.noEmitOnError)
-        throw toThrow('noEmitOnError is not supported');
-    if (options.options.extendedDiagnostics || options.options.generateTrace)
-        throw toThrow('--extendedDiagnostics / --generateTrace is not supported, please run `Write Virtual Files` in VSCode to write virtual files and use `--extendedDiagnostics` / `--generateTrace` via tsc instead of vue-tsc to debug.');
-    if (!options.host)
-        throw toThrow('!options.host');
-    const ts = require('typescript');
-    let program = options.oldProgram;
-    if (shared_1.state.hook) {
-        program = shared_1.state.hook.program;
-        program.__vue.options = options;
-    }
-    else if (!program) {
-        const ctx = {
-            projectVersion: 0,
-            options,
-            get languageHost() {
-                return languageHost;
-            },
-            get vueCompilerOptions() {
-                return vueCompilerOptions;
-            },
-            get languageService() {
-                return vueTsLs;
-            },
-            get langaugeContext() {
-                return languageContext;
-            },
-        };
-        const vueCompilerOptions = getVueCompilerOptions();
-        const scripts = new Map();
-        const languageHost = {
-            workspacePath: ctx.options.host.getCurrentDirectory().replace(windowsPathReg, '/'),
-            rootPath: ctx.options.host.getCurrentDirectory().replace(windowsPathReg, '/'),
-            getCompilationSettings: () => ctx.options.options,
-            getScriptFileNames: () => {
-                return ctx.options.rootNames;
-            },
-            getScriptSnapshot,
-            getProjectVersion: () => {
-                return ctx.projectVersion.toString();
-            },
-            getProjectReferences: () => ctx.options.projectReferences,
-            getCancellationToken: ctx.options.host.getCancellationToken ? () => ctx.options.host.getCancellationToken() : undefined,
-        };
-        const languageContext = vue.createLanguageContext(languageHost, vue.createLanguages(ts, languageHost.getCompilationSettings(), vueCompilerOptions));
-        const languageServiceHost = volarTs.createLanguageServiceHost(languageContext, ts, ts.sys);
-        const vueTsLs = ts.createLanguageService(languageServiceHost, volarTs.getDocumentRegistry(ts, ts.sys.useCaseSensitiveFileNames, languageHost.workspacePath));
-        volarTs.decorateLanguageService(languageContext.virtualFiles, vueTsLs, false);
-        program = volarTs.getProgram(ts, languageContext, vueTsLs, ts.sys);
-        program.__vue = ctx;
-        function getVueCompilerOptions() {
-            const tsConfig = ctx.options.options.configFilePath;
-            if (typeof tsConfig === 'string') {
-                return vue.createParsedCommandLine(ts, ts.sys, tsConfig.replace(windowsPathReg, '/')).vueOptions;
-            }
-            return {};
-        }
-        function getScriptSnapshot(fileName) {
-            return getScript(fileName)?.scriptSnapshot;
-        }
-        function getScript(fileName) {
-            const script = scripts.get(fileName);
-            if (script?.projectVersion === ctx.projectVersion) {
-                return script;
-            }
-            const modifiedTime = ts.sys.getModifiedTime?.(fileName)?.valueOf() ?? 0;
-            if (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: ctx.options.host.createHash?.(fileContent) ?? fileContent,
-                    };
-                    scripts.set(fileName, script);
-                    return script;
-                }
-            }
-        }
-    }
-    else {
-        const ctx = program.__vue;
-        ctx.options = options;
-        ctx.projectVersion++;
-    }
-    const vueCompilerOptions = program.__vue.vueCompilerOptions;
-    if (vueCompilerOptions?.hooks) {
-        const index = (shared_1.state.hook?.index ?? -1) + 1;
-        if (index < vueCompilerOptions.hooks.length) {
-            const hookPath = vueCompilerOptions.hooks[index];
-            const hook = require(hookPath);
-            shared_1.state.hook = {
-                program,
-                index,
-                worker: (async () => await hook(program))(),
-            };
-            throw 'hook';
-        }
-    }
-    for (const rootName of options.rootNames) {
-        // register file watchers
-        options.host.getSourceFile(rootName, ts.ScriptTarget.ESNext);
-    }
-    return program;
-}
-exports.createProgram = createProgram;
-function toThrow(msg) {
-    console.error(msg);
-    return msg;
-}
-//# sourceMappingURL=index.js.map

package/out/shared.d.ts

@@ -1,9 +0,0 @@
-import type { _Program } from './index';
-export declare const state: {
-    hook?: {
-        program: _Program;
-        index: number;
-        worker: Promise<any>;
-    };
-};
-//# sourceMappingURL=shared.d.ts.map

package/out/shared.js

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