@opra/mongodb 1.5.7 → 1.7.0

package/cjs/adapter/mongo-patch-generator.js

@@ -19,6 +19,7 @@ class MongoPatchGenerator {
         return {
             update,
             arrayFilters: ctx.arrayFilters,
+            initArrayFields: ctx.initArrayFields,
         };
     }
     _processComplexType(ctx, dataType, path, input, scope) {
@@ -84,6 +85,8 @@ class MongoPatchGenerator {
                 if (!value)
                     continue;
                 if (field.isArray) {
+                    ctx.initArrayFields = ctx.initArrayFields || [];
+                    ctx.initArrayFields.push(pathDot + field.name);
                     if (!value.length)
                         continue;
                     keyField = field.keyField || field.type.keyField;

package/cjs/services/mongo-entity-service.js

@@ -201,7 +201,10 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
         });
         /** Execute db command */
         try {
-            /** Fetch the cursor and decode the result objects */
+            /** Fetch the cursor */
+            if (options?.noDecode)
+                return cursor.toArray();
+            /** Decode result objects */
             const outputCodec = this._getOutputCodec('find');
             return (await cursor.toArray()).map((r) => outputCodec(r));
         }
@@ -269,7 +272,9 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
             const facetResult = await cursor.toArray();
             return {
                 count: facetResult[0].count[0]?.totalMatches || 0,
-                items: facetResult[0].data?.map((r) => outputCodec(r)),
+                items: options?.noDecode
+                    ? facetResult[0].data
+                    : facetResult[0].data?.map((r) => outputCodec(r)),
             };
         }
         finally {
@@ -329,6 +334,21 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
         ]);
         const db = this.getDatabase();
         const collection = await this.getCollection(db);
+        /** Create array fields if not exists */
+        if (options?.initArrayFields) {
+            const $set = options.initArrayFields.reduce((a, k) => {
+                a[k] = { $ifNull: ['$' + k, []] };
+                return a;
+            }, {});
+            await collection.updateOne(filter || {}, [{ $set }], {
+                ...options,
+                session: options?.session ?? this.getSession(),
+                arrayFilters: undefined,
+                upsert: false,
+            });
+            delete options.initArrayFields;
+        }
+        /** Execute update operation */
         return (await collection.updateOne(filter || {}, update, {
             ...options,
             session: options?.session ?? this.getSession(),
@@ -352,6 +372,21 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
         const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter(options?.filter);
         const db = this.getDatabase();
         const collection = await this.getCollection(db);
+        /** Create array fields if not exists */
+        if (options?.initArrayFields) {
+            const $set = options.initArrayFields.reduce((a, k) => {
+                a[k] = { $ifNull: ['$' + k, []] };
+                return a;
+            }, {});
+            await collection.updateMany(filter || {}, [{ $set }], {
+                ...(0, objects_1.omit)(options, ['filter']),
+                session: options?.session ?? this.getSession(),
+                arrayFilters: undefined,
+                upsert: false,
+            });
+            delete options.initArrayFields;
+        }
+        /** Execute update operation */
         return (await collection.updateMany(filter || {}, update, {
             ...(0, objects_1.omit)(options, ['filter']),
             session: options?.session ?? this.getSession(),
@@ -406,13 +441,14 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
     }
     _generatePatch(command, doc) {
         const patchGenerator = new mongo_patch_generator_js_1.MongoPatchGenerator();
-        const { update, arrayFilters } = patchGenerator.generatePatch(this.dataType, doc, {
+        const { update, arrayFilters, initArrayFields } = patchGenerator.generatePatch(this.dataType, doc, {
             scope: this._dataTypeScope,
         });
         command.options = command.options || {};
         if (arrayFilters) {
             command.options.arrayFilters = command.options.arrayFilters || [];
             command.options.arrayFilters.push(...arrayFilters);
+            command.options.initArrayFields = initArrayFields;
         }
         return update;
     }

package/cjs/services/mongo-service.js

@@ -253,6 +253,7 @@ class MongoService extends core_1.ServiceBase {
         if (operation === 'update') {
             options.partial = 'deep';
             options.allowPatchOperators = true;
+            options.keepKeyFields = true;
         }
         const dataType = this.dataType;
         validator = dataType.generateCodec('decode', options);

package/esm/adapter/mongo-patch-generator.js

@@ -16,6 +16,7 @@ export class MongoPatchGenerator {
         return {
             update,
             arrayFilters: ctx.arrayFilters,
+            initArrayFields: ctx.initArrayFields,
         };
     }
     _processComplexType(ctx, dataType, path, input, scope) {
@@ -81,6 +82,8 @@ export class MongoPatchGenerator {
                 if (!value)
                     continue;
                 if (field.isArray) {
+                    ctx.initArrayFields = ctx.initArrayFields || [];
+                    ctx.initArrayFields.push(pathDot + field.name);
                     if (!value.length)
                         continue;
                     keyField = field.keyField || field.type.keyField;

package/esm/services/mongo-entity-service.js

@@ -198,7 +198,10 @@ export class MongoEntityService extends MongoService {
         });
         /** Execute db command */
         try {
-            /** Fetch the cursor and decode the result objects */
+            /** Fetch the cursor */
+            if (options?.noDecode)
+                return cursor.toArray();
+            /** Decode result objects */
             const outputCodec = this._getOutputCodec('find');
             return (await cursor.toArray()).map((r) => outputCodec(r));
         }
@@ -266,7 +269,9 @@ export class MongoEntityService extends MongoService {
             const facetResult = await cursor.toArray();
             return {
                 count: facetResult[0].count[0]?.totalMatches || 0,
-                items: facetResult[0].data?.map((r) => outputCodec(r)),
+                items: options?.noDecode
+                    ? facetResult[0].data
+                    : facetResult[0].data?.map((r) => outputCodec(r)),
             };
         }
         finally {
@@ -326,6 +331,21 @@ export class MongoEntityService extends MongoService {
         ]);
         const db = this.getDatabase();
         const collection = await this.getCollection(db);
+        /** Create array fields if not exists */
+        if (options?.initArrayFields) {
+            const $set = options.initArrayFields.reduce((a, k) => {
+                a[k] = { $ifNull: ['$' + k, []] };
+                return a;
+            }, {});
+            await collection.updateOne(filter || {}, [{ $set }], {
+                ...options,
+                session: options?.session ?? this.getSession(),
+                arrayFilters: undefined,
+                upsert: false,
+            });
+            delete options.initArrayFields;
+        }
+        /** Execute update operation */
         return (await collection.updateOne(filter || {}, update, {
             ...options,
             session: options?.session ?? this.getSession(),
@@ -349,6 +369,21 @@ export class MongoEntityService extends MongoService {
         const filter = MongoAdapter.prepareFilter(options?.filter);
         const db = this.getDatabase();
         const collection = await this.getCollection(db);
+        /** Create array fields if not exists */
+        if (options?.initArrayFields) {
+            const $set = options.initArrayFields.reduce((a, k) => {
+                a[k] = { $ifNull: ['$' + k, []] };
+                return a;
+            }, {});
+            await collection.updateMany(filter || {}, [{ $set }], {
+                ...omit(options, ['filter']),
+                session: options?.session ?? this.getSession(),
+                arrayFilters: undefined,
+                upsert: false,
+            });
+            delete options.initArrayFields;
+        }
+        /** Execute update operation */
         return (await collection.updateMany(filter || {}, update, {
             ...omit(options, ['filter']),
             session: options?.session ?? this.getSession(),
@@ -403,13 +438,14 @@ export class MongoEntityService extends MongoService {
     }
     _generatePatch(command, doc) {
         const patchGenerator = new MongoPatchGenerator();
-        const { update, arrayFilters } = patchGenerator.generatePatch(this.dataType, doc, {
+        const { update, arrayFilters, initArrayFields } = patchGenerator.generatePatch(this.dataType, doc, {
             scope: this._dataTypeScope,
         });
         command.options = command.options || {};
         if (arrayFilters) {
             command.options.arrayFilters = command.options.arrayFilters || [];
             command.options.arrayFilters.push(...arrayFilters);
+            command.options.initArrayFields = initArrayFields;
         }
         return update;
     }

package/esm/services/mongo-service.js

@@ -250,6 +250,7 @@ export class MongoService extends ServiceBase {
         if (operation === 'update') {
             options.partial = 'deep';
             options.allowPatchOperators = true;
+            options.keepKeyFields = true;
         }
         const dataType = this.dataType;
         validator = dataType.generateCodec('decode', options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/mongodb",
-  "version": "1.5.7",
+  "version": "1.7.0",
   "description": "Opra MongoDB adapter package",
   "author": "Panates",
   "license": "MIT",
@@ -10,9 +10,9 @@
     "valgen": "^5.12.0"
   },
   "peerDependencies": {
-    "@opra/common": "^1.5.7",
-    "@opra/core": "^1.5.7",
-    "@opra/http": "^1.5.7",
+    "@opra/common": "^1.7.0",
+    "@opra/core": "^1.7.0",
+    "@opra/http": "^1.7.0",
     "mongodb": ">= 6.0.0"
   },
   "type": "module",

package/types/adapter/mongo-patch-generator.d.ts

@@ -7,11 +7,13 @@ interface Context {
     $push?: Record<string, any>;
     $pull?: Record<string, any>;
     arrayFilters?: Record<string, any>[];
+    initArrayFields?: string[];
 }
 export declare class MongoPatchGenerator {
     generatePatch<T extends object>(dataType: ComplexType, doc: PatchDTO<T>, options?: MongoPatchGenerator.Options): {
         update: UpdateFilter<T>;
         arrayFilters?: Record<string, any>[];
+        initArrayFields?: string[];
     };
     protected _processComplexType(ctx: Context, dataType: ComplexType, path: string, input: any, scope?: string): boolean;
     protected _processPush(ctx: Context, dataType: ComplexType, path: string, input: any, scope?: string): boolean;

package/types/services/mongo-entity-service.d.ts

@@ -32,12 +32,15 @@ export declare namespace MongoEntityService {
     interface FindOneOptions<T> extends MongoService.FindOneOptions<T> {
     }
     interface FindManyOptions<T> extends MongoService.FindManyOptions<T> {
+        noDecode?: boolean;
     }
     interface ReplaceOptions<T> extends MongoService.ReplaceOptions<T> {
     }
     interface UpdateOneOptions<T> extends MongoService.UpdateOneOptions<T> {
+        initArrayFields?: string[];
     }
     interface UpdateManyOptions<T> extends MongoService.UpdateManyOptions<T> {
+        initArrayFields?: string[];
     }
     interface CreateCommand<T> extends StrictOmit<CommandInfo, 'documentId' | 'nestedId' | 'input'> {
         crud: 'create';