Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,856 changes: 934 additions & 922 deletions package-lock.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
6 changes: 5 additions & 1 deletion src/transformation/utils/typescript/nodes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 4 additions & 1 deletion src/transformation/visitors/spread.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion src/transpilation/transformers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion test/transpile/transformers/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}