Skip to content

Fix default exports reference bug #830

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 4 commits into from
Feb 27, 2020
+33 −8
Merged

Fix default exports reference bug #830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6dab5f7
Use escaped symbol names to reference default exports
hazzard993 Feb 25, 2020
d34e387
Update src/transformation/visitors/identifier.ts
hazzard993 Feb 25, 2020
f3d5018
Move logic to transformIdentifierExpression
hazzard993 Feb 26, 2020
0e56c3b
Use extra if in identifier expression
hazzard993 Feb 26, 2020
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
20 changes: 12 additions & 8 deletions src/transformation/visitors/identifier.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { transformBuiltinIdentifierExpression } from "../builtins";
import { FunctionVisitor, TransformationContext } from "../context";
import { isForRangeType } from "../utils/annotations";
import { InvalidForRangeCall } from "../utils/errors";
import { createExportedIdentifier, getIdentifierExportScope } from "../utils/export";
import { createExportedIdentifier, getSymbolExportScope } from "../utils/export";
import { createSafeName, hasUnsafeIdentifierName } from "../utils/safe-names";
import { getIdentifierSymbolId } from "../utils/symbols";
import { findFirstNodeAbove } from "../utils/typescript";
Expand All @@ -27,12 +27,16 @@ export function transformIdentifier(context: TransformationContext, identifier:
}

export const transformIdentifierExpression: FunctionVisitor<ts.Identifier> = (node, context) => {
// TODO: Move below to avoid extra transforms?
const identifier = transformIdentifier(context, node);

const exportScope = getIdentifierExportScope(context, identifier);
if (exportScope) {
return createExportedIdentifier(context, identifier, exportScope);
const symbol = context.checker.getSymbolAtLocation(node);
if (symbol) {
const exportScope = getSymbolExportScope(context, symbol);
if (exportScope) {
const name = symbol.name;
const text = hasUnsafeIdentifierName(context, node) ? createSafeName(name) : name;
const symbolId = getIdentifierSymbolId(context, node);
const identifier = lua.createIdentifier(text, node, symbolId, name);
return createExportedIdentifier(context, identifier, exportScope);
}
}

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

return identifier;
return transformIdentifier(context, node);
};
21 changes: 21 additions & 0 deletions test/unit/modules/modules.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,3 +272,24 @@ test("export dependency modified in for in loop", () => {
.setReturnExport("bar")
.expectToEqual("x");
});

test("export default class with future reference", () => {
util.testModule`
export default class Default {}
const d = new Default();
export const result = d.constructor.name;
`
.setReturnExport("result")
.expectToMatchJsResult();
});

test("export default function with future reference", () => {
util.testModule`
export default function defaultFunction() {
return true;
}
export const result = defaultFunction();
`
.setReturnExport("result")
.expectToMatchJsResult();
});