loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

add free form object support to ts fetch (#2453)

Browse Source
This commit is contained in:
William Cheng 2019-04-05 07:20:26 +08:00 committed by GitHub
parent d9ae80f76f
commit 9368bea130
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,8 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
"any", "any",
"File", "File",
"Error", "Error",
"Map" "Map",
"object"
)); ));
languageGenericTypes = new HashSet<String>(Arrays.asList( languageGenericTypes = new HashSet<String>(Arrays.asList(
@ -106,7 +107,7 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
typeMapping.put("short", "number"); typeMapping.put("short", "number");
typeMapping.put("char", "string"); typeMapping.put("char", "string");
typeMapping.put("double", "number"); typeMapping.put("double", "number");
typeMapping.put("object", "any"); typeMapping.put("object", "object");
typeMapping.put("integer", "number"); typeMapping.put("integer", "number");
typeMapping.put("Map", "any"); typeMapping.put("Map", "any");
typeMapping.put("map", "any"); typeMapping.put("map", "any");

10
modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache vendored
View File

@ -50,7 +50,12 @@ export function {{classname}}FromJSON(json: any): {{classname}} {
'{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}(json['{{baseName}}'] as Array<any>).map({{#items}}{{datatype}}{{/items}}FromJSON), '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}(json['{{baseName}}'] as Array<any>).map({{#items}}{{datatype}}{{/items}}FromJSON),
{{/isContainer}} {{/isContainer}}
{{^isContainer}} {{^isContainer}}
{{^isFreeFormObject}}
'{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}{{datatype}}FromJSON(json['{{baseName}}']), '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}{{datatype}}FromJSON(json['{{baseName}}']),
{{/isFreeFormObject}}
{{#isFreeFormObject}}
'{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}json['{{baseName}}'],
{{/isFreeFormObject}}
{{/isContainer}} {{/isContainer}}
{{/isPrimitiveType}} {{/isPrimitiveType}}
{{/allVars}} {{/allVars}}
@ -77,7 +82,12 @@ export function {{classname}}ToJSON(value?: {{classname}}): any {
'{{baseName}}': {{^required}}value.{{name}} === undefined ? undefined : {{/required}}(value.{{name}} as Array<any>).map({{#items}}{{datatype}}{{/items}}ToJSON), '{{baseName}}': {{^required}}value.{{name}} === undefined ? undefined : {{/required}}(value.{{name}} as Array<any>).map({{#items}}{{datatype}}{{/items}}ToJSON),
{{/isContainer}} {{/isContainer}}
{{^isContainer}} {{^isContainer}}
{{^isFreeFormObject}}
'{{baseName}}': {{datatype}}ToJSON(value.{{name}}), '{{baseName}}': {{datatype}}ToJSON(value.{{name}}),
{{/isFreeFormObject}}
{{#isFreeFormObject}}
'{{baseName}}': value.{{name}},
{{/isFreeFormObject}}
{{/isContainer}} {{/isContainer}}
{{/isPrimitiveType}} {{/isPrimitiveType}}
{{/isReadOnly}} {{/isReadOnly}}