@volar/typescript 2.0.0-alpha.4 → 2.0.0-alpha.5

package/lib/node/proxyCreateProgram.js

@@ -8,9 +8,6 @@ function proxyCreateProgram(ts, original, extensions, getLanguagePlugins) {
         apply: (target, thisArg, args) => {
             const options = args[0];
             assert(!!options.host, '!!options.host');
-            const originalHost = options.host;
-            options.host = { ...originalHost };
-            options.options.allowArbitraryExtensions = true;
             const sourceFileToSnapshotMap = new WeakMap();
             const files = (0, language_core_1.createFileProvider)(getLanguagePlugins(ts, options), ts.sys.useCaseSensitiveFileNames, fileName => {
                 let snapshot;
@@ -43,6 +40,7 @@ function proxyCreateProgram(ts, original, extensions, getLanguagePlugins) {
             const originalSourceFiles = new Map();
             const parsedSourceFiles = new WeakMap();
             const arbitraryExtensions = extensions.map(ext => `.d${ext}.ts`);
+            const originalHost = options.host;
             const moduleResolutionHost = {
                 ...originalHost,
                 fileExists(fileName) {
@@ -54,6 +52,8 @@ function proxyCreateProgram(ts, original, extensions, getLanguagePlugins) {
                     return originalHost.fileExists(fileName);
                 },
             };
+            options.host = { ...originalHost };
+            options.options.allowArbitraryExtensions = true;
             options.host.getSourceFile = (fileName, languageVersionOrOptions, onError, shouldCreateNewSourceFile) => {
                 const originalSourceFile = originalHost.getSourceFile(fileName, languageVersionOrOptions, onError, shouldCreateNewSourceFile);
                 originalSourceFiles.set(fileName, originalSourceFile);

package/lib/starters/runTsc.js

@@ -7,7 +7,6 @@ exports.getLanguagePlugins = getLanguagePlugins;
 function runTsc(tscPath, extensions, _getLanguagePlugins) {
     exports.getLanguagePlugins = _getLanguagePlugins;
     const proxyApiPath = require.resolve('../node/proxyCreateProgram');
-    const currentFilePath = require.resolve('./runTsc');
     const readFileSync = fs.readFileSync;
     fs.readFileSync = (...args) => {
         if (args[0] === tscPath) {
@@ -22,14 +21,20 @@ function runTsc(tscPath, extensions, _getLanguagePlugins) {
                 + `new Proxy({}, { get(_target, p, _receiver) {return eval(p); } } ), `
                 + `_createProgram, `
                 + `[${extsText}], `
-                + `require(${JSON.stringify(currentFilePath)}).getLanguagePlugins`
+                + `require(${JSON.stringify(__filename)}).getLanguagePlugins`
                 + `);\n`
                 + s.replace('createProgram', '_createProgram'));
             return tsc;
         }
         return readFileSync(...args);
     };
-    require(tscPath);
+    try {
+        require(tscPath);
+    }
+    finally {
+        fs.readFileSync = readFileSync;
+        delete require.cache[tscPath];
+    }
 }
 exports.runTsc = runTsc;
 function replace(text, ...[search, replace]) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.0.0-alpha.4",
+	"version": "2.0.0-alpha.5",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,13 +12,13 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.0.0-alpha.4",
+		"@volar/language-core": "2.0.0-alpha.5",
 		"path-browserify": "^1.0.1"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/language-service": "2.0.0-alpha.4"
+		"@volar/language-service": "2.0.0-alpha.5"
 	},
-	"gitHead": "4d07249613d0cc5de4197e90c741a64adf92b84b"
+	"gitHead": "80f4f8791c304fbcf4a0a8425eae8ea0b5ab739c"
 }