From 95ac23802635d4ab9f954ab0277f1903833aafca Mon Sep 17 00:00:00 2001 From: Chester Husk III Date: Sat, 19 Nov 2016 01:51:14 -0600 Subject: [PATCH] [Typescript] Add Error to the list of reserved words that must be escaped (#4203) * Add Error to the list of reserved words that must be escaped for Class-generation This fixes a part of #2456. * add in special casing for the model names to not clobber existing language type names * address formatting issues to be in line with language convention --- .../languages/AbstractTypeScriptClientCodegen.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java index 71f7d32c5eb2..9322af82e95b 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java @@ -55,7 +55,8 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp "Array", "Date", "number", - "any" + "any", + "Error" )); instantiationTypes.put("array", "Array"); @@ -174,6 +175,11 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp return modelName; } + if (languageSpecificPrimitives.contains(name)) { + String modelName = camelize("model_" + name); + LOGGER.warn(name + " (model name matches existing language type) cannot be used as a model name. Renamed to " + modelName); + return modelName; + } // camelize the model name // phone_number => PhoneNumber return camelize(name);