@treatwell/moleculer-essentials 2.1.0-beta.1 → 2.1.0-beta.3

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

@@ -248,7 +248,11 @@ function isZodSchema(schema, type) {
   if (!_isZodType(schema)) {
     return false;
   }
-  return type ? schema.type === type : true;
+  if (!type) {
+    return true;
+  }
+  const sType = schema.type || schema._zod.def.type;
+  return sType === type;
 }
 
 const ServerErrorSchema = {

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

@@ -250,7 +250,11 @@ function isZodSchema(schema, type) {
   if (!_isZodType(schema)) {
     return false;
   }
-  return type ? schema.type === type : true;
+  if (!type) {
+    return true;
+  }
+  const sType = schema.type || schema._zod.def.type;
+  return sType === type;
 }
 
 const ServerErrorSchema = {

package/dist/index.cjs

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

package/dist/index.d.cts

@@ -1,9 +1,9 @@
-import { S as SomeJSONSchema, J as JSONSchemaType, C as CustomActionSchema, A as Alias, P as PartialCustomServiceSchema, D as Document, a as SchemaObject, O as OperationObject, R as ReferenceObject, b as CustomServiceSchema, c as CreateLoggerOptions, M as MoleculerLoggerConfigOptions } from './types-rbdpRATx.cjs';
-export { d as AjvValidator, e as ApiKeySecurityScheme, f as CallbackObject, g as ComponentsObject, h as ContactObject, i as ContextFactory, E as EncodingObject, j as ExampleObject, k as ExternalDocumentationObject, H as HeaderObject, l as HttpSecurityScheme, I as InfoObject, m as InternalCallbackServiceThis, n as InternalObjectServiceThis, L as LicenseObject, o as LinkObject, p as MediaTypeObject, q as OAuth2SecurityScheme, r as OpenIdSecurityScheme, s as ParameterBaseObject, t as ParameterObject, u as PathItemObject, v as PathsObject, w as PropertiesSchema, x as RequestBodyObject, y as RequiredMembers, z as ResponseObject, B as ResponsesObject, F as SecurityRequirementObject, G as SecuritySchemeObject, K as ServerObject, N as ServerVariableObject, T as TagObject, Q as Transform, U as TransformField, V as TransformLevel, W as TransformMap, X as Transformer, Y as ValidationSchema, Z as ZodValidator } from './types-rbdpRATx.cjs';
+import { S as SomeJSONSchema, J as JSONSchemaType, C as CustomActionSchema, A as Alias, P as PartialCustomServiceSchema, D as Document, a as SchemaObject, O as OperationObject, R as ReferenceObject, b as CustomServiceSchema, c as CreateLoggerOptions, M as MoleculerLoggerConfigOptions } from './types-Cdh7thEZ.cjs';
+export { d as AjvValidator, e as ApiKeySecurityScheme, f as CallbackObject, g as ComponentsObject, h as ContactObject, i as ContextFactory, E as EncodingObject, j as ExampleObject, k as ExternalDocumentationObject, H as HeaderObject, l as HttpSecurityScheme, I as InfoObject, m as InternalCallbackServiceThis, n as InternalObjectServiceThis, L as LicenseObject, o as LinkObject, p as MediaTypeObject, q as OAuth2SecurityScheme, r as OpenIdSecurityScheme, s as ParameterBaseObject, t as ParameterObject, u as PathItemObject, v as PathsObject, w as PropertiesSchema, x as RequestBodyObject, y as RequiredMembers, z as ResponseObject, B as ResponsesObject, F as SecurityRequirementObject, G as SecuritySchemeObject, K as ServerObject, N as ServerVariableObject, T as TagObject, Q as Transform, U as TransformField, V as TransformLevel, W as TransformMap, X as Transformer, Y as ValidationSchema, Z as ZodValidator } from './types-Cdh7thEZ.cjs';
 import { ObjectId } from 'bson';
 import { z, ZodType } from 'zod/v4';
 import { Ajv2019 } from 'ajv/dist/2019.js';
-import { Errors, Context, ServiceSchema, ServiceSettingSchema, Service, ServiceBroker, BrokerOptions, Middleware, LoggerConfig, TracerExporters, Logger as Logger$1, Tracer, Span, MetricReporters, MetricRegistry } from 'moleculer';
+import { Errors, Context, ServiceSettingSchema, ServiceSchema, Service, ServiceBroker, BrokerOptions, Middleware, LoggerConfig, TracerExporters, Logger as Logger$1, Tracer, Span, MetricReporters, MetricRegistry } from 'moleculer';
 import { Logger } from 'pino';
 import 'pino-pretty';
 
@@ -205,7 +205,7 @@ declare function wrapMixin<Settings, Methods, Mixins>(svc: PartialCustomServiceS
  * type that extend the original one.
  * More on why: https://github.com/microsoft/TypeScript/pull/58176#issuecomment-2052698294
  */
-type _InferredServiceSchema = ServiceSchema;
+type _InferredServiceSchema<TSettings = ServiceSettingSchema> = ServiceSchema<TSettings>;
 /**
  * This function is a NO-OP and is only useful for Typescript types.
  * Using Generic arguments allows TS to infer types directly from the object
@@ -214,7 +214,7 @@ type _InferredServiceSchema = ServiceSchema;
  * For the wrapService fn, it will return a moleculer ServiceSchema that will stripe
  * out every smart typing of methods. This should never be used inside a mixin.
  */
-declare function wrapService<Settings, Methods, Mixins>(svc: CustomServiceSchema<Settings, Methods, Mixins>): _InferredServiceSchema;
+declare function wrapService<Settings, Methods, Mixins>(svc: CustomServiceSchema<Settings, Methods, Mixins>): _InferredServiceSchema<Settings>;
 
 /**
  * This class replace the default Service class in Moleculer to:

package/dist/index.d.mts

@@ -1,9 +1,9 @@
-import { S as SomeJSONSchema, J as JSONSchemaType, C as CustomActionSchema, A as Alias, P as PartialCustomServiceSchema, D as Document, a as SchemaObject, O as OperationObject, R as ReferenceObject, b as CustomServiceSchema, c as CreateLoggerOptions, M as MoleculerLoggerConfigOptions } from './types-rbdpRATx.mjs';
-export { d as AjvValidator, e as ApiKeySecurityScheme, f as CallbackObject, g as ComponentsObject, h as ContactObject, i as ContextFactory, E as EncodingObject, j as ExampleObject, k as ExternalDocumentationObject, H as HeaderObject, l as HttpSecurityScheme, I as InfoObject, m as InternalCallbackServiceThis, n as InternalObjectServiceThis, L as LicenseObject, o as LinkObject, p as MediaTypeObject, q as OAuth2SecurityScheme, r as OpenIdSecurityScheme, s as ParameterBaseObject, t as ParameterObject, u as PathItemObject, v as PathsObject, w as PropertiesSchema, x as RequestBodyObject, y as RequiredMembers, z as ResponseObject, B as ResponsesObject, F as SecurityRequirementObject, G as SecuritySchemeObject, K as ServerObject, N as ServerVariableObject, T as TagObject, Q as Transform, U as TransformField, V as TransformLevel, W as TransformMap, X as Transformer, Y as ValidationSchema, Z as ZodValidator } from './types-rbdpRATx.mjs';
+import { S as SomeJSONSchema, J as JSONSchemaType, C as CustomActionSchema, A as Alias, P as PartialCustomServiceSchema, D as Document, a as SchemaObject, O as OperationObject, R as ReferenceObject, b as CustomServiceSchema, c as CreateLoggerOptions, M as MoleculerLoggerConfigOptions } from './types-Cdh7thEZ.mjs';
+export { d as AjvValidator, e as ApiKeySecurityScheme, f as CallbackObject, g as ComponentsObject, h as ContactObject, i as ContextFactory, E as EncodingObject, j as ExampleObject, k as ExternalDocumentationObject, H as HeaderObject, l as HttpSecurityScheme, I as InfoObject, m as InternalCallbackServiceThis, n as InternalObjectServiceThis, L as LicenseObject, o as LinkObject, p as MediaTypeObject, q as OAuth2SecurityScheme, r as OpenIdSecurityScheme, s as ParameterBaseObject, t as ParameterObject, u as PathItemObject, v as PathsObject, w as PropertiesSchema, x as RequestBodyObject, y as RequiredMembers, z as ResponseObject, B as ResponsesObject, F as SecurityRequirementObject, G as SecuritySchemeObject, K as ServerObject, N as ServerVariableObject, T as TagObject, Q as Transform, U as TransformField, V as TransformLevel, W as TransformMap, X as Transformer, Y as ValidationSchema, Z as ZodValidator } from './types-Cdh7thEZ.mjs';
 import { ObjectId } from 'bson';
 import { z, ZodType } from 'zod/v4';
 import { Ajv2019 } from 'ajv/dist/2019.js';
-import { Errors, Context, ServiceSchema, ServiceSettingSchema, Service, ServiceBroker, BrokerOptions, Middleware, LoggerConfig, TracerExporters, Logger as Logger$1, Tracer, Span, MetricReporters, MetricRegistry } from 'moleculer';
+import { Errors, Context, ServiceSettingSchema, ServiceSchema, Service, ServiceBroker, BrokerOptions, Middleware, LoggerConfig, TracerExporters, Logger as Logger$1, Tracer, Span, MetricReporters, MetricRegistry } from 'moleculer';
 import { Logger } from 'pino';
 import 'pino-pretty';
 
@@ -205,7 +205,7 @@ declare function wrapMixin<Settings, Methods, Mixins>(svc: PartialCustomServiceS
  * type that extend the original one.
  * More on why: https://github.com/microsoft/TypeScript/pull/58176#issuecomment-2052698294
  */
-type _InferredServiceSchema = ServiceSchema;
+type _InferredServiceSchema<TSettings = ServiceSettingSchema> = ServiceSchema<TSettings>;
 /**
  * This function is a NO-OP and is only useful for Typescript types.
  * Using Generic arguments allows TS to infer types directly from the object
@@ -214,7 +214,7 @@ type _InferredServiceSchema = ServiceSchema;
  * For the wrapService fn, it will return a moleculer ServiceSchema that will stripe
  * out every smart typing of methods. This should never be used inside a mixin.
  */
-declare function wrapService<Settings, Methods, Mixins>(svc: CustomServiceSchema<Settings, Methods, Mixins>): _InferredServiceSchema;
+declare function wrapService<Settings, Methods, Mixins>(svc: CustomServiceSchema<Settings, Methods, Mixins>): _InferredServiceSchema<Settings>;
 
 /**
  * This class replace the default Service class in Moleculer to:

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-DNiA_V_T.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-DNiA_V_T.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-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 { 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-CjPjJvVl.cjs');
+var index = require('../index-lmnhNH-8.cjs');
 var moleculer = require('moleculer');
 var esToolkit = require('es-toolkit');
 var v4 = require('zod/v4');

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

@@ -1,7 +1,7 @@
 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 { ActionVisibility, Validators, Errors, Context } from 'moleculer';
 import { ZodType, ZodObject } from 'zod/v4';
-import { Y as ValidationSchema, J as JSONSchemaType, C as CustomActionSchema, P as PartialCustomServiceSchema } from '../types-rbdpRATx.cjs';
+import { Y as ValidationSchema, J as JSONSchemaType, C as CustomActionSchema, P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.cjs';
 import { Readable } from 'stream';
 import 'bson';
 import 'ajv/dist/2019.js';

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

@@ -1,7 +1,7 @@
 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 { ActionVisibility, Validators, Errors, Context } from 'moleculer';
 import { ZodType, ZodObject } from 'zod/v4';
-import { Y as ValidationSchema, J as JSONSchemaType, C as CustomActionSchema, P as PartialCustomServiceSchema } from '../types-rbdpRATx.mjs';
+import { Y as ValidationSchema, J as JSONSchemaType, C as CustomActionSchema, P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.mjs';
 import { Readable } from 'stream';
 import 'bson';
 import 'ajv/dist/2019.js';

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-DNiA_V_T.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-8Cv0B4uH.mjs';
 import { Errors } from 'moleculer';
 import { isEqual as isEqual$1 } from 'es-toolkit';
 import { z } from 'zod/v4';

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

@@ -1,4 +1,4 @@
-import { P as PartialCustomServiceSchema } from '../types-rbdpRATx.cjs';
+import { P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.cjs';
 import { buildClient, NodeCachingMaterialsManager } from '@aws-crypto/client-node';
 import 'moleculer';
 import 'bson';

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

@@ -1,4 +1,4 @@
-import { P as PartialCustomServiceSchema } from '../types-rbdpRATx.mjs';
+import { P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.mjs';
 import { buildClient, NodeCachingMaterialsManager } from '@aws-crypto/client-node';
 import 'moleculer';
 import 'bson';

package/dist/mixins/global-store.mixin.d.cts

@@ -1,4 +1,4 @@
-import { P as PartialCustomServiceSchema } from '../types-rbdpRATx.cjs';
+import { P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.cjs';
 import 'moleculer';
 import 'bson';
 import 'zod/v4';

package/dist/mixins/global-store.mixin.d.mts

@@ -1,4 +1,4 @@
-import { P as PartialCustomServiceSchema } from '../types-rbdpRATx.mjs';
+import { P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.mjs';
 import 'moleculer';
 import 'bson';
 import 'zod/v4';

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

@@ -1,4 +1,4 @@
-import { P as PartialCustomServiceSchema } from '../types-rbdpRATx.cjs';
+import { P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.cjs';
 import { SignOptions, PrivateKey, VerifyOptions, JwtHeader, SigningKeyCallback } from 'jsonwebtoken';
 import { Options, JwksClient } from 'jwks-rsa';
 import { Context } from 'moleculer';

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

@@ -1,4 +1,4 @@
-import { P as PartialCustomServiceSchema } from '../types-rbdpRATx.mjs';
+import { P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.mjs';
 import { SignOptions, PrivateKey, VerifyOptions, JwtHeader, SigningKeyCallback } from 'jsonwebtoken';
 import { Options, JwksClient } from 'jwks-rsa';
 import { Context } from 'moleculer';

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

@@ -1,4 +1,4 @@
-import { P as PartialCustomServiceSchema } from '../types-rbdpRATx.cjs';
+import { P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.cjs';
 import { Redis } from 'ioredis';
 import { QueueOptions, Queue, JobsOptions, Job, QueueEventsOptions, QueueEvents, QueueBaseOptions, FlowProducer, RepeatOptions, WorkerOptions, Worker } from 'bullmq';
 import { Service } from 'moleculer';

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

@@ -1,4 +1,4 @@
-import { P as PartialCustomServiceSchema } from '../types-rbdpRATx.mjs';
+import { P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.mjs';
 import { Redis } from 'ioredis';
 import { QueueOptions, Queue, JobsOptions, Job, QueueEventsOptions, QueueEvents, QueueBaseOptions, FlowProducer, RepeatOptions, WorkerOptions, Worker } from 'bullmq';
 import { Service } from 'moleculer';

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

@@ -1,4 +1,4 @@
-import { P as PartialCustomServiceSchema } from '../types-rbdpRATx.cjs';
+import { P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.cjs';
 import { RedisOptions, Redis } from 'ioredis';
 import { Service } from 'moleculer';
 import 'bson';

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

@@ -1,4 +1,4 @@
-import { P as PartialCustomServiceSchema } from '../types-rbdpRATx.mjs';
+import { P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.mjs';
 import { RedisOptions, Redis } from 'ioredis';
 import { Service } from 'moleculer';
 import 'bson';

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

@@ -1,4 +1,4 @@
-import { P as PartialCustomServiceSchema } from '../types-rbdpRATx.cjs';
+import { P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.cjs';
 import { Service } from 'moleculer';
 import { RedisOptions, Redis } from 'ioredis';
 import Redlock from 'redlock';

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

@@ -1,4 +1,4 @@
-import { P as PartialCustomServiceSchema } from '../types-rbdpRATx.mjs';
+import { P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.mjs';
 import { Service } from 'moleculer';
 import { RedisOptions, Redis } from 'ioredis';
 import Redlock from 'redlock';

package/dist/{types-rbdpRATx.d.cts → types-Cdh7thEZ.d.cts}

@@ -350,7 +350,7 @@ interface CustomActionSchema<T = unknown> extends Omit<ActionSchema, 'params' |
     openAPINames?: string[] | null;
     openapi?: OperationObject;
     bodySchemaRefName?: string;
-    rest?: CustomRestSchema | CustomRestSchema[] | string | string[];
+    rest?: CustomRestSchema | CustomRestSchema[] | string | string[] | null;
 }
 type Alias = {
     actionName: string;

package/dist/{types-rbdpRATx.d.mts → types-Cdh7thEZ.d.mts}

@@ -350,7 +350,7 @@ interface CustomActionSchema<T = unknown> extends Omit<ActionSchema, 'params' |
     openAPINames?: string[] | null;
     openapi?: OperationObject;
     bodySchemaRefName?: string;
-    rest?: CustomRestSchema | CustomRestSchema[] | string | string[];
+    rest?: CustomRestSchema | CustomRestSchema[] | string | string[] | null;
 }
 type Alias = {
     actionName: string;

package/package.json

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