@ztimson/momentum 1.3.1 → 1.4.0

package/dist/data.d.ts

@@ -1,12 +1,22 @@
 import { Unsubscribe } from '@ztimson/utils';
 import { Meta, PathEventEmitter } from './core';
 import { Momentum } from './momentum';
+/** Comparison operators for filters */
+export type FilterOperator = '=' | '!=' | '>' | '>=' | '<' | '<=' | 'in' | 'nin' | 'regex' | 'exists';
+/** Filter value - primitive for equality or [operator, value] for comparison */
+export type FilterValue<T = any> = T | [FilterOperator, T];
+/** Filter object with comparison support */
+export type Filter<T = any> = {
+    [K in keyof T]?: FilterValue<T[K]>;
+} & {
+    [key: string]: FilterValue;
+};
 /** Generic MongoDB document */
 export type Document<T> = Meta & T;
 /** Raw MongoDB query */
 export type RawQuery = {
     /** Query operation type */
-    operand: 'delete' | 'deleteOne' | 'find' | 'findOne' | 'insertOne' | 'replaceOne' | 'update' | 'updateOne';
+    operand: 'deleteMany' | 'deleteOne' | 'findMany' | 'findOne' | 'insertMany' | 'insertOne' | 'replaceMany' | 'replaceOne' | 'updateMany' | 'updateOne';
     /** Filter affected documents */
     filter?: any;
     /** Query */
@@ -36,7 +46,8 @@ export declare class Data extends PathEventEmitter {
      * @param {number} id Document ID
      * @return {Promise<void>} Returns once complete
      */
-    delete(collection: string, id: number): Promise<number>;
+    delete(collection: string, id: number): Promise<number[]>;
+    delete<T>(collection: string, filter: Filter<T>): Promise<number[]>;
     /**
      * Read collection/document
      * @param {string} collection target collection/document
@@ -44,14 +55,18 @@ export declare class Data extends PathEventEmitter {
      */
     read<T extends Meta>(collection: string): Promise<T[]>;
     read<T extends Meta>(collection: string, id: number): Promise<T>;
+    read<T extends Meta>(collection: string, filter: Filter<T>): Promise<T[]>;
     /**
      * Update document in collection
      * @param {string} collection Target collection
      * @param {Document<T>} document Document to update
-     * @param {boolean} append Append or replace existing document
-     * @return {Promise<Document<T>>} New saved document
+     * @param {object} options Filter and append options
+     * @return {Promise<Document<T> | Document<T>[]>} Updated document(s)
      */
-    update<T>(collection: string, document: Document<T>, append?: boolean): Promise<Document<T>>;
+    update<T>(collection: string, document: Document<T>, options?: {
+        filter?: Filter<T>;
+        append?: boolean;
+    }): Promise<Document<T> | Document<T>[]>;
     /**
      * Create raw MongoDB query
      * @param {string} collection Target collection name

package/dist/data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../src/data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAC,KAAK,IAAI,EAAE,gBAAgB,EAAM,MAAM,QAAQ,CAAC;AACxD,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEpC,+BAA+B;AAC/B,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;AAEnC,wBAAwB;AACxB,MAAM,MAAM,QAAQ,GAAG;IACtB,2BAA2B;IAC3B,OAAO,EAAE,QAAQ,GAAG,WAAW,GAAG,MAAM,GAAG,SAAS,GAAG,WAAW,GAAG,YAAY,GAAG,QAAQ,GAAG,WAAW,CAAC;IAC3G,gCAAgC;IAChC,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,YAAY;IACZ,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,gCAAgC;IAChC,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,4BAA4B;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAC;CAChB,CAAA;AAED,qCAAqC;AACrC,qBAAa,IAAK,SAAQ,gBAAgB;IAG7B,SAAS,CAAC,QAAQ,EAAE,QAAQ;IAFxC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAA;KAAC,CAAM;gBAE5C,QAAQ,EAAE,QAAQ;IAIxC;;;;;OAKG;IACH,MAAM,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAY1E;;;;;OAKG;IACG,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAU7D;;;;OAIG;IACH,IAAI,CAAC,CAAC,SAAS,IAAI,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IACtD,IAAI,CAAC,CAAC,SAAS,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAShE;;;;;;OAMG;IACH,MAAM,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAY5F;;;;;OAKG;IACH,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IASzD;;;;;;OAMG;IACH,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,EAAE,IAAI,GAAE;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAM,GAAG,WAAW;CAmBtG"}
+{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../src/data.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -3145,25 +3145,27 @@ Must be either: call, email or sms`);
         return resp;
       });
     }
-    /**
-     * Delete document from collection
-     * @param {string} collection Target collection
-     * @param {number} id Document ID
-     * @return {Promise<void>} Returns once complete
-     */
-    async delete(collection, id) {
-      if (!collection || !id) throw new Error("Cannot delete document, missing collection or ID");
-      const count = await this.momentum.api.request({
-        url: `api/` + PES`data/${collection}/${id}`,
-        method: "DELETE"
-      });
-      if (count) this.emit(PES`data/${collection}/${id}:d`, id);
-      return count;
-    }
-    read(collection, id) {
+    async delete(collection, filter) {
+      if (!collection || !filter) throw new Error("Cannot delete document, missing collection or filter");
+      const pk = typeof filter == "object" ? filter?.["_id"] ?? null : filter;
+      const q = typeof filter == "object" ? JSON.stringify(filter) : null;
+      const url = `api/data/${collection}${pk ? `/${pk}` : ""}${q ? `?q=${encodeURIComponent(q)}` : ""}`;
+      const ids = await this.momentum.api.request({ url, method: "DELETE" });
+      ids.forEach((id) => this.emit(PES`data/${collection}/${id}:d`, id));
+      return ids;
+    }
+    read(collection, filter) {
       if (!collection) throw new Error("Cannot read documents, missing collection");
-      return this.momentum.api.request({ url: `api/` + PES`data/${collection}/${id}` }).then((resp) => {
-        this.emit(PES`data/${collection}/${id}:r`, collection, resp);
+      const pk = typeof filter == "object" ? filter?.["_id"] ?? null : filter;
+      const q = typeof filter == "object" ? JSON.stringify(filter) : null;
+      const url = `api/data/${collection}${pk ? `/${pk}` : ""}${q ? `?q=${encodeURIComponent(q)}` : ""}`;
+      return this.momentum.api.request({ url }).then((resp) => {
+        if (Array.isArray(resp)) {
+          if (!q) this.emit(PES`data/${collection}:r`, collection, resp);
+          else resp.forEach((r) => this.emit(PES`data/${collection}/${r._id}:r`, collection, resp));
+        } else {
+          this.emit(PES`data/${collection}/${resp._id}:r`, collection, resp);
+        }
         return resp;
       });
     }
@@ -3171,17 +3173,21 @@ Must be either: call, email or sms`);
      * Update document in collection
      * @param {string} collection Target collection
      * @param {Document<T>} document Document to update
-     * @param {boolean} append Append or replace existing document
-     * @return {Promise<Document<T>>} New saved document
+     * @param {object} options Filter and append options
+     * @return {Promise<Document<T> | Document<T>[]>} Updated document(s)
      */
-    update(collection, document2, append) {
+    update(collection, document2, options = {}) {
       if (!collection || !document2) throw new Error("Cannot update document, missing collection or document");
+      const pk = options.filter ? options.filter?.["_id"] ?? document2._id : document2._id;
+      const q = options.filter && !options.filter?.["_id"] ? JSON.stringify(options.filter) : null;
+      const url = `api/data/${collection}${pk ? `/${pk}` : ""}${q ? `?q=${encodeURIComponent(q)}` : ""}`;
       return this.momentum.api.request({
-        url: `api/` + PES`data/${collection}/${document2._id}`,
-        method: append ? "PATCH" : "PUT",
+        url,
+        method: options.append === false ? "PUT" : "PATCH",
         body: document2
       }).then((resp) => {
-        this.emit(PES`data/${collection}/${document2._id}:u`, resp);
+        if (Array.isArray(resp)) resp.forEach((r) => this.emit(PES`data/${collection}/${r._id}:u`, r));
+        else this.emit(PES`data/${collection}/${resp._id}:u`, resp);
         return resp;
       });
     }
@@ -3216,12 +3222,12 @@ Must be either: call, email or sms`);
         callback(cache.all());
       });
       if (opts.reload == void 0 || opts.reload) this.read(path);
-      if (!this.subscribers.length) this.momentum.socket?.subscribe(e);
+      if (!Object.keys(this.subscribers).length) this.momentum.socket?.subscribe(e);
       const key = Object.keys(this.subscribers).length.toString();
       this.subscribers[key] = () => {
         unsubscribe();
         delete this.subscribers[key];
-        if (!this.subscribers.length) this.momentum.socket?.unsubscribe(e);
+        if (!Object.keys(this.subscribers).length) this.momentum.socket?.unsubscribe(e);
       };
       return this.subscribers[key];
     }
@@ -4250,7 +4256,7 @@ ${log}`;
     }
     momentum;
   }
-  const version = "1.3.1";
+  const version = "1.4.0";
   class WebRtc extends PathEventEmitter {
     constructor(momentum) {
       super("webrtc");

package/dist/index.mjs

@@ -3141,25 +3141,27 @@ class Data extends PathEventEmitter {
       return resp;
     });
   }
-  /**
-   * Delete document from collection
-   * @param {string} collection Target collection
-   * @param {number} id Document ID
-   * @return {Promise<void>} Returns once complete
-   */
-  async delete(collection, id) {
-    if (!collection || !id) throw new Error("Cannot delete document, missing collection or ID");
-    const count = await this.momentum.api.request({
-      url: `api/` + PES`data/${collection}/${id}`,
-      method: "DELETE"
-    });
-    if (count) this.emit(PES`data/${collection}/${id}:d`, id);
-    return count;
-  }
-  read(collection, id) {
+  async delete(collection, filter) {
+    if (!collection || !filter) throw new Error("Cannot delete document, missing collection or filter");
+    const pk = typeof filter == "object" ? filter?.["_id"] ?? null : filter;
+    const q = typeof filter == "object" ? JSON.stringify(filter) : null;
+    const url = `api/data/${collection}${pk ? `/${pk}` : ""}${q ? `?q=${encodeURIComponent(q)}` : ""}`;
+    const ids = await this.momentum.api.request({ url, method: "DELETE" });
+    ids.forEach((id) => this.emit(PES`data/${collection}/${id}:d`, id));
+    return ids;
+  }
+  read(collection, filter) {
     if (!collection) throw new Error("Cannot read documents, missing collection");
-    return this.momentum.api.request({ url: `api/` + PES`data/${collection}/${id}` }).then((resp) => {
-      this.emit(PES`data/${collection}/${id}:r`, collection, resp);
+    const pk = typeof filter == "object" ? filter?.["_id"] ?? null : filter;
+    const q = typeof filter == "object" ? JSON.stringify(filter) : null;
+    const url = `api/data/${collection}${pk ? `/${pk}` : ""}${q ? `?q=${encodeURIComponent(q)}` : ""}`;
+    return this.momentum.api.request({ url }).then((resp) => {
+      if (Array.isArray(resp)) {
+        if (!q) this.emit(PES`data/${collection}:r`, collection, resp);
+        else resp.forEach((r) => this.emit(PES`data/${collection}/${r._id}:r`, collection, resp));
+      } else {
+        this.emit(PES`data/${collection}/${resp._id}:r`, collection, resp);
+      }
       return resp;
     });
   }
@@ -3167,17 +3169,21 @@ class Data extends PathEventEmitter {
    * Update document in collection
    * @param {string} collection Target collection
    * @param {Document<T>} document Document to update
-   * @param {boolean} append Append or replace existing document
-   * @return {Promise<Document<T>>} New saved document
+   * @param {object} options Filter and append options
+   * @return {Promise<Document<T> | Document<T>[]>} Updated document(s)
    */
-  update(collection, document2, append) {
+  update(collection, document2, options = {}) {
     if (!collection || !document2) throw new Error("Cannot update document, missing collection or document");
+    const pk = options.filter ? options.filter?.["_id"] ?? document2._id : document2._id;
+    const q = options.filter && !options.filter?.["_id"] ? JSON.stringify(options.filter) : null;
+    const url = `api/data/${collection}${pk ? `/${pk}` : ""}${q ? `?q=${encodeURIComponent(q)}` : ""}`;
     return this.momentum.api.request({
-      url: `api/` + PES`data/${collection}/${document2._id}`,
-      method: append ? "PATCH" : "PUT",
+      url,
+      method: options.append === false ? "PUT" : "PATCH",
       body: document2
     }).then((resp) => {
-      this.emit(PES`data/${collection}/${document2._id}:u`, resp);
+      if (Array.isArray(resp)) resp.forEach((r) => this.emit(PES`data/${collection}/${r._id}:u`, r));
+      else this.emit(PES`data/${collection}/${resp._id}:u`, resp);
       return resp;
     });
   }
@@ -3212,12 +3218,12 @@ class Data extends PathEventEmitter {
       callback(cache.all());
     });
     if (opts.reload == void 0 || opts.reload) this.read(path);
-    if (!this.subscribers.length) this.momentum.socket?.subscribe(e);
+    if (!Object.keys(this.subscribers).length) this.momentum.socket?.subscribe(e);
     const key = Object.keys(this.subscribers).length.toString();
     this.subscribers[key] = () => {
       unsubscribe();
       delete this.subscribers[key];
-      if (!this.subscribers.length) this.momentum.socket?.unsubscribe(e);
+      if (!Object.keys(this.subscribers).length) this.momentum.socket?.unsubscribe(e);
     };
     return this.subscribers[key];
   }
@@ -4246,7 +4252,7 @@ class Static extends Storage {
   }
   momentum;
 }
-const version = "1.3.1";
+const version = "1.4.0";
 class WebRtc extends PathEventEmitter {
   constructor(momentum) {
     super("webrtc");

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/momentum",
-	"version": "1.3.1",
+	"version": "1.4.0",
 	"description": "Client library for momentum",
 	"keywords": [
 		"Momentum"