Upgarde to TypeScript 6.0

Perryvw · Perryvw · commit 3dfbb65ed9a3 · 2026-04-01T21:49:42.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
         "lint:prettier": "prettier --check . || (echo 'Run `npm run fix:prettier` to fix it.' && exit 1)",
         "lint:eslint": "eslint .",
         "fix:prettier": "prettier --write .",
-        "check:language-extensions": "tsc --strict language-extensions/index.d.ts",
+        "check:language-extensions": "tsc --strict --ignoreConfig language-extensions/index.d.ts",
         "preversion": "npm run build && npm test",
         "postversion": "git push && git push --tags"
     },
@@ -42,7 +42,7 @@
         "node": ">=16.10.0"
     },
     "peerDependencies": {
-        "typescript": "5.9.3"
+        "typescript": "6.0.2"
     },
     "dependencies": {
         "@typescript-to-lua/language-extensions": "1.19.0",
@@ -69,7 +69,7 @@
         "prettier": "^2.8.8",
         "ts-jest": "^29.2.5",
         "ts-node": "^10.9.2",
-        "typescript": "5.9.3",
+        "typescript": "6.0.2",
         "typescript-eslint": "^8.46.3"
     }
 }
diff --git a/src/transpilation/resolve.ts b/src/transpilation/resolve.ts
@@ -27,7 +27,7 @@ interface ResolutionResult {
 }
 
 class ResolutionContext {
-    private noResolvePaths: picomatch.Matcher[];
+    private noResolvePaths: RegExp[];
 
     public diagnostics: ts.Diagnostic[] = [];
     public resolvedFiles = new Map<string, ProcessedFile>();
@@ -39,7 +39,7 @@ class ResolutionContext {
         private readonly plugins: Plugin[]
     ) {
         const unique = [...new Set(options.noResolvePaths)];
-        const matchers = unique.map(x => picomatch(x));
+        const matchers = unique.map(x => picomatch.makeRe(x));
         this.noResolvePaths = matchers;
     }
 
@@ -73,7 +73,7 @@ class ResolutionContext {
             return;
         }
 
-        if (this.noResolvePaths.find(isMatch => isMatch(required.requirePath))) {
+        if (this.noResolvePaths.find(isMatch => isMatch.test(required.requirePath))) {
             if (this.options.tstlVerbose) {
                 console.log(
                     `Skipping module resolution of ${required.requirePath} as it is in the tsconfig noResolvePaths.`
@@ -215,14 +215,20 @@ class ResolutionContext {
         const fileFromPath = this.getFileFromPath(resolvedPath);
         if (fileFromPath) return fileFromPath;
 
-        if (this.options.paths && this.options.baseUrl) {
+        if (this.options.paths) {
             // If no file found yet and paths are present, try to find project file via paths mappings
-            const fileFromPaths = this.tryGetModuleNameFromPaths(
-                dependencyPath,
-                this.options.paths,
-                this.options.baseUrl
-            );
-            if (fileFromPaths) return fileFromPaths;
+            // When baseUrl is not set, resolve paths relative to the tsconfig directory (TS 6.0+ behavior)
+            const pathsBase =
+                this.options.baseUrl ??
+                (this.options.configFilePath ? path.dirname(this.options.configFilePath) : undefined);
+            if (pathsBase) {
+                const fileFromPaths = this.tryGetModuleNameFromPaths(
+                    dependencyPath,
+                    this.options.paths,
+                    pathsBase
+                );
+                if (fileFromPaths) return fileFromPaths;
+            }
         }
 
         // Not a TS file in our project sources, use resolver to check if we can find dependency
diff --git a/src/utils.ts b/src/utils.ts
@@ -77,7 +77,7 @@ export function cast<TOriginal, TCast extends TOriginal>(
 }
 
 export function assert(value: any, message?: string | Error): asserts value {
-    nativeAssert(value, message);
+    nativeAssert.ok(value, message);
 }
 
 export function assertNever(_value: never): never {
diff --git a/test/setup.ts b/test/setup.ts
@@ -13,7 +13,7 @@ declare global {
 
 expect.extend({
     toHaveDiagnostics(diagnostics: ts.Diagnostic[], expected?: number[]): jest.CustomMatcherResult {
-        assert(Array.isArray(diagnostics));
+        assert.ok(Array.isArray(diagnostics));
         // @ts-ignore
         const matcherHint = this.utils.matcherHint("toHaveDiagnostics", undefined, "", this);
 
diff --git a/test/util.ts b/test/util.ts
@@ -51,7 +51,7 @@ function getLuaBindingsForVersion(target: tstl.LuaTarget): { lauxlib: LauxLib; l
 }
 
 export function assert(value: any, message?: string | Error): asserts value {
-    nativeAssert(value, message);
+    nativeAssert.ok(value, message);
 }
 
 export const formatCode = (...values: unknown[]) => values.map(e => stringify(e)).join(", ");
@@ -92,17 +92,15 @@ export function expectEachVersionExceptJit<T>(
     };
 }
 
-const memoize: MethodDecorator = (_target, _propertyKey, descriptor) => {
-    const originalFunction = descriptor.value as any;
+const memoize = (originalFunction: any) => {
     const memoized = new WeakMap();
-    descriptor.value = function (this: any, ...args: any[]): any {
+    return function (this: any, ...args: any[]): any {
         if (!memoized.has(this)) {
             memoized.set(this, originalFunction.apply(this, args));
         }
 
         return memoized.get(this);
-    } as any;
-    return descriptor;
+    };
 };
 
 export class ExecutionError extends Error {
@@ -163,7 +161,7 @@ export abstract class TestBuilder {
         skipLibCheck: true,
         target: ts.ScriptTarget.ES2017,
         lib: ["lib.esnext.d.ts"],
-        moduleResolution: ts.ModuleResolutionKind.Node10,
+        moduleResolution: ts.ModuleResolutionKind.Bundler,
         resolveJsonModule: true,
         sourceMap: true,
     };
diff --git a/tsconfig.json b/tsconfig.json
@@ -4,7 +4,6 @@
         "lib": ["es2019"],
         "types": ["node"],
         "module": "commonjs",
-        "experimentalDecorators": true,
 
         "rootDir": "src",
         "outDir": "dist",

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ export function cast<TOriginal, TCast extends TOriginal>(`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`export function assert(value: any, message?: string \| Error): asserts value {`
`80`		`- nativeAssert(value, message);`
	`80`	`+ nativeAssert.ok(value, message);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`export function assertNever(_value: never): never {`