[typescript] Apply nameMappings and parameterNameMappings before sanitizing

TypeScriptClientCodegen.toVarName and toParamName sanitized the name before
calling the parent method, so the mapping lookup in
AbstractTypeScriptClientCodegen saw the sanitized name ("id" instead of
"$id") and never matched. Look the original name up first, as the parent
class does.

Author: ndbroadbent

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

@@ -269,6 +269,11 @@ private String getReturnType(List<CodegenResponse> responses) {
 
     @Override
     public String toParamName(String name) {
+        // obtain the name from parameterNameMapping directly if provided (before sanitizing, which would change the key)
+        if (parameterNameMapping.containsKey(name)) {
+            return parameterNameMapping.get(name);
+        }
+
         // sanitize name
         name = sanitizeName(name);
 
@@ -286,6 +291,11 @@ public String toParamName(String name) {
 
     @Override
     public String toVarName(String name) {
+        // obtain the name from nameMapping directly if provided (before sanitizing, which would change the key)
+        if (nameMapping.containsKey(name)) {
+            return nameMapping.get(name);
+        }
+
         // sanitize name
         name = sanitizeName(name);
 

modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/TypeScriptClientCodegenTest.java

@@ -146,6 +146,19 @@ public void modelImportWithMappingTest() {
         Assert.assertEquals(tsImports.get(0).get("classname"), "ApiResponse");
     }
 
+    @Test
+    public void testNameMappingsUseTheOriginalName() {
+        final TypeScriptClientCodegen codegen = new TypeScriptClientCodegen();
+        codegen.nameMapping().put("$id", "schemaId");
+        codegen.parameterNameMapping().put("$filter", "filterExpression");
+
+        // sanitizing turns "$id" into "id", so the mapping has to be looked up first
+        Assert.assertEquals(codegen.toVarName("$id"), "schemaId");
+        Assert.assertEquals(codegen.toVarName("id"), "id");
+        Assert.assertEquals(codegen.toParamName("$filter"), "filterExpression");
+        Assert.assertEquals(codegen.toParamName("filter"), "filter");
+    }
+
     @Test
     public void testCompilePattern() {
         final DefaultCodegen codegen = new TypeScriptClientCodegen();