tstyche 1.0.0-beta.8 → 1.0.0-beta.9

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.0.0-beta.9] - 2024-01-05
+
+### Fixed
+
+- Fix `"target": ["current"]` support for TypeScript 5.2 and below ([#83](https://github.com/tstyche/tstyche/pull/83))
+
 ## [1.0.0-beta.8] - 2024-01-05
 
 ### Changed
@@ -94,6 +100,7 @@
 
 _First pre-release._
 
+[1.0.0-beta.9]: https://github.com/tstyche/tstyche/releases/tag/v1.0.0-beta.9
 [1.0.0-beta.8]: https://github.com/tstyche/tstyche/releases/tag/v1.0.0-beta.8
 [1.0.0-beta.7]: https://github.com/tstyche/tstyche/releases/tag/v1.0.0-beta.7
 [1.0.0-beta.6]: https://github.com/tstyche/tstyche/releases/tag/v1.0.0-beta.6

package/build/tstyche.js

@@ -2525,7 +2525,7 @@ class TSTyche {
     #abortController = new AbortController();
     #storeService;
     #taskRunner;
-    static version = "1.0.0-beta.8";
+    static version = "1.0.0-beta.9";
     constructor(resolvedConfig, storeService) {
         this.resolvedConfig = resolvedConfig;
         this.#storeService = storeService;
@@ -3521,16 +3521,16 @@ class StoreService {
         if (compilerInstance != null) {
             return compilerInstance;
         }
-        let modulePath;
+        const modulePaths = [];
         if (tag === "current") {
             try {
-                modulePath = this.#nodeRequire.resolve("typescript");
+                modulePaths.push(this.#nodeRequire.resolve("typescript/lib/tsserverlibrary.js"), this.#nodeRequire.resolve("typescript"));
             }
             catch (error) {
                 this.#onDiagnostic(Diagnostic.fromError("Failed to resolve locally installed 'typescript' package. It might be not installed.", error));
             }
         }
-        if (modulePath == null) {
+        if (modulePaths.length === 0) {
             if (tag === "current") {
                 return;
             }
@@ -3543,24 +3543,33 @@ class StoreService {
             if (compilerInstance != null) {
                 return compilerInstance;
             }
-            modulePath = await this.#packageInstaller.ensure(version, signal);
+            const installedModulePath = await this.#packageInstaller.ensure(version, signal);
+            if (installedModulePath != null) {
+                modulePaths.push(installedModulePath);
+            }
         }
-        if (modulePath != null) {
-            compilerInstance = await this.#loadModule(modulePath);
+        if (modulePaths.length !== 0) {
+            compilerInstance = await this.#loadModule(modulePaths);
             this.#compilerInstanceCache.set(tag, compilerInstance);
             this.#compilerInstanceCache.set(compilerInstance.version, compilerInstance);
             return compilerInstance;
         }
         return;
     }
-    async #loadModule(modulePath) {
+    async #loadModule(modulePaths) {
         const exports = {};
-        const require = createRequire(modulePath);
         const module = { exports };
-        let sourceText = await fs.readFile(modulePath, { encoding: "utf8" });
-        sourceText = sourceText.replace("isTypeAssignableTo,", "isTypeAssignableTo, isTypeIdenticalTo, isTypeSubtypeOf,");
-        const compiledWrapper = vm.compileFunction(sourceText, ["exports", "require", "module", "__filename", "__dirname"], { filename: modulePath });
-        compiledWrapper(exports, require, module, modulePath, Path.dirname(modulePath));
+        for (const modulePath of modulePaths) {
+            const require = createRequire(modulePath);
+            let sourceText = await fs.readFile(modulePath, { encoding: "utf8" });
+            if (sourceText.length < 3000) {
+                continue;
+            }
+            sourceText = sourceText.replace("isTypeAssignableTo,", "isTypeAssignableTo, isTypeIdenticalTo, isTypeSubtypeOf,");
+            const compiledWrapper = vm.compileFunction(sourceText, ["exports", "require", "module", "__filename", "__dirname"], { filename: modulePath });
+            compiledWrapper(exports, require, module, modulePath, Path.dirname(modulePath));
+            break;
+        }
         return module.exports;
     }
     #onDiagnostic = (diagnostic) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tstyche",
-  "version": "1.0.0-beta.8",
+  "version": "1.0.0-beta.9",
   "description": "The Essential Type Testing Tool.",
   "keywords": [
     "typescript",