Skip to content

Commit 3085bf1

Browse files
authored
[typescript] allow $ in var name (#694)
1 parent 58e0946 commit 3085bf1

2 files changed

Lines changed: 20 additions & 2 deletions

File tree

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
package org.openapitools.codegen.languages;
1919

2020
import io.swagger.v3.oas.models.media.ArraySchema;
21-
import io.swagger.v3.oas.models.media.NumberSchema;
2221
import io.swagger.v3.oas.models.media.Schema;
2322
import io.swagger.v3.oas.models.parameters.Parameter;
2423
import org.apache.commons.lang3.StringUtils;
@@ -157,7 +156,7 @@ public String toParamName(String name) {
157156
@Override
158157
public String toVarName(String name) {
159158
// sanitize name
160-
name = sanitizeName(name);
159+
name = sanitizeName(name, "\\W-[\\$]");
161160

162161
if ("_".equals(name)) {
163162
name = "_u";
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package org.openapitools.codegen.typescript.typescriptnode;
2+
3+
import org.openapitools.codegen.languages.TypeScriptNodeClientCodegen;
4+
import org.testng.Assert;
5+
import org.testng.annotations.Test;
6+
7+
public class TypeScriptNodeClientCodegenTest {
8+
9+
@Test
10+
public void convertVarName() throws Exception {
11+
TypeScriptNodeClientCodegen codegen = new TypeScriptNodeClientCodegen();
12+
Assert.assertEquals(codegen.toVarName("name"), "name");
13+
Assert.assertEquals(codegen.toVarName("$name"), "$name");
14+
Assert.assertEquals(codegen.toVarName("nam$$e"), "nam$$e");
15+
Assert.assertEquals(codegen.toVarName("user-name"), "userName");
16+
Assert.assertEquals(codegen.toVarName("user_name"), "userName");
17+
Assert.assertEquals(codegen.toVarName("user|name"), "userName");
18+
}
19+
}

0 commit comments

Comments
 (0)