@travetto/model-mongo 3.1.3 → 3.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-mongo",
-  "version": "3.1.3",
+  "version": "3.1.5",
   "description": "Mongo backing for the travetto model module.",
   "keywords": [
     "mongo",
@@ -26,12 +26,12 @@
   },
   "dependencies": {
     "@travetto/config": "^3.1.2",
-    "@travetto/model": "^3.1.5",
-    "@travetto/model-query": "^3.1.3",
+    "@travetto/model": "^3.1.7",
+    "@travetto/model-query": "^3.1.5",
     "mongodb": "^5.0.1"
   },
   "peerDependencies": {
-    "@travetto/command": "^3.1.1"
+    "@travetto/command": "^3.1.2"
   },
   "peerDependenciesMeta": {
     "@travetto/command": {

package/src/internal/util.ts

@@ -134,7 +134,7 @@ export class MongoUtil {
   /**
    * Convert `'a.b.c'` to `{ a: { b: { c: ... }}}`
    */
-  static extractSimple<T>(o: T, path: string = ''): Record<string, unknown> {
+  static extractSimple<T>(o: T, path: string = '', recursive: boolean = true): Record<string, unknown> {
     const out: Record<string, unknown> = {};
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     const sub = o as Record<string, unknown>;
@@ -150,7 +150,11 @@ export class MongoUtil {
         const isPlain = v && ObjectUtil.isPlainObject(v);
         const firstKey = isPlain ? Object.keys(v)[0] : '';
         if ((isPlain && !firstKey.startsWith('$')) || v?.constructor?.Ⲑid) {
-          Object.assign(out, this.extractSimple(v, `${subpath}.`));
+          if (recursive) {
+            Object.assign(out, this.extractSimple(v, `${subpath}.`));
+          } else {
+            out[subpath] = v;
+          }
         } else {
           if (firstKey === '$gt' || firstKey === '$lt' || firstKey === '$gte' || firstKey === '$lte') {
             for (const [sk, sv] of Object.entries(v)) {

package/src/service.ts

@@ -7,7 +7,7 @@ import {
   ModelCrudSupport, ModelStorageSupport, ModelStreamSupport,
   ModelExpirySupport, ModelBulkSupport, ModelIndexedSupport,
   StreamMeta, BulkOp, BulkResponse,
-  NotFoundError, ExistsError, IndexConfig
+  NotFoundError, ExistsError, IndexConfig, PartialStream
 } from '@travetto/model';
 import {
   ModelQuery, ModelQueryCrudSupport, ModelQueryFacetSupport, ModelQuerySupport,
@@ -26,7 +26,7 @@ import { ModelQuerySuggestUtil } from '@travetto/model-query/src/internal/servic
 import { PointImpl } from '@travetto/model-query/src/internal/model/point';
 import { ModelQueryExpiryUtil } from '@travetto/model-query/src/internal/service/expiry';
 import { ModelExpiryUtil } from '@travetto/model/src/internal/service/expiry';
-import { StreamModel, STREAMS } from '@travetto/model/src/internal/service/stream';
+import { ModelStreamUtil, StreamModel, STREAMS } from '@travetto/model/src/internal/service/stream';
 import { AllViewⲐ } from '@travetto/schema/src/internal/types';
 import { ModelBulkUtil } from '@travetto/model/src/internal/service/bulk';
 
@@ -234,7 +234,7 @@ export class MongoModelService implements
 
     let final: Record<string, unknown> = item;
 
-    const items = MongoUtil.extractSimple(final);
+    const items = MongoUtil.extractSimple(final, undefined, false);
     final = Object
       .entries(items)
       .reduce<Record<string, unknown>>((acc, [k, v]) => {
@@ -258,7 +258,7 @@ export class MongoModelService implements
     );
 
     if (!res.value) {
-      new NotFoundError(cls, id);
+      throw new NotFoundError(cls, id);
     }
 
     return this.get(cls, id);
@@ -308,6 +308,20 @@ export class MongoModelService implements
     return res;
   }
 
+  async getStreamPartial(location: string, start: number, end?: number): Promise<PartialStream> {
+    const meta = await this.describeStream(location);
+
+    end ??= meta.size - 1;
+
+    ModelStreamUtil.checkRange(start, end, meta.size);
+
+    const res = await this.#bucket.openDownloadStreamByName(location, { start, end: end + 1 });
+    if (!res) {
+      throw new NotFoundError(STREAMS, location);
+    }
+    return { stream: res, range: [start, end] };
+  }
+
   async describeStream(location: string): Promise<StreamMeta> {
     return (await this.#describeStreamRaw(location)).metadata;
   }
@@ -497,6 +511,19 @@ export class MongoModelService implements
   }
 
   // Query Crud
+  async updateOneWithQuery<T extends ModelType>(cls: Class<T>, data: T, query: ModelQuery<T>): Promise<T> {
+    const col = await this.getStore(cls);
+    const item = await ModelCrudUtil.preStore(cls, data, this);
+    query = ModelQueryUtil.getQueryWithId(cls, data, query);
+
+    const { filter } = MongoUtil.prepareQuery(cls, query);
+    const res = await col.replaceOne(filter, item);
+    if (res.matchedCount === 0) {
+      throw new NotFoundError(cls, item.id);
+    }
+    return item;
+  }
+
   async deleteByQuery<T extends ModelType>(cls: Class<T>, query: ModelQuery<T>): Promise<number> {
     const col = await this.getStore(cls);
     const { filter } = MongoUtil.prepareQuery(cls, query, false);