Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TS][Fetch] Add support for openapi maps/dictionaries to be generated as typescript map #2913

Merged
merged 2 commits into from
May 20, 2019
Merged

[TS][Fetch] Add support for openapi maps/dictionaries to be generated as typescript map #2913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a2be88
Add openapi dictionary/map support to typescript-fetch client generator
ehvattum May 16, 2019
2454ade
Run typescript-fetch generator scripts and update output files
ehvattum May 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 19 additions & 9 deletions modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
{{#hasImports}}
import {
{{#imports}}
Expand Down Expand Up @@ -46,17 +46,22 @@ export function {{classname}}FromJSON(json: any): {{classname}} {
{{/isDate}}
{{/isPrimitiveType}}
{{^isPrimitiveType}}
{{#isContainer}}
{{#isListContainer}}
'{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}(json['{{baseName}}'] as Array<any>).map({{#items}}{{datatype}}{{/items}}FromJSON),
{{/isContainer}}
{{^isContainer}}
{{/isListContainer}}
{{#isMapContainer}}
'{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}mapValues(json['{{baseName}}'], {{#items}}{{datatype}}{{/items}}FromJSON),
{{/isMapContainer}}
{{^isListContainer}}
{{^isMapContainer}}
{{^isFreeFormObject}}
'{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}{{datatype}}FromJSON(json['{{baseName}}']),
{{/isFreeFormObject}}
{{#isFreeFormObject}}
'{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}json['{{baseName}}'],
{{/isFreeFormObject}}
{{/isContainer}}
{{/isMapContainer}}
{{/isListContainer}}
{{/isPrimitiveType}}
{{/allVars}}
};
Expand All @@ -78,17 +83,22 @@ export function {{classname}}ToJSON(value?: {{classname}}): any {
'{{baseName}}': {{#isDate}}{{^required}}value.{{name}} === undefined ? undefined : {{/required}}value.{{name}}.toISOString().substr(0,10){{/isDate}}{{#isDateTime}}{{^required}}value.{{name}} === undefined ? undefined : {{/required}}value.{{name}}.toISOString(){{/isDateTime}}{{^isDate}}{{^isDateTime}}value.{{name}}{{/isDateTime}}{{/isDate}},
{{/isPrimitiveType}}
{{^isPrimitiveType}}
{{#isContainer}}
{{#isListContainer}}
'{{baseName}}': {{^required}}value.{{name}} === undefined ? undefined : {{/required}}(value.{{name}} as Array<any>).map({{#items}}{{datatype}}{{/items}}ToJSON),
{{/isContainer}}
{{^isContainer}}
{{/isListContainer}}
{{#isMapContainer}}
'{{baseName}}': {{^required}}value.{{name}} === undefined ? undefined : {{/required}}mapValues(value.{{name}}, {{#items}}{{datatype}}{{/items}}ToJSON),
{{/isMapContainer}}
{{^isListContainer}}
{{^isMapContainer}}
{{^isFreeFormObject}}
'{{baseName}}': {{datatype}}ToJSON(value.{{name}}),
{{/isFreeFormObject}}
{{#isFreeFormObject}}
'{{baseName}}': value.{{name}},
{{/isFreeFormObject}}
{{/isContainer}}
{{/isMapContainer}}
{{/isListContainer}}
{{/isPrimitiveType}}
{{/isReadOnly}}
{{/allVars}}
Expand Down
7 changes: 7 additions & 0 deletions modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,13 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
.join('&');
}

export function mapValues(data: any, fn: (item: any) => any) {
return Object.keys(data).reduce(
(acc, key) => ({ ...acc, [key]: fn(data[key]) }),
{}
);
}

export interface RequestContext {
fetch: FetchAPI;
url: string;
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/default/models/Category.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Do not edit the class manually.
*/

import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
/**
* A category for a pet
* @export
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/default/models/ModelApiResponse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Do not edit the class manually.
*/

import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
/**
* Describes the result of uploading an image resource
* @export
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/default/models/Order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Do not edit the class manually.
*/

import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
/**
* An order for a pets from the pet store
* @export
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/default/models/Pet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Do not edit the class manually.
*/

import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
import {
Category,
CategoryFromJSON,
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/default/models/Tag.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Do not edit the class manually.
*/

import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
/**
* A tag for a pet
* @export
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/default/models/User.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Do not edit the class manually.
*/

import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
/**
* A User who is purchasing from the pet store
* @export
Expand Down
7 changes: 7 additions & 0 deletions samples/client/petstore/typescript-fetch/builds/default/runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,13 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
.join('&');
}

export function mapValues(data: any, fn: (item: any) => any) {
return Object.keys(data).reduce(
(acc, key) => ({ ...acc, [key]: fn(data[key]) }),
{}
);
}

export interface RequestContext {
fetch: FetchAPI;
url: string;
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/es6-target/models/Category.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Do not edit the class manually.
*/

import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
/**
* A category for a pet
* @export
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/es6-target/models/ModelApiResponse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Do not edit the class manually.
*/

import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
/**
* Describes the result of uploading an image resource
* @export
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/es6-target/models/Order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Do not edit the class manually.
*/

import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
/**
* An order for a pets from the pet store
* @export
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/es6-target/models/Pet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Do not edit the class manually.
*/

import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
import {
Category,
CategoryFromJSON,
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/es6-target/models/Tag.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Do not edit the class manually.
*/

import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
/**
* A tag for a pet
* @export
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/es6-target/models/User.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Do not edit the class manually.
*/

import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
/**
* A User who is purchasing from the pet store
* @export
Expand Down
7 changes: 7 additions & 0 deletions samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,13 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
.join('&');
}

export function mapValues(data: any, fn: (item: any) => any) {
return Object.keys(data).reduce(
(acc, key) => ({ ...acc, [key]: fn(data[key]) }),
{}
);
}

export interface RequestContext {
fetch: FetchAPI;
url: string;
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Category.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Do not edit the class manually.
*/

import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
/**
* A category for a pet
* @export
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/with-interfaces/models/ModelApiResponse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Do not edit the class manually.
*/

import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
/**
* Describes the result of uploading an image resource
* @export
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Do not edit the class manually.
*/

import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
/**
* An order for a pets from the pet store
* @export
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Pet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Do not edit the class manually.
*/

import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
import {
Category,
CategoryFromJSON,
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Tag.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Do not edit the class manually.
*/

import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
/**
* A tag for a pet
* @export
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/with-interfaces/models/User.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Do not edit the class manually.
*/

import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
/**
* A User who is purchasing from the pet store
* @export
Expand Down
7 changes: 7 additions & 0 deletions samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,13 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
.join('&');
}

export function mapValues(data: any, fn: (item: any) => any) {
return Object.keys(data).reduce(
(acc, key) => ({ ...acc, [key]: fn(data[key]) }),
{}
);
}

export interface RequestContext {
fetch: FetchAPI;
url: string;
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Category.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Do not edit the class manually.
*/

import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
/**
* A category for a pet
* @export
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/with-npm-version/models/ModelApiResponse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Do not edit the class manually.
*/

import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
/**
* Describes the result of uploading an image resource
* @export
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Do not edit the class manually.
*/

import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
/**
* An order for a pets from the pet store
* @export
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Pet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Do not edit the class manually.
*/

import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
import {
Category,
CategoryFromJSON,
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Tag.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Do not edit the class manually.
*/

import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
/**
* A tag for a pet
* @export
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/with-npm-version/models/User.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Do not edit the class manually.
*/

import { exists } from '../runtime';
import { exists, mapValues } from '../runtime';
/**
* A User who is purchasing from the pet store
* @export
Expand Down
7 changes: 7 additions & 0 deletions samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,13 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string {
.join('&');
}

export function mapValues(data: any, fn: (item: any) => any) {
return Object.keys(data).reduce(
(acc, key) => ({ ...acc, [key]: fn(data[key]) }),
{}
);
}

export interface RequestContext {
fetch: FetchAPI;
url: string;
Expand Down