Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions src/LuaTransformer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,14 @@ export class LuaTransformer {
return undefined;
}

const importUniqueName = tstl.createIdentifier(path.basename((importPath)));
const tstlIdentifier = (name: string) => "__TSTL_" + name;
const importUniqueName = tstl.createIdentifier(tstlIdentifier(path.basename((importPath))));
const requireStatement = tstl.createVariableDeclarationStatement(
tstl.createIdentifier(path.basename(importPath)), requireCall, undefined, statement);
tstl.createIdentifier(tstlIdentifier(path.basename((importPath)))),
requireCall,
undefined,
statement
);
result.push(requireStatement);

filteredElements.forEach(importSpecifier => {
Expand Down
4 changes: 2 additions & 2 deletions test/translation/lua/modulesImportNamed.lua
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
local test = require("test");
local TestClass = test.TestClass;
local __TSTL_test = require("test");
local TestClass = __TSTL_test.TestClass;
4 changes: 2 additions & 2 deletions test/translation/lua/modulesImportRenamed.lua
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
local test = require("test");
local RenamedClass = test.TestClass;
local __TSTL_test = require("test");
local RenamedClass = __TSTL_test.TestClass;