@travetto/model-mongo 4.0.0-rc.0 → 4.0.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-mongo",
-  "version": "4.0.0-rc.0",
+  "version": "4.0.0-rc.2",
   "description": "Mongo backing for the travetto model module.",
   "keywords": [
     "mongo",
@@ -25,13 +25,13 @@
     "directory": "module/model-mongo"
   },
   "dependencies": {
-    "@travetto/config": "^4.0.0-rc.0",
-    "@travetto/model": "^4.0.0-rc.0",
-    "@travetto/model-query": "^4.0.0-rc.0",
+    "@travetto/config": "^4.0.0-rc.2",
+    "@travetto/model": "^4.0.0-rc.2",
+    "@travetto/model-query": "^4.0.0-rc.2",
     "mongodb": "^6.3.0"
   },
   "peerDependencies": {
-    "@travetto/command": "^4.0.0-rc.0"
+    "@travetto/command": "^4.0.0-rc.2"
   },
   "peerDependenciesMeta": {
     "@travetto/command": {

package/src/internal/util.ts

@@ -1,9 +1,9 @@
 import * as mongo from 'mongodb';
 
-import { Class, DataUtil, ObjectUtil } from '@travetto/base';
+import { Class, ObjectUtil } from '@travetto/base';
 import { DistanceUnit, ModelQuery, Query, WhereClause } from '@travetto/model-query';
 import type { ModelType, IndexField } from '@travetto/model';
-import { SchemaRegistry } from '@travetto/schema';
+import { DataUtil, SchemaRegistry } from '@travetto/schema';
 import { ModelQueryUtil } from '@travetto/model-query/src/internal/service/query';
 import { AllViewⲐ } from '@travetto/schema/src/internal/types';
 

package/src/service.ts

@@ -1,6 +1,7 @@
 // Wildcard import needed here due to packaging issues
 import * as mongo from 'mongodb';
 import { Readable } from 'node:stream';
+import { pipeline } from 'node:stream/promises';
 
 import {
   ModelRegistry, ModelType, OptionalId,
@@ -292,9 +293,7 @@ export class MongoModelService implements
       metadata: meta
     });
 
-    await new Promise<unknown>((resolve, reject) => {
-      input.pipe(writeStream).on('finish', resolve).on('error', reject);
-    });
+    await pipeline(input, writeStream);
   }
 
   async getStream(location: string): Promise<Readable> {
@@ -553,7 +552,7 @@ export class MongoModelService implements
   // Facet
   async facet<T extends ModelType>(cls: Class<T>, field: ValidStringFields<T>, query?: ModelQuery<T>): Promise<{ key: string, count: number }[]> {
     const col = await this.getStore(cls);
-    const pipeline: object[] = [{
+    const aggs: object[] = [{
       $group: {
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         _id: `$${field as string}`,
@@ -569,10 +568,10 @@ export class MongoModelService implements
       q = { $and: [q, MongoUtil.prepareQuery(cls, query).filter] };
     }
 
-    pipeline.unshift({ $match: q });
+    aggs.unshift({ $match: q });
 
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    const result = (await col.aggregate(pipeline).toArray()) as { _id: mongo.ObjectId, count: number }[];
+    const result = (await col.aggregate(aggs).toArray()) as { _id: mongo.ObjectId, count: number }[];
 
     return result.map(val => ({
       key: MongoUtil.idToString(val._id),