Skip to content

Fix compileMembersOnly ignoring preceding variable path #662

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 1 commit into from
Jul 14, 2019
Merged

Fix compileMembersOnly ignoring preceding variable path #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 26 additions & 5 deletions src/LuaTransformer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1675,16 +1675,27 @@ export class LuaTransformer {
for (const enumMember of this.computeEnumMembers(enumDeclaration)) {
const memberName = this.transformPropertyName(enumMember.name);
if (membersOnly) {
const enumSymbol = this.checker.getSymbolAtLocation(enumDeclaration.name);
const exportScope = enumSymbol ? this.getSymbolExportScope(enumSymbol) : undefined;

if (tstl.isIdentifier(memberName)) {
result.push(
...this.createLocalOrExportedOrGlobalDeclaration(memberName, enumMember.value, enumDeclaration)
...this.createLocalOrExportedOrGlobalDeclaration(
memberName,
enumMember.value,
enumDeclaration,
undefined,
exportScope
)
);
} else {
result.push(
...this.createLocalOrExportedOrGlobalDeclaration(
tstl.createIdentifier(enumMember.name.getText(), enumMember.name),
enumMember.value,
enumDeclaration
enumDeclaration,
undefined,
exportScope
)
);
}
Expand Down Expand Up @@ -4087,7 +4098,16 @@ export class LuaTransformer {
const decorators = tsHelper.getCustomDecorators(type, this.checker);
// Do not output path for member only enums
if (decorators.has(DecoratorKind.CompileMembersOnly)) {
return tstl.createIdentifier(property, expression);
if (ts.isPropertyAccessExpression(expression.expression)) {
// in case of ...x.enum.y transform to ...x.y
return tstl.createTableIndexExpression(
this.transformExpression(expression.expression.expression),
tstl.createStringLiteral(property),
expression
);
} else {
return tstl.createIdentifier(property, expression);
}
}

if (decorators.has(DecoratorKind.LuaTable)) {
Expand Down Expand Up @@ -5161,7 +5181,8 @@ export class LuaTransformer {
lhs: tstl.Identifier | tstl.Identifier[],
rhs?: tstl.Expression | tstl.Expression[],
tsOriginal?: ts.Node,
parent?: tstl.Node
parent?: tstl.Node,
overrideExportScope?: ts.SourceFile | ts.ModuleDeclaration
): tstl.Statement[] {
let declaration: tstl.VariableDeclarationStatement | undefined;
let assignment: tstl.AssignmentStatement | undefined;
Expand All @@ -5173,7 +5194,7 @@ export class LuaTransformer {
return [];
}

const exportScope = this.getIdentifierExportScope(identifiers[0]);
const exportScope = overrideExportScope || this.getIdentifierExportScope(identifiers[0]);
if (exportScope) {
// exported
if (!rhs) {
Expand Down
17 changes: 17 additions & 0 deletions test/unit/lualib/lualib.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,3 +150,20 @@ test("lualibs should not include tstl header", () => {

expect(util.transpileString(code)).not.toMatch("Generated with");
});

test("compileMembersOnly in namespace", () => {
const header = `
namespace wifi {
/** @compileMembersOnly */
export enum WifiMode {
NULLMODE = 0,
STATION = 1,
SOFTAP = 2
}
}`;
const code = `
return wifi.WifiMode.STATION;
`;

expect(util.transpileAndExecute(code, undefined, undefined, header)).toBe(1);
});