@ps-aux/api-client-axios 0.0.7-rc-2 → 0.0.7-rc-3

package/dist/AxiosOpenApiHttpClient.d.ts

@@ -0,0 +1,6 @@
+import { AxiosInstance } from 'axios';
+import { PlatformHelper } from './platform/types';
+import { UrlConverter, PromiseHttpClient } from '@ps-aux/api-client-common';
+export declare const noOpUrlConverter: () => UrlConverter;
+export declare const springBootUrlConverter: () => UrlConverter;
+export declare const createHttpClient: (axios: AxiosInstance, platform: PlatformHelper, urlConverter?: UrlConverter) => PromiseHttpClient;

package/dist/browser.d.ts

@@ -0,0 +1,4 @@
+import { AxiosInstance } from 'axios';
+import { PromiseHttpClient } from './commonExports';
+export declare const createHttpClient: (axios: AxiosInstance, urlConverter?: import("@ps-aux/api-client-common").UrlConverter) => PromiseHttpClient;
+export * from './commonExports';

package/dist/browser.esm.js

@@ -1,10 +1,5 @@
 import 'qs';
 
-const ContentType = {
-    Json: 'application/json',
-    FormData: 'multipart/form-data',
-};
-
 const convertToFormData = (payload, platform) => {
     const formData = platform.newFormData();
     const addProp = (key, val) => {
@@ -284,6 +279,20 @@ const objectToParams = (obj) => {
     return res;
 };
 
+const fileResFilenameRegex = /filename="([^"]+)"/;
+const getFileNameFromContentDispositionHeader = (contentDispositionHeader) => {
+    if (!contentDispositionHeader)
+        return 'download-file';
+    const match = contentDispositionHeader.match(fileResFilenameRegex);
+    const fileName = match ? match[1] : 'downloaded-file';
+    return fileName;
+};
+
+const ContentType = {
+    Json: 'application/json',
+    FormData: 'multipart/form-data',
+};
+
 const noOpUrlConverter = () => ({ query, path }) => {
     return {
         url: path,
@@ -296,7 +305,6 @@ const springBootUrlConverter = () => ({ query, path }) => {
         params: undefined,
     };
 };
-const fileResFilenameRegex = /filename="([^"]+)"/;
 const createHttpClient$1 = (axios, platform, urlConverter = noOpUrlConverter()) => {
     return {
         request: (req) => {
@@ -314,16 +322,16 @@ const createHttpClient$1 = (axios, platform, urlConverter = noOpUrlConverter())
                 headers: {
                     ContentType: type,
                 },
-                responseType: isBlobResponse ? 'blob' : 'json'
+                responseType: isBlobResponse ? 'blob' : 'json',
             })
                 .then(r => {
                 const { data } = r;
                 if (isBlobResponse) {
                     const contDist = r.headers['content-disposition'];
-                    const fileName = getFileName(contDist);
+                    const fileName = getFileNameFromContentDispositionHeader(contDist);
                     const type = r.headers['content-type'];
                     return new File([data], fileName, {
-                        type
+                        type,
                     });
                 }
                 return data;
@@ -331,13 +339,6 @@ const createHttpClient$1 = (axios, platform, urlConverter = noOpUrlConverter())
         },
     };
 };
-const getFileName = (contentDispositionHeader) => {
-    if (!contentDispositionHeader)
-        return 'download-file';
-    const match = contentDispositionHeader.match(fileResFilenameRegex);
-    const fileName = match ? match[1] : 'downloaded-file';
-    return fileName;
-};
 
 class BrowserPlatFormHelper {
     isFile = (obj) => obj instanceof File;
@@ -358,4 +359,4 @@ const createHttpClient = (axios, urlConverter = noOpUrlConverter()) => {
     return createHttpClient$1(axios, new BrowserPlatFormHelper(), urlConverter);
 };
 
-export { createHttpClient, noOpUrlConverter, springBootUrlConverter };
+export { ContentType, createHttpClient, noOpUrlConverter, springBootUrlConverter };

package/dist/browser.js

@@ -2,11 +2,6 @@
 
 require('qs');
 
-const ContentType = {
-    Json: 'application/json',
-    FormData: 'multipart/form-data',
-};
-
 const convertToFormData = (payload, platform) => {
     const formData = platform.newFormData();
     const addProp = (key, val) => {
@@ -286,6 +281,20 @@ const objectToParams = (obj) => {
     return res;
 };
 
+const fileResFilenameRegex = /filename="([^"]+)"/;
+const getFileNameFromContentDispositionHeader = (contentDispositionHeader) => {
+    if (!contentDispositionHeader)
+        return 'download-file';
+    const match = contentDispositionHeader.match(fileResFilenameRegex);
+    const fileName = match ? match[1] : 'downloaded-file';
+    return fileName;
+};
+
+const ContentType = {
+    Json: 'application/json',
+    FormData: 'multipart/form-data',
+};
+
 const noOpUrlConverter = () => ({ query, path }) => {
     return {
         url: path,
@@ -298,7 +307,6 @@ const springBootUrlConverter = () => ({ query, path }) => {
         params: undefined,
     };
 };
-const fileResFilenameRegex = /filename="([^"]+)"/;
 const createHttpClient$1 = (axios, platform, urlConverter = noOpUrlConverter()) => {
     return {
         request: (req) => {
@@ -316,16 +324,16 @@ const createHttpClient$1 = (axios, platform, urlConverter = noOpUrlConverter())
                 headers: {
                     ContentType: type,
                 },
-                responseType: isBlobResponse ? 'blob' : 'json'
+                responseType: isBlobResponse ? 'blob' : 'json',
             })
                 .then(r => {
                 const { data } = r;
                 if (isBlobResponse) {
                     const contDist = r.headers['content-disposition'];
-                    const fileName = getFileName(contDist);
+                    const fileName = getFileNameFromContentDispositionHeader(contDist);
                     const type = r.headers['content-type'];
                     return new File([data], fileName, {
-                        type
+                        type,
                     });
                 }
                 return data;
@@ -333,13 +341,6 @@ const createHttpClient$1 = (axios, platform, urlConverter = noOpUrlConverter())
         },
     };
 };
-const getFileName = (contentDispositionHeader) => {
-    if (!contentDispositionHeader)
-        return 'download-file';
-    const match = contentDispositionHeader.match(fileResFilenameRegex);
-    const fileName = match ? match[1] : 'downloaded-file';
-    return fileName;
-};
 
 class BrowserPlatFormHelper {
     isFile = (obj) => obj instanceof File;
@@ -360,6 +361,7 @@ const createHttpClient = (axios, urlConverter = noOpUrlConverter()) => {
     return createHttpClient$1(axios, new BrowserPlatFormHelper(), urlConverter);
 };
 
+exports.ContentType = ContentType;
 exports.createHttpClient = createHttpClient;
 exports.noOpUrlConverter = noOpUrlConverter;
 exports.springBootUrlConverter = springBootUrlConverter;

package/dist/commonExports.d.ts

@@ -0,0 +1,2 @@
+export { UrlConverter, PromiseHttpClient, ContentType } from '@ps-aux/api-client-common';
+export { springBootUrlConverter, noOpUrlConverter } from './AxiosOpenApiHttpClient';

package/dist/convertFormData.d.ts

@@ -0,0 +1,2 @@
+import { PlatformHelper } from "./platform/types";
+export declare const convertToFormData: (payload: Record<string, any>, platform: PlatformHelper) => FormData;

package/dist/node.d.ts

@@ -0,0 +1,4 @@
+import { AxiosInstance } from 'axios';
+import { PromiseHttpClient } from './commonExports';
+export declare const createHttpClient: (axios: AxiosInstance, urlConverter?: import("@ps-aux/api-client-common").UrlConverter) => PromiseHttpClient;
+export * from './commonExports';

package/dist/node.esm.js

@@ -2,11 +2,6 @@ import 'qs';
 import NodeFormData from 'form-data';
 import stream from 'stream';
 
-const ContentType = {
-    Json: 'application/json',
-    FormData: 'multipart/form-data',
-};
-
 const convertToFormData = (payload, platform) => {
     const formData = platform.newFormData();
     const addProp = (key, val) => {
@@ -286,6 +281,20 @@ const objectToParams = (obj) => {
     return res;
 };
 
+const fileResFilenameRegex = /filename="([^"]+)"/;
+const getFileNameFromContentDispositionHeader = (contentDispositionHeader) => {
+    if (!contentDispositionHeader)
+        return 'download-file';
+    const match = contentDispositionHeader.match(fileResFilenameRegex);
+    const fileName = match ? match[1] : 'downloaded-file';
+    return fileName;
+};
+
+const ContentType = {
+    Json: 'application/json',
+    FormData: 'multipart/form-data',
+};
+
 const noOpUrlConverter = () => ({ query, path }) => {
     return {
         url: path,
@@ -298,7 +307,6 @@ const springBootUrlConverter = () => ({ query, path }) => {
         params: undefined,
     };
 };
-const fileResFilenameRegex = /filename="([^"]+)"/;
 const createHttpClient$1 = (axios, platform, urlConverter = noOpUrlConverter()) => {
     return {
         request: (req) => {
@@ -316,16 +324,16 @@ const createHttpClient$1 = (axios, platform, urlConverter = noOpUrlConverter())
                 headers: {
                     ContentType: type,
                 },
-                responseType: isBlobResponse ? 'blob' : 'json'
+                responseType: isBlobResponse ? 'blob' : 'json',
             })
                 .then(r => {
                 const { data } = r;
                 if (isBlobResponse) {
                     const contDist = r.headers['content-disposition'];
-                    const fileName = getFileName(contDist);
+                    const fileName = getFileNameFromContentDispositionHeader(contDist);
                     const type = r.headers['content-type'];
                     return new File([data], fileName, {
-                        type
+                        type,
                     });
                 }
                 return data;
@@ -333,13 +341,6 @@ const createHttpClient$1 = (axios, platform, urlConverter = noOpUrlConverter())
         },
     };
 };
-const getFileName = (contentDispositionHeader) => {
-    if (!contentDispositionHeader)
-        return 'download-file';
-    const match = contentDispositionHeader.match(fileResFilenameRegex);
-    const fileName = match ? match[1] : 'downloaded-file';
-    return fileName;
-};
 
 class NodePlatFormHelper {
     isFile = (obj) => {
@@ -370,4 +371,4 @@ const createHttpClient = (axios, urlConverter = noOpUrlConverter()) => {
     return createHttpClient$1(axios, new NodePlatFormHelper(), urlConverter);
 };
 
-export { createHttpClient, noOpUrlConverter, springBootUrlConverter };
+export { ContentType, createHttpClient, noOpUrlConverter, springBootUrlConverter };

package/dist/node.js

@@ -4,11 +4,6 @@ require('qs');
 var NodeFormData = require('form-data');
 var stream = require('stream');
 
-const ContentType = {
-    Json: 'application/json',
-    FormData: 'multipart/form-data',
-};
-
 const convertToFormData = (payload, platform) => {
     const formData = platform.newFormData();
     const addProp = (key, val) => {
@@ -288,6 +283,20 @@ const objectToParams = (obj) => {
     return res;
 };
 
+const fileResFilenameRegex = /filename="([^"]+)"/;
+const getFileNameFromContentDispositionHeader = (contentDispositionHeader) => {
+    if (!contentDispositionHeader)
+        return 'download-file';
+    const match = contentDispositionHeader.match(fileResFilenameRegex);
+    const fileName = match ? match[1] : 'downloaded-file';
+    return fileName;
+};
+
+const ContentType = {
+    Json: 'application/json',
+    FormData: 'multipart/form-data',
+};
+
 const noOpUrlConverter = () => ({ query, path }) => {
     return {
         url: path,
@@ -300,7 +309,6 @@ const springBootUrlConverter = () => ({ query, path }) => {
         params: undefined,
     };
 };
-const fileResFilenameRegex = /filename="([^"]+)"/;
 const createHttpClient$1 = (axios, platform, urlConverter = noOpUrlConverter()) => {
     return {
         request: (req) => {
@@ -318,16 +326,16 @@ const createHttpClient$1 = (axios, platform, urlConverter = noOpUrlConverter())
                 headers: {
                     ContentType: type,
                 },
-                responseType: isBlobResponse ? 'blob' : 'json'
+                responseType: isBlobResponse ? 'blob' : 'json',
             })
                 .then(r => {
                 const { data } = r;
                 if (isBlobResponse) {
                     const contDist = r.headers['content-disposition'];
-                    const fileName = getFileName(contDist);
+                    const fileName = getFileNameFromContentDispositionHeader(contDist);
                     const type = r.headers['content-type'];
                     return new File([data], fileName, {
-                        type
+                        type,
                     });
                 }
                 return data;
@@ -335,13 +343,6 @@ const createHttpClient$1 = (axios, platform, urlConverter = noOpUrlConverter())
         },
     };
 };
-const getFileName = (contentDispositionHeader) => {
-    if (!contentDispositionHeader)
-        return 'download-file';
-    const match = contentDispositionHeader.match(fileResFilenameRegex);
-    const fileName = match ? match[1] : 'downloaded-file';
-    return fileName;
-};
 
 class NodePlatFormHelper {
     isFile = (obj) => {
@@ -372,6 +373,7 @@ const createHttpClient = (axios, urlConverter = noOpUrlConverter()) => {
     return createHttpClient$1(axios, new NodePlatFormHelper(), urlConverter);
 };
 
+exports.ContentType = ContentType;
 exports.createHttpClient = createHttpClient;
 exports.noOpUrlConverter = noOpUrlConverter;
 exports.springBootUrlConverter = springBootUrlConverter;

package/dist/platform/browser.d.ts

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

package/dist/platform/foo.d.ts

@@ -0,0 +1 @@
+export { BrowserPlatFormHelper as Platform } from './browser';

package/dist/platform/node.d.ts

@@ -0,0 +1,10 @@
+import { PlatformHelper } from './types';
+export declare class NodePlatFormHelper implements PlatformHelper {
+    isFile: (obj: any) => boolean;
+    getFileAndName: (obj: any) => {
+        file: any;
+        name: any;
+    };
+    isFileList: (obj: any) => boolean;
+    newFormData: () => FormData;
+}

package/dist/platform/types.d.ts

@@ -0,0 +1,9 @@
+export type PlatformHelper = {
+    newFormData: () => FormData;
+    isFile: (obj: any) => boolean;
+    getFileAndName: (obj: any) => {
+        file: any;
+        name: string;
+    };
+    isFileList: (obj: any) => boolean;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ps-aux/api-client-axios",
-  "version": "0.0.7-rc-2",
+  "version": "0.0.7-rc-3",
   "main": "dist/node.js",
   "module": "dist/node.esm.js",
   "browser": "dist/browser.esm.js",
@@ -8,7 +8,6 @@
   "scripts": {
     "build": "rollup -c",
     "dev": "rollup -c --watch",
-    "publish": "npm run build && npm publish",
     "tc": "tsc"
   },
   "author": "",

package/src/AxiosOpenApiHttpClient.ts

@@ -1,9 +1,13 @@
 import { AxiosInstance } from 'axios'
-import { ContentType, HttpClient } from './t'
 import { convertToFormData } from './convertFormData'
 import { PlatformHelper } from './platform/types'
-import { serializeQueryForSpringBoot } from '@ps-aux/api-client-common'
-import { UrlConverter } from '@ps-aux/api-client-common/src'
+import {
+    serializeQueryForSpringBoot,
+    UrlConverter,
+    PromiseHttpClient,
+    ContentType,
+    getFileNameFromContentDispositionHeader,
+} from '@ps-aux/api-client-common'
 
 
 export const noOpUrlConverter: () => UrlConverter = () => ({ query, path }) => {
@@ -22,13 +26,12 @@ export const springBootUrlConverter: () => UrlConverter = () => ({ query, path }
 }
 
 
-const fileResFilenameRegex =  /filename="([^"]+)"/
 
 export const createHttpClient = (
     axios: AxiosInstance,
     platform: PlatformHelper,
     urlConverter = noOpUrlConverter(),
-): HttpClient => {
+): PromiseHttpClient => {
     return {
         request: (req) => {
             const { query, type, body } = req
@@ -49,18 +52,18 @@ export const createHttpClient = (
                     headers: {
                         ContentType: type,
                     },
-                    responseType: isBlobResponse ? 'blob' : 'json'
+                    responseType: isBlobResponse ? 'blob' : 'json',
                 })
                 .then(r => {
                     const { data } = r
                     if (isBlobResponse) {
                         const contDist = r.headers['content-disposition']
-                        const fileName = getFileName(contDist)
+                        const fileName = getFileNameFromContentDispositionHeader(contDist)
 
                         const type = r.headers['content-type']
 
                         return new File([data as Blob], fileName, {
-                            type
+                            type,
                         })
                     }
 
@@ -71,12 +74,3 @@ export const createHttpClient = (
 }
 
 
-const getFileName = (contentDispositionHeader?: string):string => {
-    if (!contentDispositionHeader)
-        return 'download-file'
-
-    const match = contentDispositionHeader.match(fileResFilenameRegex)
-    const fileName = match ? match[1] : 'downloaded-file'
-
-    return fileName
-}

package/src/browser.ts

@@ -1,11 +1,10 @@
 import { AxiosInstance } from 'axios'
-import { HttpClient } from './t'
-
 import { createHttpClient as create, noOpUrlConverter } from './AxiosOpenApiHttpClient'
 import { BrowserPlatFormHelper } from './platform/browser'
+import { PromiseHttpClient } from './commonExports'
 
 
-export const createHttpClient = (axios: AxiosInstance, urlConverter = noOpUrlConverter()): HttpClient => {
+export const createHttpClient = (axios: AxiosInstance, urlConverter = noOpUrlConverter()): PromiseHttpClient => {
     return create(axios, new BrowserPlatFormHelper(), urlConverter)
 }
 

package/src/commonExports.ts

@@ -1,3 +1,2 @@
-export { UrlConverter } from '@ps-aux/api-client-common'
-export { HttpClient, Request, RequestParams } from './t'
+export { UrlConverter, PromiseHttpClient, ContentType } from '@ps-aux/api-client-common'
 export { springBootUrlConverter, noOpUrlConverter } from './AxiosOpenApiHttpClient'

package/src/node.ts

@@ -1,10 +1,9 @@
 import { AxiosInstance } from 'axios'
-import { HttpClient } from './t'
-
 import { createHttpClient as create, noOpUrlConverter } from './AxiosOpenApiHttpClient'
 import { NodePlatFormHelper } from './platform/node'
+import { PromiseHttpClient } from './commonExports'
 
-export const createHttpClient = (axios: AxiosInstance, urlConverter = noOpUrlConverter()): HttpClient => {
+export const createHttpClient = (axios: AxiosInstance, urlConverter = noOpUrlConverter()): PromiseHttpClient => {
     return create(axios, new NodePlatFormHelper(), urlConverter)
 }
 

package/src/t.ts

@@ -1,22 +0,0 @@
-export type ContentType = {}
-
-export type RequestParams = {}
-
-export const ContentType = {
-    Json: 'application/json',
-    FormData: 'multipart/form-data',
-}
-
-export type Request = {
-    path: string
-    method: 'GET' | 'POST' | 'PUT' | 'DELETE'
-    format?: 'json' | 'document'
-    query?: any
-    body?: any
-    type?: string
-    secure?: boolean
-}
-
-export type HttpClient<Any = any> = {
-    request: <Data, A = any>(req: Request) => Promise<Data>
-}