@treatwell/moleculer-essentials 2.2.0 → 2.2.1

package/dist/mixins/database.mixin.cjs

@@ -1005,22 +1005,30 @@ async function getIndexesDifference(collection, declaredIndexes = [], declaredSe
 }
 const DATABASE_INDEXES_MIXIN_SYNC_EVENT = "database-indexes-mixin.sync";
 function DatabaseIndexesMixin(opts) {
+  const { collectionName: mixinCollectionName, searchIndexes, indexes } = opts;
   return index$1.wrapMixin({
     methods: {
       async _syncIndexes({
+        collectionName,
         dropIndexes,
         createIndexes
       }) {
-        if (typeof this.getCollection !== "function") {
+        if (typeof this.getCollection !== "function" || typeof this.getMongoDb !== "function") {
           throw new Error(
-            "getCollection method not found, did you add the DatabaseConnectionMixin?"
+            "getCollection or getMongoDb method not found, did you add the DatabaseConnectionMixin?"
           );
         }
-        const collection = this.getCollection();
+        let collection;
+        if (collectionName) {
+          const db = this.getMongoDb();
+          collection = db.collection(collectionName);
+        } else {
+          collection = this.getCollection();
+        }
         const states = await getIndexesDifference(
           collection,
-          opts.indexes,
-          opts.searchIndexes
+          indexes,
+          searchIndexes
         );
         const notOkStates = states.filter((s) => s.status !== IndexStatus.OK);
         if (!notOkStates.length) {
@@ -1087,12 +1095,17 @@ function DatabaseIndexesMixin(opts) {
           ctx.logger.info(
             `Received sync indexes event for service ${this.name}`
           );
-          await this._syncIndexes({ createIndexes: true, dropIndexes: false });
+          await this._syncIndexes({
+            collectionName: mixinCollectionName,
+            createIndexes: true,
+            dropIndexes: false
+          });
         }
       },
       "$broker.started": {
         async handler() {
           await this._syncIndexes({
+            collectionName: mixinCollectionName,
             createIndexes: shouldAutoCreateIndexes(),
             dropIndexes: shouldAutoDropIndexes()
           });

package/dist/mixins/database.mixin.d.cts

@@ -792,16 +792,24 @@ type IndexState = {
 };
 
 type DatabaseIndexesOptions = {
+    /**
+     * Mostly useful when no collectionName was provided on the underlying DatabaseConnectionMixin.
+     * It allows users to have multiple DatabaseIndexesMixin on the same service.
+     *
+     * Using a different collectionName from the one specified in DatabaseConnectionMixin is NOT recommended.
+     */
+    collectionName?: string;
     indexes?: IndexTuple[];
     searchIndexes?: Record<string, SearchIndexDefinition>;
 };
 type SyncIndexesOptions = {
+    collectionName?: string;
     createIndexes: boolean;
     dropIndexes: boolean;
 };
 declare const DATABASE_INDEXES_MIXIN_SYNC_EVENT = "database-indexes-mixin.sync";
 declare function DatabaseIndexesMixin(opts: DatabaseIndexesOptions): PartialCustomServiceSchema<unknown, {
-    _syncIndexes({ dropIndexes, createIndexes, }: SyncIndexesOptions): Promise<void>;
+    _syncIndexes({ collectionName, dropIndexes, createIndexes, }: SyncIndexesOptions): Promise<void>;
     _createIndexFromState(col: Collection, state: IndexState): Promise<void>;
 }, unknown>;
 

package/dist/mixins/database.mixin.d.mts

@@ -792,16 +792,24 @@ type IndexState = {
 };
 
 type DatabaseIndexesOptions = {
+    /**
+     * Mostly useful when no collectionName was provided on the underlying DatabaseConnectionMixin.
+     * It allows users to have multiple DatabaseIndexesMixin on the same service.
+     *
+     * Using a different collectionName from the one specified in DatabaseConnectionMixin is NOT recommended.
+     */
+    collectionName?: string;
     indexes?: IndexTuple[];
     searchIndexes?: Record<string, SearchIndexDefinition>;
 };
 type SyncIndexesOptions = {
+    collectionName?: string;
     createIndexes: boolean;
     dropIndexes: boolean;
 };
 declare const DATABASE_INDEXES_MIXIN_SYNC_EVENT = "database-indexes-mixin.sync";
 declare function DatabaseIndexesMixin(opts: DatabaseIndexesOptions): PartialCustomServiceSchema<unknown, {
-    _syncIndexes({ dropIndexes, createIndexes, }: SyncIndexesOptions): Promise<void>;
+    _syncIndexes({ collectionName, dropIndexes, createIndexes, }: SyncIndexesOptions): Promise<void>;
     _createIndexFromState(col: Collection, state: IndexState): Promise<void>;
 }, unknown>;
 

package/dist/mixins/database.mixin.mjs

@@ -1003,22 +1003,30 @@ async function getIndexesDifference(collection, declaredIndexes = [], declaredSe
 }
 const DATABASE_INDEXES_MIXIN_SYNC_EVENT = "database-indexes-mixin.sync";
 function DatabaseIndexesMixin(opts) {
+  const { collectionName: mixinCollectionName, searchIndexes, indexes } = opts;
   return wrapMixin({
     methods: {
       async _syncIndexes({
+        collectionName,
         dropIndexes,
         createIndexes
       }) {
-        if (typeof this.getCollection !== "function") {
+        if (typeof this.getCollection !== "function" || typeof this.getMongoDb !== "function") {
           throw new Error(
-            "getCollection method not found, did you add the DatabaseConnectionMixin?"
+            "getCollection or getMongoDb method not found, did you add the DatabaseConnectionMixin?"
           );
         }
-        const collection = this.getCollection();
+        let collection;
+        if (collectionName) {
+          const db = this.getMongoDb();
+          collection = db.collection(collectionName);
+        } else {
+          collection = this.getCollection();
+        }
         const states = await getIndexesDifference(
           collection,
-          opts.indexes,
-          opts.searchIndexes
+          indexes,
+          searchIndexes
         );
         const notOkStates = states.filter((s) => s.status !== IndexStatus.OK);
         if (!notOkStates.length) {
@@ -1085,12 +1093,17 @@ function DatabaseIndexesMixin(opts) {
           ctx.logger.info(
             `Received sync indexes event for service ${this.name}`
           );
-          await this._syncIndexes({ createIndexes: true, dropIndexes: false });
+          await this._syncIndexes({
+            collectionName: mixinCollectionName,
+            createIndexes: true,
+            dropIndexes: false
+          });
         }
       },
       "$broker.started": {
         async handler() {
           await this._syncIndexes({
+            collectionName: mixinCollectionName,
             createIndexes: shouldAutoCreateIndexes(),
             dropIndexes: shouldAutoDropIndexes()
           });

package/package.json

@@ -6,7 +6,7 @@
     "type": "git",
     "url": "https://github.com/treatwell/moleculer-essentials"
   },
-  "version": "2.2.0",
+  "version": "2.2.1",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.cts",