Skip to content

Avoid exporting anonymous identifiers #756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Perryvw merged 5 commits into from
Dec 3, 2019
Merged

Avoid exporting anonymous identifiers #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4ab708e
Avoid exporting anonymous identifiers
hazzard993 Dec 1, 2019
50ece7f
Use existing test for anonymous destructuring
hazzard993 Dec 3, 2019
811a1c0
Remove TODO for issue 32656 with test filter
hazzard993 Dec 3, 2019
ddac23f
Update test/unit/destructuring.spec.ts
hazzard993 Dec 3, 2019
1f3ac33
Update test/unit/destructuring.spec.ts
hazzard993 Dec 3, 2019
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
3 changes: 3 additions & 0 deletions src/LuaAST.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,6 +829,7 @@ export function createMethodCallExpression(

export interface Identifier extends Expression {
kind: SyntaxKind.Identifier;
exportable: boolean;
text: string;
originalName?: string;
symbolId?: SymbolId;
Expand All @@ -846,6 +847,7 @@ export function createIdentifier(
parent?: Node
): Identifier {
const expression = createNode(SyntaxKind.Identifier, tsOriginal, parent) as Identifier;
expression.exportable = true;
expression.text = text;
expression.symbolId = symbolId;
expression.originalName = originalName;
Expand All @@ -858,6 +860,7 @@ export function cloneIdentifier(identifier: Identifier, tsOriginal?: ts.Node): I

export function createAnonymousIdentifier(tsOriginal?: ts.Node, parent?: Node): Identifier {
const expression = createNode(SyntaxKind.Identifier, tsOriginal, parent) as Identifier;
expression.exportable = false;
expression.text = "____";
return expression;
}
Expand Down
4 changes: 4 additions & 0 deletions src/LuaTransformer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5480,6 +5480,10 @@ export class LuaTransformer {
identifier: tstl.Identifier,
exportScope?: ts.SourceFile | ts.ModuleDeclaration
): tstl.AssignmentLeftHandSideExpression {
if (!identifier.exportable) {
return identifier;
}

const exportTable =
exportScope && ts.isModuleDeclaration(exportScope)
? this.createModuleLocalNameIdentifier(exportScope)
Expand Down
15 changes: 5 additions & 10 deletions test/unit/destructuring.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,11 @@ test.each(testCases)("in variable declaration (%p)", ({ binding, value }) => {
`.expectToMatchJsResult();
});

// TODO: https://github.com/TypeScriptToLua/TypeScriptToLua/issues/695
// TODO: https://github.com/microsoft/TypeScript/issues/32656
test.each(testCases.filter(x => x.binding !== "[x, , y]" && x.binding !== "{ x, ...rest }"))(
"in exported variable declaration (%p)",
({ binding, value }) => {
util.testModule`
export const ${binding} = ${value};
`.expectToMatchJsResult();
}
);
test.each(testCases)("in exported variable declaration (%p)", ({ binding, value }) => {
util.testModule`
export const ${binding} = ${value};
`.expectToMatchJsResult();
});

const assignmentTestCases = [
...testCases,
Expand Down