@treatwell/moleculer-essentials 1.2.3 → 1.2.4

package/dist/{index-DAz9xV2z.mjs → index-B6AujuxZ.mjs}

@@ -1,9 +1,8 @@
 import { omit, pick } from 'es-toolkit';
-import { z as z$1 } from 'zod/v4';
-import 'es-toolkit/compat';
 import { ObjectId } from 'bson';
 import { parseISO } from 'date-fns';
-import { z } from 'zod';
+import { z } from 'zod/v4';
+import 'es-toolkit/compat';
 
 const COERCE_ARRAY_ATTRIBUTE = "x-coerce-array";
 const SCHEMA_REF_NAME = "$id";
@@ -239,6 +238,18 @@ const zodObjectId = z.transform((val) => {
 function zodCoerceArray(element, params) {
   return z.transform((val) => !Array.isArray(val) && val !== void 0 ? [val] : val).pipe(z.array(element, params));
 }
+function _isZodType(schema) {
+  if (!schema || typeof schema !== "object") {
+    return false;
+  }
+  return "_zod" in schema;
+}
+function isZodSchema(schema, type) {
+  if (!_isZodType(schema)) {
+    return false;
+  }
+  return type ? schema.type === type : true;
+}
 
 const ServerErrorSchema = {
   type: "object",
@@ -322,10 +333,9 @@ const ValidationErrorSchema = {
     ]
   }
 };
-const GetOpenApiParamsSchema = z$1.object({ kind: z$1.string().optional() });
+const GetOpenApiParamsSchema = z.object({ kind: z.string().optional() });
 
 function createOpenAPIResponses(model, description = "") {
-  const isZodType = model instanceof z$1.ZodType;
   return {
     responses: {
       "200": {
@@ -335,8 +345,8 @@ function createOpenAPIResponses(model, description = "") {
             // @ts-expect-error Moleculer will clone this object using lodash,
             // losing the zod class instance. By using a function, we ensure
             // that clone doesn't break the zod instance
-            zodInstance: isZodType ? () => model : void 0,
-            schema: isZodType ? void 0 : model
+            zodInstance: isZodSchema(model) ? () => model : void 0,
+            schema: isZodSchema(model) ? void 0 : model
           }
         }
       }
@@ -344,4 +354,4 @@ function createOpenAPIResponses(model, description = "") {
   };
 }
 
-export { COERCE_ARRAY_ATTRIBUTE as C, DATE_TYPE as D, EMPTY_OBJECT_SCHEMA as E, FileTooBigSchema as F, GetOpenApiParamsSchema as G, OBJECTID_TYPE as O, SCHEMA_REF_NAME as S, UnauthorizedErrorSchema as U, ValidationErrorSchema as V, FileNotExistSchema as a, ServerErrorSchema as b, addFieldsToSchema as c, optionalFields as d, optionalExceptFields as e, composeSchemas as f, zodDate as g, zodObjectId as h, zodCoerceArray as i, createOpenAPIResponses as j, omitFields as o, pickFields as p, toPartialSchema as t, zodToOpenAPISchema as z };
+export { COERCE_ARRAY_ATTRIBUTE as C, DATE_TYPE as D, EMPTY_OBJECT_SCHEMA as E, FileTooBigSchema as F, GetOpenApiParamsSchema as G, OBJECTID_TYPE as O, SCHEMA_REF_NAME as S, UnauthorizedErrorSchema as U, ValidationErrorSchema as V, FileNotExistSchema as a, ServerErrorSchema as b, addFieldsToSchema as c, optionalFields as d, optionalExceptFields as e, composeSchemas as f, zodDate as g, zodObjectId as h, isZodSchema as i, zodCoerceArray as j, createOpenAPIResponses as k, omitFields as o, pickFields as p, toPartialSchema as t, zodToOpenAPISchema as z };

package/dist/{index-BuNrZnJ4.cjs → index-CjPjJvVl.cjs}

@@ -1,11 +1,10 @@
 'use strict';
 
 var esToolkit = require('es-toolkit');
-var v4 = require('zod/v4');
-require('es-toolkit/compat');
 var bson = require('bson');
 var dateFns = require('date-fns');
-var zod = require('zod');
+var v4 = require('zod/v4');
+require('es-toolkit/compat');
 
 const COERCE_ARRAY_ATTRIBUTE = "x-coerce-array";
 const SCHEMA_REF_NAME = "$id";
@@ -179,7 +178,7 @@ function deepRefReplacer(obj, extractor, currentId = "") {
   }
 }
 function zodToOpenAPISchema(schema, extractor) {
-  const res = zod.z.toJSONSchema(schema, {
+  const res = v4.z.toJSONSchema(schema, {
     io: "input",
     unrepresentable: "any",
     override: ({ zodSchema, jsonSchema }) => {
@@ -219,7 +218,7 @@ function zodToOpenAPISchema(schema, extractor) {
   }
   return res;
 }
-const zodDate = zod.z.transform((val) => {
+const zodDate = v4.z.transform((val) => {
   if (typeof val === "string") {
     const date = dateFns.parseISO(val);
     if (!Number.isNaN(date.getTime())) {
@@ -227,19 +226,31 @@ const zodDate = zod.z.transform((val) => {
     }
   }
   return val;
-}).pipe(zod.z.date());
+}).pipe(v4.z.date());
 const OBJECT_ID_PATTERN = /^[a-f\d]{24}$/i;
 function isObjectId(val) {
   return val instanceof bson.ObjectId;
 }
-const zodObjectId = zod.z.transform((val) => {
+const zodObjectId = v4.z.transform((val) => {
   if (typeof val === "string" && OBJECT_ID_PATTERN.test(val)) {
     return new bson.ObjectId(val);
   }
   return val;
-}).pipe(zod.z.custom(isObjectId, { abort: true })).meta({ id: "ObjectId" });
+}).pipe(v4.z.custom(isObjectId, { abort: true })).meta({ id: "ObjectId" });
 function zodCoerceArray(element, params) {
-  return zod.z.transform((val) => !Array.isArray(val) && val !== void 0 ? [val] : val).pipe(zod.z.array(element, params));
+  return v4.z.transform((val) => !Array.isArray(val) && val !== void 0 ? [val] : val).pipe(v4.z.array(element, params));
+}
+function _isZodType(schema) {
+  if (!schema || typeof schema !== "object") {
+    return false;
+  }
+  return "_zod" in schema;
+}
+function isZodSchema(schema, type) {
+  if (!_isZodType(schema)) {
+    return false;
+  }
+  return type ? schema.type === type : true;
 }
 
 const ServerErrorSchema = {
@@ -327,7 +338,6 @@ const ValidationErrorSchema = {
 const GetOpenApiParamsSchema = v4.z.object({ kind: v4.z.string().optional() });
 
 function createOpenAPIResponses(model, description = "") {
-  const isZodType = model instanceof v4.z.ZodType;
   return {
     responses: {
       "200": {
@@ -337,8 +347,8 @@ function createOpenAPIResponses(model, description = "") {
             // @ts-expect-error Moleculer will clone this object using lodash,
             // losing the zod class instance. By using a function, we ensure
             // that clone doesn't break the zod instance
-            zodInstance: isZodType ? () => model : void 0,
-            schema: isZodType ? void 0 : model
+            zodInstance: isZodSchema(model) ? () => model : void 0,
+            schema: isZodSchema(model) ? void 0 : model
           }
         }
       }
@@ -360,6 +370,7 @@ exports.ValidationErrorSchema = ValidationErrorSchema;
 exports.addFieldsToSchema = addFieldsToSchema;
 exports.composeSchemas = composeSchemas;
 exports.createOpenAPIResponses = createOpenAPIResponses;
+exports.isZodSchema = isZodSchema;
 exports.omitFields = omitFields;
 exports.optionalExceptFields = optionalExceptFields;
 exports.optionalFields = optionalFields;

package/dist/index.cjs

@@ -1,7 +1,6 @@
 'use strict';
 
-var index = require('./index-BuNrZnJ4.cjs');
-var v4 = require('zod/v4');
+var index = require('./index-CjPjJvVl.cjs');
 var _2019_js = require('ajv/dist/2019.js');
 var moleculer = require('moleculer');
 var addFormats = require('ajv-formats');
@@ -9,12 +8,12 @@ var addKeywords = require('ajv-keywords');
 var esToolkit = require('es-toolkit');
 var dateFns = require('date-fns');
 var bson = require('bson');
+var v4 = require('zod/v4');
 var index$1 = require('./index-82e1CXJX.cjs');
 var compat = require('es-toolkit/compat');
 var http = require('http');
 var pino = require('pino');
 var node_os = require('node:os');
-require('zod');
 
 function getSchemaFromMoleculer(schema) {
   if (!schema) {
@@ -191,7 +190,7 @@ function createOperationFromAlias(alias, extractor, url) {
   extractor.setMeta({ url, alias });
   const pathParams = url.match(/{(\w+)}/g) || [];
   const params = getSchemaFromMoleculer(alias.action.params);
-  if (params instanceof v4.ZodType) {
+  if (index.isZodSchema(params)) {
     ({ parameters, requestBody } = createOperationFromZodParams(
       params,
       pathParams,
@@ -306,7 +305,7 @@ function createOperationFromAjvParams(params, pathParams, alias, extractor) {
 function createOperationFromZodParams(params, pathParams, alias, extractor) {
   const parameters = [];
   let requestBody;
-  if (!(params instanceof v4.ZodObject)) {
+  if (!index.isZodSchema(params, "object")) {
     throw new Error(
       `Expected params to be an ZodObject in ${alias.actionName}`
     );
@@ -330,7 +329,7 @@ function createOperationFromZodParams(params, pathParams, alias, extractor) {
         in: "query",
         name: key,
         schema: index.zodToOpenAPISchema(val, extractor),
-        required: !(val instanceof v4.ZodOptional)
+        required: !index.isZodSchema(val, "optional")
       }))
     );
   } else if (params) {
@@ -763,7 +762,7 @@ class AjvValidator extends moleculer.Validators.Base {
     }
   }
   validate(params, schema) {
-    if (schema instanceof v4.ZodType) {
+    if (index.isZodSchema(schema)) {
       if (!this.zodValidator) {
         throw new Error("No validator to handle zod schemas");
       }
@@ -861,7 +860,7 @@ ${(errors || []).map(
         if (!schema) {
           return handler;
         }
-        if (schema instanceof v4.ZodType) {
+        if (index.isZodSchema(schema)) {
           return zodMiddleware.localAction(
             handler,
             action
@@ -878,7 +877,7 @@ ${(errors || []).map(
         if (!schema) {
           return handler;
         }
-        if (schema instanceof v4.ZodType) {
+        if (index.isZodSchema(schema)) {
           return zodMiddleware.localEvent(
             handler,
             event
@@ -1602,6 +1601,7 @@ exports.SCHEMA_REF_NAME = index.SCHEMA_REF_NAME;
 exports.addFieldsToSchema = index.addFieldsToSchema;
 exports.composeSchemas = index.composeSchemas;
 exports.createOpenAPIResponses = index.createOpenAPIResponses;
+exports.isZodSchema = index.isZodSchema;
 exports.omitFields = index.omitFields;
 exports.optionalExceptFields = index.optionalExceptFields;
 exports.optionalFields = index.optionalFields;

package/dist/index.d.cts

@@ -1,8 +1,7 @@
 import { J as JSONSchemaType, S as SomeJSONSchema, C as CustomActionSchema, A as Alias, a as CustomServiceSchema, D as Document, b as SchemaObject, O as OperationObject, R as ReferenceObject } from './index-IHCgtNKZ.cjs';
 export { d as AjvValidator, x as ApiKeySecurityScheme, F as CallbackObject, G as ComponentsObject, j as ContactObject, i as ContextFactory, q as EncodingObject, p as ExampleObject, E as ExternalDocumentationObject, H as HeaderObject, w as HttpSecurityScheme, I as InfoObject, L as LicenseObject, s as LinkObject, M as MediaTypeObject, y as OAuth2SecurityScheme, z as OpenIdSecurityScheme, o as ParameterBaseObject, n as ParameterObject, N as PathItemObject, m as PathsObject, P as PropertiesSchema, r as RequestBodyObject, c as RequiredMembers, t as ResponseObject, u as ResponsesObject, v as SecurityRequirementObject, B as SecuritySchemeObject, l as ServerObject, k as ServerVariableObject, K as TagObject, e as Transform, h as TransformField, f as TransformLevel, g as TransformMap, T as Transformer, V as ValidationSchema, Z as ZodValidator, Q as createLogger, U as createLoggerConfig, W as defaultLogger } from './index-IHCgtNKZ.cjs';
 import { ObjectId } from 'bson';
-import { ZodType, z as z$1 } from 'zod';
-import { z } from 'zod/v4';
+import { z, ZodType } from 'zod/v4';
 import { Ajv2019 } from 'ajv/dist/2019.js';
 import * as Moleculer from 'moleculer';
 import { Context, ServiceSchema, ServiceSettingSchema, Service, ServiceBroker, BrokerOptions, Middleware, TracerExporters, LoggerInstance, Tracer, Span, MetricReporters, MetricRegistry, MetricReporterOptions } from 'moleculer';
@@ -174,9 +173,10 @@ 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$1.ZodPipe<z$1.ZodTransform<unknown, unknown>, z$1.ZodDate>;
-declare const zodObjectId: z$1.ZodPipe<z$1.ZodTransform<unknown, unknown>, z$1.ZodCustom<ObjectId, ObjectId>>;
-declare function zodCoerceArray<T extends ZodType>(element: T, params?: Parameters<typeof z$1.array>[1]): z$1.ZodPipe<z$1.ZodTransform<any[] | undefined, unknown>, z$1.ZodArray<T>>;
+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 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;
 
 declare class AjvExtractor extends RefExtractor {
     private readonly ajv;
@@ -365,5 +365,5 @@ declare class NewrelicMetricsReporter extends MetricReporters.Base {
     generateMetricsPayload(): unknown[];
 }
 
-export { AjvExtractor, Alias, COERCE_ARRAY_ATTRIBUTE, CustomActionSchema, CustomServiceSchema, DATE_TYPE, Document, EMPTY_OBJECT_SCHEMA, HealthCheckMiddleware, JSONSchemaType, NewrelicMetricsReporter, NewrelicTraceExporter, OBJECTID_TYPE, OpenAPIExtractor, OpenAPIMixin, OperationObject, RefExtractor, ReferenceObject, SCHEMA_REF_NAME, SchemaObject, ServiceFactory, SomeJSONSchema, addFieldsToSchema, composeSchemas, createOpenAPIResponses, createServiceBroker, getMetadataFromService, isServiceSelected, omitFields, optionalExceptFields, optionalFields, pickFields, toPartialSchema, wrapMixin, wrapService, zodCoerceArray, zodDate, zodObjectId, zodToOpenAPISchema };
+export { AjvExtractor, Alias, COERCE_ARRAY_ATTRIBUTE, CustomActionSchema, CustomServiceSchema, DATE_TYPE, Document, EMPTY_OBJECT_SCHEMA, HealthCheckMiddleware, JSONSchemaType, NewrelicMetricsReporter, NewrelicTraceExporter, OBJECTID_TYPE, OpenAPIExtractor, OpenAPIMixin, OperationObject, RefExtractor, ReferenceObject, SCHEMA_REF_NAME, SchemaObject, ServiceFactory, SomeJSONSchema, addFieldsToSchema, composeSchemas, createOpenAPIResponses, createServiceBroker, getMetadataFromService, isServiceSelected, isZodSchema, omitFields, optionalExceptFields, optionalFields, pickFields, toPartialSchema, wrapMixin, wrapService, zodCoerceArray, zodDate, zodObjectId, zodToOpenAPISchema };
 export type { OpenAPIMixinOptions, OpenAPIResponses, Selector };

package/dist/index.d.mts

@@ -1,8 +1,7 @@
 import { J as JSONSchemaType, S as SomeJSONSchema, C as CustomActionSchema, A as Alias, a as CustomServiceSchema, D as Document, b as SchemaObject, O as OperationObject, R as ReferenceObject } from './index-IHCgtNKZ.mjs';
 export { d as AjvValidator, x as ApiKeySecurityScheme, F as CallbackObject, G as ComponentsObject, j as ContactObject, i as ContextFactory, q as EncodingObject, p as ExampleObject, E as ExternalDocumentationObject, H as HeaderObject, w as HttpSecurityScheme, I as InfoObject, L as LicenseObject, s as LinkObject, M as MediaTypeObject, y as OAuth2SecurityScheme, z as OpenIdSecurityScheme, o as ParameterBaseObject, n as ParameterObject, N as PathItemObject, m as PathsObject, P as PropertiesSchema, r as RequestBodyObject, c as RequiredMembers, t as ResponseObject, u as ResponsesObject, v as SecurityRequirementObject, B as SecuritySchemeObject, l as ServerObject, k as ServerVariableObject, K as TagObject, e as Transform, h as TransformField, f as TransformLevel, g as TransformMap, T as Transformer, V as ValidationSchema, Z as ZodValidator, Q as createLogger, U as createLoggerConfig, W as defaultLogger } from './index-IHCgtNKZ.mjs';
 import { ObjectId } from 'bson';
-import { ZodType, z as z$1 } from 'zod';
-import { z } from 'zod/v4';
+import { z, ZodType } from 'zod/v4';
 import { Ajv2019 } from 'ajv/dist/2019.js';
 import * as Moleculer from 'moleculer';
 import { Context, ServiceSchema, ServiceSettingSchema, Service, ServiceBroker, BrokerOptions, Middleware, TracerExporters, LoggerInstance, Tracer, Span, MetricReporters, MetricRegistry, MetricReporterOptions } from 'moleculer';
@@ -174,9 +173,10 @@ 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$1.ZodPipe<z$1.ZodTransform<unknown, unknown>, z$1.ZodDate>;
-declare const zodObjectId: z$1.ZodPipe<z$1.ZodTransform<unknown, unknown>, z$1.ZodCustom<ObjectId, ObjectId>>;
-declare function zodCoerceArray<T extends ZodType>(element: T, params?: Parameters<typeof z$1.array>[1]): z$1.ZodPipe<z$1.ZodTransform<any[] | undefined, unknown>, z$1.ZodArray<T>>;
+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 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;
 
 declare class AjvExtractor extends RefExtractor {
     private readonly ajv;
@@ -365,5 +365,5 @@ declare class NewrelicMetricsReporter extends MetricReporters.Base {
     generateMetricsPayload(): unknown[];
 }
 
-export { AjvExtractor, Alias, COERCE_ARRAY_ATTRIBUTE, CustomActionSchema, CustomServiceSchema, DATE_TYPE, Document, EMPTY_OBJECT_SCHEMA, HealthCheckMiddleware, JSONSchemaType, NewrelicMetricsReporter, NewrelicTraceExporter, OBJECTID_TYPE, OpenAPIExtractor, OpenAPIMixin, OperationObject, RefExtractor, ReferenceObject, SCHEMA_REF_NAME, SchemaObject, ServiceFactory, SomeJSONSchema, addFieldsToSchema, composeSchemas, createOpenAPIResponses, createServiceBroker, getMetadataFromService, isServiceSelected, omitFields, optionalExceptFields, optionalFields, pickFields, toPartialSchema, wrapMixin, wrapService, zodCoerceArray, zodDate, zodObjectId, zodToOpenAPISchema };
+export { AjvExtractor, Alias, COERCE_ARRAY_ATTRIBUTE, CustomActionSchema, CustomServiceSchema, DATE_TYPE, Document, EMPTY_OBJECT_SCHEMA, HealthCheckMiddleware, JSONSchemaType, NewrelicMetricsReporter, NewrelicTraceExporter, OBJECTID_TYPE, OpenAPIExtractor, OpenAPIMixin, OperationObject, RefExtractor, ReferenceObject, SCHEMA_REF_NAME, SchemaObject, ServiceFactory, SomeJSONSchema, addFieldsToSchema, composeSchemas, createOpenAPIResponses, createServiceBroker, getMetadataFromService, isServiceSelected, isZodSchema, omitFields, optionalExceptFields, optionalFields, pickFields, toPartialSchema, wrapMixin, wrapService, zodCoerceArray, zodDate, zodObjectId, zodToOpenAPISchema };
 export type { OpenAPIMixinOptions, OpenAPIResponses, Selector };

package/dist/index.mjs

@@ -1,6 +1,5 @@
-import { S as SCHEMA_REF_NAME, 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-DAz9xV2z.mjs';
-export { D as DATE_TYPE, E as EMPTY_OBJECT_SCHEMA, O as OBJECTID_TYPE, c as addFieldsToSchema, f as composeSchemas, j as createOpenAPIResponses, e as optionalExceptFields, d as optionalFields, p as pickFields, t as toPartialSchema, i as zodCoerceArray, g as zodDate, h as zodObjectId } from './index-DAz9xV2z.mjs';
-import { ZodType, ZodObject, ZodOptional, z } from 'zod/v4';
+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-B6AujuxZ.mjs';
+export { D as DATE_TYPE, E as EMPTY_OBJECT_SCHEMA, O as OBJECTID_TYPE, c as addFieldsToSchema, f as composeSchemas, k as createOpenAPIResponses, e as optionalExceptFields, d as optionalFields, p as pickFields, t as toPartialSchema, j as zodCoerceArray, g as zodDate, h as zodObjectId } from './index-B6AujuxZ.mjs';
 import { Ajv2019 } from 'ajv/dist/2019.js';
 import { Validators, Errors, Context, ServiceBroker, Service, TracerExporters, MetricReporters } from 'moleculer';
 import addFormats from 'ajv-formats';
@@ -8,13 +7,13 @@ import addKeywords from 'ajv-keywords';
 import { omit, isEqual, isPlainObject } from 'es-toolkit';
 import { parseISO } from 'date-fns';
 import { ObjectId } from 'bson';
+import { z } from 'zod/v4';
 import { w as wrapMixin } from './index-DNJWwcZu.mjs';
 export { a as wrapService } from './index-DNJWwcZu.mjs';
 import { merge, defaultsDeep, isObject } from 'es-toolkit/compat';
 import http, { STATUS_CODES } from 'http';
 import { pino } from 'pino';
 import { hostname } from 'node:os';
-import 'zod';
 
 function getSchemaFromMoleculer(schema) {
   if (!schema) {
@@ -191,7 +190,7 @@ function createOperationFromAlias(alias, extractor, url) {
   extractor.setMeta({ url, alias });
   const pathParams = url.match(/{(\w+)}/g) || [];
   const params = getSchemaFromMoleculer(alias.action.params);
-  if (params instanceof ZodType) {
+  if (isZodSchema(params)) {
     ({ parameters, requestBody } = createOperationFromZodParams(
       params,
       pathParams,
@@ -306,7 +305,7 @@ function createOperationFromAjvParams(params, pathParams, alias, extractor) {
 function createOperationFromZodParams(params, pathParams, alias, extractor) {
   const parameters = [];
   let requestBody;
-  if (!(params instanceof ZodObject)) {
+  if (!isZodSchema(params, "object")) {
     throw new Error(
       `Expected params to be an ZodObject in ${alias.actionName}`
     );
@@ -330,7 +329,7 @@ function createOperationFromZodParams(params, pathParams, alias, extractor) {
         in: "query",
         name: key,
         schema: zodToOpenAPISchema(val, extractor),
-        required: !(val instanceof ZodOptional)
+        required: !isZodSchema(val, "optional")
       }))
     );
   } else if (params) {
@@ -763,7 +762,7 @@ class AjvValidator extends Validators.Base {
     }
   }
   validate(params, schema) {
-    if (schema instanceof ZodType) {
+    if (isZodSchema(schema)) {
       if (!this.zodValidator) {
         throw new Error("No validator to handle zod schemas");
       }
@@ -861,7 +860,7 @@ ${(errors || []).map(
         if (!schema) {
           return handler;
         }
-        if (schema instanceof ZodType) {
+        if (isZodSchema(schema)) {
           return zodMiddleware.localAction(
             handler,
             action
@@ -878,7 +877,7 @@ ${(errors || []).map(
         if (!schema) {
           return handler;
         }
-        if (schema instanceof ZodType) {
+        if (isZodSchema(schema)) {
           return zodMiddleware.localEvent(
             handler,
             event
@@ -1594,4 +1593,4 @@ class NewrelicMetricsReporter extends MetricReporters.Base {
   }
 }
 
-export { AjvExtractor, AjvValidator, COERCE_ARRAY_ATTRIBUTE, ContextFactory, HealthCheckMiddleware, NewrelicMetricsReporter, NewrelicTraceExporter, OpenAPIExtractor, OpenAPIMixin, RefExtractor, SCHEMA_REF_NAME, ServiceFactory, ZodValidator, createLogger, createLoggerConfig, createServiceBroker, defaultLogger, getMetadataFromService, isServiceSelected, omitFields, wrapMixin, zodToOpenAPISchema };
+export { AjvExtractor, AjvValidator, COERCE_ARRAY_ATTRIBUTE, ContextFactory, HealthCheckMiddleware, NewrelicMetricsReporter, NewrelicTraceExporter, OpenAPIExtractor, OpenAPIMixin, RefExtractor, SCHEMA_REF_NAME, ServiceFactory, ZodValidator, createLogger, createLoggerConfig, createServiceBroker, defaultLogger, getMetadataFromService, isServiceSelected, isZodSchema, omitFields, wrapMixin, zodToOpenAPISchema };

package/dist/mixins/database.mixin.cjs

@@ -1,16 +1,15 @@
 'use strict';
 
-var v4 = require('zod/v4');
-var index = require('../index-BuNrZnJ4.cjs');
+var index = require('../index-CjPjJvVl.cjs');
 var moleculer = require('moleculer');
 var esToolkit = require('es-toolkit');
+var v4 = require('zod/v4');
 var mongodb = require('mongodb');
 var index$1 = require('../index-82e1CXJX.cjs');
 var mixins_globalStore_mixin = require('./global-store.mixin.cjs');
 var compat = require('es-toolkit/compat');
 require('bson');
 require('date-fns');
-require('zod');
 
 const { MoleculerClientError } = moleculer.Errors;
 class EntityNotFoundError extends MoleculerClientError {
@@ -324,7 +323,7 @@ function parseAndValidateQuery(validator, schema, sQuery) {
     return {};
   }
   let query = parseStringifiedQuery(sQuery);
-  if (schema instanceof v4.ZodType) {
+  if (index.isZodSchema(schema)) {
     query = validator.validate(query, schema);
   } else {
     validator.validate(query, schema);
@@ -338,7 +337,7 @@ class ZodActionSchemaFactory {
     this.opts = opts;
     const { schema, tenantField } = opts;
     if (schema) {
-      if (!(schema instanceof v4.ZodObject)) {
+      if (!index.isZodSchema(schema, "object")) {
         throw new Error("Schema must be a ZodObject");
       }
       if (tenantField) {
@@ -361,7 +360,7 @@ class ZodActionSchemaFactory {
       return this.schemaWithDbFields;
     }
     const { timestamps, schema, schemaName } = this.opts;
-    if (!schema || !(schema instanceof v4.ZodObject)) {
+    if (!index.isZodSchema(schema, "object")) {
       throw new Error("Schema is not a ZodObject");
     }
     let res = schema.required({ _id: true });
@@ -463,7 +462,7 @@ class ZodActionSchemaFactory {
   createCreateParams(params) {
     const { schema } = this.opts;
     const { allowClientId } = params;
-    if (!schema || !(schema instanceof v4.ZodObject)) {
+    if (!index.isZodSchema(schema, "object")) {
       throw new Error("Schema is not a ZodObject");
     }
     if (allowClientId) {
@@ -473,7 +472,7 @@ class ZodActionSchemaFactory {
   }
   createUpdateParams() {
     const { tenantField, schema } = this.opts;
-    if (!schema || !(schema instanceof v4.ZodObject)) {
+    if (!index.isZodSchema(schema, "object")) {
       throw new Error("Schema is not a ZodObject");
     }
     const mask = { _id: true };
@@ -516,7 +515,7 @@ const PUBLISHABLE_ACTIONS = [
 ];
 function createActions(opts) {
   const actions = {};
-  const factory = opts.actions?.schemaFactory || (opts.actions?.schema instanceof v4.ZodType ? new ZodActionSchemaFactory({
+  const factory = opts.actions?.schemaFactory || (index.isZodSchema(opts.actions?.schema) ? new ZodActionSchemaFactory({
     schemaName: opts.actions.schemaName,
     schema: opts.actions.schema,
     timestamps: opts.timestamps,

package/dist/mixins/database.mixin.mjs

@@ -1,14 +1,13 @@
-import { ZodType, z, ZodObject } from 'zod/v4';
-import { o as omitFields, d as optionalFields, S as SCHEMA_REF_NAME, O as OBJECTID_TYPE, C as COERCE_ARRAY_ATTRIBUTE, h as zodObjectId, i as zodCoerceArray, j as createOpenAPIResponses } from '../index-DAz9xV2z.mjs';
+import { o as omitFields, d as optionalFields, S as SCHEMA_REF_NAME, O as OBJECTID_TYPE, C as COERCE_ARRAY_ATTRIBUTE, i as isZodSchema, h as zodObjectId, j as zodCoerceArray, k as createOpenAPIResponses } from '../index-B6AujuxZ.mjs';
 import { Errors } from 'moleculer';
 import { isEqual as isEqual$1 } from 'es-toolkit';
+import { z } from 'zod/v4';
 import { MongoClient } from 'mongodb';
 import { w as wrapMixin } from '../index-DNJWwcZu.mjs';
 import { GlobalStoreMixin } from './global-store.mixin.mjs';
 import { isMatch, isEqual } from 'es-toolkit/compat';
 import 'bson';
 import 'date-fns';
-import 'zod';
 
 const { MoleculerClientError } = Errors;
 class EntityNotFoundError extends MoleculerClientError {
@@ -322,7 +321,7 @@ function parseAndValidateQuery(validator, schema, sQuery) {
     return {};
   }
   let query = parseStringifiedQuery(sQuery);
-  if (schema instanceof ZodType) {
+  if (isZodSchema(schema)) {
     query = validator.validate(query, schema);
   } else {
     validator.validate(query, schema);
@@ -336,7 +335,7 @@ class ZodActionSchemaFactory {
     this.opts = opts;
     const { schema, tenantField } = opts;
     if (schema) {
-      if (!(schema instanceof ZodObject)) {
+      if (!isZodSchema(schema, "object")) {
         throw new Error("Schema must be a ZodObject");
       }
       if (tenantField) {
@@ -359,7 +358,7 @@ class ZodActionSchemaFactory {
       return this.schemaWithDbFields;
     }
     const { timestamps, schema, schemaName } = this.opts;
-    if (!schema || !(schema instanceof ZodObject)) {
+    if (!isZodSchema(schema, "object")) {
       throw new Error("Schema is not a ZodObject");
     }
     let res = schema.required({ _id: true });
@@ -461,7 +460,7 @@ class ZodActionSchemaFactory {
   createCreateParams(params) {
     const { schema } = this.opts;
     const { allowClientId } = params;
-    if (!schema || !(schema instanceof ZodObject)) {
+    if (!isZodSchema(schema, "object")) {
       throw new Error("Schema is not a ZodObject");
     }
     if (allowClientId) {
@@ -471,7 +470,7 @@ class ZodActionSchemaFactory {
   }
   createUpdateParams() {
     const { tenantField, schema } = this.opts;
-    if (!schema || !(schema instanceof ZodObject)) {
+    if (!isZodSchema(schema, "object")) {
       throw new Error("Schema is not a ZodObject");
     }
     const mask = { _id: true };
@@ -514,7 +513,7 @@ const PUBLISHABLE_ACTIONS = [
 ];
 function createActions(opts) {
   const actions = {};
-  const factory = opts.actions?.schemaFactory || (opts.actions?.schema instanceof ZodType ? new ZodActionSchemaFactory({
+  const factory = opts.actions?.schemaFactory || (isZodSchema(opts.actions?.schema) ? new ZodActionSchemaFactory({
     schemaName: opts.actions.schemaName,
     schema: opts.actions.schema,
     timestamps: opts.timestamps,

package/package.json

@@ -6,7 +6,7 @@
     "type": "git",
     "url": "https://github.com/treatwell/moleculer-essentials"
   },
-  "version": "1.2.3",
+  "version": "1.2.4",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.cts",
@@ -148,33 +148,33 @@
   },
   "devDependencies": {
     "@aws-crypto/client-node": "^4.2.1",
-    "@eslint/js": "^9.34.0",
+    "@eslint/js": "^9.36.0",
     "@treatwell/eslint-plugin-moleculer": "^1.1.0",
     "@tsconfig/node-lts": "^22.0.2",
     "@types/jsonwebtoken": "^9.0.10",
-    "@types/node": "^24.3.0",
+    "@types/node": "^24.6.1",
     "@types/redlock": "^4.0.7",
-    "bullmq": "^5.12.10",
-    "eslint": "^9.34.0",
+    "bullmq": "^5.59.0",
+    "eslint": "^9.36.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-prettier": "^5.5.4",
-    "ioredis": "^5.2.3",
-    "jiti": "^2.5.1",
+    "ioredis": "^5.8.0",
+    "jiti": "^2.6.1",
     "jsonwebtoken": "^9.0.2",
-    "jwks-rsa": "^3.0.1",
-    "moleculer": "^0.14.33",
-    "mongodb": "^6.15.0",
-    "mongodb-memory-server": "^10.2.0",
-    "pkgroll": "^2.15.3",
+    "jwks-rsa": "^3.2.0",
+    "moleculer": "^0.14.35",
+    "mongodb": "^6.20.0",
+    "mongodb-memory-server": "^10.2.1",
+    "pkgroll": "^2.15.4",
     "prettier": "^3.6.2",
     "redlock": "^4.2.0",
-    "semantic-release": "^24.2.7",
-    "typescript": "~5.9.2",
-    "typescript-eslint": "^8.41.0",
+    "semantic-release": "^24.2.9",
+    "typescript": "~5.9.3",
+    "typescript-eslint": "^8.45.0",
     "vitest": "^3.2.4",
-    "zod": "^4.1.5"
+    "zod": "^4.1.11"
   },
   "files": [
     "dist"