Skip to content

Fix for export detection of shadowed names #387

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
tomblind merged 1 commit into from
Feb 9, 2019
+46 −19
Merged

Fix for export detection of shadowed names #387

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
52 changes: 34 additions & 18 deletions src/LuaTransformer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3170,25 +3170,41 @@ export class LuaTransformer {
}

public transformIdentifierExpression(expression: ts.Identifier): tstl.IdentifierOrTableIndexExpression {
if (this.isIdentifierExported(expression.escapedText)) {
return this.createExportedIdentifier(this.transformIdentifier(expression));
const identifier = this.transformIdentifier(expression);
if (this.isIdentifierExported(identifier)) {
return this.createExportedIdentifier(identifier);
}
return this.transformIdentifier(expression);
return identifier;
}

public isIdentifierExported(identifierName: string | ts.__String): boolean {
public isIdentifierExported(identifier: tstl.Identifier): boolean {
if (!this.isModule && !this.currentNamespace) {
return false;
}

const symbolInfo = identifier.symbolId && this.symbolInfo.get(identifier.symbolId);
if (!symbolInfo) {
return false;
}

const currentScope = this.currentNamespace ? this.currentNamespace : this.currentSourceFile;
const scopeSymbol = this.checker.getSymbolAtLocation(currentScope)
? this.checker.getSymbolAtLocation(currentScope)
: this.checker.getTypeAtLocation(currentScope).getSymbol();
return scopeSymbol.exports.has(identifierName as ts.__String);

const it: Iterable<ts.Symbol> = {
[Symbol.iterator]: () => scopeSymbol.exports.values(), // Why isn't ts.SymbolTable.values() iterable?
};
for (const symbol of it) {
if (symbol === symbolInfo.symbol) {
return true;
}
}
return false;
}

public addExportToIdentifier(identifier: tstl.Identifier): tstl.IdentifierOrTableIndexExpression {
if (this.isIdentifierExported(identifier.text)) {
if (this.isIdentifierExported(identifier)) {
return this.createExportedIdentifier(identifier);
}
return identifier;
Expand Down Expand Up @@ -3292,9 +3308,9 @@ export class LuaTransformer {
return false;
}
if (Array.isArray(identifier)) {
return identifier.some(i => this.isIdentifierExported(i.text));
return identifier.some(i => this.isIdentifierExported(i));
} else {
return this.isIdentifierExported(identifier.text);
return this.isIdentifierExported(identifier);
}
}

Expand Down Expand Up @@ -3481,6 +3497,16 @@ export class LuaTransformer {
const symbol = this.checker.getSymbolAtLocation(identifier);
let symbolId: number | undefined;
if (symbol) {
// Track first time symbols are seen
if (!this.symbolIds.has(symbol)) {
symbolId = this.genSymbolIdCounter++;
const symbolInfo: SymbolInfo = {symbol, firstSeenAtPos: identifier.pos};
this.symbolIds.set(symbol, symbolId);
this.symbolInfo.set(symbolId, symbolInfo);
} else {
symbolId = this.symbolIds.get(symbol);
}

if (this.options.noHoisting) {
// Check for reference-before-declaration
const declaration = tsHelper.getFirstDeclaration(symbol, this.currentSourceFile);
Expand All @@ -3489,16 +3515,6 @@ export class LuaTransformer {
}

} else {
// Track first time symbols are seen
if (!this.symbolIds.has(symbol)) {
symbolId = this.genSymbolIdCounter++;
const symbolInfo: SymbolInfo = {symbol, firstSeenAtPos: identifier.pos};
this.symbolIds.set(symbol, symbolId);
this.symbolInfo.set(symbolId, symbolInfo);
} else {
symbolId = this.symbolIds.get(symbol);
}

//Mark symbol as seen in all current scopes
this.scopeStack.forEach(s => {
if (!s.referencedSymbols) { s.referencedSymbols = new Set(); }
Expand Down
13 changes: 12 additions & 1 deletion test/unit/functions.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Expect, Test, TestCase, FocusTest } from "alsatian";
import { Expect, Test, TestCase } from "alsatian";

import * as ts from "typescript";
import * as util from "../src/util";
Expand Down Expand Up @@ -388,4 +388,15 @@ export class FunctionTests {
const result = util.transpileAndExecute(code);
Expect(result).toBe("foobar");
}

@Test("Function local overriding export")
public functionLocalOverridingExport(): void {
const code =
`export const foo = 5;
function bar(foo: number) {
return foo;
}
export const result = bar(7);`;
Expect(util.transpileExecuteAndReturnExport(code, "result")).toBe(7);
}
}