Skip to content

Commit 2da9a20

Browse files
ark120202ark120202
committed
Merge remote-tracking branch 'upstream/master' into tsconfig-plugins
2 parents 68cb2df + 1703170 commit 2da9a20

File tree

11 files changed

+130
-91
lines changed

11 files changed

+130
-91
lines changed

‎src/lualib/SourceMapTraceBack.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@ function __TS__SourceMapTraceBack(this: void, fileName: string, sourceMap: { [li
77
if (globalThis.__TS__originalTraceback === undefined) {
88
globalThis.__TS__originalTraceback = debug.traceback;
99
debug.traceback = (thread, message, level) => {
10-
const trace = globalThis.__TS__originalTraceback(thread, message, level);
10+
let trace: string;
11+
if (thread === undefined && message === undefined && level === undefined) {
12+
trace = globalThis.__TS__originalTraceback();
13+
} else {
14+
trace = globalThis.__TS__originalTraceback(thread, message, level);
15+
}
1116

1217
if (typeof trace !== "string") {
1318
return trace;

‎src/transformation/utils/errors.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,6 @@ export const UnsupportedNonDestructuringLuaIterator = (node: ts.Node) =>
130130
export const UnresolvableRequirePath = (node: ts.Node, reason: string, path?: string) =>
131131
new TranspileError(`${reason}. TypeScript path: ${path}.`, node);
132132

133-
export const UnsupportedObjectDestructuringInForOf = (node: ts.Node) =>
134-
new TranspileError(`Unsupported object destructuring in for...of statement.`, node);
135-
136133
export const InvalidAmbientIdentifierName = (node: ts.Identifier) =>
137134
new TranspileError(
138135
`Invalid ambient identifier name "${node.text}". Ambient identifiers must be valid lua identifiers.`,

‎src/transformation/visitors/binary-expression/destructuring-assignments.ts‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,20 @@ export function transformDestructuringAssignment(
3838
node: ts.DestructuringAssignment,
3939
root: lua.Expression
4040
): lua.Statement[] {
41-
switch (node.left.kind) {
42-
case ts.SyntaxKind.ObjectLiteralExpression:
43-
return transformObjectDestructuringAssignment(context, node as ts.ObjectDestructuringAssignment, root);
44-
case ts.SyntaxKind.ArrayLiteralExpression:
45-
return transformArrayDestructuringAssignment(context, node as ts.ArrayDestructuringAssignment, root);
46-
}
41+
return transformAssignmentPattern(context, node.left, root);
4742
}
4843

49-
function transformArrayDestructuringAssignment(
44+
export function transformAssignmentPattern(
5045
context: TransformationContext,
51-
node: ts.ArrayDestructuringAssignment,
46+
node: ts.AssignmentPattern,
5247
root: lua.Expression
5348
): lua.Statement[] {
54-
return transformArrayLiteralAssignmentPattern(context, node.left, root);
49+
switch (node.kind) {
50+
case ts.SyntaxKind.ObjectLiteralExpression:
51+
return transformObjectLiteralAssignmentPattern(context, node, root);
52+
case ts.SyntaxKind.ArrayLiteralExpression:
53+
return transformArrayLiteralAssignmentPattern(context, node, root);
54+
}
5555
}
5656

5757
function transformArrayLiteralAssignmentPattern(
@@ -132,14 +132,6 @@ function transformArrayLiteralAssignmentPattern(
132132
});
133133
}
134134

135-
function transformObjectDestructuringAssignment(
136-
context: TransformationContext,
137-
node: ts.ObjectDestructuringAssignment,
138-
root: lua.Expression
139-
): lua.Statement[] {
140-
return transformObjectLiteralAssignmentPattern(context, node.left, root);
141-
}
142-
143135
function transformObjectLiteralAssignmentPattern(
144136
context: TransformationContext,
145137
node: ts.ObjectLiteralExpression,

‎src/transformation/visitors/identifier.ts‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { transformBuiltinIdentifierExpression } from "../builtins";
44
import { FunctionVisitor, TransformationContext } from "../context";
55
import { isForRangeType } from "../utils/annotations";
66
import { InvalidForRangeCall } from "../utils/errors";
7-
import { createExportedIdentifier, getIdentifierExportScope } from "../utils/export";
7+
import { createExportedIdentifier, getSymbolExportScope } from "../utils/export";
88
import { createSafeName, hasUnsafeIdentifierName } from "../utils/safe-names";
99
import { getIdentifierSymbolId } from "../utils/symbols";
1010
import { findFirstNodeAbove } from "../utils/typescript";
@@ -27,12 +27,16 @@ export function transformIdentifier(context: TransformationContext, identifier:
2727
}
2828

2929
export const transformIdentifierExpression: FunctionVisitor<ts.Identifier> = (node, context) => {
30-
// TODO: Move below to avoid extra transforms?
31-
const identifier = transformIdentifier(context, node);
32-
33-
const exportScope = getIdentifierExportScope(context, identifier);
34-
if (exportScope) {
35-
return createExportedIdentifier(context, identifier, exportScope);
30+
const symbol = context.checker.getSymbolAtLocation(node);
31+
if (symbol) {
32+
const exportScope = getSymbolExportScope(context, symbol);
33+
if (exportScope) {
34+
const name = symbol.name;
35+
const text = hasUnsafeIdentifierName(context, node) ? createSafeName(name) : name;
36+
const symbolId = getIdentifierSymbolId(context, node);
37+
const identifier = lua.createIdentifier(text, node, symbolId, name);
38+
return createExportedIdentifier(context, identifier, exportScope);
39+
}
3640
}
3741

3842
if (node.originalKeywordKind === ts.SyntaxKind.UndefinedKeyword) {
@@ -44,5 +48,5 @@ export const transformIdentifierExpression: FunctionVisitor<ts.Identifier> = (no
4448
return builtinResult;
4549
}
4650

47-
return identifier;
51+
return transformIdentifier(context, node);
4852
};

‎src/transformation/visitors/literal.ts‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,16 @@ export function createShorthandIdentifier(
6060
return identifier;
6161
}
6262

63+
const transformNumericLiteralExpression: FunctionVisitor<ts.NumericLiteral> = expression => {
64+
if (expression.text === "Infinity") {
65+
const math = lua.createIdentifier("math");
66+
const huge = lua.createStringLiteral("huge");
67+
return lua.createTableIndexExpression(math, huge, expression);
68+
}
69+
70+
return lua.createNumericLiteral(Number(expression.text), expression);
71+
};
72+
6373
const transformObjectLiteralExpression: FunctionVisitor<ts.ObjectLiteralExpression> = (expression, context) => {
6474
let properties: lua.TableFieldExpression[] = [];
6575
const tableExpressions: lua.Expression[] = [];
@@ -142,7 +152,7 @@ export const literalVisitors: Visitors = {
142152
[ts.SyntaxKind.NullKeyword]: node => lua.createNilLiteral(node),
143153
[ts.SyntaxKind.TrueKeyword]: node => lua.createBooleanLiteral(true, node),
144154
[ts.SyntaxKind.FalseKeyword]: node => lua.createBooleanLiteral(false, node),
145-
[ts.SyntaxKind.NumericLiteral]: node => lua.createNumericLiteral(Number(node.text), node),
155+
[ts.SyntaxKind.NumericLiteral]: transformNumericLiteralExpression,
146156
[ts.SyntaxKind.StringLiteral]: node => lua.createStringLiteral(node.text, node),
147157
[ts.SyntaxKind.NoSubstitutionTemplateLiteral]: node => lua.createStringLiteral(node.text, node),
148158
[ts.SyntaxKind.ObjectLiteralExpression]: transformObjectLiteralExpression,

‎src/transformation/visitors/loops/for-in.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { FunctionVisitor } from "../../context";
44
import { ForbiddenForIn, UnsupportedForInVariable } from "../../utils/errors";
55
import { isArrayType } from "../../utils/typescript";
66
import { transformIdentifier } from "../identifier";
7+
import { transformAssignment } from "../binary-expression/assignments";
78
import { getVariableDeclarationBinding, transformLoopBody } from "./utils";
89

910
export const transformForInStatement: FunctionVisitor<ts.ForInStatement> = (statement, context) => {
@@ -33,11 +34,14 @@ export const transformForInStatement: FunctionVisitor<ts.ForInStatement> = (stat
3334
// Iteration variable becomes ____key
3435
iterationVariable = lua.createIdentifier("____key");
3536
// Push variable = ____key to the start of the loop body to match TS scoping
36-
const initializer = lua.createAssignmentStatement(
37-
transformIdentifier(context, statement.initializer),
38-
iterationVariable
37+
const assignment = transformAssignment(
38+
context,
39+
statement.initializer,
40+
iterationVariable,
41+
statement.initializer
3942
);
40-
body.statements.unshift(initializer);
43+
44+
body.statements.unshift(...assignment);
4145
} else {
4246
// This should never occur
4347
throw UnsupportedForInVariable(statement.initializer);

‎src/transformation/visitors/loops/for-of.ts‎

Lines changed: 11 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
import * as ts from "typescript";
22
import * as lua from "../../../LuaAST";
3-
import { cast, castEach } from "../../../utils";
3+
import { castEach } from "../../../utils";
44
import { FunctionVisitor, TransformationContext } from "../../context";
55
import { AnnotationKind, getTypeAnnotations, isForRangeType, isLuaIteratorType } from "../../utils/annotations";
6-
import {
7-
InvalidForRangeCall,
8-
MissingForOfVariables,
9-
UnsupportedNonDestructuringLuaIterator,
10-
UnsupportedObjectDestructuringInForOf,
11-
} from "../../utils/errors";
12-
import { createUnpackCall } from "../../utils/lua-ast";
6+
import { InvalidForRangeCall, MissingForOfVariables, UnsupportedNonDestructuringLuaIterator } from "../../utils/errors";
137
import { LuaLibFeature, transformLuaLibFunction } from "../../utils/lualib";
14-
import { isArrayType, isNumberType } from "../../utils/typescript";
8+
import { isArrayType, isNumberType, isAssignmentPattern } from "../../utils/typescript";
159
import { transformArguments } from "../call";
1610
import { transformIdentifier } from "../identifier";
1711
import {
@@ -20,6 +14,8 @@ import {
2014
transformVariableDeclaration,
2115
} from "../variable-declaration";
2216
import { getVariableDeclarationBinding, transformLoopBody } from "./utils";
17+
import { transformAssignment } from "../binary-expression/assignments";
18+
import { transformAssignmentPattern } from "../binary-expression/destructuring-assignments";
2319

2420
function transformForOfInitializer(
2521
context: TransformationContext,
@@ -29,15 +25,8 @@ function transformForOfInitializer(
2925
if (ts.isVariableDeclarationList(initializer)) {
3026
const binding = getVariableDeclarationBinding(initializer);
3127
// Declaration of new variable
32-
if (ts.isArrayBindingPattern(binding)) {
33-
if (binding.elements.length === 0) {
34-
// Ignore empty destructuring assignment
35-
return [];
36-
}
37-
28+
if (ts.isArrayBindingPattern(binding) || ts.isObjectBindingPattern(binding)) {
3829
return transformBindingPattern(context, binding, expression);
39-
} else if (ts.isObjectBindingPattern(binding)) {
40-
throw UnsupportedObjectDestructuringInForOf(initializer);
4130
}
4231

4332
const variableStatements = transformVariableDeclaration(context, initializer.declarations[0]);
@@ -53,27 +42,13 @@ function transformForOfInitializer(
5342
throw MissingForOfVariables(initializer);
5443
}
5544
} else {
56-
// Assignment to existing variable
57-
let variables: lua.AssignmentLeftHandSideExpression | lua.AssignmentLeftHandSideExpression[];
58-
let valueExpression: lua.Expression = expression;
59-
if (ts.isArrayLiteralExpression(initializer)) {
60-
if (initializer.elements.length > 0) {
61-
valueExpression = createUnpackCall(context, expression, initializer);
62-
variables = castEach(
63-
initializer.elements.map(e => context.transformExpression(e)),
64-
lua.isAssignmentLeftHandSideExpression
65-
);
66-
} else {
67-
// Ignore empty destructring assignment
68-
return [];
69-
}
70-
} else if (ts.isObjectLiteralExpression(initializer)) {
71-
throw UnsupportedObjectDestructuringInForOf(initializer);
72-
} else {
73-
variables = cast(context.transformExpression(initializer), lua.isAssignmentLeftHandSideExpression);
45+
// Assignment to existing variable(s)
46+
47+
if (isAssignmentPattern(initializer)) {
48+
return transformAssignmentPattern(context, initializer, expression);
7449
}
7550

76-
return [lua.createAssignmentStatement(variables, valueExpression)];
51+
return transformAssignment(context, initializer, expression);
7752
}
7853
}
7954

‎test/unit/builtins/numbers.spec.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,7 @@ test("number intersected method", () => {
7474
return ({ normalize: () => 3 } as Vector).normalize();
7575
`.expectToMatchJsResult();
7676
});
77+
78+
test("numbers overflowing the float limit become math.huge", () => {
79+
util.testExpression`1e309`.expectToMatchJsResult();
80+
});

‎test/unit/destructuring.spec.ts‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,34 @@ test.each(["[]", "{}"])("empty binding pattern", bindingPattern => {
9696
`.expectToMatchJsResult();
9797
});
9898

99+
// TODO: https://github.com/microsoft/TypeScript/pull/35906
100+
// Adjust this test to use expectToMatchJsResult() and testCases when this issue is fixed.
101+
test.each([
102+
["foo", "['bar']"],
103+
["[foo]", "[['bar']]"],
104+
["[foo = 'bar']", "[[]]"],
105+
["{ foo }", "[{ foo: 'bar' }]"],
106+
["{ x: foo }", "[{ x: 'bar' }]"],
107+
["{ foo = 'bar' }", "[{}] as { foo?: string }[]"],
108+
])("forof assignment updates dependencies", (initializer, expression) => {
109+
util.testModule`
110+
let foo = '';
111+
export { foo };
112+
for (${initializer} of ${expression}) {}
113+
`
114+
.setReturnExport("foo")
115+
.expectToEqual("bar");
116+
});
117+
118+
test.each(testCases)("forof variable declaration binding patterns (%p)", ({ binding, value }) => {
119+
util.testFunction`
120+
let ${allBindings};
121+
for (const ${binding} of [${value} as any]) {
122+
return { ${allBindings} };
123+
}
124+
`.expectToMatchJsResult();
125+
});
126+
99127
describe("array destructuring optimization", () => {
100128
// TODO: Try to generalize optimization logic between declaration and assignment and make more generic tests
101129

‎test/unit/loops.spec.ts‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
import * as ts from "typescript";
22
import * as tstl from "../../src";
3-
import {
4-
ForbiddenForIn,
5-
UnsupportedForTarget,
6-
UnsupportedObjectDestructuringInForOf,
7-
} from "../../src/transformation/utils/errors";
3+
import { ForbiddenForIn, UnsupportedForTarget } from "../../src/transformation/utils/errors";
84
import * as util from "../util";
95

106
test("while", () => {
@@ -428,22 +424,6 @@ test("forof array which modifies length", () => {
428424
`.expectToMatchJsResult();
429425
});
430426

431-
test.each([
432-
{ initializer: "const {a, b}", vars: "" },
433-
{ initializer: "const {a: x, b: y}", vars: "" },
434-
{ initializer: "{a, b}", vars: "let a: string, b: string;" },
435-
{ initializer: "{a: c, b: d}", vars: "let c: string, d: string;" },
436-
])("forof object destructuring (%p)", ({ initializer, vars }) => {
437-
const code = `
438-
declare const arr: {a: string, b: string}[];
439-
${vars}
440-
for (${initializer} of arr) {}`;
441-
442-
expect(() => util.transpileString(code)).toThrow(
443-
UnsupportedObjectDestructuringInForOf(ts.createEmptyStatement()).message
444-
);
445-
});
446-
447427
test("forof nested destructuring", () => {
448428
util.testFunction`
449429
let result = 0;

0 commit comments

Comments
 (0)