From b2366670d79fbb54545f3310cffafe4363ede08b Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Thu, 29 Jun 2017 23:06:25 +0800
Subject: [PATCH] update ts fetch petstore samples

---
 .../typescript-fetch/builds/default/api.ts    | 40 +++++++++----------
 .../typescript-fetch/builds/es6-target/api.ts | 40 +++++++++----------
 .../builds/with-npm-version/api.ts            | 40 +++++++++----------
 3 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/samples/client/petstore/typescript-fetch/builds/default/api.ts b/samples/client/petstore/typescript-fetch/builds/default/api.ts
index 1ab5a830727..77011719163 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/api.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default/api.ts
@@ -108,7 +108,7 @@ export const PetApiFetchParamCreator = {
             fetchOptions.body = JSON.stringify(params["body"] || {});
         }
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -134,7 +134,7 @@ export const PetApiFetchParamCreator = {
         let contentTypeHeader: Dictionary<string> = {};
         fetchOptions.headers = assign({
             "api_key": params["apiKey"],
-        }, contentTypeHeader);
+        }, contentTypeHeader, fetchOptions.headers);
         return {
             url: url.format(urlObj),
             options: fetchOptions,
@@ -155,7 +155,7 @@ export const PetApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -177,7 +177,7 @@ export const PetApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -201,7 +201,7 @@ export const PetApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -224,7 +224,7 @@ export const PetApiFetchParamCreator = {
             fetchOptions.body = JSON.stringify(params["body"] || {});
         }
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -255,7 +255,7 @@ export const PetApiFetchParamCreator = {
             "status": params["status"],
         });
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -286,7 +286,7 @@ export const PetApiFetchParamCreator = {
             "file": params["file"],
         });
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -616,7 +616,7 @@ export const StoreApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -634,7 +634,7 @@ export const StoreApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -658,7 +658,7 @@ export const StoreApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -681,7 +681,7 @@ export const StoreApiFetchParamCreator = {
             fetchOptions.body = JSON.stringify(params["body"] || {});
         }
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -860,7 +860,7 @@ export const UserApiFetchParamCreator = {
             fetchOptions.body = JSON.stringify(params["body"] || {});
         }
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -883,7 +883,7 @@ export const UserApiFetchParamCreator = {
             fetchOptions.body = JSON.stringify(params["body"] || {});
         }
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -906,7 +906,7 @@ export const UserApiFetchParamCreator = {
             fetchOptions.body = JSON.stringify(params["body"] || {});
         }
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -930,7 +930,7 @@ export const UserApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -954,7 +954,7 @@ export const UserApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -978,7 +978,7 @@ export const UserApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -996,7 +996,7 @@ export const UserApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -1025,7 +1025,7 @@ export const UserApiFetchParamCreator = {
             fetchOptions.body = JSON.stringify(params["body"] || {});
         }
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/api.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/api.ts
index 5b787dc84bb..c7f1a032306 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/api.ts
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/api.ts
@@ -107,7 +107,7 @@ export const PetApiFetchParamCreator = {
             fetchOptions.body = JSON.stringify(params["body"] || {});
         }
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -133,7 +133,7 @@ export const PetApiFetchParamCreator = {
         let contentTypeHeader: Dictionary<string> = {};
         fetchOptions.headers = Object.assign({
             "api_key": params["apiKey"],
-        }, contentTypeHeader);
+        }, contentTypeHeader, fetchOptions.headers);
         return {
             url: url.format(urlObj),
             options: fetchOptions,
@@ -154,7 +154,7 @@ export const PetApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -176,7 +176,7 @@ export const PetApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -200,7 +200,7 @@ export const PetApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -223,7 +223,7 @@ export const PetApiFetchParamCreator = {
             fetchOptions.body = JSON.stringify(params["body"] || {});
         }
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -254,7 +254,7 @@ export const PetApiFetchParamCreator = {
             "status": params["status"],
         });
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -285,7 +285,7 @@ export const PetApiFetchParamCreator = {
             "file": params["file"],
         });
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -615,7 +615,7 @@ export const StoreApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -633,7 +633,7 @@ export const StoreApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -657,7 +657,7 @@ export const StoreApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -680,7 +680,7 @@ export const StoreApiFetchParamCreator = {
             fetchOptions.body = JSON.stringify(params["body"] || {});
         }
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -859,7 +859,7 @@ export const UserApiFetchParamCreator = {
             fetchOptions.body = JSON.stringify(params["body"] || {});
         }
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -882,7 +882,7 @@ export const UserApiFetchParamCreator = {
             fetchOptions.body = JSON.stringify(params["body"] || {});
         }
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -905,7 +905,7 @@ export const UserApiFetchParamCreator = {
             fetchOptions.body = JSON.stringify(params["body"] || {});
         }
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -929,7 +929,7 @@ export const UserApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -953,7 +953,7 @@ export const UserApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -977,7 +977,7 @@ export const UserApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -995,7 +995,7 @@ export const UserApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -1024,7 +1024,7 @@ export const UserApiFetchParamCreator = {
             fetchOptions.body = JSON.stringify(params["body"] || {});
         }
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/api.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/api.ts
index 1ab5a830727..77011719163 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/api.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/api.ts
@@ -108,7 +108,7 @@ export const PetApiFetchParamCreator = {
             fetchOptions.body = JSON.stringify(params["body"] || {});
         }
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -134,7 +134,7 @@ export const PetApiFetchParamCreator = {
         let contentTypeHeader: Dictionary<string> = {};
         fetchOptions.headers = assign({
             "api_key": params["apiKey"],
-        }, contentTypeHeader);
+        }, contentTypeHeader, fetchOptions.headers);
         return {
             url: url.format(urlObj),
             options: fetchOptions,
@@ -155,7 +155,7 @@ export const PetApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -177,7 +177,7 @@ export const PetApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -201,7 +201,7 @@ export const PetApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -224,7 +224,7 @@ export const PetApiFetchParamCreator = {
             fetchOptions.body = JSON.stringify(params["body"] || {});
         }
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -255,7 +255,7 @@ export const PetApiFetchParamCreator = {
             "status": params["status"],
         });
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -286,7 +286,7 @@ export const PetApiFetchParamCreator = {
             "file": params["file"],
         });
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -616,7 +616,7 @@ export const StoreApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -634,7 +634,7 @@ export const StoreApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -658,7 +658,7 @@ export const StoreApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -681,7 +681,7 @@ export const StoreApiFetchParamCreator = {
             fetchOptions.body = JSON.stringify(params["body"] || {});
         }
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -860,7 +860,7 @@ export const UserApiFetchParamCreator = {
             fetchOptions.body = JSON.stringify(params["body"] || {});
         }
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -883,7 +883,7 @@ export const UserApiFetchParamCreator = {
             fetchOptions.body = JSON.stringify(params["body"] || {});
         }
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -906,7 +906,7 @@ export const UserApiFetchParamCreator = {
             fetchOptions.body = JSON.stringify(params["body"] || {});
         }
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -930,7 +930,7 @@ export const UserApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -954,7 +954,7 @@ export const UserApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -978,7 +978,7 @@ export const UserApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -996,7 +996,7 @@ export const UserApiFetchParamCreator = {
 
         let contentTypeHeader: Dictionary<string> = {};
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),
@@ -1025,7 +1025,7 @@ export const UserApiFetchParamCreator = {
             fetchOptions.body = JSON.stringify(params["body"] || {});
         }
         if (contentTypeHeader) {
-            fetchOptions.headers = contentTypeHeader;
+            fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers);
         }
         return {
             url: url.format(urlObj),