TypeScriptToLua · Perryvw · Aug 31, 2022 · Aug 27, 2022 · Aug 27, 2022 · Aug 27, 2022
diff --git a/jest.config.js b/jest.config.js
@@ -1,4 +1,4 @@
-const isCI = require("is-ci");
+const isCI = process.env.GITHUB_ACTIONS !== undefined;
 
 /** @type {Partial<import("@jest/types").Config.DefaultOptions>} */
 module.exports = {

diff --git a/language-extensions/index.d.ts b/language-extensions/index.d.ts
@@ -666,11 +666,11 @@ declare interface ReadonlyLuaSet<T extends AnyNotNil = AnyNotNil> extends LuaPai
 
 interface ObjectConstructor {
     /** Returns an array of keys of an object, when iterated with `pairs`. */
-    keys<K>(o: LuaPairsIterable<K, any> | LuaPairsKeyIterable<K>): K[];
+    keys<K extends AnyNotNil>(o: LuaPairsIterable<K, any> | LuaPairsKeyIterable<K>): K[];
 
     /** Returns an array of values of an object, when iterated with `pairs`. */
     values<V>(o: LuaPairsIterable<any, V>): V[];
 
     /** Returns an array of key/values of an object, when iterated with `pairs`. */
-    entries<K, V>(o: LuaPairsIterable<K, V>): Array<[K, V]>;
+    entries<K extends AnyNotNil, V>(o: LuaPairsIterable<K, V>): Array<[K, V]>;
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,18 +32,18 @@
         "lint:prettier": "prettier --check . || (echo 'Run `npm run fix:prettier` to fix it.' && exit 1)",
         "lint:eslint": "eslint . --ext .js,.ts",
         "fix:prettier": "prettier --write .",
-        "check:language-extensions": "tsc language-extensions/index.d.ts",
+        "check:language-extensions": "tsc --strict language-extensions/index.d.ts",
         "preversion": "npm run build && npm test",
         "postversion": "git push && git push --tags"
     },
     "bin": {
         "tstl": "dist/tstl.js"
     },
     "engines": {
-        "node": ">=12.13.0"
+        "node": ">=16.10.0"
     },
     "peerDependencies": {
-        "typescript": "~4.7.3"
+        "typescript": "~4.8.2"
     },
     "dependencies": {
         "enhanced-resolve": "^5.8.2",
@@ -56,20 +56,20 @@
         "@types/jest": "^27.5.2",
         "@types/node": "^13.7.7",
         "@types/resolve": "1.14.0",
-        "@typescript-eslint/eslint-plugin": "^5.27.0",
-        "@typescript-eslint/parser": "^5.27.0",
-        "eslint": "^8.17.0",
+        "@typescript-eslint/eslint-plugin": "^5.35.1",
+        "@typescript-eslint/parser": "^5.35.1",
+        "eslint": "^8.23.0",
         "eslint-plugin-import": "^2.26.0",
-        "eslint-plugin-jest": "^26.4.6",
+        "eslint-plugin-jest": "^26.8.7",
         "fs-extra": "^8.1.0",
         "javascript-stringify": "^2.0.1",
-        "jest": "^27.3.0",
-        "jest-circus": "^27.3.0",
-        "lua-types": "^2.11.0",
+        "jest": "^28.1.3",
+        "jest-circus": "^29.0.1",
+        "lua-types": "^2.12.1",
         "lua-wasm-bindings": "^0.2.2",
         "prettier": "^2.3.2",
-        "ts-jest": "^27.1.3",
-        "ts-node": "^10.3.0",
-        "typescript": "~4.7.3"
+        "ts-jest": "^28.0.8",
+        "ts-node": "^10.9.1",
+        "typescript": "~4.8.2"
     }
 }
diff --git a/src/transformation/utils/typescript/index.ts b/src/transformation/utils/typescript/index.ts
@@ -91,7 +91,7 @@ export function isExpressionWithEvaluationEffect(node: ts.Expression): boolean {
 
 export function getFunctionTypeForCall(context: TransformationContext, node: ts.CallExpression) {
     const signature = context.checker.getResolvedSignature(node);
-    if (!signature || !signature.declaration) {
+    if (!signature?.declaration) {
         return;
     }
     const typeDeclaration = findFirstNodeAbove(signature.declaration, ts.isTypeAliasDeclaration);
@@ -110,7 +110,7 @@ export function isConstIdentifier(context: TransformationContext, node: ts.Node)
         return false;
     }
     const symbol = context.checker.getSymbolAtLocation(identifier);
-    if (!symbol || !symbol.declarations) {
+    if (!symbol?.declarations) {
         return false;
     }
     return symbol.declarations.some(

diff --git a/src/transformation/visitors/class/index.ts b/src/transformation/visitors/class/index.ts
@@ -187,11 +187,11 @@ function transformClassLikeDeclaration(
     result.push(...decorationStatements);
 
     // Decorate the class
-    if (classDeclaration.decorators) {
+    if (ts.canHaveDecorators(classDeclaration) && ts.getDecorators(classDeclaration)) {
         const decoratingExpression = createDecoratingExpression(
             context,
             classDeclaration.kind,
-            classDeclaration.decorators.map(d => transformDecoratorExpression(context, d)),
+            ts.getDecorators(classDeclaration)?.map(d => transformDecoratorExpression(context, d)) ?? [],
             localClassName
         );
         const decoratingStatement = lua.createAssignmentStatement(localClassName, decoratingExpression);

diff --git a/src/transformation/visitors/class/members/fields.ts b/src/transformation/visitors/class/members/fields.ts
@@ -12,13 +12,15 @@ export function createPropertyDecoratingExpression(
     node: ts.PropertyDeclaration | ts.AccessorDeclaration,
     className: lua.Identifier
 ): lua.Expression | undefined {
-    if (!node.decorators) return;
+    if (!ts.canHaveDecorators(node)) return;
+    const decorators = ts.getDecorators(node);
+    if (!decorators) return;
     const propertyName = transformPropertyName(context, node.name);
     const propertyOwnerTable = transformMemberExpressionOwnerName(node, className);
     return createDecoratingExpression(
         context,
         node.kind,
-        node.decorators.map(d => transformDecoratorExpression(context, d)),
+        decorators.map(d => transformDecoratorExpression(context, d)),
         propertyOwnerTable,
         propertyName
     );

diff --git a/src/transformation/visitors/class/members/method.ts b/src/transformation/visitors/class/members/method.ts
@@ -53,19 +53,21 @@ export function createMethodDecoratingExpression(
 
     const parameterDecorators = node.parameters
         .flatMap((parameter, index) =>
-            parameter.decorators?.map(decorator =>
-                transformLuaLibFunction(
-                    context,
-                    LuaLibFeature.DecorateParam,
-                    node,
-                    lua.createNumericLiteral(index),
-                    transformDecoratorExpression(context, decorator)
+            ts
+                .getDecorators(parameter)
+                ?.map(decorator =>
+                    transformLuaLibFunction(
+                        context,
+                        LuaLibFeature.DecorateParam,
+                        node,
+                        lua.createNumericLiteral(index),
+                        transformDecoratorExpression(context, decorator)
+                    )
                 )
-            )
         )
         .filter(isNonNull);
 
-    const methodDecorators = node.decorators?.map(d => transformDecoratorExpression(context, d)) ?? [];
+    const methodDecorators = ts.getDecorators(node)?.map(d => transformDecoratorExpression(context, d)) ?? [];
 
     if (methodDecorators.length > 0 || parameterDecorators.length > 0) {
         const decorateMethod = createDecoratingExpression(

diff --git a/src/transformation/visitors/modules/export.ts b/src/transformation/visitors/modules/export.ts
@@ -136,12 +136,7 @@ function transformExportSpecifiersFrom(
         )
     );
 
-    const importDeclaration = ts.factory.createImportDeclaration(
-        statement.decorators,
-        statement.modifiers,
-        importClause,
-        moduleSpecifier
-    );
+    const importDeclaration = ts.factory.createImportDeclaration(statement.modifiers, importClause, moduleSpecifier);
 
     // Wrap in block to prevent imports from hoisting out of `do` statement
     const [block] = transformScopeBlock(context, ts.factory.createBlock([importDeclaration]), ScopeType.Block);

diff --git a/src/utils.ts b/src/utils.ts
@@ -5,7 +5,7 @@ import * as path from "path";
 export function castArray<T>(value: T | T[]): T[];
 export function castArray<T>(value: T | readonly T[]): readonly T[];
 export function castArray<T>(value: T | readonly T[]): readonly T[] {
-    return Array.isArray(value) ? value : [value];
+    return Array.isArray(value) ? value : [value as T];
 }
 
 export const intersperse = <T>(values: readonly T[], separator: T): T[] =>