[typescript] allow $ in var name (OpenAPITools#694)

ihsmarkitoss · Jul 31, 2018 · 6bec88a · 6bec88a
1 parent c842f5b
commit 6bec88a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/...tor/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java b/...tor/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java
@@ -18,7 +18,6 @@
 package org.openapitools.codegen.languages;
 
 import io.swagger.v3.oas.models.media.ArraySchema;
-import io.swagger.v3.oas.models.media.NumberSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.parameters.Parameter;
 import org.apache.commons.lang3.StringUtils;
@@ -157,7 +156,7 @@ public String toParamName(String name) {
     @Override
     public String toVarName(String name) {
         // sanitize name
-        name = sanitizeName(name);
+        name = sanitizeName(name, "\\W-[\\$]");
 
         if ("_".equals(name)) {
             name = "_u";

diff --git a/...a/org/openapitools/codegen/typescript/typescriptnode/TypeScriptNodeClientCodegenTest.java b/...a/org/openapitools/codegen/typescript/typescriptnode/TypeScriptNodeClientCodegenTest.java
@@ -0,0 +1,19 @@
+package org.openapitools.codegen.typescript.typescriptnode;
+
+import org.openapitools.codegen.languages.TypeScriptNodeClientCodegen;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class TypeScriptNodeClientCodegenTest {
+
+    @Test
+    public void convertVarName() throws Exception {
+       TypeScriptNodeClientCodegen codegen = new TypeScriptNodeClientCodegen();
+       Assert.assertEquals(codegen.toVarName("name"), "name");
+       Assert.assertEquals(codegen.toVarName("$name"), "$name");
+       Assert.assertEquals(codegen.toVarName("nam$$e"), "nam$$e");
+       Assert.assertEquals(codegen.toVarName("user-name"), "userName");
+       Assert.assertEquals(codegen.toVarName("user_name"), "userName");
+       Assert.assertEquals(codegen.toVarName("user|name"), "userName");
+   }
+}