@ps-aux/api-client-angular 0.2.2-rc1 → 0.3.0-rc1

package/dist/AngularApiHttpClient.d.ts

@@ -2,4 +2,4 @@ import { HttpClient as AngularHttpClient } from '@angular/common/http';
 import { UrlConverter, ObservableHttpClient } from '@ps-aux/api-client-common';
 export declare const qsUrlConverter: () => UrlConverter;
 export declare const springBootUrlConverter: () => UrlConverter;
-export declare const createHttpClient: (client: AngularHttpClient, urlConverter?: UrlConverter) => ObservableHttpClient;
+export declare const createHttpClient: (client: AngularHttpClient, urlConverter?: UrlConverter) => ObservableHttpClient<never>;

package/{src/index.ts → dist/_index.d.ts}

@@ -1,2 +1 @@
-export { createHttpClient, springBootUrlConverter, qsUrlConverter  } from './AngularApiHttpClient'
-
+export { createHttpClient, springBootUrlConverter, qsUrlConverter } from './AngularApiHttpClient';

package/dist/index.esm.js

@@ -265,18 +265,17 @@ const getFileNameFromContentDispositionHeader = (contentDispositionHeader) => {
 };
 
 const ContentType = {
-    Json: 'application/json',
-    FormData: 'multipart/form-data',
+    FormData: 'multipart/form-data'
 };
 
 const qsUrlConverter = () => ({ query, path }) => {
     return {
-        url: path + (query ? `?${serializeQueryWithQs(query)}` : ''),
+        url: path + (query ? `?${serializeQueryWithQs(query)}` : '')
     };
 };
 const springBootUrlConverter = () => ({ query, path }) => {
     return {
-        url: path + (query ? `?${serializeQueryForSpringBoot(query)}` : ''),
+        url: path + (query ? `?${serializeQueryForSpringBoot(query)}` : '')
     };
 };
 const createHttpClient = (client, urlConverter = qsUrlConverter()) => {
@@ -288,7 +287,7 @@ const createHttpClient = (client, urlConverter = qsUrlConverter()) => {
                 params,
                 body: prepareBody(req.body, req.type),
                 responseType: (isBlob ? 'blob' : 'json'),
-                observe: 'response',
+                observe: 'response'
             });
             return obs.pipe(map((r) => {
                 const { body } = r;
@@ -300,7 +299,7 @@ const createHttpClient = (client, urlConverter = qsUrlConverter()) => {
                     type: data.type
                 });
             }));
-        },
+        }
     };
 };
 const prepareBody = (payload, type) => {

package/dist/index.js

@@ -267,18 +267,17 @@ const getFileNameFromContentDispositionHeader = (contentDispositionHeader) => {
 };
 
 const ContentType = {
-    Json: 'application/json',
-    FormData: 'multipart/form-data',
+    FormData: 'multipart/form-data'
 };
 
 const qsUrlConverter = () => ({ query, path }) => {
     return {
-        url: path + (query ? `?${serializeQueryWithQs(query)}` : ''),
+        url: path + (query ? `?${serializeQueryWithQs(query)}` : '')
     };
 };
 const springBootUrlConverter = () => ({ query, path }) => {
     return {
-        url: path + (query ? `?${serializeQueryForSpringBoot(query)}` : ''),
+        url: path + (query ? `?${serializeQueryForSpringBoot(query)}` : '')
     };
 };
 const createHttpClient = (client, urlConverter = qsUrlConverter()) => {
@@ -290,7 +289,7 @@ const createHttpClient = (client, urlConverter = qsUrlConverter()) => {
                 params,
                 body: prepareBody(req.body, req.type),
                 responseType: (isBlob ? 'blob' : 'json'),
-                observe: 'response',
+                observe: 'response'
             });
             return obs.pipe(rxjs.map((r) => {
                 const { body } = r;
@@ -302,7 +301,7 @@ const createHttpClient = (client, urlConverter = qsUrlConverter()) => {
                     type: data.type
                 });
             }));
-        },
+        }
     };
 };
 const prepareBody = (payload, type) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ps-aux/api-client-angular",
-  "version": "0.2.2-rc1",
+  "version": "0.3.0-rc1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "module": "dist/index.esm.js",
@@ -16,9 +16,7 @@
     "qs": "^6.11.2"
   },
   "peerDependencies": {
-    "rxjs": "^7.8.1"
-  },
-  "devDependencies": {
+    "rxjs": "^7.8.1",
     "@angular/common": "^16.2.12"
   }
 }

package/dist/api-client-angular/src/AngularApiHttpClient.d.ts

@@ -1,3 +0,0 @@
-import { HttpClient as AngularHttpClient } from '@angular/common/http';
-import { HttpClient } from './types';
-export declare const createHttpClient: (client: AngularHttpClient) => HttpClient;

package/dist/api-client-angular/src/index.d.ts

@@ -1 +0,0 @@
-export { createHttpClient } from './AngularApiHttpClient';

package/dist/api-client-angular/src/serializeQuery.d.ts

@@ -1,2 +0,0 @@
-export declare const serializeQuery: (obj: any) => any;
-export declare const flattenObject: (obj: any, prefix?: string) => any;

package/dist/api-client-angular/src/types.d.ts

@@ -1,20 +0,0 @@
-import { Observable } from 'rxjs';
-export type ContentType = {};
-export type RequestParams = {};
-export declare const ContentType: {
-    Json: string;
-    FormData: string;
-};
-export type Request = {
-    path: string;
-    method: 'GET' | 'POST' | 'PUT' | 'DELETE';
-    format?: 'json';
-    query?: any;
-    body?: any;
-    type?: string;
-    secure?: boolean;
-    responseType?: 'arraybuffer' | 'blob' | 'json' | 'text';
-};
-export type HttpClient<Any = any> = {
-    request: <Data, A = any>(req: Request) => Observable<Data>;
-};

package/dist/api-client-common/src/index.d.ts

@@ -1 +0,0 @@
-export declare const myFun: (f: string) => string;

package/dist/types.d.ts

@@ -1,19 +0,0 @@
-import { Observable } from 'rxjs';
-export type ContentType = {};
-export type RequestParams = {};
-export declare const ContentType: {
-    Json: string;
-    FormData: string;
-};
-export type Request = {
-    path: string;
-    method: 'GET' | 'POST' | 'PUT' | 'DELETE';
-    format?: 'json';
-    query?: any;
-    body?: any;
-    type?: string;
-    secure?: boolean;
-};
-export type HttpClient<Any = any> = {
-    request: <Data, A = any>(req: Request) => Observable<Data>;
-};

package/src/AngularApiHttpClient.ts

@@ -1,87 +0,0 @@
-import { HttpClient as AngularHttpClient, HttpResponse } from '@angular/common/http'
-import { map, Observable } from 'rxjs'
-import {
-    serializeQueryForSpringBoot,
-    serializeQueryWithQs,
-    UrlConverter,
-    ObservableHttpClient,
-    Request, ContentType, getFileNameFromContentDispositionHeader,
-} from '@ps-aux/api-client-common'
-
-export const qsUrlConverter: () => UrlConverter = () => ({ query, path }) => {
-    return {
-        url: path + (query ? `?${serializeQueryWithQs(query)}` : ''),
-    }
-}
-
-export const springBootUrlConverter: () => UrlConverter = () => ({ query, path }) => {
-    return {
-        url: path + (query ? `?${serializeQueryForSpringBoot(query)}` : ''),
-    }
-}
-
-
-export const createHttpClient = (client: AngularHttpClient, urlConverter: UrlConverter = qsUrlConverter()): ObservableHttpClient => {
-    return {
-        request: <D>(req: Request): Observable<D> => {
-            const { url, params } = urlConverter(req)
-
-            const isBlob = req.format === 'document'
-
-            const obs = client.request<D>(
-                req.method,
-                url,
-                {
-                    params,
-                    body: prepareBody(req.body, req.type),
-                    responseType: (isBlob ? 'blob' : 'json') as any,
-                    observe: 'response',
-                })
-
-            return obs.pipe(
-                map((r: HttpResponse<D>) => {
-                    const { body } = r
-
-                    if (!isBlob)
-                        return body as D
-
-                    const data = body as Blob
-
-                    const contDisp = r.headers.get('content-disposition')
-                    return new File([data], getFileNameFromContentDispositionHeader(contDisp), {
-                        type: data.type
-                    }) as D
-                }),
-            )
-        },
-    }
-}
-
-const prepareBody = (payload: any, type?: string): any => {
-    if (type === ContentType.FormData) {
-        return convertToFormData(payload)
-    }
-
-    return payload
-}
-
-const convertToFormData = (payload: Record<string, any>): FormData => {
-    const formData = new FormData()
-    const addProp = (key: string, val: any) => {
-        if (Array.isArray(val) || val instanceof FileList) {
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore - seems that FileList is iterable despite the warning
-            // TODO change to other iteration method if this is not true
-            for (const valItem of val) {
-                addProp(key, valItem)
-            }
-        } else if (typeof val === 'object' && val != null && !(val instanceof File)) {
-            throw new Error('Object serialization into FormData not supported')
-        } else {
-            formData.append(key, val)
-        }
-    }
-
-    Object.entries(payload).forEach(([key, val]) => addProp(key, val))
-    return formData
-}

package/src/serializeQuery.ts

@@ -1,45 +0,0 @@
-// @ts-nocheck
-
-// TODO improve typings and check implementation
-export const serializeQuery = (obj: any): any => {
-  let result = {};
-  if (obj) {
-    Object.entries(obj).forEach(([key, val]) => {
-      if (Array.isArray(val)) {
-        val.map(v => {
-          if (result[key]) {
-            result[key] += `&${key}=${v}`;
-          } else {
-            result[key] = v;
-          }
-        });
-      } else if (typeof val === 'object') {
-        result = { ...result, ...flattenObject(val) };
-      } else {
-        result[key] = val;
-      }
-    });
-  }
-  return result;
-};
-
-export const flattenObject = (obj: any, prefix?: string): any => {
-  let str = {};
-  const pfix = prefix ? prefix + '.' : '';
-
-  for (const p in obj) {
-    if (obj.hasOwnProperty(p)) {
-      if (Array.isArray(obj[p])) {
-        str[pfix + p] = obj[p];
-      } else if (obj[p] === null) {
-        str[pfix + p] = null;
-      } else if (typeof obj[p] === 'object') {
-        str = { ...str, ...flattenObject(obj[p], pfix + p) };
-      } else if (obj[p] !== undefined) {
-        str[pfix + p] = obj[p];
-      }
-    }
-  }
-
-  return str;
-};