@treatwell/moleculer-essentials 2.1.1-beta.2 → 2.2.0

package/README.md

@@ -14,6 +14,7 @@
   - [Basic Example](#basic-example)
 - [Mixins](#mixins)
 - [License](#license)
+
 <!-- TOC -->
 
 > [!WARNING]

package/dist/{index-8Cv0B4uH.mjs → index-BMLRFTWF.mjs}

@@ -216,25 +216,29 @@ function zodToOpenAPISchema(schema, extractor) {
   }
   return res;
 }
-const zodDate = z.transform((val) => {
-  if (typeof val === "string") {
-    const date = parseISO(val);
-    if (!Number.isNaN(date.getTime())) {
-      return date;
+const zodDate = z.nonoptional(
+  z.transform((val) => {
+    if (typeof val === "string") {
+      const date = parseISO(val);
+      if (!Number.isNaN(date.getTime())) {
+        return date;
+      }
     }
-  }
-  return val;
-}).pipe(z.date());
+    return val;
+  }).pipe(z.date())
+);
 const OBJECT_ID_PATTERN = /^[a-f\d]{24}$/i;
 function isObjectId(val) {
   return val instanceof ObjectId;
 }
-const zodObjectId = z.transform((val) => {
-  if (typeof val === "string" && OBJECT_ID_PATTERN.test(val)) {
-    return new ObjectId(val);
-  }
-  return val;
-}).pipe(z.custom(isObjectId, { abort: true })).meta({ id: "ObjectId" });
+const zodObjectId = z.nonoptional(
+  z.transform((val) => {
+    if (typeof val === "string" && OBJECT_ID_PATTERN.test(val)) {
+      return new ObjectId(val);
+    }
+    return val;
+  }).pipe(z.custom(isObjectId, { abort: true })).meta({ id: "ObjectId" })
+);
 function zodCoerceArray(element, params) {
   return z.transform((val) => !Array.isArray(val) && val !== void 0 ? [val] : val).pipe(z.array(element, params));
 }

package/dist/{index-lmnhNH-8.cjs → index-CbFCa8NT.cjs}

@@ -218,25 +218,29 @@ function zodToOpenAPISchema(schema, extractor) {
   }
   return res;
 }
-const zodDate = v4.z.transform((val) => {
-  if (typeof val === "string") {
-    const date = dateFns.parseISO(val);
-    if (!Number.isNaN(date.getTime())) {
-      return date;
+const zodDate = v4.z.nonoptional(
+  v4.z.transform((val) => {
+    if (typeof val === "string") {
+      const date = dateFns.parseISO(val);
+      if (!Number.isNaN(date.getTime())) {
+        return date;
+      }
     }
-  }
-  return val;
-}).pipe(v4.z.date());
+    return val;
+  }).pipe(v4.z.date())
+);
 const OBJECT_ID_PATTERN = /^[a-f\d]{24}$/i;
 function isObjectId(val) {
   return val instanceof bson.ObjectId;
 }
-const zodObjectId = v4.z.transform((val) => {
-  if (typeof val === "string" && OBJECT_ID_PATTERN.test(val)) {
-    return new bson.ObjectId(val);
-  }
-  return val;
-}).pipe(v4.z.custom(isObjectId, { abort: true })).meta({ id: "ObjectId" });
+const zodObjectId = v4.z.nonoptional(
+  v4.z.transform((val) => {
+    if (typeof val === "string" && OBJECT_ID_PATTERN.test(val)) {
+      return new bson.ObjectId(val);
+    }
+    return val;
+  }).pipe(v4.z.custom(isObjectId, { abort: true })).meta({ id: "ObjectId" })
+);
 function zodCoerceArray(element, params) {
   return v4.z.transform((val) => !Array.isArray(val) && val !== void 0 ? [val] : val).pipe(v4.z.array(element, params));
 }

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-lmnhNH-8.cjs');
+var index = require('./index-CbFCa8NT.cjs');
 var _2019_js = require('ajv/dist/2019.js');
 var moleculer = require('moleculer');
 var addFormats = require('ajv-formats');

package/dist/index.d.cts

@@ -173,8 +173,8 @@ declare function createOpenAPIResponses(model: OpenAPIResponses, description?: s
  * For this, you should use helpers provided by this package.
  */
 declare function zodToOpenAPISchema(schema: ZodType, extractor: OpenAPIExtractor): SchemaObject | ReferenceObject;
-declare const zodDate: z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodDate>;
-declare const zodObjectId: z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodCustom<ObjectId, ObjectId>>;
+declare const zodDate: z.ZodNonOptional<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodDate>>;
+declare const zodObjectId: z.ZodNonOptional<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodCustom<ObjectId, ObjectId>>>;
 declare function zodCoerceArray<T extends ZodType>(element: T, params?: Parameters<typeof z.array>[1]): z.ZodPipe<z.ZodTransform<any[] | undefined, unknown>, z.ZodArray<T>>;
 declare function isZodSchema<S extends z.ZodType>(schema: unknown, type?: S['type']): schema is S;
 

package/dist/index.d.mts

@@ -173,8 +173,8 @@ declare function createOpenAPIResponses(model: OpenAPIResponses, description?: s
  * For this, you should use helpers provided by this package.
  */
 declare function zodToOpenAPISchema(schema: ZodType, extractor: OpenAPIExtractor): SchemaObject | ReferenceObject;
-declare const zodDate: z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodDate>;
-declare const zodObjectId: z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodCustom<ObjectId, ObjectId>>;
+declare const zodDate: z.ZodNonOptional<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodDate>>;
+declare const zodObjectId: z.ZodNonOptional<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodCustom<ObjectId, ObjectId>>>;
 declare function zodCoerceArray<T extends ZodType>(element: T, params?: Parameters<typeof z.array>[1]): z.ZodPipe<z.ZodTransform<any[] | undefined, unknown>, z.ZodArray<T>>;
 declare function isZodSchema<S extends z.ZodType>(schema: unknown, type?: S['type']): schema is S;
 

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { S as SCHEMA_REF_NAME, i as isZodSchema, z as zodToOpenAPISchema, o as omitFields, G as GetOpenApiParamsSchema, V as ValidationErrorSchema, F as FileTooBigSchema, a as FileNotExistSchema, U as UnauthorizedErrorSchema, b as ServerErrorSchema, C as COERCE_ARRAY_ATTRIBUTE } from './index-8Cv0B4uH.mjs';
-export { D as DATE_TYPE, E as EMPTY_OBJECT_SCHEMA, O as OBJECTID_TYPE, c as addFieldsToSchema, d as composeSchemas, e as createOpenAPIResponses, f as optionalExceptFields, g as optionalFields, p as pickFields, t as toPartialSchema, h as zodCoerceArray, j as zodDate, k as zodObjectId } from './index-8Cv0B4uH.mjs';
+import { S as SCHEMA_REF_NAME, i as isZodSchema, z as zodToOpenAPISchema, o as omitFields, G as GetOpenApiParamsSchema, V as ValidationErrorSchema, F as FileTooBigSchema, a as FileNotExistSchema, U as UnauthorizedErrorSchema, b as ServerErrorSchema, C as COERCE_ARRAY_ATTRIBUTE } from './index-BMLRFTWF.mjs';
+export { D as DATE_TYPE, E as EMPTY_OBJECT_SCHEMA, O as OBJECTID_TYPE, c as addFieldsToSchema, d as composeSchemas, e as createOpenAPIResponses, f as optionalExceptFields, g as optionalFields, p as pickFields, t as toPartialSchema, h as zodCoerceArray, j as zodDate, k as zodObjectId } from './index-BMLRFTWF.mjs';
 import { Ajv2019 } from 'ajv/dist/2019.js';
 import { Validators, Errors, Context, ServiceBroker, Service, TracerExporters, MetricReporters } from 'moleculer';
 import addFormats from 'ajv-formats';

package/dist/mixins/database.mixin.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('../index-lmnhNH-8.cjs');
+var index = require('../index-CbFCa8NT.cjs');
 var moleculer = require('moleculer');
 var esToolkit = require('es-toolkit');
 var v4 = require('zod/v4');
@@ -783,8 +783,16 @@ function DatabaseConnectionMixin(opts) {
       getMongoClient() {
         return this.mongoClient;
       },
-      getCollection(options) {
-        return this.getMongoClient().db(dbName).collection(collectionName, options);
+      getMongoDb(options) {
+        return this.getMongoClient().db(dbName, options);
+      },
+      getCollection(options, dbOptions) {
+        if (!collectionName) {
+          throw new Error(
+            "No collectionName was provided in DatabaseConnectionMixin"
+          );
+        }
+        return this.getMongoClient().db(dbName, dbOptions).collection(collectionName, options);
       }
     },
     created() {
@@ -809,13 +817,19 @@ function DatabaseConnectionMixin(opts) {
     async started() {
       this.logger.debug("Service connecting to mongoDB");
       await this.getMongoClient().connect();
-      this.logger.debug("Service connected to mongoDB, creating collection");
-      try {
-        await this.getMongoClient().db(dbName).createCollection(collectionName, createCollectionOptions);
-      } catch (err) {
-        if (err?.code !== 48) {
-          this.logger.error("Error while creating collection", { err });
+      if (collectionName) {
+        this.logger.debug("Service connected to mongoDB, creating collection");
+        try {
+          await this.getMongoClient().db(dbName).createCollection(collectionName, createCollectionOptions);
+        } catch (err) {
+          if (err?.code !== 48) {
+            this.logger.error("Error while creating collection", { err });
+          }
         }
+      } else {
+        this.logger.debug(
+          "Service connected to mongoDB, no collection defined"
+        );
       }
     },
     async stopped() {

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

@@ -1,4 +1,4 @@
-import { Document, ObjectId, WithoutId, InferIdType, Filter, OptionalId, WithId, CountDocumentsOptions, DeleteOptions, FindOneAndDeleteOptions, FindOptions, BulkWriteOptions, FindOneAndUpdateOptions, UpdateOptions, FindOneAndReplaceOptions, CollationOptions, CreateCollectionOptions, MongoClient, CollectionOptions, Collection, UpdateFilter, FindCursor, UpdateResult } from 'mongodb';
+import { Document, ObjectId, WithoutId, InferIdType, Filter, OptionalId, WithId, CountDocumentsOptions, DeleteOptions, FindOneAndDeleteOptions, FindOptions, BulkWriteOptions, FindOneAndUpdateOptions, UpdateOptions, FindOneAndReplaceOptions, CollationOptions, CreateCollectionOptions, MongoClient, DbOptions, Db, CollectionOptions, Collection, UpdateFilter, FindCursor, UpdateResult } from 'mongodb';
 import { ActionVisibility, Validators, Errors, Context } from 'moleculer';
 import { ZodType, ZodObject } from 'zod/v4';
 import { _ as ValidationSchema, J as JSONSchemaType, C as CustomActionSchema, P as PartialCustomServiceSchema } from '../newrelic-metrics-reporter-CmRMT4LG.cjs';
@@ -468,13 +468,14 @@ type DatabaseConnectionOptions = {
      * Name of the database to use.
      * If not specified, will use the default one (inferred from uri).
      *
-     * OVERRIDDEN by globalThis.__MONGO_DB_NAME__ if set, which is useful for tests.
+     * OVERRIDDEN by `globalThis.__MONGO_DB_NAME__` if set, which is useful for tests.
      */
     databaseName?: string;
     /**
-     * Name of the collection in the DB.
+     * Name of the collection in the DB. If undefined, will throw on `getCollection` method
+     * and will not try to create the collection.
      */
-    collectionName: string;
+    collectionName: string | undefined;
     /**
      * Collection creation options.
      * If not specified, will use the default one.
@@ -488,13 +489,14 @@ type DatabaseConnectionOptions = {
      * - process.env.MONGODB_URL
      * - 'mongodb://localhost:27017' (default)
      *
-     * OVERRIDDEN by globalThis.__MONGO_URI__ if set, which is useful for tests.
+     * OVERRIDDEN by `globalThis.__MONGO_URI__` if set, which is useful for tests.
      */
     uri?: string;
 };
 declare function DatabaseConnectionMixin<TSchema extends Record<string, unknown> = never>(opts: DatabaseConnectionOptions): PartialCustomServiceSchema<unknown, {
     getMongoClient(): MongoClient;
-    getCollection(options?: CollectionOptions): Collection<TSchema>;
+    getMongoDb(options?: DbOptions): Db;
+    getCollection(options?: CollectionOptions, dbOptions?: DbOptions): Collection<TSchema>;
 }, PartialCustomServiceSchema<unknown, {
     getStore(storeName: string): Map<string, {
         services: Set<unknown>;
@@ -839,7 +841,7 @@ declare function optimizeQuery<T extends Record<string, unknown>>(query: Filter<
  * Return an object with each list item as key and 1/0/-1 as value
  * to be used in mongo projection or sort.
  */
-declare function getQueryFromList<T extends 'sort' | 'projection', NotOp extends T extends 'sort' ? -1 : 0>(type: T, list?: string[]): Record<string, 1 | NotOp> | undefined;
+declare function getQueryFromList<T extends 'sort' | 'projection', NotOp extends (T extends 'sort' ? -1 : 0)>(type: T, list?: string[]): Record<string, 1 | NotOp> | undefined;
 
 declare function DatabaseMethodsMixin<TSchema extends Document & {
     _id: ObjectId | string;

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

@@ -1,4 +1,4 @@
-import { Document, ObjectId, WithoutId, InferIdType, Filter, OptionalId, WithId, CountDocumentsOptions, DeleteOptions, FindOneAndDeleteOptions, FindOptions, BulkWriteOptions, FindOneAndUpdateOptions, UpdateOptions, FindOneAndReplaceOptions, CollationOptions, CreateCollectionOptions, MongoClient, CollectionOptions, Collection, UpdateFilter, FindCursor, UpdateResult } from 'mongodb';
+import { Document, ObjectId, WithoutId, InferIdType, Filter, OptionalId, WithId, CountDocumentsOptions, DeleteOptions, FindOneAndDeleteOptions, FindOptions, BulkWriteOptions, FindOneAndUpdateOptions, UpdateOptions, FindOneAndReplaceOptions, CollationOptions, CreateCollectionOptions, MongoClient, DbOptions, Db, CollectionOptions, Collection, UpdateFilter, FindCursor, UpdateResult } from 'mongodb';
 import { ActionVisibility, Validators, Errors, Context } from 'moleculer';
 import { ZodType, ZodObject } from 'zod/v4';
 import { _ as ValidationSchema, J as JSONSchemaType, C as CustomActionSchema, P as PartialCustomServiceSchema } from '../newrelic-metrics-reporter-CmRMT4LG.mjs';
@@ -468,13 +468,14 @@ type DatabaseConnectionOptions = {
      * Name of the database to use.
      * If not specified, will use the default one (inferred from uri).
      *
-     * OVERRIDDEN by globalThis.__MONGO_DB_NAME__ if set, which is useful for tests.
+     * OVERRIDDEN by `globalThis.__MONGO_DB_NAME__` if set, which is useful for tests.
      */
     databaseName?: string;
     /**
-     * Name of the collection in the DB.
+     * Name of the collection in the DB. If undefined, will throw on `getCollection` method
+     * and will not try to create the collection.
      */
-    collectionName: string;
+    collectionName: string | undefined;
     /**
      * Collection creation options.
      * If not specified, will use the default one.
@@ -488,13 +489,14 @@ type DatabaseConnectionOptions = {
      * - process.env.MONGODB_URL
      * - 'mongodb://localhost:27017' (default)
      *
-     * OVERRIDDEN by globalThis.__MONGO_URI__ if set, which is useful for tests.
+     * OVERRIDDEN by `globalThis.__MONGO_URI__` if set, which is useful for tests.
      */
     uri?: string;
 };
 declare function DatabaseConnectionMixin<TSchema extends Record<string, unknown> = never>(opts: DatabaseConnectionOptions): PartialCustomServiceSchema<unknown, {
     getMongoClient(): MongoClient;
-    getCollection(options?: CollectionOptions): Collection<TSchema>;
+    getMongoDb(options?: DbOptions): Db;
+    getCollection(options?: CollectionOptions, dbOptions?: DbOptions): Collection<TSchema>;
 }, PartialCustomServiceSchema<unknown, {
     getStore(storeName: string): Map<string, {
         services: Set<unknown>;
@@ -839,7 +841,7 @@ declare function optimizeQuery<T extends Record<string, unknown>>(query: Filter<
  * Return an object with each list item as key and 1/0/-1 as value
  * to be used in mongo projection or sort.
  */
-declare function getQueryFromList<T extends 'sort' | 'projection', NotOp extends T extends 'sort' ? -1 : 0>(type: T, list?: string[]): Record<string, 1 | NotOp> | undefined;
+declare function getQueryFromList<T extends 'sort' | 'projection', NotOp extends (T extends 'sort' ? -1 : 0)>(type: T, list?: string[]): Record<string, 1 | NotOp> | undefined;
 
 declare function DatabaseMethodsMixin<TSchema extends Document & {
     _id: ObjectId | string;

package/dist/mixins/database.mixin.mjs

@@ -1,4 +1,4 @@
-import { g as optionalFields, o as omitFields, S as SCHEMA_REF_NAME, O as OBJECTID_TYPE, C as COERCE_ARRAY_ATTRIBUTE, i as isZodSchema, k as zodObjectId, h as zodCoerceArray, e as createOpenAPIResponses } from '../index-8Cv0B4uH.mjs';
+import { g as optionalFields, o as omitFields, S as SCHEMA_REF_NAME, O as OBJECTID_TYPE, C as COERCE_ARRAY_ATTRIBUTE, i as isZodSchema, k as zodObjectId, h as zodCoerceArray, e as createOpenAPIResponses } from '../index-BMLRFTWF.mjs';
 import { Errors } from 'moleculer';
 import { isEqual as isEqual$1 } from 'es-toolkit';
 import { z } from 'zod/v4';
@@ -781,8 +781,16 @@ function DatabaseConnectionMixin(opts) {
       getMongoClient() {
         return this.mongoClient;
       },
-      getCollection(options) {
-        return this.getMongoClient().db(dbName).collection(collectionName, options);
+      getMongoDb(options) {
+        return this.getMongoClient().db(dbName, options);
+      },
+      getCollection(options, dbOptions) {
+        if (!collectionName) {
+          throw new Error(
+            "No collectionName was provided in DatabaseConnectionMixin"
+          );
+        }
+        return this.getMongoClient().db(dbName, dbOptions).collection(collectionName, options);
       }
     },
     created() {
@@ -807,13 +815,19 @@ function DatabaseConnectionMixin(opts) {
     async started() {
       this.logger.debug("Service connecting to mongoDB");
       await this.getMongoClient().connect();
-      this.logger.debug("Service connected to mongoDB, creating collection");
-      try {
-        await this.getMongoClient().db(dbName).createCollection(collectionName, createCollectionOptions);
-      } catch (err) {
-        if (err?.code !== 48) {
-          this.logger.error("Error while creating collection", { err });
+      if (collectionName) {
+        this.logger.debug("Service connected to mongoDB, creating collection");
+        try {
+          await this.getMongoClient().db(dbName).createCollection(collectionName, createCollectionOptions);
+        } catch (err) {
+          if (err?.code !== 48) {
+            this.logger.error("Error while creating collection", { err });
+          }
         }
+      } else {
+        this.logger.debug(
+          "Service connected to mongoDB, no collection defined"
+        );
       }
     },
     async stopped() {

package/package.json

@@ -6,7 +6,7 @@
     "type": "git",
     "url": "https://github.com/treatwell/moleculer-essentials"
   },
-  "version": "2.1.1-beta.2",
+  "version": "2.2.0",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.cts",
@@ -113,11 +113,11 @@
     "pino-pretty": "^13.1.3"
   },
   "peerDependencies": {
-    "@aws-crypto/client-node": "^4.2.1",
+    "@aws-crypto/client-node": "^4.2.1 || ^5.0.0",
     "bullmq": "^5.12.10",
     "ioredis": "^5.2.3",
     "jsonwebtoken": "^9.0.2",
-    "jwks-rsa": "^3.0.1",
+    "jwks-rsa": "^3.0.1 || ^4.0.1",
     "moleculer": "^0.15.0",
     "mongodb": "^6.15.0 || ^7.1.0",
     "redlock": "^4.2.0",
@@ -149,32 +149,32 @@
   "devDependencies": {
     "@aws-crypto/client-node": "^4.2.2",
     "@eslint/js": "^10.0.1",
-    "@treatwell/eslint-plugin-moleculer": "^1.1.3",
+    "@treatwell/eslint-plugin-moleculer": "^1.1.4",
     "@tsconfig/node-lts": "^24.0.0",
     "@types/jsonwebtoken": "^9.0.10",
-    "@types/node": "^24.12.0",
+    "@types/node": "^24.13.3",
     "@types/redlock": "^4.0.8",
     "bullmq": "^5.71.1",
-    "eslint": "^10.1.0",
+    "eslint": "^10.8.1",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-import-resolver-typescript": "^4.4.4",
+    "eslint-import-resolver-typescript": "^4.4.5",
     "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-prettier": "^5.5.5",
+    "eslint-plugin-prettier": "^5.5.6",
     "ioredis": "^5.10.1",
-    "jiti": "^2.6.1",
+    "jiti": "^2.7.0",
     "jsonwebtoken": "^9.0.3",
     "jwks-rsa": "^4.0.1",
-    "moleculer": "^0.15.0",
-    "mongodb": "^7.1.1",
-    "mongodb-memory-server": "^11.0.1",
-    "pkgroll": "2.27.0",
-    "prettier": "^3.8.1",
+    "moleculer": "^0.15.1",
+    "mongodb": "^7.5.0",
+    "mongodb-memory-server": "^11.2.0",
+    "pkgroll": "2.27.1",
+    "prettier": "^3.9.6",
     "redlock": "^4.2.0",
-    "semantic-release": "^25.0.3",
+    "semantic-release": "^25.0.9",
     "typescript": "~5.9.3",
-    "typescript-eslint": "^8.57.2",
-    "vitest": "^4.1.2",
-    "zod": "^4.3.6"
+    "typescript-eslint": "^8.67.0",
+    "vitest": "^4.1.10",
+    "zod": "^4.4.3"
   },
   "files": [
     "dist"
@@ -182,5 +182,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "packageManager": "yarn@4.13.0"
+  "packageManager": "yarn@4.18.0"
 }