@livequery/rest 1.0.86 → 2.0.6

package/build/RestTransporter.d.ts

@@ -1,17 +1,17 @@
-import { Transporter, QueryOption, QueryStream } from '@livequery/types';
+import { Transporter, QueryOption, QueryStream, Response } from '@livequery/types';
+import { Observable } from 'rxjs';
 type MaybePromise<T> = T | Promise<T>;
+export type Request = {
+    url: RequestInfo | URL | string;
+    options?: RequestInit;
+};
 export type RestTransporterConfig = {
     websocket_url: () => MaybePromise<string>;
     base_url: () => MaybePromise<string>;
     headers?: () => Promise<{
         [key: string]: string;
     }>;
-    onResponse?: (data: {
-        url: string;
-        headers: Headers;
-        body: any;
-        status: number;
-    }) => void;
+    hooks?: (o: Observable<Request>) => Observable<Request>;
 };
 export declare class RestTransporter implements Transporter {
     #private;
@@ -20,7 +20,7 @@ export declare class RestTransporter implements Transporter {
     constructor(config: RestTransporterConfig);
     query<T extends {
         id: string;
-    }>(ref: string, options?: Partial<QueryOption<T>>): import("rxjs").Observable<QueryStream<T> | {
+    }>(ref: string, options?: Partial<QueryOption<T>>): Observable<QueryStream<T> | {
         error: any;
     }> & {
         reload: () => void;
@@ -29,7 +29,7 @@ export declare class RestTransporter implements Transporter {
     get<T>(ref: string, query?: any): Promise<T>;
     add<T extends {} = {}>(ref: string, data: Partial<T>): Promise<any>;
     update<T extends {} = {}>(ref: string, data: Partial<T>, method?: 'PATCH' | 'PUT'): Promise<any>;
-    remove(ref: string): Promise<void>;
-    trigger<Query = any, Payload = any, Response = void>(ref: string, name: string, query: Query, payload: Payload): Promise<Response>;
+    remove<T>(ref: string): Promise<T>;
+    trigger<T extends {}>(ref: string, name: string, payload?: any, query?: any): Promise<Response<T>>;
 }
 export {};

package/build/RestTransporter.js

@@ -1,8 +1,8 @@
-import { of } from 'rxjs';
+import { of, lastValueFrom } from 'rxjs';
 import { catchError, map, mergeMap } from 'rxjs/operators';
-import { merge, Subject } from 'rxjs';
+import { merge, Subject, BehaviorSubject } from 'rxjs';
 import { Socket } from './Socket.js';
-import { stringify } from 'query-string';
+import qs from 'query-string';
 export class RestTransporter {
     config;
     socket;
@@ -13,17 +13,17 @@ export class RestTransporter {
     query(ref, options) {
         const $on_reload = new Subject();
         const http_request = merge(of(1), this.socket?.$reconnect || of(), $on_reload)
-            .pipe(mergeMap(() => this.call(ref, 'GET', options)), map(({ data, error }) => {
+            .pipe(mergeMap(() => this.call(ref, 'GET', undefined, options)), map(({ data, error }) => {
             if (error)
                 throw error;
-            data.realtime_token && this.socket?.subscribe(data.realtime_token);
-            // If collection
+            data.subscription_token && this.socket?.subscribe(data.subscription_token);
             const collection = data;
+            // If collection
             if (collection.items) {
                 return {
                     data: {
                         changes: collection.items.map(data => ({ data, type: 'added', ref })),
-                        paging: { ...collection.paging, n: 0 }
+                        paging: { ...collection, n: 0 }
                     }
                 };
             }
@@ -32,11 +32,11 @@ export class RestTransporter {
             return {
                 data: {
                     changes: [{ data: document.item, type: 'added', ref }],
-                    paging: { n: 0 }
+                    paging: { ...collection, n: 0 }
                 }
             };
         }), catchError(error => of({ error })));
-        const websocket_sync = (!this.socket || options._cursor) ? of() : (this.socket.listen(ref).pipe(map((change) => ({ data: { changes: [change] } }))));
+        const websocket_sync = (!this.socket || options[':after'] || options[':before'] || options[':around']) ? of() : (this.socket.listen(ref).pipe(map((change) => ({ data: { changes: [change] } }))));
         return Object.assign(merge(http_request, websocket_sync), {
             reload: () => $on_reload.next()
         });
@@ -48,9 +48,9 @@ export class RestTransporter {
             ...o,
             [key]: typeof query[key] == 'object' ? JSON.stringify(query[key]) : query[key]
         }), {});
-        return `?${stringify(encoded_query)}`;
+        return `?${qs.stringify(encoded_query)}`;
     }
-    async call(url, method, query = {}, payload) {
+    async call(url, method, payload, query = {}) {
         const headers = {
             ...await this.config.headers?.() || {},
             ...payload ? {
@@ -59,48 +59,38 @@ export class RestTransporter {
             ...this.socket ? { socket_id: this.socket.socket_session } : {}
         };
         try {
-            const response = await fetch(`${this.config.base_url()}/${url}${this.#encode_query(query)}`, {
-                method,
-                headers: headers,
-                ...payload ? { body: JSON.stringify(payload) } : {},
-            });
-            try {
-                const body = await response.json();
-                this.config.onResponse?.({
-                    body,
-                    headers: response.headers,
-                    status: response.status,
-                    url
-                });
-                return body;
-            }
-            catch (e) {
-                this.config.onResponse?.({
-                    body: null,
-                    headers: response.headers,
-                    status: response.status,
-                    url
-                });
-                return null;
-            }
+            const request = {
+                url: `${this.config.base_url()}/${url}${this.#encode_query(query)}`,
+                options: {
+                    method,
+                    headers: headers,
+                    ...payload ? { body: JSON.stringify(payload) } : {},
+                }
+            };
+            const mapped = this.config.hooks ? await lastValueFrom(this.config.hooks(new BehaviorSubject(request))) : request;
+            const response = await fetch(mapped.url, mapped.options);
+            const body = await response.json();
+            if (body.error)
+                throw body.error;
+            return body;
         }
         catch (error) {
             throw error;
         }
     }
-    async get(ref, query = {}) {
-        return await this.call(ref, 'GET', query, null);
+    get(ref, query = {}) {
+        return this.call(ref, 'GET', null, query);
     }
-    async add(ref, data) {
-        return await this.call(ref, 'POST', {}, data);
+    add(ref, data) {
+        return this.call(ref, 'POST', data, {});
     }
-    async update(ref, data, method = 'PATCH') {
-        return await this.call(ref, method, {}, data);
+    update(ref, data, method = 'PATCH') {
+        return this.call(ref, method, data, {});
     }
-    async remove(ref) {
-        return await this.call(ref, 'DELETE');
+    remove(ref) {
+        return this.call(ref, 'DELETE');
     }
-    async trigger(ref, name, query, payload) {
-        return await this.call(`${ref}/~${name}`, 'POST', query, payload);
+    trigger(ref, name, payload, query) {
+        return this.call(`${ref}/~${name}`, 'POST', payload, query);
     }
 }

package/package.json

@@ -3,7 +3,7 @@
     "repository": {
         "url": "https://github.com/livequery/rest"
     },
-    "version": "1.0.86",
+    "version": "2.0.6",
     "type": "module",
     "description": "",
     "main": "build/index.js",
@@ -12,14 +12,14 @@
         "build/**/*"
     ],
     "dependencies": {
-        "@types/uuid": "^8.3.0",
         "query-string": "^7.0.1",
-        "rxjs": "^7.1.0",
-        "typescript": "4.9.5",
         "uuid": "^8.3.2"
     },
     "devDependencies": {
-        "@livequery/types": "1.0.82"
+        "rxjs": "^7.1.0",
+        "typescript": "4.9.5",
+        "@types/uuid": "^8.3.0",
+        "@livequery/types": "2.0.0"
     },
     "peerDependencies": {},
     "scripts": {