@opra/mongodb 1.4.3 → 1.4.4

package/esm/adapter/prepare-projection.js

@@ -1,11 +1,15 @@
-import { ComplexType, parseFieldsProjection } from '@opra/common';
+import { ComplexType, parseFieldsProjection, } from '@opra/common';
 export default function prepareProjection(dataType, projection) {
     if (projection === '*')
         return undefined;
-    if (projection && typeof projection === 'object' && !Array.isArray(projection))
+    if (projection &&
+        typeof projection === 'object' &&
+        !Array.isArray(projection))
         return projection;
     const out = {};
-    const projection_ = typeof projection === 'string' || Array.isArray(projection) ? parseFieldsProjection(projection) : projection;
+    const projection_ = typeof projection === 'string' || Array.isArray(projection)
+        ? parseFieldsProjection(projection)
+        : projection;
     // const exclusionProjection = !pick && !!omit;
     prepare(dataType, out, projection_);
     return Object.keys(out).length ? out : undefined;
@@ -32,7 +36,8 @@ export function prepare(dataType, target, projection) {
             (defaultFields && field.exclusive && !p)) {
             continue;
         }
-        if (field.type instanceof ComplexType && typeof p?.projection === 'object') {
+        if (field.type instanceof ComplexType &&
+            typeof p?.projection === 'object') {
             target[fieldName] = {};
             prepare(field.type, target[fieldName], p.projection);
             continue;

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

@@ -38,7 +38,10 @@ export class MongoCollectionService extends MongoEntityService {
             input,
             options,
         };
-        input._id = input._id == null || input._id === '' ? this._generateId(command) : input._id;
+        input._id =
+            input._id == null || input._id === ''
+                ? this._generateId(command)
+                : input._id;
         return this._executeCommand(command, async () => {
             const r = await this._create(command);
             const findCommand = {
@@ -69,7 +72,10 @@ export class MongoCollectionService extends MongoEntityService {
         return this._executeCommand(command, async () => {
             const documentFilter = await this._getDocumentFilter(command);
             if (documentFilter) {
-                const filter = MongoAdapter.prepareFilter([documentFilter, command.options?.filter]);
+                const filter = MongoAdapter.prepareFilter([
+                    documentFilter,
+                    command.options?.filter,
+                ]);
                 command.options = { ...command.options, filter };
             }
             return this._count(command);
@@ -93,7 +99,10 @@ export class MongoCollectionService extends MongoEntityService {
         return this._executeCommand(command, async () => {
             const documentFilter = await this._getDocumentFilter(command);
             if (documentFilter) {
-                const filter = MongoAdapter.prepareFilter([documentFilter, command.options?.filter]);
+                const filter = MongoAdapter.prepareFilter([
+                    documentFilter,
+                    command.options?.filter,
+                ]);
                 command.options = { ...command.options, filter };
             }
             return this._delete(command);
@@ -115,7 +124,10 @@ export class MongoCollectionService extends MongoEntityService {
         return this._executeCommand(command, async () => {
             const documentFilter = await this._getDocumentFilter(command);
             if (documentFilter) {
-                const filter = MongoAdapter.prepareFilter([documentFilter, command.options?.filter]);
+                const filter = MongoAdapter.prepareFilter([
+                    documentFilter,
+                    command.options?.filter,
+                ]);
                 command.options = { ...command.options, filter };
             }
             return this._deleteMany(command);
@@ -138,7 +150,10 @@ export class MongoCollectionService extends MongoEntityService {
         return this._executeCommand(command, async () => {
             const documentFilter = await this._getDocumentFilter(command);
             if (documentFilter) {
-                const filter = MongoAdapter.prepareFilter([documentFilter, command.options?.filter]);
+                const filter = MongoAdapter.prepareFilter([
+                    documentFilter,
+                    command.options?.filter,
+                ]);
                 command.options = { ...command.options, filter };
             }
             return this._distinct(command);
@@ -163,8 +178,15 @@ export class MongoCollectionService extends MongoEntityService {
             const findCommand = command;
             const documentFilter = await this._getDocumentFilter(command);
             if (documentFilter) {
-                const filter = MongoAdapter.prepareFilter([documentFilter, command.options?.filter]);
-                findCommand.options = { ...command.options, filter, projection: ['_id'] };
+                const filter = MongoAdapter.prepareFilter([
+                    documentFilter,
+                    command.options?.filter,
+                ]);
+                findCommand.options = {
+                    ...command.options,
+                    filter,
+                    projection: ['_id'],
+                };
             }
             return !!(await this._findById(findCommand));
         });
@@ -189,7 +211,10 @@ export class MongoCollectionService extends MongoEntityService {
         return this._executeCommand(command, async () => {
             const documentFilter = await this._getDocumentFilter(command);
             if (documentFilter) {
-                const filter = MongoAdapter.prepareFilter([documentFilter, command.options?.filter]);
+                const filter = MongoAdapter.prepareFilter([
+                    documentFilter,
+                    command.options?.filter,
+                ]);
                 command.options = { ...command.options, filter };
             }
             return this._findById(command);
@@ -205,7 +230,10 @@ export class MongoCollectionService extends MongoEntityService {
         return this._executeCommand(command, async () => {
             const documentFilter = await this._getDocumentFilter(command);
             if (documentFilter) {
-                const filter = MongoAdapter.prepareFilter([documentFilter, command.options?.filter]);
+                const filter = MongoAdapter.prepareFilter([
+                    documentFilter,
+                    command.options?.filter,
+                ]);
                 command.options = { ...command.options, filter };
             }
             return this._findOne(command);
@@ -222,7 +250,10 @@ export class MongoCollectionService extends MongoEntityService {
             const documentFilter = await this._getDocumentFilter(command);
             command.options = command.options || {};
             if (documentFilter) {
-                command.options.filter = MongoAdapter.prepareFilter([documentFilter, command.options?.filter]);
+                command.options.filter = MongoAdapter.prepareFilter([
+                    documentFilter,
+                    command.options?.filter,
+                ]);
             }
             const limit = command.options?.limit || this.defaultLimit;
             if (limit)
@@ -241,7 +272,10 @@ export class MongoCollectionService extends MongoEntityService {
             const documentFilter = await this._getDocumentFilter(command);
             command.options = command.options || {};
             if (documentFilter) {
-                command.options.filter = MongoAdapter.prepareFilter([documentFilter, command.options?.filter]);
+                command.options.filter = MongoAdapter.prepareFilter([
+                    documentFilter,
+                    command.options?.filter,
+                ]);
             }
             const limit = command.options?.limit || this.defaultLimit;
             if (limit)
@@ -268,7 +302,10 @@ export class MongoCollectionService extends MongoEntityService {
         return this._executeCommand(command, async () => {
             const documentFilter = await this._getDocumentFilter(command);
             if (documentFilter) {
-                const filter = MongoAdapter.prepareFilter([documentFilter, command.options?.filter]);
+                const filter = MongoAdapter.prepareFilter([
+                    documentFilter,
+                    command.options?.filter,
+                ]);
                 command.options = { ...command.options, filter };
             }
             return await this._replace(command);
@@ -288,7 +325,10 @@ export class MongoCollectionService extends MongoEntityService {
         return this._executeCommand(command, async () => {
             const documentFilter = await this._getDocumentFilter(command);
             if (documentFilter) {
-                const filter = MongoAdapter.prepareFilter([documentFilter, command.options?.filter]);
+                const filter = MongoAdapter.prepareFilter([
+                    documentFilter,
+                    command.options?.filter,
+                ]);
                 command.options = { ...command.options, filter };
             }
             return this._update(command);
@@ -316,7 +356,10 @@ export class MongoCollectionService extends MongoEntityService {
         return this._executeCommand(command, async () => {
             const documentFilter = await this._getDocumentFilter(command);
             if (documentFilter) {
-                const filter = MongoAdapter.prepareFilter([documentFilter, command.options?.filter]);
+                const filter = MongoAdapter.prepareFilter([
+                    documentFilter,
+                    command.options?.filter,
+                ]);
                 command.options = { ...command.options, filter };
             }
             return this._updateOnly(command);
@@ -342,7 +385,10 @@ export class MongoCollectionService extends MongoEntityService {
         return this._executeCommand(command, async () => {
             const documentFilter = await this._getDocumentFilter(command);
             if (documentFilter) {
-                const filter = MongoAdapter.prepareFilter([documentFilter, command.options?.filter]);
+                const filter = MongoAdapter.prepareFilter([
+                    documentFilter,
+                    command.options?.filter,
+                ]);
                 command.options = { ...command.options, filter };
             }
             return this._updateMany(command);

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

@@ -461,52 +461,76 @@ export class MongoEntityService extends MongoService {
             throw e;
         }
     }
+    async _beforeCreate(
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async _beforeCreate(command) {
+    command) {
         // Do nothing
     }
+    async _beforeDelete(
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async _beforeDelete(command) {
+    command) {
         // Do nothing
     }
+    async _beforeDeleteMany(
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async _beforeDeleteMany(command) {
+    command) {
         // Do nothing
     }
+    async _beforeReplace(
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async _beforeReplace(command) {
+    command) {
         // Do nothing
     }
+    async _beforeUpdate(
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async _beforeUpdate(command) {
+    command) {
         // Do nothing
     }
+    async _beforeUpdateMany(
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async _beforeUpdateMany(command) {
+    command) {
         // Do nothing
     }
+    async _afterCreate(
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async _afterCreate(command, result) {
+    command, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    result) {
         // Do nothing
     }
+    async _afterReplace(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    command, 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async _afterReplace(command, result) {
+    result) {
         // Do nothing
     }
+    async _afterDelete(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    command, 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async _afterDelete(command, affected) {
+    affected) {
         // Do nothing
     }
+    async _afterDeleteMany(
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async _afterDeleteMany(command, affected) {
+    command, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    affected) {
         // Do nothing
     }
+    async _afterUpdate(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    command, 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async _afterUpdate(command, result) {
+    result) {
         // Do nothing
     }
+    async _afterUpdateMany(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    command, 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async _afterUpdateMany(command, affected) {
+    affected) {
         // Do nothing
     }
 }

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

@@ -1,5 +1,5 @@
 import { omit } from '@jsopen/objects';
-import { ComplexType, NotAcceptableError, ResourceNotAvailableError } from '@opra/common';
+import { ComplexType, NotAcceptableError, ResourceNotAvailableError, } from '@opra/common';
 import { isNotNullish } from 'valgen';
 import { MongoAdapter } from '../adapter/mongo-adapter.js';
 import { MongoPatchGenerator } from '../adapter/mongo-patch-generator.js';
@@ -106,7 +106,8 @@ export class MongoNestedService extends MongoService {
             options,
         };
         input[this.nestedKey] =
-            input[this.nestedKey] == null || input[this.nestedKey] === ''
+            input[this.nestedKey] == null ||
+                input[this.nestedKey] === ''
                 ? this._generateId(command)
                 : input[this.nestedKey];
         return this._executeCommand(command, () => this._create(command));
@@ -150,8 +151,13 @@ export class MongoNestedService extends MongoService {
             options,
         };
         return this._executeCommand(command, async () => {
-            const documentFilter = MongoAdapter.prepareFilter([await this._getDocumentFilter(command)]);
-            const filter = MongoAdapter.prepareFilter([await this._getNestedFilter(command), command.options?.filter]);
+            const documentFilter = MongoAdapter.prepareFilter([
+                await this._getDocumentFilter(command),
+            ]);
+            const filter = MongoAdapter.prepareFilter([
+                await this._getNestedFilter(command),
+                command.options?.filter,
+            ]);
             command.options = { ...command.options, filter, documentFilter };
             return this._count(command);
         });
@@ -204,8 +210,13 @@ export class MongoNestedService extends MongoService {
             options,
         };
         return this._executeCommand(command, async () => {
-            const documentFilter = MongoAdapter.prepareFilter([await this._getDocumentFilter(command)]);
-            const filter = MongoAdapter.prepareFilter([await this._getNestedFilter(command), command.options?.filter]);
+            const documentFilter = MongoAdapter.prepareFilter([
+                await this._getDocumentFilter(command),
+            ]);
+            const filter = MongoAdapter.prepareFilter([
+                await this._getNestedFilter(command),
+                command.options?.filter,
+            ]);
             command.options = { ...command.options, filter, documentFilter };
             return this._delete(command);
         });
@@ -218,7 +229,10 @@ export class MongoNestedService extends MongoService {
             MongoAdapter.prepareKeyValues(documentId, ['_id']),
             options?.documentFilter,
         ]);
-        const pullFilter = MongoAdapter.prepareFilter([MongoAdapter.prepareKeyValues(nestedId, [this.nestedKey]), options?.filter]) || {};
+        const pullFilter = MongoAdapter.prepareFilter([
+            MongoAdapter.prepareKeyValues(nestedId, [this.nestedKey]),
+            options?.filter,
+        ]) || {};
         const update = {
             $pull: { [this.fieldName]: pullFilter },
         };
@@ -247,8 +261,13 @@ export class MongoNestedService extends MongoService {
             options,
         };
         return this._executeCommand(command, async () => {
-            const documentFilter = MongoAdapter.prepareFilter([await this._getDocumentFilter(command)]);
-            const filter = MongoAdapter.prepareFilter([await this._getNestedFilter(command), command.options?.filter]);
+            const documentFilter = MongoAdapter.prepareFilter([
+                await this._getDocumentFilter(command),
+            ]);
+            const filter = MongoAdapter.prepareFilter([
+                await this._getNestedFilter(command),
+                command.options?.filter,
+            ]);
             command.options = { ...command.options, filter, documentFilter };
             return this._deleteMany(command);
         });
@@ -299,7 +318,9 @@ export class MongoNestedService extends MongoService {
             options,
         };
         return this._executeCommand(command, async () => {
-            const documentFilter = MongoAdapter.prepareFilter([await this._getDocumentFilter(command)]);
+            const documentFilter = MongoAdapter.prepareFilter([
+                await this._getDocumentFilter(command),
+            ]);
             const filter = MongoAdapter.prepareFilter([
                 await this._getNestedFilter(command),
                 documentFilter,
@@ -326,9 +347,17 @@ export class MongoNestedService extends MongoService {
         };
         return this._executeCommand(command, async () => {
             const documentFilter = await this._getDocumentFilter(command);
-            const filter = MongoAdapter.prepareFilter([documentFilter, command.options?.filter]);
+            const filter = MongoAdapter.prepareFilter([
+                documentFilter,
+                command.options?.filter,
+            ]);
             const findCommand = command;
-            findCommand.options = { ...command.options, filter, documentFilter, projection: ['_id'] };
+            findCommand.options = {
+                ...command.options,
+                filter,
+                documentFilter,
+                projection: ['_id'],
+            };
             return !!(await this._findOne(findCommand));
         });
     }
@@ -342,8 +371,13 @@ export class MongoNestedService extends MongoService {
             options,
         };
         return this._executeCommand(command, async () => {
-            const documentFilter = MongoAdapter.prepareFilter([await this._getDocumentFilter(command)]);
-            const filter = MongoAdapter.prepareFilter([await this._getNestedFilter(command), command.options?.filter]);
+            const documentFilter = MongoAdapter.prepareFilter([
+                await this._getDocumentFilter(command),
+            ]);
+            const filter = MongoAdapter.prepareFilter([
+                await this._getNestedFilter(command),
+                command.options?.filter,
+            ]);
             command.options = { ...command.options, filter, documentFilter };
             return this._findById(command);
         });
@@ -378,8 +412,13 @@ export class MongoNestedService extends MongoService {
             options,
         };
         return this._executeCommand(command, async () => {
-            const documentFilter = MongoAdapter.prepareFilter([await this._getDocumentFilter(command)]);
-            const filter = MongoAdapter.prepareFilter([await this._getNestedFilter(command), command.options?.filter]);
+            const documentFilter = MongoAdapter.prepareFilter([
+                await this._getDocumentFilter(command),
+            ]);
+            const filter = MongoAdapter.prepareFilter([
+                await this._getNestedFilter(command),
+                command.options?.filter,
+            ]);
             command.options = { ...command.options, filter, documentFilter };
             return this._findOne(command);
         });
@@ -435,7 +474,10 @@ export class MongoNestedService extends MongoService {
             stages.push(...options.preStages);
         /** Filter */
         if (options?.filter || options?.nestedFilter) {
-            const optionsFilter = MongoAdapter.prepareFilter([options?.filter, options.nestedFilter]);
+            const optionsFilter = MongoAdapter.prepareFilter([
+                options?.filter,
+                options.nestedFilter,
+            ]);
             stages.push({ $match: optionsFilter });
         }
         /** Sort */
@@ -459,7 +501,15 @@ export class MongoNestedService extends MongoService {
         const db = this.getDatabase();
         const collection = await this.getCollection(db);
         const cursor = collection.aggregate(stages, {
-            ...omit(options, ['documentFilter', 'nestedFilter', 'projection', 'sort', 'skip', 'limit', 'filter']),
+            ...omit(options, [
+                'documentFilter',
+                'nestedFilter',
+                'projection',
+                'sort',
+                'skip',
+                'limit',
+                'filter',
+            ]),
             session: options?.session ?? this.getSession(),
         });
         try {
@@ -516,7 +566,10 @@ export class MongoNestedService extends MongoService {
             dataStages.push(...options.preStages);
         /** Filter */
         if (options?.filter || options?.nestedFilter) {
-            const optionsFilter = MongoAdapter.prepareFilter([options?.filter, options?.nestedFilter]);
+            const optionsFilter = MongoAdapter.prepareFilter([
+                options?.filter,
+                options?.nestedFilter,
+            ]);
             dataStages.push({ $match: optionsFilter });
         }
         /** Sort */
@@ -540,7 +593,15 @@ export class MongoNestedService extends MongoService {
         const db = this.getDatabase();
         const collection = await this.getCollection(db);
         const cursor = collection.aggregate(stages, {
-            ...omit(options, ['documentFilter', 'nestedFilter', 'projection', 'sort', 'skip', 'limit', 'filter']),
+            ...omit(options, [
+                'documentFilter',
+                'nestedFilter',
+                'projection',
+                'sort',
+                'skip',
+                'limit',
+                'filter',
+            ]),
             session: options?.session ?? this.getSession(),
         });
         try {
@@ -574,8 +635,13 @@ export class MongoNestedService extends MongoService {
             options,
         };
         return this._executeCommand(command, async () => {
-            const documentFilter = MongoAdapter.prepareFilter([await this._getDocumentFilter(command)]);
-            const filter = MongoAdapter.prepareFilter([await this._getNestedFilter(command), command.options?.filter]);
+            const documentFilter = MongoAdapter.prepareFilter([
+                await this._getDocumentFilter(command),
+            ]);
+            const filter = MongoAdapter.prepareFilter([
+                await this._getNestedFilter(command),
+                command.options?.filter,
+            ]);
             command.options = {
                 ...command.options,
                 filter,
@@ -618,8 +684,13 @@ export class MongoNestedService extends MongoService {
             options,
         };
         return this._executeCommand(command, async () => {
-            const documentFilter = MongoAdapter.prepareFilter([await this._getDocumentFilter(command)]);
-            const filter = MongoAdapter.prepareFilter([await this._getNestedFilter(command), command.options?.filter]);
+            const documentFilter = MongoAdapter.prepareFilter([
+                await this._getDocumentFilter(command),
+            ]);
+            const filter = MongoAdapter.prepareFilter([
+                await this._getNestedFilter(command),
+                command.options?.filter,
+            ]);
             command.options = {
                 ...command.options,
                 filter,
@@ -662,8 +733,13 @@ export class MongoNestedService extends MongoService {
             options,
         };
         return this._executeCommand(command, async () => {
-            const documentFilter = MongoAdapter.prepareFilter([await this._getDocumentFilter(command)]);
-            const filter = MongoAdapter.prepareFilter([await this._getNestedFilter(command), command.options?.filter]);
+            const documentFilter = MongoAdapter.prepareFilter([
+                await this._getDocumentFilter(command),
+            ]);
+            const filter = MongoAdapter.prepareFilter([
+                await this._getNestedFilter(command),
+                command.options?.filter,
+            ]);
             command.options = { ...command.options, filter, documentFilter };
             return this._updateMany(command);
         });
@@ -682,7 +758,9 @@ export class MongoNestedService extends MongoService {
             { [this.fieldName]: { $exists: true } },
         ]);
         if (options?.filter) {
-            const elemMatch = MongoAdapter.prepareFilter([options?.filter], { fieldPrefix: 'elem.' });
+            const elemMatch = MongoAdapter.prepareFilter([options?.filter], {
+                fieldPrefix: 'elem.',
+            });
             options.arrayFilters = [elemMatch];
         }
         const patchGenerator = new MongoPatchGenerator();
@@ -720,7 +798,9 @@ export class MongoNestedService extends MongoService {
      * that resolves to the common filter, or undefined if not available.
      */
     _getNestedFilter(args) {
-        return typeof this.nestedFilter === 'function' ? this.nestedFilter(args, this) : this.nestedFilter;
+        return typeof this.nestedFilter === 'function'
+            ? this.nestedFilter(args, this)
+            : this.nestedFilter;
     }
     async _executeCommand(command, commandFn) {
         try {
@@ -766,44 +846,64 @@ export class MongoNestedService extends MongoService {
             throw e;
         }
     }
+    async _beforeCreate(
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async _beforeCreate(command) {
+    command) {
         // Do nothing
     }
+    async _beforeUpdate(
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async _beforeUpdate(command) {
+    command) {
         // Do nothing
     }
+    async _beforeUpdateMany(
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async _beforeUpdateMany(command) {
+    command) {
         // Do nothing
     }
+    async _beforeDelete(
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async _beforeDelete(command) {
+    command) {
         // Do nothing
     }
+    async _beforeDeleteMany(
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async _beforeDeleteMany(command) {
+    command) {
         // Do nothing
     }
+    async _afterCreate(
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async _afterCreate(command, result) {
+    command, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    result) {
         // Do nothing
     }
+    async _afterUpdate(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    command, 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async _afterUpdate(command, result) {
+    result) {
         // Do nothing
     }
+    async _afterUpdateMany(
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async _afterUpdateMany(command, affected) {
+    command, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    affected) {
         // Do nothing
     }
+    async _afterDelete(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    command, 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async _afterDelete(command, affected) {
+    affected) {
         // Do nothing
     }
+    async _afterDeleteMany(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    command, 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async _afterDeleteMany(command, affected) {
+    affected) {
         // Do nothing
     }
 }