Fix #187: support TypeScript v6 and let test features work.

.github/workflows/build.yml

@@ -26,22 +26,15 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cache/yarn
-            node_modules
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
       - name: Install Packages
         run: yarn install --frozen-lockfile
 
       - name: Build
         run: yarn build
 
+      - name: Clean yarn cache
+        run: yarn cache clean
+
       - name: Test
         run: yarn run test && yarn run perf
         env:

package.json

@@ -73,7 +73,7 @@
     "ts-node": "^10.9.1",
     "ts-patch": "^3.3.0",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "5.7.2",
+    "typescript": "~6.0.2",
     "ts-next": "npm:typescript@beta",
     "ts-expose-internals": "npm:ts-expose-internals@5.4.5"
   },

projects/core/src/actions/check.ts

@@ -2,7 +2,7 @@ import { LogLevel, PatchError } from '../system';
 import chalk from 'chalk';
 import { getTsPackage } from '../ts-package';
 import { PatchDetail } from "../patch/patch-detail";
-import { getTsModule } from "../module";
+import { getTsModule, TsModule } from "../module";
 import { getInstallerOptions, InstallerOptions } from "../options";
 
 
@@ -47,6 +47,15 @@ export function check(moduleNameOrNames?: string | string[], opts?: Partial<Inst
     if (!tsPackage.moduleNames.includes(moduleName))
       throw new PatchError(`${moduleName} is not a valid TypeScript module in ${packageDir}`);
 
+    /* Report non-patchable modules (thin wrappers in TS 6+) */
+    if (!TsModule.isPatchable(moduleName, tsPackage.majorVer)) {
+      log([ '~',
+        `${chalk.blueBright(moduleName)} delegates to ${chalk.blueBright('typescript.js')} (no independent patch needed)`
+      ]);
+      res[moduleName] = undefined;
+      continue;
+    }
+
     /* Report */
     const tsModule = getTsModule(tsPackage, moduleName, { skipCache: options.skipCache });
     const { patchDetail } = tsModule.moduleFile;

projects/core/src/actions/patch.ts

@@ -1,7 +1,7 @@
 import { LogLevel, PatchError, TspError, } from '../system';
 import { getTsPackage } from '../ts-package';
 import chalk from 'chalk';
-import { getModuleFile, getTsModule, ModuleFile } from '../module';
+import { getModuleFile, getTsModule, TsModule, ModuleFile } from '../module';
 import path from 'path';
 import { getInstallerOptions, InstallerOptions } from '../options';
 import { writeFileWithLock } from '../utils';
@@ -27,9 +27,21 @@ export function patch(moduleNameOrNames: string | string[], opts?: Partial<Insta
   /* Load Package */
   const tsPackage = getTsPackage(dir);
 
+  /* Skip non-patchable modules (e.g. thin wrappers in TS 6+) */
+  const patchableModuleNames = targetModuleNames.filter(m => {
+    if (!TsModule.isPatchable(m, tsPackage.majorVer)) {
+      log([ '~',
+        `${chalk.blueBright(m)} is not independently patchable in TS ${tsPackage.majorVer}+ ` +
+        `(delegates to ${chalk.blueBright('typescript.js')})`
+      ]);
+      return false;
+    }
+    return true;
+  });
+
   /* Get modules to patch and patch info */
   const moduleFiles: [ string, ModuleFile ][] =
-    targetModuleNames.map(m => [ m, getModuleFile(tsPackage.getModulePath(m)) ]);
+    patchableModuleNames.map(m => [ m, getModuleFile(tsPackage.getModulePath(m)) ]);
 
   /* Determine files not already patched or outdated  */
   const patchableFiles = moduleFiles.filter(entry => {

projects/core/src/module/ts-module.ts

@@ -19,6 +19,24 @@ export namespace TsModule {
     'tsserver.js': '_tsserver.js'
   } satisfies Partial<Record<typeof names[number], string>>;
 
+  /**
+   * Modules that are thin wrappers (re-export or import-only) in certain TS major versions.
+   * These delegate to typescript.js and don't need independent patching.
+   *
+   * - TS 6+: tsserverlibrary.js re-exports typescript.js; _tsserver.js is ESM-style (not IIFE)
+   */
+  const nonPatchableModulesByMajorVer: Record<number, string[]> = {
+    6: [ 'tsserverlibrary.js', 'tsserver.js' ]
+  };
+
+  export function isPatchable(moduleName: string, majorVer: number): boolean {
+    for (let ver = majorVer; ver >= 6; ver--) {
+      const nonPatchable = nonPatchableModulesByMajorVer[ver];
+      if (nonPatchable?.includes(moduleName)) return false;
+    }
+    return true;
+  }
+
   export function getContentFileName(moduleName: typeof names[number]): string {
     return contentFileMap[moduleName] || moduleName;
   }

projects/core/tsconfig.json

@@ -8,11 +8,13 @@
     "sourceMap" : true,
     "composite" : true,
     "declaration" : true,
+    "types" : [ "node" ],
 
     "plugins" : [
       {
         "transform" : "./plugin.ts",
-        "transformProgram" : true
+        "transformProgram" : true,
+        "tsConfig" : "../../tsconfig.plugin.json"
       }
     ]
   }

projects/patch/src/plugin/esm-intercept.ts

@@ -113,9 +113,19 @@ namespace tsp {
           /* Add to cache */
           Module._cache[resolvedPath] = newModule;
 
-          /* Load with ESM library */
-          const res = getEsmLibrary()(newModule)(targetFilePath);
-          newModule.filename = resolvedPath;
+          /* Load ESM module — try native require first (Node.js 22.12.0+), fall back to esm library */
+          let res;
+          try {
+            res = originalRequire.call(this, targetFilePath);
+            newModule.exports = res;
+          } catch (loadErr: any) {
+            if (loadErr?.code === 'ERR_REQUIRE_ESM') {
+              res = getEsmLibrary()(newModule)(targetFilePath);
+              newModule.filename = resolvedPath;
+            } else {
+              throw loadErr;
+            }
+          }
 
           return res;
         }
@@ -128,4 +138,4 @@ namespace tsp {
   }
 
   // endregion
-}
+}

projects/patch/src/plugin/register-plugin.ts

@@ -115,7 +115,8 @@ namespace tsp {
             target: isEsm ? 'ESNext' : 'ES2018',
             jsx: 'react',
             esModuleInterop: true,
-            module: isEsm ? 'ESNext' : 'commonjs',
+            module: isEsm ? 'ESNext' : 'node16',
+            moduleResolution: isEsm ? 'bundler' : 'node16',
           }
         });
       }

projects/patch/tsconfig.json

@@ -5,6 +5,7 @@
 
   "compilerOptions": {
     "outFile": "../../dist/resources/module-patch.js",
+    "rootDir": "./src",
     "declaration": true,
     "types": [ "@types/node" ],
 
@@ -17,6 +18,7 @@
     "target": "ES2020",
     "downlevelIteration": true,
     "useUnknownInCatchVariables": false,
+    "ignoreDeprecations": "6.0",
     "newLine": "LF",
     "moduleResolution": "Node",
     "esModuleInterop": true,
@@ -25,7 +27,8 @@
       {
         "transform": "./plugin.ts",
         "transformProgram": true,
-        "import": "transformProgram"
+        "import": "transformProgram",
+        "tsConfig": "../../tsconfig.plugin.json"
       }
     ]
   }

test/assets/projects/package-config/tsconfig.json

@@ -1,6 +1,7 @@
 {
   "include": [ "src" ],
   "compilerOptions": {
+    "rootDir": "src",
     "outDir": "dist",
     "module": "commonjs",
     "target": "esnext",

test/assets/projects/path-mapping/tsconfig.json

@@ -3,6 +3,7 @@
   "compilerOptions": {
     "outDir" : "dist",
     "moduleResolution" : "node",
+    "ignoreDeprecations": "6.0",
     "module": "commonjs",
     "target": "ES2020",
     "noEmit": false,

test/assets/projects/path-mapping/tsconfig.plugin.json

@@ -1,10 +1,12 @@
 {
   "include": [ "src" ],
   "compilerOptions": {
+    "rootDir": "src",
     "outDir": "dist",
     "module": "commonjs",
     "target": "ES2020",
     "noEmit": true,
+    "ignoreDeprecations": "6.0",
     "baseUrl" : "src",
     "paths": {
       "@a/*": [ "./a/*" ],

test/assets/projects/webpack/tsconfig.json

@@ -6,6 +6,7 @@
     "target": "ESNext",
     "declaration": false,
     "moduleResolution" : "Node",
+    "ignoreDeprecations": "6.0",
     "plugins": [
       { "transform": "./plugin.ts" }
     ]

test/tests/webpack.test.ts

@@ -56,8 +56,16 @@ describe('Webpack', () => {
     expect(err).toContain('Error: ts-patch worked (esm)');
   });
 
-  test(`Compiler with ESM transformer throws if no ESM package`, () => {
+  test(`Compiler with ESM transformer works without esm package on Node 22.12+ or throws if unavailable`, () => {
+    const [major, minor] = process.versions.node.split('.').map(Number);
+    const nativeEsmRequire = major > 22 || (major === 22 && minor >= 12);
+
     const err = execAndGetErr(projectPath, './tsconfig.esm.json', 'esm');
-    expect(err).toContain('To enable experimental ESM support, install the \'esm\' package');
+    if (nativeEsmRequire) {
+      // Node.js 22.12.0+ can require ESM modules natively — esm package not needed
+      expect(err).toContain('Error: ts-patch worked (esm)');
+    } else {
+      expect(err).toContain('To enable experimental ESM support, install the \'esm\' package');
+    }
   });
 });

test/tsconfig.json

@@ -6,6 +6,7 @@
     "noEmit": true,
     "target": "ESNext",
     "skipDefaultLibCheck": true,
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "types": [ "jest", "node" ]
   }
 }

tsconfig.base.json

@@ -6,6 +6,7 @@
     "noImplicitReturns": true,
     "forceConsistentCasingInFileNames": true,
     "useUnknownInCatchVariables": false,
+    "ignoreDeprecations": "6.0",
 
     "lib": [ "es2020", "dom" ],
     "outDir": "dist",

tsconfig.plugin.json

@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "ES2020",
+    "moduleResolution": "bundler",
+    "esModuleInterop": true,
+    "rootDir": "."
+  }
+}

yarn.lock

@@ -3309,10 +3309,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
-typescript@5.7.2:
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.2.tgz#3169cf8c4c8a828cde53ba9ecb3d2b1d5dd67be6"
-  integrity sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==
+typescript@~6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-6.0.2.tgz#0b1bfb15f68c64b97032f3d78abbf98bdbba501f"
+  integrity sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==
 
 uglify-js@^3.1.4:
   version "3.19.3"