Support special characters in module names (#428)

thatcosmonaut · Perryvw · commit b5dd8ef5ef2e · 2019-02-20T21:12:02.000+01:00
* transform to underscore when using module with kebab case

* support replacement of other special characters

* newline endings
diff --git a/src/LuaTransformer.ts b/src/LuaTransformer.ts
@@ -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)))),
diff --git a/test/translation/lua/modulesImportNamedSpecialChars.lua b/test/translation/lua/modulesImportNamedSpecialChars.lua
@@ -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;
diff --git a/test/translation/lua/modulesImportRenamedSpecialChars.lua b/test/translation/lua/modulesImportRenamedSpecialChars.lua
@@ -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;
diff --git a/test/translation/ts/modulesImportNamedSpecialChars.ts b/test/translation/ts/modulesImportNamedSpecialChars.ts
@@ -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"
diff --git a/test/translation/ts/modulesImportRenamedSpecialChars.ts b/test/translation/ts/modulesImportRenamedSpecialChars.ts
@@ -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"

Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,7 @@ export class LuaTransformer {`
`334`	`334`	`return undefined;`
`335`	`335`	`}`
`336`	`336`
`337`		`- const tstlIdentifier = (name: string) => "__TSTL_" + name;`
	`337`	`+ const tstlIdentifier = (name: string) => "__TSTL_" + name.replace(new RegExp("-\|\\$\| \|#\|'", "g"), "_");`
`338`	`338`	`const importUniqueName = tstl.createIdentifier(tstlIdentifier(path.basename((importPath))));`
`339`	`339`	`const requireStatement = tstl.createVariableDeclarationStatement(`
`340`	`340`	`tstl.createIdentifier(tstlIdentifier(path.basename((importPath)))),`