@livequery/client 1.0.23 → 1.0.24

package/build/Collection.d.ts

@@ -28,6 +28,8 @@ export declare class CollectionObservable<T extends {
     private ref;
     private collection_options;
     private is_collection_ref;
+    private collection_ref;
+    private document_id;
     constructor(ref: string, collection_options: CollectionOption<T>);
     private push_item;
     private sync;
@@ -36,11 +38,11 @@ export declare class CollectionObservable<T extends {
     reset(): void;
     fetch_more(): void;
     filter(filters: Partial<QueryOption<T>>): void;
-    add(payload: T, local?: boolean): Promise<void>;
-    remove(id: string): Promise<void>;
-    update({ id, ...payload }: {
+    add(payload: T): Promise<void>;
+    remove(remove_document_id?: string): Promise<void>;
+    update({ id: update_payload_id, ...payload }: Partial<T & {
         id: string;
-    } & Partial<T>): Promise<void>;
-    trigger(name: string, document_id: string | null, payload?: object): Promise<unknown>;
+    }>): Promise<void>;
+    trigger(name: string, payload?: object, trigger_document_id?: string): Promise<unknown>;
 }
 export {};

package/build/Collection.js

@@ -38,7 +38,6 @@ exports.CollectionObservable = void 0;
 const rxjs_1 = require("rxjs");
 const get_sort_function_1 = require("./helpers/get_sort_function");
 const operators_1 = require("rxjs/operators");
-const uuid_1 = require("uuid");
 class CollectionObservable extends rxjs_1.Observable {
     constructor(ref, collection_options) {
         super(o => {
@@ -57,12 +56,15 @@ class CollectionObservable extends rxjs_1.Observable {
         _subscriptions.set(this, new Set());
         _state.set(this, void 0);
         _next_cursor.set(this, null);
+        if (ref.startsWith('/') || ref.endsWith('/'))
+            throw 'INVAILD_REF_FORMAT';
         const refs = ref.split('/');
         this.is_collection_ref = refs.length % 2 == 1;
+        this.collection_ref = refs.slice(0, refs.length - (this.is_collection_ref ? 0 : 1)).join('/');
+        this.document_id = this.is_collection_ref ? null : refs[refs.length - 1];
     }
     push_item(data) {
-        const { id } = data;
-        const item = Object.assign(Object.assign({ __adding: false, __updating: true, __removing: false }, data), { __remove: () => this.remove(id), __trigger: (name, payload) => this.trigger(name, id, payload), __update: (payload) => this.update(Object.assign({ id }, payload)) });
+        const item = Object.assign(Object.assign({ __adding: false, __updating: true, __removing: false }, data), { __remove: () => this.remove(data === null || data === void 0 ? void 0 : data.id), __trigger: (name, payload) => this.trigger(name, payload, data === null || data === void 0 ? void 0 : data.id), __update: (payload) => this.update(Object.assign({ id: data === null || data === void 0 ? void 0 : data.id }, payload)) });
         __classPrivateFieldGet(this, _state).items.push(item);
     }
     sync(stream) {
@@ -167,26 +169,14 @@ class CollectionObservable extends rxjs_1.Observable {
     filter(filters) {
         this.fetch_data(filters, true);
     }
-    add(payload, local = false) {
+    add(payload) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (local) {
-                const data = Object.assign(Object.assign({ id: uuid_1.v4() }, payload), { __adding: true });
-                this.sync([{
-                        data: {
-                            changes: [{
-                                    data: Object.assign(Object.assign({}, payload), { __adding: true }),
-                                    ref: this.ref,
-                                    type: 'added'
-                                }]
-                        }
-                    }]);
-                return yield this.collection_options.transporter.add(`${this.ref}`, data);
-            }
-            return yield this.collection_options.transporter.add(`${this.ref}`, payload);
+            return yield this.collection_options.transporter.add(`${this.collection_ref}`, payload);
         });
     }
-    remove(id) {
+    remove(remove_document_id) {
         return __awaiter(this, void 0, void 0, function* () {
+            const id = remove_document_id || this.document_id;
             this.sync([{
                     data: {
                         changes: [{
@@ -197,13 +187,14 @@ class CollectionObservable extends rxjs_1.Observable {
                     }
                 }]);
             // Trigger  
-            const ref = `${this.ref}${this.is_collection_ref ? `/${id}` : ''}`;
+            const ref = `${this.collection_ref}${id ? `/${id}` : ''}`;
             return yield this.collection_options.transporter.remove(ref);
         });
     }
     update(_a) {
-        var { id } = _a, payload = __rest(_a, ["id"]);
+        var { id: update_payload_id } = _a, payload = __rest(_a, ["id"]);
         return __awaiter(this, void 0, void 0, function* () {
+            const id = update_payload_id || this.document_id;
             // Trigger local update
             this.sync([{
                     data: {
@@ -214,13 +205,14 @@ class CollectionObservable extends rxjs_1.Observable {
                             }]
                     }
                 }]);
-            const ref = `${this.ref}${this.is_collection_ref ? `/${id}` : ''}`;
+            const ref = `${this.collection_ref}${id ? `/${id}` : ''}`;
             return yield this.collection_options.transporter.update(ref, payload);
         });
     }
-    trigger(name, document_id, payload) {
+    trigger(name, payload, trigger_document_id) {
         return __awaiter(this, void 0, void 0, function* () {
-            const ref = `${this.ref}${this.is_collection_ref ? `/${document_id}` : ''}`;
+            const id = trigger_document_id || this.document_id;
+            const ref = `${this.collection_ref}${id ? `/${id}` : ''}`;
             return yield this.collection_options.transporter.trigger(ref, name, {}, payload);
         });
     }

package/package.json

@@ -3,7 +3,7 @@
   "repository": {
     "url": "https://github.com/livequery/client"
   },
-  "version": "1.0.23",
+  "version": "1.0.24",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",