Merge pull request #77 from asarazan/fix/packageNameDashes

Dashes become underscores in package names, also respects snakeToCamel.

src/martok/Martok.ts

@@ -17,7 +17,7 @@ import { title } from "./NameGenerators";
 import { AsyncLocalStorage } from "async_hooks";
 import { TypeReplacer } from "./processing/TypeReplacer";
 import { processSnakeCase } from "./processing/SnakeCase";
-import { processOldNames } from "./processing/SanitizeNames";
+import { processOldNames, sanitizeName } from "./processing/SanitizeNames";
 import { TypeExpander } from "./processing/TypeExpander";
 import { TsCompiler } from "./TsCompiler";
 
@@ -200,6 +200,8 @@ export class Martok {
         `${file.fileName} is not within the given source root, it can't be included in this project.`
       );
     }
-    return `${this.config.package}${relativePath.replace(/\//g, ".")}`;
+    return sanitizeName(
+      `${this.config.package}${relativePath.replace(/\//g, ".")}`
+    );
   }
 }

src/martok/processing/SanitizeNames.ts

@@ -3,7 +3,7 @@ import Klass = kotlin.Klass;
 import { MartokOutFile } from "../MartokOutFile";
 
 export function sanitizeName(name: string): string {
-  return name.replace(/:/g, "_").replace(/"/g, "");
+  return name.replace(/:/g, "_").replace(/"/g, "").replace(/-/g, "_");
 }
 
 export function processOldNames(files: MartokOutFile[]) {

src/martok/processing/SnakeCase.ts

@@ -5,6 +5,7 @@ import { MartokOutFile } from "../MartokOutFile";
 
 export function processSnakeCase(files: MartokOutFile[]) {
   for (const file of files) {
+    file.pkg = snakeToCamel(file.pkg);
     for (const klass of file.text.declarations) {
       if (!(klass instanceof Klass)) continue;
       processKlass(klass);

src/tests/NameGenerators.spec.ts

@@ -1,12 +1,13 @@
 import { pascalToSnake, snakeToCamel, title } from "../martok/NameGenerators";
+import { sanitizeName } from "../martok/processing/SanitizeNames";
 
 describe("Naming Correctness Tests", () => {
   it("convert snake to camel", () => {
     expect(snakeToCamel("utcDate1")).toBe("utcDate1");
     expect(snakeToCamel("utc_date_1")).toBe("utcDate1");
     expect(snakeToCamel("foo_bar")).toBe("fooBar");
   });
-  it("convert pascale to snake", () => {
+  it("convert pascal to snake", () => {
     expect(pascalToSnake("oneTwo")).toBe("one_two");
     expect(pascalToSnake("OneTwo")).toBe("one_two");
     expect(pascalToSnake("one")).toBe("one");
@@ -17,4 +18,7 @@ describe("Naming Correctness Tests", () => {
     expect(title("foo_bar")).toBe("FooBar");
     expect(title("foo__bar")).toBe("FooBar");
   });
+  it("Sanitize dashes", () => {
+    expect(sanitizeName("foo-bar")).toBe("foo_bar");
+  });
 });