Upgrade TypeScript to 5.0 (#1417)

Perryvw · web-flow · commit f51fc0966a56 · 2023-03-18T16:02:06.000+01:00
* TS 5.0

* Fix build
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
         "node": ">=16.10.0"
     },
     "peerDependencies": {
-        "typescript": "~4.9.3"
+        "typescript": "^5.0.2"
     },
     "dependencies": {
         "@typescript-to-lua/language-extensions": "1.0.0",
@@ -56,20 +56,20 @@
         "@types/jest": "^27.5.2",
         "@types/node": "^13.7.7",
         "@types/resolve": "1.14.0",
-        "@typescript-eslint/eslint-plugin": "^5.52.0",
-        "@typescript-eslint/parser": "^5.52.0",
-        "eslint": "^8.34.0",
+        "@typescript-eslint/eslint-plugin": "^5.55.0",
+        "@typescript-eslint/parser": "^5.55.0",
+        "eslint": "^8.36.0",
         "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-jest": "^26.9.0",
         "fs-extra": "^8.1.0",
         "javascript-stringify": "^2.0.1",
         "jest": "^28.1.3",
-        "jest-circus": "^29.4.2",
+        "jest-circus": "^29.5.0",
         "lua-types": "^2.13.0",
         "lua-wasm-bindings": "^0.3.1",
-        "prettier": "^2.3.2",
+        "prettier": "^2.8.4",
         "ts-jest": "^28.0.8",
         "ts-node": "^10.9.1",
-        "typescript": "~4.9.3"
+        "typescript": "^5.0.2"
     }
 }
diff --git a/src/transformation/utils/typescript/nodes.ts b/src/transformation/utils/typescript/nodes.ts
@@ -33,7 +33,11 @@ export function isInAsyncFunction(node: ts.Node): boolean {
         return false;
     }
 
-    return declaration.modifiers?.some(m => m.kind === ts.SyntaxKind.AsyncKeyword) ?? false;
+    if (ts.canHaveModifiers(declaration)) {
+        return ts.getModifiers(declaration)?.some(m => m.kind === ts.SyntaxKind.AsyncKeyword) ?? false;
+    } else {
+        return false;
+    }
 }
 
 export function isInGeneratorFunction(node: ts.Node): boolean {
diff --git a/src/transformation/visitors/spread.ts b/src/transformation/visitors/spread.ts
@@ -39,7 +39,10 @@ export function isOptimizedVarArgSpread(context: TransformationContext, symbol:
     }
 
     // Scope cannot be an async function
-    if (scope.node.modifiers?.some(m => m.kind === ts.SyntaxKind.AsyncKeyword)) {
+    if (
+        ts.canHaveModifiers(scope.node) &&
+        ts.getModifiers(scope.node)?.some(m => m.kind === ts.SyntaxKind.AsyncKeyword)
+    ) {
         return false;
     }
 
diff --git a/src/transpilation/transformers.ts b/src/transpilation/transformers.ts
@@ -79,7 +79,7 @@ export const stripParenthesisExpressionsTransformer: ts.TransformerFactory<ts.So
 
         return ts.visitEachChild(node, visit, context);
     }
-    return ts.visitNode(sourceFile, visit);
+    return ts.visitEachChild(sourceFile, visit, context);
 };
 
 function loadTransformersFromOptions(program: ts.Program, diagnostics: ts.Diagnostic[]): ts.CustomTransformers {
diff --git a/test/transpile/transformers/utils.ts b/test/transpile/transformers/utils.ts
@@ -2,5 +2,5 @@ import * as ts from "typescript";
 
 export function visitAndReplace<T extends ts.Node>(context: ts.TransformationContext, node: T, visitor: ts.Visitor): T {
     const visit: ts.Visitor = node => visitor(node) ?? ts.visitEachChild(node, visit, context);
-    return ts.visitNode(node, visit);
+    return ts.visitEachChild(node, visit, context);
 }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,11 @@ export function isInAsyncFunction(node: ts.Node): boolean {`
`33`	`33`	`return false;`
`34`	`34`	`}`
`35`	`35`
`36`		`- return declaration.modifiers?.some(m => m.kind === ts.SyntaxKind.AsyncKeyword) ?? false;`
	`36`	`+ if (ts.canHaveModifiers(declaration)) {`
	`37`	`+ return ts.getModifiers(declaration)?.some(m => m.kind === ts.SyntaxKind.AsyncKeyword) ?? false;`
	`38`	`+ } else {`
	`39`	`+ return false;`
	`40`	`+ }`
`37`	`41`	`}`
`38`	`42`
`39`	`43`	`export function isInGeneratorFunction(node: ts.Node): boolean {`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,10 @@ export function isOptimizedVarArgSpread(context: TransformationContext, symbol:`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`// Scope cannot be an async function`
`42`		`- if (scope.node.modifiers?.some(m => m.kind === ts.SyntaxKind.AsyncKeyword)) {`
	`42`	`+ if (`
	`43`	`+ ts.canHaveModifiers(scope.node) &&`
	`44`	`+ ts.getModifiers(scope.node)?.some(m => m.kind === ts.SyntaxKind.AsyncKeyword)`
	`45`	`+ ) {`
`43`	`46`	`return false;`
`44`	`47`	`}`
`45`	`48`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ export const stripParenthesisExpressionsTransformer: ts.TransformerFactory<ts.So`
`79`	`79`
`80`	`80`	`return ts.visitEachChild(node, visit, context);`
`81`	`81`	`}`
`82`		`- return ts.visitNode(sourceFile, visit);`
	`82`	`+ return ts.visitEachChild(sourceFile, visit, context);`
`83`	`83`	`};`
`84`	`84`
`85`	`85`	`function loadTransformersFromOptions(program: ts.Program, diagnostics: ts.Diagnostic[]): ts.CustomTransformers {`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ import * as ts from "typescript";`
`2`	`2`
`3`	`3`	`export function visitAndReplace<T extends ts.Node>(context: ts.TransformationContext, node: T, visitor: ts.Visitor): T {`
`4`	`4`	`const visit: ts.Visitor = node => visitor(node) ?? ts.visitEachChild(node, visit, context);`
`5`		`- return ts.visitNode(node, visit);`
	`5`	`+ return ts.visitEachChild(node, visit, context);`
`6`	`6`	`}`