Feature/typescript fetch/map templating (#2913)

* Add openapi dictionary/map support to typescript-fetch client generator

	Change isContainer -> isListContainer for existing array support.
	Add isMapContainer control flow, adding map support.
	Add utility function to help map openapi map/dictionaries to ts maps.
	Close #1878

* Run typescript-fetch generator scripts and update output files

modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache

@@ -1,4 +1,4 @@
-import { exists } from '../runtime';
+import { exists, mapValues } from '../runtime';
 {{#hasImports}}
 import {
     {{#imports}}
@@ -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}}
     };
@@ -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}}

modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache

@@ -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;

samples/client/petstore/typescript-fetch/builds/default/models/Category.ts

@@ -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

samples/client/petstore/typescript-fetch/builds/default/models/ModelApiResponse.ts

@@ -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

samples/client/petstore/typescript-fetch/builds/default/models/Order.ts

@@ -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

samples/client/petstore/typescript-fetch/builds/default/models/Pet.ts

@@ -11,7 +11,7 @@
  * Do not edit the class manually.
  */
 
-import { exists } from '../runtime';
+import { exists, mapValues } from '../runtime';
 import {
     Category,
     CategoryFromJSON,

samples/client/petstore/typescript-fetch/builds/default/models/Tag.ts

@@ -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

samples/client/petstore/typescript-fetch/builds/default/models/User.ts

@@ -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

samples/client/petstore/typescript-fetch/builds/default/runtime.ts

@@ -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;

samples/client/petstore/typescript-fetch/builds/es6-target/models/Category.ts

@@ -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

samples/client/petstore/typescript-fetch/builds/es6-target/models/ModelApiResponse.ts

@@ -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

samples/client/petstore/typescript-fetch/builds/es6-target/models/Order.ts

@@ -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

samples/client/petstore/typescript-fetch/builds/es6-target/models/Pet.ts

@@ -11,7 +11,7 @@
  * Do not edit the class manually.
  */
 
-import { exists } from '../runtime';
+import { exists, mapValues } from '../runtime';
 import {
     Category,
     CategoryFromJSON,

samples/client/petstore/typescript-fetch/builds/es6-target/models/Tag.ts

@@ -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

samples/client/petstore/typescript-fetch/builds/es6-target/models/User.ts

@@ -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

samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts

@@ -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;

samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Category.ts

@@ -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

samples/client/petstore/typescript-fetch/builds/with-interfaces/models/ModelApiResponse.ts

@@ -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

samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Order.ts

@@ -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

samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Pet.ts

@@ -11,7 +11,7 @@
  * Do not edit the class manually.
  */
 
-import { exists } from '../runtime';
+import { exists, mapValues } from '../runtime';
 import {
     Category,
     CategoryFromJSON,

samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Tag.ts

@@ -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

samples/client/petstore/typescript-fetch/builds/with-interfaces/models/User.ts

@@ -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

samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts

@@ -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;

samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Category.ts

@@ -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

samples/client/petstore/typescript-fetch/builds/with-npm-version/models/ModelApiResponse.ts

@@ -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

samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Order.ts

@@ -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

samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Pet.ts

@@ -11,7 +11,7 @@
  * Do not edit the class manually.
  */
 
-import { exists } from '../runtime';
+import { exists, mapValues } from '../runtime';
 import {
     Category,
     CategoryFromJSON,

samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Tag.ts

@@ -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

samples/client/petstore/typescript-fetch/builds/with-npm-version/models/User.ts

@@ -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

samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts

@@ -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;