@automatons/typescript-client-axios 1.0.3 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automatons/typescript-client-axios",
-  "version": "1.0.3",
+  "version": "1.0.7",
   "repository": "git@github.com:openapi-automatons/typescript-client-axios.git",
   "author": "tanmen <yt.prog@gmail.com>",
   "license": "MIT",

package/templates/apis/api.hbs

@@ -6,9 +6,7 @@ import { Config{{#if securities}}, Security{{/if}} } from "../config";
 		import { {{#if hasTemplate}}template{{#or hasQuery hasFormData}},{{/or}}{{/if}} {{#if hasQuery}}query{{#if hasFormData}},{{/if}}{{/if}} {{#if hasFormData}}formData{{/if}}  } from "../utils";
 	{{/or}}
 {{/with}}
-{{#each api/imports~}}
-  import { {{title}} } from "../models";
-{{/each}}
+import { {{#each api/imports~}} {{title}}{{#unless @last}}, {{/unless}}{{/each}} } from "../models";
 
 {{#each api/servers}}
 type {{name}}Server = { name: "{{name}}"{{#if values}}; values: { {{#each values}}{{name}}: {{#if enums}}{{#each enums}}'{{this}}'{{#unless @last}} | {{/unless}}{{/each}}{{else}}string{{/if}} {{/each}} }; {{/if}} }

package/templates/apis/partials/config/request.hbs

@@ -4,7 +4,7 @@ public async {{name}}({{> apis/config/arguments}}): Promise<AxiosRequestConfig>
 	let _cookies = config?.headers?.Cookie ?? '';
 	{{> apis/config/request/cookies }}
 
-	const _headers = { ...config?.headers, 'Content-Type': headers['Content-Type'], Cookie: _cookies || undefined };
+	const _headers = Object.assign({ ...config?.headers, 'Content-Type': headers['Content-Type']}, _cookies ? {Cookie: _cookies} : undefined);
 	{{> apis/config/request/headers }}
 
 	return {

package/templates/utils/query.hbs

@@ -1,4 +1,9 @@
-import {ParsedUrlQueryInput} from 'querystring';
+type ParsedUrlQueryInput = NodeJS.Dict<string | number | boolean | ReadonlyArray<string> | ReadonlyArray<number> | ReadonlyArray<boolean> | null>
+
+const isObject = (value: any): value is object => {
+	const type = typeof value
+	return value != null && (type == 'object' || type == 'function')
+}
 
 const queryForm =
   (name: string,
@@ -10,7 +15,7 @@ const queryForm =
       } else {
         return {[name]: value.join(',')}
       }
-    } else if (value instanceof Object) {
+    } else if (isObject(value)) {
       if (explode) {
         return value;
       } else {
@@ -26,7 +31,7 @@ const querySpaceDelimited =
    value: string | number | Array<string | number> | { [key: string]: string | number }): ParsedUrlQueryInput => {
     if (Array.isArray(value)) {
       return {[name]: value.join(' ')}
-    } else if (value instanceof Object) {
+    } else if (isObject(value)) {
       return {[name]: Object.entries(value).map((prop: [string, string | number]) => prop.join(' ')).join(' ')}
     }
     throw new Error(`Unsupported value: ${name}`);
@@ -37,7 +42,7 @@ const queryPipeDelimited =
    value: string | number | Array<string | number> | { [key: string]: string | number }): ParsedUrlQueryInput => {
     if (Array.isArray(value)) {
       return {[name]: value.join('|')}
-    } else if (value instanceof Object) {
+    } else if (isObject(value)) {
       return {[name]: Object.entries(value).map((prop: [string, string | number]) => prop.join('|')).join('|')}
     }
     throw new Error(`Unsupported value: ${name}`);
@@ -46,7 +51,7 @@ const queryPipeDelimited =
 const queryDeepObject =
   (name: string,
    value: string | number | Array<string | number> | { [key: string]: string | number }): ParsedUrlQueryInput => {
-    if (!Array.isArray(value) && value instanceof Object) {
+    if (!Array.isArray(value) && isObject(value)) {
       return Object.keys(value).reduce((pre, cur) => ({...pre, [`${name}[${cur}]`]: value[cur]}), {});
     }
     throw new Error(`Unsupported value: ${name}`);