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
2 changes: 1 addition & 1 deletion src/LuaTransformer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ export class LuaTransformer {
return undefined;
}

const tstlIdentifier = (name: string) => "__TSTL_" + name;
const tstlIdentifier = (name: string) => "__TSTL_" + name.replace(new RegExp("-|\\$| |#|'", "g"), "_");
const importUniqueName = tstl.createIdentifier(tstlIdentifier(path.basename((importPath))));
const requireStatement = tstl.createVariableDeclarationStatement(
tstl.createIdentifier(tstlIdentifier(path.basename((importPath)))),
Expand Down
10 changes: 10 additions & 0 deletions test/translation/lua/modulesImportNamedSpecialChars.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
local __TSTL_kebab_module = require("kebab-module");
local TestClass = __TSTL_kebab_module.TestClass;
local __TSTL_dollar_module = require("dollar$module");
local TestClass = __TSTL_dollar_module.TestClass;
local __TSTL_singlequote_module = require("singlequote'module");
local TestClass = __TSTL_singlequote_module.TestClass;
local __TSTL_hash_module = require("hash#module");
local TestClass = __TSTL_hash_module.TestClass;
local __TSTL_space_module = require("space module");
local TestClass = __TSTL_space_module.TestClass;
10 changes: 10 additions & 0 deletions test/translation/lua/modulesImportRenamedSpecialChars.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
local __TSTL_kebab_module = require("kebab-module");
local RenamedClass = __TSTL_kebab_module.TestClass;
local __TSTL_dollar_module = require("dollar$module");
local RenamedClass = __TSTL_dollar_module.TestClass;
local __TSTL_singlequote_module = require("singlequote'module");
local RenamedClass = __TSTL_singlequote_module.TestClass;
local __TSTL_hash_module = require("hash#module");
local RenamedClass = __TSTL_hash_module.TestClass;
local __TSTL_space_module = require("space module");
local RenamedClass = __TSTL_space_module.TestClass;
5 changes: 5 additions & 0 deletions test/translation/ts/modulesImportNamedSpecialChars.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import {TestClass} from "kebab-module"
import {TestClass} from "dollar$module"
import {TestClass} from "singlequote'module"
import {TestClass} from "hash#module"
import {TestClass} from "space module"
5 changes: 5 additions & 0 deletions test/translation/ts/modulesImportRenamedSpecialChars.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import {TestClass as RenamedClass} from "kebab-module"
import {TestClass as RenamedClass} from "dollar$module"
import {TestClass as RenamedClass} from "singlequote'module"
import {TestClass as RenamedClass} from "hash#module"
import {TestClass as RenamedClass} from "space module"