@ztimson/momentum 1.4.5 → 1.4.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/data.d.ts +18 -12
  2. package/dist/data.d.ts.map +1 -1
  3. package/dist/index.js +26 -34
  4. package/dist/index.mjs +26 -34
  5. package/package.json +1 -1
package/dist/data.d.ts CHANGED
@@ -62,23 +62,14 @@ export declare class Data extends PathEventEmitter {
62
62
  * @param {Document<T> | Document<T>[]} documents New document(s)
63
63
  * @return {Promise<Document<T> | Document<T>[]>} New saved document(s)
64
64
  */
65
- create<T>(collection: string, documents: Document<T> | Document<T>[]): Promise<Document<T> | Document<T>[]>;
66
- /**
67
- * Delete document(s) from collection
68
- * @param {string} collection Target collection
69
- * @param {number | Filter<T>} filter Document ID or filter object
70
- * @param {DeleteOptions} options Delete options
71
- * @return {Promise<number[]>} Array of deleted document IDs
72
- */
73
- delete(collection: string, id: number, options?: DeleteOptions): Promise<number[]>;
74
- delete(collection: string, ids: number[], options?: DeleteOptions): Promise<number[]>;
75
- delete<T>(collection: string, filter: Filter<T>, options?: DeleteOptions): Promise<number[]>;
65
+ create<T>(collection: string, documents: Document<T>): Promise<Document<T>>;
66
+ create<T>(collection: string, documents: Document<T>[]): Promise<Document<T>[]>;
76
67
  /**
77
68
  * Read document(s) from collection
78
69
  * @param {string} collection Target collection
79
70
  * @param {number | Filter<T>} filter Document ID or filter object
80
71
  * @param {ReadOptions} options Read options (limit, page, sortBy, sortDir)
81
- * @return {Promise<T | T[]>} Single document if ID provided, array of documents if filter or no filter provided
72
+ * @return {Promise<T | T[]>} Single document if numeric ID provided, array otherwise
82
73
  */
83
74
  read<T extends Meta>(collection: string, filter?: undefined, options?: ReadOptions): Promise<T[]>;
84
75
  read<T extends Meta>(collection: string, filter?: number, options?: ReadOptions): Promise<T>;
@@ -90,7 +81,22 @@ export declare class Data extends PathEventEmitter {
90
81
  * @param {UpdateOptions<T>} options Update options (filter, append, limit, upsert)
91
82
  * @return {Promise<Document<T> | Document<T>[]>} Updated document(s)
92
83
  */
84
+ update<T>(collection: string, documents: Document<T>, options?: UpdateOptions<T>): Promise<Document<T>>;
85
+ update<T>(collection: string, documents: Document<T>[], options?: UpdateOptions<T>): Promise<Document<T>[]>;
86
+ update<T>(collection: string, documents: Partial<T>, options: UpdateOptions<T> & {
87
+ filter: Filter<T>;
88
+ }): Promise<Document<T>[]>;
93
89
  update<T>(collection: string, documents: Document<T> | Document<T>[], options?: UpdateOptions<T>): Promise<Document<T> | Document<T>[]>;
90
+ /**
91
+ * Delete document(s) from collection
92
+ * @param {string} collection Target collection
93
+ * @param {number | Filter<T>} filter Document ID or filter object
94
+ * @param {DeleteOptions} options Delete options
95
+ * @return {Promise<number[]>} Array of deleted document IDs
96
+ */
97
+ delete(collection: string, id: number, options?: DeleteOptions): Promise<number[]>;
98
+ delete(collection: string, ids: number[], options?: DeleteOptions): Promise<number[]>;
99
+ delete<T>(collection: string, filter: Filter<T>, options?: DeleteOptions): Promise<number[]>;
94
100
  /**
95
101
  * Execute raw MongoDB query
96
102
  * @param {string} collection Target collection name
package/dist/data.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../src/data.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../src/data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAC,KAAK,IAAI,EAAE,gBAAgB,EAAM,MAAM,QAAQ,CAAC;AACxD,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEpC,uCAAuC;AACvC,MAAM,MAAM,cAAc,GAAG,GAAG,GAAG,IAAI,GAAG,GAAG,GAAG,IAAI,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAC;AAEtG,mFAAmF;AACnF,MAAM,MAAM,WAAW,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,EAAE,GAAG,CAAC,CAAC,GAAG,cAAc,GAAG,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;AAEnH,6EAA6E;AAC7E,MAAM,MAAM,MAAM,CAAC,CAAC,GAAG,GAAG,IAAI,CAAA;KAC5B,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAC;CAAC,IACrE,KAAK,CAAC,CAAA;KAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAC,GAAG;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAA;CAAC,IAAG,IAAI,CAAC,CAAC;AAEnF,+BAA+B;AAC/B,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;AAEnC,yBAAyB;AACzB,MAAM,MAAM,WAAW,GAAG;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;CACzB,CAAC;AAEF,2BAA2B;AAC3B,MAAM,MAAM,aAAa,GAAG;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,2BAA2B;AAC3B,MAAM,MAAM,aAAa,CAAC,CAAC,GAAG,GAAG,IAAI;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,wBAAwB;AACxB,MAAM,MAAM,QAAQ,GAAG;IACtB,2BAA2B;IAC3B,OAAO,EAAE,YAAY,GAAG,WAAW,GAAG,UAAU,GAAG,SAAS,GAAG,YAAY,GAAG,WAAW,GAAG,aAAa,GAAG,YAAY,GAAG,YAAY,GAAG,WAAW,CAAC;IACtJ,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;AASD,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,SAAS,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM;IAIjE;;;;;OAKG;IACH,MAAM,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC3E,MAAM,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;IAe/E;;;;;;OAMG;IACH,IAAI,CAAC,CAAC,SAAS,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IACjG,IAAI,CAAC,CAAC,SAAS,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC;IAC5F,IAAI,CAAC,CAAC,SAAS,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAsBjG;;;;;;OAMG;IACH,MAAM,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACvG,MAAM,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3G,MAAM,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG;QAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;KAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7H,MAAM,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;IAoBvI;;;;;;OAMG;IACH,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAClF,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IACrF,MAAM,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAkB5F;;;;;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"}
package/dist/index.js CHANGED
@@ -3189,6 +3189,11 @@ Must be either: call, email or sms`);
3189
3189
  }
3190
3190
  }
3191
3191
  }
3192
+ function numericPk(filter) {
3193
+ if (filter == null || typeof filter !== "object" || Array.isArray(filter)) return null;
3194
+ const id = filter["_id"];
3195
+ return typeof id === "number" ? id : null;
3196
+ }
3192
3197
  class Data extends PathEventEmitter {
3193
3198
  constructor(momentum) {
3194
3199
  super();
@@ -3199,12 +3204,6 @@ Must be either: call, email or sms`);
3199
3204
  dataUrl(collection, pk) {
3200
3205
  return `api/data/${collection}${pk != null ? `/${pk}` : ""}`;
3201
3206
  }
3202
- /**
3203
- * Create new document(s) in collection
3204
- * @param {string} collection Target collection
3205
- * @param {Document<T> | Document<T>[]} documents New document(s)
3206
- * @return {Promise<Document<T> | Document<T>[]>} New saved document(s)
3207
- */
3208
3207
  create(collection, documents) {
3209
3208
  if (!collection || !documents) throw new Error("Cannot create document, missing collection or document");
3210
3209
  if (Array.isArray(documents) && !documents.length) return Promise.resolve([]);
@@ -3218,26 +3217,10 @@ Must be either: call, email or sms`);
3218
3217
  return resp;
3219
3218
  });
3220
3219
  }
3221
- async delete(collection, filter, options) {
3222
- if (!collection || filter == null) throw new Error("Cannot delete document, missing collection or filter");
3223
- if (Array.isArray(filter) && !filter.length) return [];
3224
- const pk = Array.isArray(filter) ? null : typeof filter == "object" ? filter["_id"] == null || Array.isArray(filter["_id"]) ? null : filter["_id"] : filter;
3225
- const url = this.dataUrl(collection, pk);
3226
- const ids = await this.momentum.api.request({
3227
- url,
3228
- method: "DELETE",
3229
- body: {
3230
- filter: Array.isArray(filter) ? { _id: ["in", filter] } : typeof filter == "object" && pk == null ? filter : null,
3231
- ...options
3232
- }
3233
- });
3234
- ids.forEach((id) => this.emit(PES`data/${collection}/${id}:d`, id));
3235
- return ids;
3236
- }
3237
3220
  read(collection, filter, options) {
3238
3221
  if (!collection) throw new Error("Cannot read documents, missing collection");
3239
- const pk = Array.isArray(filter) ? null : typeof filter == "object" ? filter["_id"] == null || Array.isArray(filter["_id"]) ? null : filter["_id"] : filter;
3240
- const q = typeof filter == "object" && filter != null && Object.keys(filter).length && pk == null ? filter : null;
3222
+ const pk = typeof filter === "number" ? filter : numericPk(filter);
3223
+ const q = typeof filter === "object" && filter != null && Object.keys(filter).length && pk == null ? filter : null;
3241
3224
  const url = this.dataUrl(collection, pk);
3242
3225
  return this.momentum.api.request({
3243
3226
  url,
@@ -3254,31 +3237,40 @@ Must be either: call, email or sms`);
3254
3237
  return resp;
3255
3238
  });
3256
3239
  }
3257
- /**
3258
- * Update document(s) in collection
3259
- * @param {string} collection Target collection
3260
- * @param {Document<T> | Document<T>[]} documents Document(s) to update
3261
- * @param {UpdateOptions<T>} options Update options (filter, append, limit, upsert)
3262
- * @return {Promise<Document<T> | Document<T>[]>} Updated document(s)
3263
- */
3264
3240
  update(collection, documents, options = {}) {
3265
3241
  if (!collection || !documents) throw new Error("Cannot update, missing collection or document");
3266
3242
  if (Array.isArray(documents) && !documents.length) return Promise.resolve([]);
3267
3243
  const { filter, append, ...queryOptions } = options;
3268
3244
  const isArray = Array.isArray(documents);
3269
3245
  const firstDoc = isArray ? documents[0] : documents;
3270
- const pk = (isArray ? null : filter && !Array.isArray(filter?._id) ? filter?._id : null) ?? firstDoc._id;
3246
+ const pk = !isArray && !filter ? typeof firstDoc._id === "number" ? firstDoc._id : null : null;
3271
3247
  const url = this.dataUrl(collection, pk);
3272
3248
  return this.momentum.api.request({
3273
3249
  url,
3274
3250
  method: append === false ? "PUT" : "PATCH",
3275
- body: { data: documents, filter: filter && filter?._id == null ? filter : null, ...queryOptions }
3251
+ body: { data: documents, filter: filter && numericPk(filter) == null ? filter : null, ...queryOptions }
3276
3252
  }).then((resp) => {
3277
3253
  if (!resp) return null;
3278
3254
  makeArray(resp).forEach((r) => this.emit(PES`data/${collection}/${r._id}:u`, r));
3279
3255
  return resp;
3280
3256
  });
3281
3257
  }
3258
+ async delete(collection, filter, options) {
3259
+ if (!collection || filter == null) throw new Error("Cannot delete document, missing collection or filter");
3260
+ if (Array.isArray(filter) && !filter.length) return [];
3261
+ const pk = typeof filter === "number" ? filter : null;
3262
+ const url = this.dataUrl(collection, pk);
3263
+ const ids = await this.momentum.api.request({
3264
+ url,
3265
+ method: "DELETE",
3266
+ body: {
3267
+ filter: Array.isArray(filter) ? { _id: ["in", filter] } : typeof filter === "object" ? filter : null,
3268
+ ...options
3269
+ }
3270
+ });
3271
+ ids.forEach((id) => this.emit(PES`data/${collection}/${id}:d`, id));
3272
+ return ids;
3273
+ }
3282
3274
  /**
3283
3275
  * Execute raw MongoDB query
3284
3276
  * @param {string} collection Target collection name
@@ -4338,7 +4330,7 @@ ${log}`;
4338
4330
  }
4339
4331
  momentum;
4340
4332
  }
4341
- const version = "1.4.5";
4333
+ const version = "1.4.6";
4342
4334
  class WebRtc extends PathEventEmitter {
4343
4335
  constructor(momentum) {
4344
4336
  super("webrtc");
package/dist/index.mjs CHANGED
@@ -3185,6 +3185,11 @@ class Client extends PathEventEmitter {
3185
3185
  }
3186
3186
  }
3187
3187
  }
3188
+ function numericPk(filter) {
3189
+ if (filter == null || typeof filter !== "object" || Array.isArray(filter)) return null;
3190
+ const id = filter["_id"];
3191
+ return typeof id === "number" ? id : null;
3192
+ }
3188
3193
  class Data extends PathEventEmitter {
3189
3194
  constructor(momentum) {
3190
3195
  super();
@@ -3195,12 +3200,6 @@ class Data extends PathEventEmitter {
3195
3200
  dataUrl(collection, pk) {
3196
3201
  return `api/data/${collection}${pk != null ? `/${pk}` : ""}`;
3197
3202
  }
3198
- /**
3199
- * Create new document(s) in collection
3200
- * @param {string} collection Target collection
3201
- * @param {Document<T> | Document<T>[]} documents New document(s)
3202
- * @return {Promise<Document<T> | Document<T>[]>} New saved document(s)
3203
- */
3204
3203
  create(collection, documents) {
3205
3204
  if (!collection || !documents) throw new Error("Cannot create document, missing collection or document");
3206
3205
  if (Array.isArray(documents) && !documents.length) return Promise.resolve([]);
@@ -3214,26 +3213,10 @@ class Data extends PathEventEmitter {
3214
3213
  return resp;
3215
3214
  });
3216
3215
  }
3217
- async delete(collection, filter, options) {
3218
- if (!collection || filter == null) throw new Error("Cannot delete document, missing collection or filter");
3219
- if (Array.isArray(filter) && !filter.length) return [];
3220
- const pk = Array.isArray(filter) ? null : typeof filter == "object" ? filter["_id"] == null || Array.isArray(filter["_id"]) ? null : filter["_id"] : filter;
3221
- const url = this.dataUrl(collection, pk);
3222
- const ids = await this.momentum.api.request({
3223
- url,
3224
- method: "DELETE",
3225
- body: {
3226
- filter: Array.isArray(filter) ? { _id: ["in", filter] } : typeof filter == "object" && pk == null ? filter : null,
3227
- ...options
3228
- }
3229
- });
3230
- ids.forEach((id) => this.emit(PES`data/${collection}/${id}:d`, id));
3231
- return ids;
3232
- }
3233
3216
  read(collection, filter, options) {
3234
3217
  if (!collection) throw new Error("Cannot read documents, missing collection");
3235
- const pk = Array.isArray(filter) ? null : typeof filter == "object" ? filter["_id"] == null || Array.isArray(filter["_id"]) ? null : filter["_id"] : filter;
3236
- const q = typeof filter == "object" && filter != null && Object.keys(filter).length && pk == null ? filter : null;
3218
+ const pk = typeof filter === "number" ? filter : numericPk(filter);
3219
+ const q = typeof filter === "object" && filter != null && Object.keys(filter).length && pk == null ? filter : null;
3237
3220
  const url = this.dataUrl(collection, pk);
3238
3221
  return this.momentum.api.request({
3239
3222
  url,
@@ -3250,31 +3233,40 @@ class Data extends PathEventEmitter {
3250
3233
  return resp;
3251
3234
  });
3252
3235
  }
3253
- /**
3254
- * Update document(s) in collection
3255
- * @param {string} collection Target collection
3256
- * @param {Document<T> | Document<T>[]} documents Document(s) to update
3257
- * @param {UpdateOptions<T>} options Update options (filter, append, limit, upsert)
3258
- * @return {Promise<Document<T> | Document<T>[]>} Updated document(s)
3259
- */
3260
3236
  update(collection, documents, options = {}) {
3261
3237
  if (!collection || !documents) throw new Error("Cannot update, missing collection or document");
3262
3238
  if (Array.isArray(documents) && !documents.length) return Promise.resolve([]);
3263
3239
  const { filter, append, ...queryOptions } = options;
3264
3240
  const isArray = Array.isArray(documents);
3265
3241
  const firstDoc = isArray ? documents[0] : documents;
3266
- const pk = (isArray ? null : filter && !Array.isArray(filter?._id) ? filter?._id : null) ?? firstDoc._id;
3242
+ const pk = !isArray && !filter ? typeof firstDoc._id === "number" ? firstDoc._id : null : null;
3267
3243
  const url = this.dataUrl(collection, pk);
3268
3244
  return this.momentum.api.request({
3269
3245
  url,
3270
3246
  method: append === false ? "PUT" : "PATCH",
3271
- body: { data: documents, filter: filter && filter?._id == null ? filter : null, ...queryOptions }
3247
+ body: { data: documents, filter: filter && numericPk(filter) == null ? filter : null, ...queryOptions }
3272
3248
  }).then((resp) => {
3273
3249
  if (!resp) return null;
3274
3250
  makeArray(resp).forEach((r) => this.emit(PES`data/${collection}/${r._id}:u`, r));
3275
3251
  return resp;
3276
3252
  });
3277
3253
  }
3254
+ async delete(collection, filter, options) {
3255
+ if (!collection || filter == null) throw new Error("Cannot delete document, missing collection or filter");
3256
+ if (Array.isArray(filter) && !filter.length) return [];
3257
+ const pk = typeof filter === "number" ? filter : null;
3258
+ const url = this.dataUrl(collection, pk);
3259
+ const ids = await this.momentum.api.request({
3260
+ url,
3261
+ method: "DELETE",
3262
+ body: {
3263
+ filter: Array.isArray(filter) ? { _id: ["in", filter] } : typeof filter === "object" ? filter : null,
3264
+ ...options
3265
+ }
3266
+ });
3267
+ ids.forEach((id) => this.emit(PES`data/${collection}/${id}:d`, id));
3268
+ return ids;
3269
+ }
3278
3270
  /**
3279
3271
  * Execute raw MongoDB query
3280
3272
  * @param {string} collection Target collection name
@@ -4334,7 +4326,7 @@ class Static extends Storage {
4334
4326
  }
4335
4327
  momentum;
4336
4328
  }
4337
- const version = "1.4.5";
4329
+ const version = "1.4.6";
4338
4330
  class WebRtc extends PathEventEmitter {
4339
4331
  constructor(momentum) {
4340
4332
  super("webrtc");
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ztimson/momentum",
3
- "version": "1.4.5",
3
+ "version": "1.4.6",
4
4
  "description": "Client library for momentum",
5
5
  "keywords": [
6
6
  "Momentum"