ng2-rest 19.0.37 → 19.0.39

package/websql/lib/axios-interceptors.d.ts

@@ -0,0 +1,23 @@
+// @ts-nocheck
+import { AxiosRequestConfig, AxiosResponse } from 'axios';
+import type express from 'express';
+import { Observable } from 'rxjs';
+export interface AxiosTaonHttpHandler<T = any> {
+    handle(req: AxiosRequestConfig): Observable<AxiosResponse<T>>;
+}
+export interface TaonClientMiddlewareInterceptOptions<T = any> {
+    req: AxiosRequestConfig;
+    next: AxiosTaonHttpHandler<T>;
+}
+export interface TaonServerMiddlewareInterceptOptions<T = any> {
+    req: express.Request;
+    res: express.Response;
+    next: express.NextFunction;
+}
+export interface TaonAxiosClientInterceptor<T = any> {
+    intercept(client: TaonClientMiddlewareInterceptOptions<T>): Observable<AxiosResponse<T>>;
+}
+export declare class AxiosBackendHandler<T = any> implements AxiosTaonHttpHandler<T> {
+    handle(req: AxiosRequestConfig): Observable<AxiosResponse<T>>;
+}
+export declare const buildInterceptorChain: <T = any>(interceptors: Array<TaonAxiosClientInterceptor<T>>, backend: AxiosTaonHttpHandler<T>) => AxiosTaonHttpHandler<T>;

package/websql/lib/index.d.ts

@@ -6,5 +6,6 @@ export * from './rest.class';
 export * from './rest-headers';
 export * from './helpers';
 export * from './content-type';
+export * from './axios-interceptors';
 export { SimpleResource } from './other/simple-resource';
 export { interpolateParamsToUrl } from './params';

package/websql/lib/models.d.ts

@@ -1,13 +1,14 @@
 // @ts-nocheck
+import { AxiosRequestConfig } from 'axios';
+import { Circ } from 'json10/websql';
 import { Observable } from 'rxjs';
 import { Subject } from 'rxjs';
-import { RestHeaders } from './rest-headers';
-import { Rest } from './rest.class';
+import { CoreModels } from 'tnp-core/websql';
+import { Models as HelpersModels } from 'typescript-class-helpers/websql';
 import { Cookie } from './cookie';
 import { Mapping } from './mapping';
-import { Models as HelpersModels } from 'typescript-class-helpers/websql';
-import { Circ } from 'json10/websql';
-import { CoreModels } from 'tnp-core/websql';
+import { RestHeaders } from './rest-headers';
+import { Rest } from './rest.class';
 export declare namespace Models {
     export import HttpMethod = CoreModels.HttpMethod;
     export import ParamType = CoreModels.ParamType;
@@ -41,8 +42,10 @@ export declare namespace Models {
     type PromiseObservableMix<T> = Promise<T> & {
         observable: Observable<T>;
     };
-    type MethodWithoutBody<E, T, R = PromiseObservableMix<E>> = (params?: UrlParams[], doNotSerializeParams?: boolean) => R;
-    type MethodWithBody<E, T, R = PromiseObservableMix<E>> = (item?: T, params?: UrlParams[], doNotSerializeParams?: boolean) => R;
+    type Ng2RestAxiosRequestConfig = {
+        doNotSerializeParams?: boolean;
+    } & AxiosRequestConfig<any>;
+    type MethodWithBody<E, T, R = PromiseObservableMix<E>> = (item?: T, params?: UrlParams[], axiosOptions?: Ng2RestAxiosRequestConfig) => R;
     type ReplayData = {
         subject: Subject<any>;
         data: {
@@ -69,13 +72,13 @@ export declare namespace Models {
         headers: RestHeaders;
     }
     interface Ng2RestMethods<E, T> {
-        get: MethodWithoutBody<E, T>;
+        get: MethodWithBody<E, T>;
         post: MethodWithBody<E, T>;
         put: MethodWithBody<E, T>;
         patch: MethodWithBody<E, T>;
-        head: MethodWithoutBody<E, T>;
-        delete: MethodWithoutBody<E, T>;
-        jsonp: MethodWithoutBody<E, T>;
+        head: MethodWithBody<E, T>;
+        delete: MethodWithBody<E, T>;
+        jsonp: MethodWithBody<E, T>;
     }
     type MockController = (url: string, method: CoreModels.HttpMethod, headers?: RestHeaders, body?: any) => MockResponse;
     type MockHttp = MockResponse | MockController;

package/websql/lib/other/simple-resource.d.ts

@@ -2,13 +2,13 @@
 import { Observable } from 'rxjs';
 import { Models } from '../models';
 export interface RestPromises<A, TA, QP extends Models.UrlParams> {
-    get: (queryParams?: QP) => Observable<Models.HttpResponse<A>>;
-    head: (queryParams?: QP) => Observable<Models.HttpResponse<A>>;
-    query: (queryParams?: QP) => Observable<Models.HttpResponse<TA>>;
+    get: (tem?: A, queryParams?: QP) => Observable<Models.HttpResponse<A>>;
+    head: (tem?: A, queryParams?: QP) => Observable<Models.HttpResponse<A>>;
+    query: (tem?: A, queryParams?: QP) => Observable<Models.HttpResponse<TA>>;
     put: (item?: A, queryParams?: QP) => Observable<Models.HttpResponse<A>>;
     patch: (item?: A, queryParams?: QP) => Observable<Models.HttpResponse<A>>;
     post: (item?: A, queryParams?: QP) => Observable<Models.HttpResponse<A>>;
-    delete: (queryParams?: QP) => Observable<Models.HttpResponse<A> | any>;
+    delete: (item?: A, queryParams?: QP) => Observable<Models.HttpResponse<A> | any>;
 }
 export interface Model<A, TA, RP extends Object, QP extends Models.UrlParams> {
     (restParams?: RP): RestPromises<A, TA, QP>;

package/websql/lib/rest-request.d.ts

@@ -1,5 +1,5 @@
 // @ts-nocheck
-import { AxiosRequestConfig } from 'axios';
+import { TaonAxiosClientInterceptor } from './axios-interceptors';
 import { Models } from './models';
 import { RestHeaders } from './rest-headers';
 export declare class RestRequest {
@@ -7,17 +7,25 @@ export declare class RestRequest {
     private static jobId;
     private subjectInuUse;
     private meta;
-    interceptors: Map<string, (config: AxiosRequestConfig<any>, interceptorName?: string) => Promise<AxiosRequestConfig<any>>>;
+    /**
+     * key is interceptorName (just to identify who is intercepting)
+     */
+    interceptors: Map<string, TaonAxiosClientInterceptor<any>>;
+    /**
+     * key is a joined string METHOD-expressPath.
+     * Example `GET-/api/users`
+     */
+    methodsInterceptors: Map<string, TaonAxiosClientInterceptor<any>>;
     private handlerResult;
     private req;
     private getReplay;
     private generalReq;
-    get(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp): Models.PromiseObservableMix<any>;
-    head(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp): Models.PromiseObservableMix<any>;
-    delete(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp): Models.PromiseObservableMix<any>;
-    post(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp): Models.PromiseObservableMix<any>;
-    put(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp): Models.PromiseObservableMix<any>;
-    patch(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp): Models.PromiseObservableMix<any>;
-    jsonp(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp): Models.PromiseObservableMix<any>;
+    get(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp, axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<any>;
+    head(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp, axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<any>;
+    delete(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp, axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<any>;
+    post(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp, axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<any>;
+    put(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp, axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<any>;
+    patch(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp, axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<any>;
+    jsonp(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp, axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<any>;
     private replaySubjects;
 }

package/websql/lib/rest.class.d.ts

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import { Models } from './models';
-import { RestRequest } from './rest-request';
 import { RestHeaders } from './rest-headers';
+import { RestRequest } from './rest-request';
 export declare class Rest<T, TA = T[]> implements Models.FnMethodsHttpWithMock<T, TA> {
     private request;
     private meta;
@@ -19,19 +19,19 @@ export declare class Rest<T, TA = T[]> implements Models.FnMethodsHttpWithMock<T
     constructor(endpoint: string, request: RestRequest, meta: Models.MetaRequest, customContentType: RestHeaders);
     private req;
     array: {
-        get: (params?: Models.UrlParams[], doNotSerializeParams?: boolean) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
-        head: (params?: Models.UrlParams[], doNotSerializeParams?: boolean) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
-        post: (item: TA, params?: Models.UrlParams[], doNotSerializeParams?: boolean) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
-        put: (item: TA, params?: Models.UrlParams[], doNotSerializeParams?: boolean) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
-        patch: (item: TA, params?: Models.UrlParams[], doNotSerializeParams?: boolean) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
-        delete: (params?: Models.UrlParams[], doNotSerializeParams?: boolean) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
-        jsonp: (params?: Models.UrlParams[], doNotSerializeParams?: boolean) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
+        get: (item: TA, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
+        head: (item: TA, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
+        post: (item: TA, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
+        put: (item: TA, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
+        patch: (item: TA, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
+        delete: (item: TA, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
+        jsonp: (item: TA, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
     };
-    get(params?: Models.UrlParams[], doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<T>>;
-    head(params?: Models.UrlParams[], doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<T>>;
-    post(item: T, params?: Models.UrlParams[], doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<T>>;
-    put(item: T, params?: Models.UrlParams[], doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<T>>;
-    patch(item: T, params?: Models.UrlParams[], doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<T>>;
-    delete(params?: Models.UrlParams[], doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<T>>;
-    jsonp(params?: Models.UrlParams[], doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<T>>;
+    get(item: T, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<Models.HttpResponse<T>>;
+    head(item: T, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<Models.HttpResponse<T>>;
+    post(item: T, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<Models.HttpResponse<T>>;
+    put(item: T, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<Models.HttpResponse<T>>;
+    patch(item: T, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<Models.HttpResponse<T>>;
+    delete(item: T, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<Models.HttpResponse<T>>;
+    jsonp(item: T, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<Models.HttpResponse<T>>;
 }

package/websql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ng2-rest/websql",
-  "version": "19.0.37",
+  "version": "19.0.39",
   "module": "fesm2022/ng2-rest.mjs",
   "typings": "index.d.ts",
   "exports": {