Upgrade TS to 5.1.3 (#1452)

Perryvw · web-flow · commit f01403f99419 · 2023-06-04T17:55:02.000+02:00
* Tests for new decorators

* Rename old decorate function to DecorateLegacy

* Method decorators and partially accessor decorators rewritten

* Modern decorators except field decorators working but with some regression to legacy

* All decorators legacy and modern work, except for field decorators

* Finalize property decorators

* Fix unit tests

* Upgrade TS to 5.1.3
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": "^5.0.2"
+        "typescript": "~5.1.3"
     },
     "dependencies": {
         "@typescript-to-lua/language-extensions": "1.0.0",
@@ -70,6 +70,6 @@
         "prettier": "^2.8.4",
         "ts-jest": "^29.1.0",
         "ts-node": "^10.9.1",
-        "typescript": "^5.0.4"
+        "typescript": "~5.1.3"
     }
 }
diff --git a/src/transformation/utils/function-context.ts b/src/transformation/utils/function-context.ts
@@ -30,7 +30,7 @@ function hasNoSelfAncestor(declaration: ts.Declaration): boolean {
 
 function getExplicitThisParameter(signatureDeclaration: ts.SignatureDeclaration): ts.ParameterDeclaration | undefined {
     const param = signatureDeclaration.parameters[0];
-    if (param && ts.isIdentifier(param.name) && param.name.originalKeywordKind === ts.SyntaxKind.ThisKeyword) {
+    if (param && ts.isIdentifier(param.name) && ts.identifierToKeywordKind(param.name) === ts.SyntaxKind.ThisKeyword) {
         return param;
     }
 }
diff --git a/src/transformation/visitors/function.ts b/src/transformation/visitors/function.ts
@@ -195,7 +195,7 @@ export function transformParameters(
 
     // Only push parameter name to paramName array if it isn't a spread parameter
     for (const param of parameters) {
-        if (ts.isIdentifier(param.name) && param.name.originalKeywordKind === ts.SyntaxKind.ThisKeyword) {
+        if (ts.isIdentifier(param.name) && ts.identifierToKeywordKind(param.name) === ts.SyntaxKind.ThisKeyword) {
             continue;
         }
 
diff --git a/src/transformation/visitors/identifier.ts b/src/transformation/visitors/identifier.ts
@@ -85,7 +85,7 @@ export function transformIdentifierWithSymbol(
 }
 
 export const transformIdentifierExpression: FunctionVisitor<ts.Identifier> = (node, context) => {
-    if (node.originalKeywordKind === ts.SyntaxKind.UndefinedKeyword) {
+    if (ts.identifierToKeywordKind(node) === ts.SyntaxKind.UndefinedKeyword) {
         return lua.createNilLiteral(node);
     }
 
diff --git a/src/transformation/visitors/modules/export.ts b/src/transformation/visitors/modules/export.ts
@@ -105,8 +105,8 @@ function transformExportAll(context: TransformationContext, node: ts.ExportDecla
 }
 
 const isDefaultExportSpecifier = (node: ts.ExportSpecifier) =>
-    (node.name && node.name.originalKeywordKind === ts.SyntaxKind.DefaultKeyword) ||
-    (node.propertyName && node.propertyName.originalKeywordKind === ts.SyntaxKind.DefaultKeyword);
+    (node.name && ts.identifierToKeywordKind(node.name) === ts.SyntaxKind.DefaultKeyword) ||
+    (node.propertyName && ts.identifierToKeywordKind(node.propertyName) === ts.SyntaxKind.DefaultKeyword);
 
 function transformExportSpecifier(context: TransformationContext, node: ts.ExportSpecifier): lua.AssignmentStatement {
     const exportedSymbol = context.checker.getExportSpecifierLocalTargetSymbol(node);

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ function hasNoSelfAncestor(declaration: ts.Declaration): boolean {`
`30`	`30`
`31`	`31`	`function getExplicitThisParameter(signatureDeclaration: ts.SignatureDeclaration): ts.ParameterDeclaration \| undefined {`
`32`	`32`	`const param = signatureDeclaration.parameters[0];`
`33`		`- if (param && ts.isIdentifier(param.name) && param.name.originalKeywordKind === ts.SyntaxKind.ThisKeyword) {`
	`33`	`+ if (param && ts.isIdentifier(param.name) && ts.identifierToKeywordKind(param.name) === ts.SyntaxKind.ThisKeyword) {`
`34`	`34`	`return param;`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ export function transformParameters(`
`195`	`195`
`196`	`196`	`// Only push parameter name to paramName array if it isn't a spread parameter`
`197`	`197`	`for (const param of parameters) {`
`198`		`- if (ts.isIdentifier(param.name) && param.name.originalKeywordKind === ts.SyntaxKind.ThisKeyword) {`
	`198`	`+ if (ts.isIdentifier(param.name) && ts.identifierToKeywordKind(param.name) === ts.SyntaxKind.ThisKeyword) {`
`199`	`199`	`continue;`
`200`	`200`	`}`
`201`	`201`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ export function transformIdentifierWithSymbol(`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`export const transformIdentifierExpression: FunctionVisitor<ts.Identifier> = (node, context) => {`
`88`		`- if (node.originalKeywordKind === ts.SyntaxKind.UndefinedKeyword) {`
	`88`	`+ if (ts.identifierToKeywordKind(node) === ts.SyntaxKind.UndefinedKeyword) {`
`89`	`89`	`return lua.createNilLiteral(node);`
`90`	`90`	`}`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -105,8 +105,8 @@ function transformExportAll(context: TransformationContext, node: ts.ExportDecla`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`const isDefaultExportSpecifier = (node: ts.ExportSpecifier) =>`
`108`		`- (node.name && node.name.originalKeywordKind === ts.SyntaxKind.DefaultKeyword) \|\|`
`109`		`- (node.propertyName && node.propertyName.originalKeywordKind === ts.SyntaxKind.DefaultKeyword);`
	`108`	`+ (node.name && ts.identifierToKeywordKind(node.name) === ts.SyntaxKind.DefaultKeyword) \|\|`
	`109`	`+ (node.propertyName && ts.identifierToKeywordKind(node.propertyName) === ts.SyntaxKind.DefaultKeyword);`
`110`	`110`
`111`	`111`	`function transformExportSpecifier(context: TransformationContext, node: ts.ExportSpecifier): lua.AssignmentStatement {`
`112`	`112`	`const exportedSymbol = context.checker.getExportSpecifierLocalTargetSymbol(node);`