@ps-aux/api-client-axios 0.0.8-rc-6 → 0.0.9-rc-7

package/dist/browser.esm.js

@@ -311,6 +311,10 @@ const createHttpClient$1 = (axios, platform, urlConverter = noOpUrlConverter())
             const { query, type, body } = req;
             const isBlobResponse = req.format === 'document';
             const data = type === ContentType.FormData ? convertToFormData(body, platform) : body;
+            const headers = {};
+            if (type) {
+                headers['Content-Type'] = type;
+            }
             return axios
                 .request({
                 method: req.method,
@@ -319,10 +323,8 @@ const createHttpClient$1 = (axios, platform, urlConverter = noOpUrlConverter())
                 // url: req.path,
                 ...urlConverter(req),
                 data,
-                headers: {
-                    ContentType: type,
-                },
-                responseType: isBlobResponse ? 'blob' : 'json',
+                headers,
+                responseType: isBlobResponse ? platform.getFileAxiosResponseType() : 'json',
             })
                 .then(r => {
                 const { data } = r;
@@ -353,6 +355,7 @@ class BrowserPlatFormHelper {
     isFileList = (obj) => obj instanceof FileList;
     // @ts-ignore
     newFormData = () => new FormData();
+    getFileAxiosResponseType = () => 'blob';
 }
 
 const createHttpClient = (axios, urlConverter = noOpUrlConverter()) => {

package/dist/browser.js

@@ -313,6 +313,10 @@ const createHttpClient$1 = (axios, platform, urlConverter = noOpUrlConverter())
             const { query, type, body } = req;
             const isBlobResponse = req.format === 'document';
             const data = type === ContentType.FormData ? convertToFormData(body, platform) : body;
+            const headers = {};
+            if (type) {
+                headers['Content-Type'] = type;
+            }
             return axios
                 .request({
                 method: req.method,
@@ -321,10 +325,8 @@ const createHttpClient$1 = (axios, platform, urlConverter = noOpUrlConverter())
                 // url: req.path,
                 ...urlConverter(req),
                 data,
-                headers: {
-                    ContentType: type,
-                },
-                responseType: isBlobResponse ? 'blob' : 'json',
+                headers,
+                responseType: isBlobResponse ? platform.getFileAxiosResponseType() : 'json',
             })
                 .then(r => {
                 const { data } = r;
@@ -355,6 +357,7 @@ class BrowserPlatFormHelper {
     isFileList = (obj) => obj instanceof FileList;
     // @ts-ignore
     newFormData = () => new FormData();
+    getFileAxiosResponseType = () => 'blob';
 }
 
 const createHttpClient = (axios, urlConverter = noOpUrlConverter()) => {

package/dist/node.esm.js

@@ -313,6 +313,10 @@ const createHttpClient$1 = (axios, platform, urlConverter = noOpUrlConverter())
             const { query, type, body } = req;
             const isBlobResponse = req.format === 'document';
             const data = type === ContentType.FormData ? convertToFormData(body, platform) : body;
+            const headers = {};
+            if (type) {
+                headers['Content-Type'] = type;
+            }
             return axios
                 .request({
                 method: req.method,
@@ -321,10 +325,8 @@ const createHttpClient$1 = (axios, platform, urlConverter = noOpUrlConverter())
                 // url: req.path,
                 ...urlConverter(req),
                 data,
-                headers: {
-                    ContentType: type,
-                },
-                responseType: isBlobResponse ? 'blob' : 'json',
+                headers,
+                responseType: isBlobResponse ? platform.getFileAxiosResponseType() : 'json',
             })
                 .then(r => {
                 const { data } = r;
@@ -365,6 +367,7 @@ class NodePlatFormHelper {
     };
     // @ts-ignore
     newFormData = () => new NodeFormData();
+    getFileAxiosResponseType = () => 'arraybuffer';
 }
 
 const createHttpClient = (axios, urlConverter = noOpUrlConverter()) => {

package/dist/node.js

@@ -315,6 +315,10 @@ const createHttpClient$1 = (axios, platform, urlConverter = noOpUrlConverter())
             const { query, type, body } = req;
             const isBlobResponse = req.format === 'document';
             const data = type === ContentType.FormData ? convertToFormData(body, platform) : body;
+            const headers = {};
+            if (type) {
+                headers['Content-Type'] = type;
+            }
             return axios
                 .request({
                 method: req.method,
@@ -323,10 +327,8 @@ const createHttpClient$1 = (axios, platform, urlConverter = noOpUrlConverter())
                 // url: req.path,
                 ...urlConverter(req),
                 data,
-                headers: {
-                    ContentType: type,
-                },
-                responseType: isBlobResponse ? 'blob' : 'json',
+                headers,
+                responseType: isBlobResponse ? platform.getFileAxiosResponseType() : 'json',
             })
                 .then(r => {
                 const { data } = r;
@@ -367,6 +369,7 @@ class NodePlatFormHelper {
     };
     // @ts-ignore
     newFormData = () => new NodeFormData();
+    getFileAxiosResponseType = () => 'arraybuffer';
 }
 
 const createHttpClient = (axios, urlConverter = noOpUrlConverter()) => {

package/dist/platform/browser.d.ts

@@ -1,10 +1,11 @@
 import { PlatformHelper } from './types';
 export declare class BrowserPlatFormHelper implements PlatformHelper {
-    isFile: (obj: any) => boolean;
+    isFile: (obj: any) => obj is File;
     getFileAndName: (obj: any) => {
         file: File;
         name: string;
     };
-    isFileList: (obj: any) => boolean;
+    isFileList: (obj: any) => obj is FileList;
     newFormData: () => FormData;
+    getFileAxiosResponseType: () => "blob";
 }

package/dist/platform/node.d.ts

@@ -7,4 +7,5 @@ export declare class NodePlatFormHelper implements PlatformHelper {
     };
     isFileList: (obj: any) => boolean;
     newFormData: () => FormData;
+    getFileAxiosResponseType: () => "arraybuffer";
 }

package/dist/platform/types.d.ts

@@ -6,4 +6,5 @@ export type PlatformHelper = {
         name: string;
     };
     isFileList: (obj: any) => boolean;
+    getFileAxiosResponseType: () => 'blob' | 'arraybuffer';
 };

package/package.json

@@ -1,14 +1,16 @@
 {
   "name": "@ps-aux/api-client-axios",
-  "version": "0.0.8-rc-6",
+  "version": "0.0.9-rc-7",
   "main": "dist/node.js",
   "module": "dist/node.esm.js",
   "browser": "dist/browser.esm.js",
   "types": "dist/api-client-axios/src/node.d.ts",
   "scripts": {
     "build": "rollup -c",
+    "pub": "npm run build && npm --access public publish",
     "dev": "rollup -c --watch",
-    "tc": "tsc"
+    "tc": "tsc",
+    "test": "jest"
   },
   "author": "",
   "license": "ISC",

package/src/AxiosOpenApiHttpClient.ts

@@ -41,6 +41,10 @@ export const createHttpClient = (
             const data =
                 type === ContentType.FormData ? convertToFormData(body, platform) : body
 
+            const headers: Record<string, string> = {}
+            if (type) {
+                headers['Content-Type'] = type
+            }
             return axios
                 .request({
                     method: req.method,
@@ -49,10 +53,8 @@ export const createHttpClient = (
                     // url: req.path,
                     ...urlConverter(req),
                     data,
-                    headers: {
-                        ContentType: type,
-                    },
-                    responseType: isBlobResponse ? 'blob' : 'json',
+                    headers,
+                    responseType: isBlobResponse ? platform.getFileAxiosResponseType() : 'json',
                 })
                 .then(r => {
                     const { data } = r

package/src/platform/browser.ts

@@ -19,4 +19,6 @@ export class BrowserPlatFormHelper implements PlatformHelper {
         obj instanceof FileList
     // @ts-ignore
     newFormData = () => new FormData()
+
+    getFileAxiosResponseType = (): 'blob' => 'blob'
 }

package/src/platform/node.ts

@@ -31,4 +31,7 @@ export class NodePlatFormHelper implements PlatformHelper {
     }
     // @ts-ignore
     newFormData = (): FormData => new NodeFormData()
+
+    getFileAxiosResponseType = (): 'arraybuffer' => 'arraybuffer'
+
 }

package/src/platform/types.ts

@@ -6,4 +6,6 @@ export type PlatformHelper = {
         name: string
     }
     isFileList: (obj: any) => boolean
+
+    getFileAxiosResponseType: () => 'blob' | 'arraybuffer'
 }

package/test/my.spec.ts

@@ -0,0 +1,22 @@
+import { AxiosApi } from '@ps-aux/api-client-api-testing/apis/axios/client'
+import Axios from 'axios'
+import { createHttpClient } from '../src/AxiosOpenApiHttpClient'
+import { NodePlatFormHelper } from '../src/platform/node'
+import { createHttpServer, MirroredReqRes } from '../../helpers/http-server'
+
+const Api = (url: string) =>
+    new AxiosApi(createHttpClient(Axios.create({ baseURL: url }), new NodePlatFormHelper()))
+
+it('test', async () => {
+
+    const server = createHttpServer()
+    const { url } = await server.start()
+    const api = Api(url)
+
+    try {
+        await api.app.getHello({ name: 'world' })
+        expect(server.lastRequest().url).toBe('/api/hello?name=world')
+    } finally {
+        await server.stop()
+    }
+})