diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptJqueryClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptJqueryClientCodegen.java index 701f764191e..63b8db40f8f 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptJqueryClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptJqueryClientCodegen.java @@ -72,6 +72,12 @@ public class TypeScriptJqueryClientCodegen extends AbstractTypeScriptClientCodeg @Override public String getSwaggerType(Property p) { String swaggerType = super.getSwaggerType(p); + if (p instanceof StringProperty) { + StringProperty sp = (StringProperty) p; + if (sp.getEnum() != null) { + return swaggerType; + } + } if (isLanguagePrimitive(swaggerType) || isLanguageGenericType(swaggerType)) { return swaggerType; } @@ -108,7 +114,10 @@ public class TypeScriptJqueryClientCodegen extends AbstractTypeScriptClientCodeg @Override public void postProcessParameter(CodegenParameter parameter) { super.postProcessParameter(parameter); - parameter.dataType = addModelPrefix(parameter.dataType); + + if (!parameter.isEnum) { + parameter.dataType = addModelPrefix(parameter.dataType); + } } private void addNpmPackageGeneration() { diff --git a/samples/client/petstore/typescript-jquery/default/.swagger-codegen/VERSION b/samples/client/petstore/typescript-jquery/default/.swagger-codegen/VERSION index a6254504e40..855ff9501eb 100644 --- a/samples/client/petstore/typescript-jquery/default/.swagger-codegen/VERSION +++ b/samples/client/petstore/typescript-jquery/default/.swagger-codegen/VERSION @@ -1 +1 @@ -2.3.1 \ No newline at end of file +2.4.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-jquery/npm/.swagger-codegen/VERSION b/samples/client/petstore/typescript-jquery/npm/.swagger-codegen/VERSION index a6254504e40..855ff9501eb 100644 --- a/samples/client/petstore/typescript-jquery/npm/.swagger-codegen/VERSION +++ b/samples/client/petstore/typescript-jquery/npm/.swagger-codegen/VERSION @@ -1 +1 @@ -2.3.1 \ No newline at end of file +2.4.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-jquery/npm/README.md b/samples/client/petstore/typescript-jquery/npm/README.md index 112a6835205..6b1105e1d49 100644 --- a/samples/client/petstore/typescript-jquery/npm/README.md +++ b/samples/client/petstore/typescript-jquery/npm/README.md @@ -1,4 +1,4 @@ -## @swagger/angular2-typescript-petstore@0.0.1 +## @swagger/jquery-typescript-petstore@0.0.1 This generator creates TypeScript/JavaScript client that utilizes [jQuery](https://jquery.com/). The generated Node module can be used in the following environments: @@ -36,7 +36,7 @@ navigate to the folder of your consuming project and run one of the following co _published:_ ``` -npm install @swagger/angular2-typescript-petstore@0.0.1 --save +npm install @swagger/jquery-typescript-petstore@0.0.1 --save ``` _unPublished (not recommended):_ diff --git a/samples/client/petstore/typescript-jquery/npm/package.json b/samples/client/petstore/typescript-jquery/npm/package.json index e55912ffa06..2e3360574b8 100644 --- a/samples/client/petstore/typescript-jquery/npm/package.json +++ b/samples/client/petstore/typescript-jquery/npm/package.json @@ -1,7 +1,7 @@ { - "name": "@swagger/angular2-typescript-petstore", + "name": "@swagger/jquery-typescript-petstore", "version": "0.0.1", - "description": "JQuery client for @swagger/angular2-typescript-petstore", + "description": "JQuery client for @swagger/jquery-typescript-petstore", "main": "api.js", "scripts": { "build": "tsc"