@treatwell/moleculer-essentials 2.0.0-beta.2 → 2.0.0-beta.5

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

@@ -1,7 +1,7 @@
-import { Document, WithoutId, InferIdType, ObjectId, Filter, WithId, OptionalId, FindOptions, CountDocumentsOptions, FindOneAndUpdateOptions, BulkWriteOptions, UpdateOptions, FindOneAndReplaceOptions, FindOneAndDeleteOptions, DeleteOptions, CollationOptions, CreateCollectionOptions, MongoClient, CollectionOptions, Collection, UpdateFilter, FindCursor, UpdateResult } from 'mongodb';
-import { ActionVisibility, BaseValidator, Errors, Context } from 'moleculer';
+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 { V as ValidationSchema, J as JSONSchemaType, C as CustomActionSchema, a as CustomServiceSchema } from '../types-BEknQmfU.cjs';
+import { X as ValidationSchema, J as JSONSchemaType, C as CustomActionSchema, a as CustomServiceSchema } from '../types-DLBNHgt4.cjs';
 import { Readable } from 'stream';
 import 'bson';
 import 'ajv/dist/2019.js';
@@ -224,7 +224,7 @@ declare class AjvActionSchemaFactory<TSchema extends Document> implements Action
 declare function addQueryOps<T>(schema: JSONSchemaType<T>, queryOps: QueryOp[]): JSONSchemaType<unknown>;
 
 declare function parseStringifiedQuery<TSchema extends Document>(sQuery?: string): Filter<TSchema>;
-declare function parseAndValidateQuery<TSchema extends Document>(validator: BaseValidator, schema: ValidationSchema | ZodType | undefined, sQuery: string | undefined): Filter<TSchema>;
+declare function parseAndValidateQuery<TSchema extends Document>(validator: Validators.Base, schema: ValidationSchema | ZodType | undefined, sQuery: string | undefined): Filter<TSchema>;
 
 type DatabaseSoftDeleteScope = 'include-deleted' | 'only-deleted' | 'no-deleted';
 /**

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

@@ -1,7 +1,7 @@
-import { Document, WithoutId, InferIdType, ObjectId, Filter, WithId, OptionalId, FindOptions, CountDocumentsOptions, FindOneAndUpdateOptions, BulkWriteOptions, UpdateOptions, FindOneAndReplaceOptions, FindOneAndDeleteOptions, DeleteOptions, CollationOptions, CreateCollectionOptions, MongoClient, CollectionOptions, Collection, UpdateFilter, FindCursor, UpdateResult } from 'mongodb';
-import { ActionVisibility, BaseValidator, Errors, Context } from 'moleculer';
+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 { V as ValidationSchema, J as JSONSchemaType, C as CustomActionSchema, a as CustomServiceSchema } from '../types-BEknQmfU.mjs';
+import { X as ValidationSchema, J as JSONSchemaType, C as CustomActionSchema, a as CustomServiceSchema } from '../types-DLBNHgt4.mjs';
 import { Readable } from 'stream';
 import 'bson';
 import 'ajv/dist/2019.js';
@@ -224,7 +224,7 @@ declare class AjvActionSchemaFactory<TSchema extends Document> implements Action
 declare function addQueryOps<T>(schema: JSONSchemaType<T>, queryOps: QueryOp[]): JSONSchemaType<unknown>;
 
 declare function parseStringifiedQuery<TSchema extends Document>(sQuery?: string): Filter<TSchema>;
-declare function parseAndValidateQuery<TSchema extends Document>(validator: BaseValidator, schema: ValidationSchema | ZodType | undefined, sQuery: string | undefined): Filter<TSchema>;
+declare function parseAndValidateQuery<TSchema extends Document>(validator: Validators.Base, schema: ValidationSchema | ZodType | undefined, sQuery: string | undefined): Filter<TSchema>;
 
 type DatabaseSoftDeleteScope = 'include-deleted' | 'only-deleted' | 'no-deleted';
 /**

package/dist/mixins/database.mixin.mjs

@@ -1,4 +1,4 @@
-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 { 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 { Errors } from 'moleculer';
 import { isEqual as isEqual$1 } from 'es-toolkit';
 import { z } from 'zod/v4';
@@ -308,7 +308,7 @@ function parseStringifiedQuery(sQuery) {
   if (!sQuery) {
     return {};
   }
-  let query = {};
+  let query;
   try {
     query = JSON.parse(sQuery || "{}");
   } catch {

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

@@ -1,4 +1,4 @@
-import { a as CustomServiceSchema } from '../types-BEknQmfU.cjs';
+import { a as CustomServiceSchema } from '../types-DLBNHgt4.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 { a as CustomServiceSchema } from '../types-BEknQmfU.mjs';
+import { a as CustomServiceSchema } from '../types-DLBNHgt4.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 { a as CustomServiceSchema } from '../types-BEknQmfU.cjs';
+import { a as CustomServiceSchema } from '../types-DLBNHgt4.cjs';
 import 'moleculer';
 import 'bson';
 import 'zod/v4';

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

@@ -1,4 +1,4 @@
-import { a as CustomServiceSchema } from '../types-BEknQmfU.mjs';
+import { a as CustomServiceSchema } from '../types-DLBNHgt4.mjs';
 import 'moleculer';
 import 'bson';
 import 'zod/v4';

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

@@ -1,4 +1,4 @@
-import { a as CustomServiceSchema } from '../types-BEknQmfU.cjs';
+import { a as CustomServiceSchema } from '../types-DLBNHgt4.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 { a as CustomServiceSchema } from '../types-BEknQmfU.mjs';
+import { a as CustomServiceSchema } from '../types-DLBNHgt4.mjs';
 import { SignOptions, PrivateKey, VerifyOptions, JwtHeader, SigningKeyCallback } from 'jsonwebtoken';
 import { Options, JwksClient } from 'jwks-rsa';
 import { Context } from 'moleculer';

package/dist/mixins/queue.mixin.cjs

@@ -139,6 +139,9 @@ function QueueEventsClient(queueName, opts) {
        * Same as addJob but will also wait for the job to finish before returning.
        */
       async addAndWait(qName, name, data, jOpts, ttl) {
+        if (!("addJob" in this)) {
+          throw new Error(`Missing QueueClient mixin on service ${this.name}`);
+        }
         const job = await this.addJob(qName, name, data, jOpts);
         return job.waitUntilFinished(this.getQueueEvents(qName), ttl);
       },
@@ -146,6 +149,9 @@ function QueueEventsClient(queueName, opts) {
        * Same as addBulkJob but will also wait for the jobs to finish before returning.
        */
       async addBulkAndWait(qName, name, data, jOpts, ttl) {
+        if (!("addBulkJob" in this)) {
+          throw new Error(`Missing QueueClient mixin on service ${this.name}`);
+        }
         const jobs = await this.addBulkJob(qName, name, data, jOpts);
         const q = this.getQueueEvents(qName);
         return Promise.all(jobs.map((j) => j.waitUntilFinished(q, ttl)));
@@ -219,7 +225,7 @@ function QueueFlowProducerMixin(opts) {
       this[kConnection$1] = connection;
     },
     async stopped() {
-      await this.$flowProducer?.close();
+      await this.getFlowProducer()?.close();
       this[kConnection$1]?.disconnect();
     }
   });
@@ -406,7 +412,7 @@ function QueueWorker(queueName, opts, processorOptions = {}) {
       }
     },
     async stopped() {
-      await this.$worker?.close();
+      await this.getWorker()?.close();
       this[kConnection]?.disconnect();
     }
   });

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

@@ -1,4 +1,4 @@
-import { a as CustomServiceSchema } from '../types-BEknQmfU.cjs';
+import { a as CustomServiceSchema } from '../types-DLBNHgt4.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 { a as CustomServiceSchema } from '../types-BEknQmfU.mjs';
+import { a as CustomServiceSchema } from '../types-DLBNHgt4.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/queue.mixin.mjs

@@ -137,6 +137,9 @@ function QueueEventsClient(queueName, opts) {
        * Same as addJob but will also wait for the job to finish before returning.
        */
       async addAndWait(qName, name, data, jOpts, ttl) {
+        if (!("addJob" in this)) {
+          throw new Error(`Missing QueueClient mixin on service ${this.name}`);
+        }
         const job = await this.addJob(qName, name, data, jOpts);
         return job.waitUntilFinished(this.getQueueEvents(qName), ttl);
       },
@@ -144,6 +147,9 @@ function QueueEventsClient(queueName, opts) {
        * Same as addBulkJob but will also wait for the jobs to finish before returning.
        */
       async addBulkAndWait(qName, name, data, jOpts, ttl) {
+        if (!("addBulkJob" in this)) {
+          throw new Error(`Missing QueueClient mixin on service ${this.name}`);
+        }
         const jobs = await this.addBulkJob(qName, name, data, jOpts);
         const q = this.getQueueEvents(qName);
         return Promise.all(jobs.map((j) => j.waitUntilFinished(q, ttl)));
@@ -217,7 +223,7 @@ function QueueFlowProducerMixin(opts) {
       this[kConnection$1] = connection;
     },
     async stopped() {
-      await this.$flowProducer?.close();
+      await this.getFlowProducer()?.close();
       this[kConnection$1]?.disconnect();
     }
   });
@@ -404,7 +410,7 @@ function QueueWorker(queueName, opts, processorOptions = {}) {
       }
     },
     async stopped() {
-      await this.$worker?.close();
+      await this.getWorker()?.close();
       this[kConnection]?.disconnect();
     }
   });

package/dist/mixins/redis.mixin.cjs

@@ -36,8 +36,8 @@ function RedisMixin(options, { reuseClient = true, getOptions } = {}) {
         this.setClientToStore(
           "redis",
           key,
-          this.redis,
-          () => this.redis?.disconnect()
+          this.getRedis(),
+          () => this.getRedis()?.disconnect()
         );
       }
     },

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

@@ -1,4 +1,4 @@
-import { a as CustomServiceSchema } from '../types-BEknQmfU.cjs';
+import { a as CustomServiceSchema } from '../types-DLBNHgt4.cjs';
 import { RedisOptions, Redis } from 'ioredis';
 import { Service } from 'moleculer';
 import 'bson';

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

@@ -1,4 +1,4 @@
-import { a as CustomServiceSchema } from '../types-BEknQmfU.mjs';
+import { a as CustomServiceSchema } from '../types-DLBNHgt4.mjs';
 import { RedisOptions, Redis } from 'ioredis';
 import { Service } from 'moleculer';
 import 'bson';

package/dist/mixins/redis.mixin.mjs

@@ -34,8 +34,8 @@ function RedisMixin(options, { reuseClient = true, getOptions } = {}) {
         this.setClientToStore(
           "redis",
           key,
-          this.redis,
-          () => this.redis?.disconnect()
+          this.getRedis(),
+          () => this.getRedis()?.disconnect()
         );
       }
     },

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

@@ -1,4 +1,4 @@
-import { a as CustomServiceSchema } from '../types-BEknQmfU.cjs';
+import { a as CustomServiceSchema } from '../types-DLBNHgt4.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 { a as CustomServiceSchema } from '../types-BEknQmfU.mjs';
+import { a as CustomServiceSchema } from '../types-DLBNHgt4.mjs';
 import { Service } from 'moleculer';
 import { RedisOptions, Redis } from 'ioredis';
 import Redlock from 'redlock';

package/dist/{types-BEknQmfU.d.cts → types-DLBNHgt4.d.cts}

@@ -1,8 +1,8 @@
-import Moleculer__default, { RestSchema, ActionVisibility, Service, ActionCacheOptions, Context, TracingActionOptions, BulkheadOptions, BrokerCircuitBreakerOptions, RetryPolicyOptions, FallbackHandler, ActionHooks, Validators, ActionHandler, ActionSchema, ServiceEvent, ServiceDependency, ServiceHooks, GenericObject, ServiceBroker, Endpoint } from 'moleculer';
+import { ActionSchema, Context, Validators, Middleware, EventSchema, Service, ServiceHooks, Logger, ServiceBroker, ActionEndpoint, EventEndpoint, Span } from 'moleculer';
 import { ObjectId } from 'bson';
 import { ZodType, z } from 'zod/v4';
 import { Options, ErrorObject } from 'ajv/dist/2019.js';
-import { LoggerOptions, Logger } from 'pino';
+import { LoggerOptions, Logger as Logger$1 } from 'pino';
 import { PrettyOptions } from 'pino-pretty';
 
 type UnionToIntersection$1<U> = (U extends any ? (_: U) => void : never) extends (_: infer I) => void ? I : never;
@@ -333,24 +333,14 @@ interface Document {
     'x-express-openapi-validation-strict'?: boolean;
 }
 
-interface CustomActionSchema<T = unknown> {
-    name?: string;
-    rest?: RestSchema | RestSchema[] | string | string[];
-    visibility?: ActionVisibility;
-    service?: Service;
-    cache?: boolean | ActionCacheOptions;
-    handler?: (ctx: Context<never, never>) => Promise<T> | T;
-    tracing?: boolean | TracingActionOptions;
-    bulkhead?: BulkheadOptions;
-    circuitBreaker?: BrokerCircuitBreakerOptions;
-    retryPolicy?: RetryPolicyOptions;
-    fallback?: string | FallbackHandler;
-    hooks?: ActionHooks;
+interface CustomActionSchema<T = unknown> extends Omit<ActionSchema, 'params' | 'handler'> {
     params?: unknown;
+    handler?: (ctx: Context<never, never>) => Promise<T> | T;
     disableTransforms?: boolean;
     openAPINames?: string[] | null;
     openapi?: OperationObject;
     bodySchemaRefName?: string;
+    rest?: string | string[];
 }
 type Alias = {
     actionName: string;
@@ -383,6 +373,9 @@ interface Transformer<T, U> {
     findTransforms: (schema: ValidationSchema) => TransformField[];
 }
 
+type ZodActionOrEventSchema = {
+    params?: ZodType;
+};
 /**
  * Use zod for schema validation.
  * DO NOT support Async refinements/transforms yet.
@@ -390,19 +383,32 @@ interface Transformer<T, U> {
  * Transforms MUST BE handled by the consumer directly.
  */
 declare class ZodValidator extends Validators.Base {
-    compile(): () => void;
+    constructor();
+    compile(): Validators.Base.CheckerFunction;
     validate<S extends ZodType>(params: unknown, schema: S, ctx?: Context): z.output<S>;
     /**
      * Override BaseValidator middleware to handle our custom compile function.
      */
-    middleware(): (handler: ActionHandler, action: ActionSchema) => unknown;
+    middleware(): {
+        name: string;
+        localAction: (handler: any, action: ZodActionOrEventSchema) => any;
+        localEvent: (handler: any, event: ZodActionOrEventSchema) => any;
+    };
+    convertSchemaToMoleculer(): Record<string, unknown>;
 }
 declare module 'moleculer' {
-    interface BaseValidator {
-        validate<S extends ZodType>(params: unknown, schema: S): z.output<S>;
+    namespace Validators {
+        interface Base {
+            validate<S extends ZodType>(params: unknown, schema: S): z.output<S>;
+        }
     }
 }
 
+type AjvValidatorCheckFnOption = {
+    meta: {
+        ctx: Context;
+    };
+};
 /**
  * Moleculer validator using Ajv/zod for schema validation.
  *
@@ -417,7 +423,6 @@ declare module 'moleculer' {
 declare class AjvValidator<Mode extends string> extends Validators.Base {
     private readonly modes;
     private readonly defaultMode;
-    private readonly broker;
     readonly zodValidator?: ZodValidator;
     /**
      * Cache of compiled validation functions.
@@ -438,7 +443,7 @@ declare class AjvValidator<Mode extends string> extends Validators.Base {
      *
      * Compiling a schema is quite expensive, so it will only be done once per schema.
      */
-    compile(schema: ValidationSchema, mode?: Mode): (params: unknown, ctx?: Context) => boolean;
+    compile(schema: ValidationSchema, mode?: Mode): (params: unknown, opts?: AjvValidatorCheckFnOption) => boolean;
     /**
      * For debugging purposes, log the validation errors.
      * This is only enabled if the DETAILED_AJV_VALIDATION_ERRORS env var is set to 'yes'.
@@ -448,11 +453,14 @@ declare class AjvValidator<Mode extends string> extends Validators.Base {
      * We wrap the localAction and localEvent methods to add validation to the actions and events handlers.
      * Note that we lazy compile schemas in order to avoid a performance hit on startup.
      */
-    middleware(): (handler: ActionHandler, action: ActionSchema) => unknown;
+    middleware(): Middleware;
+    convertSchemaToMoleculer(): Record<string, unknown>;
 }
 declare module 'moleculer' {
-    interface BaseValidator {
-        validate(params: unknown, schema: ValidationSchema): true;
+    namespace Validators {
+        interface Base {
+            validate(params: unknown, schema: ValidationSchema): true;
+        }
     }
 }
 
@@ -460,7 +468,7 @@ type Unpacked<T> = T extends (infer U)[] ? U : never;
 type UnionToIntersection<U> = (U extends unknown ? (arg: U) => void : never) extends (arg: infer I) => void ? I : never;
 type OptionallyArray<T> = T | T[];
 
-type ServiceEventSchema = ServiceEvent & {
+type ServiceEventSchema = EventSchema & {
     params?: unknown;
 };
 
@@ -483,7 +491,7 @@ type CallbackServiceThis<Return, Settings, Methods, Mixins, Parameters extends u
 interface CustomServiceSchema<Settings, Methods, Mixins> {
     name: string;
     version?: string | number;
-    dependencies?: OptionallyArray<string | ServiceDependency>;
+    dependencies?: OptionallyArray<string | Service.ServiceDependency>;
     metadata?: Record<string, unknown>;
     settings?: Settings;
     hooks?: ServiceHooks;
@@ -503,9 +511,9 @@ interface CustomServiceSchema<Settings, Methods, Mixins> {
  * This class replace the default Context class in Moleculer to:
  * - Add a ctx.logger instance with the trace.id and span.id in the bindings
  */
-declare class ContextFactory<P = unknown, M extends object = {}, L = GenericObject> extends Context<P, M, L> {
-    constructor(broker: ServiceBroker, endpoint: Endpoint);
-    startSpan(name: string, opts?: Moleculer__default.GenericObject): Moleculer__default.Span;
+declare class ContextFactory<P = unknown, M extends object = {}, L = Record<string, unknown>, H = Record<string, unknown>> extends Context<P, M, L, H> {
+    constructor(broker: ServiceBroker, endpoint: ActionEndpoint | EventEndpoint);
+    startSpan(name: string, opts?: Record<string, unknown>): Span;
     /**
      * Get a logger for this specific span of the context.
      */
@@ -513,7 +521,7 @@ declare class ContextFactory<P = unknown, M extends object = {}, L = GenericObje
 }
 declare module 'moleculer' {
     interface Context {
-        logger: Moleculer__default.LoggerInstance;
+        logger: Logger;
     }
 }
 
@@ -545,7 +553,7 @@ type MoleculerLoggerConfigOptions = {
      *
      * @default createLogger()
      */
-    logger?: Logger;
+    logger?: Logger$1;
     /**
      * Name of the field added for context logging. `false` disable the field
      * @default 'trace.id'
@@ -566,5 +574,5 @@ declare module 'pino' {
     }
 }
 
-export { ZodValidator as Z, AjvValidator as e, ContextFactory as j };
-export type { Alias as A, OAuth2SecurityScheme as B, CustomActionSchema as C, Document as D, ExternalDocumentationObject as E, OpenIdSecurityScheme as F, SecuritySchemeObject as G, HeaderObject as H, InfoObject as I, JSONSchemaType as J, CallbackObject as K, LicenseObject as L, MoleculerLoggerConfigOptions as M, ComponentsObject as N, OperationObject as O, PropertiesSchema as P, TagObject as Q, ReferenceObject as R, SomeJSONSchema as S, Transformer as T, PathItemObject as U, ValidationSchema as V, ObjectServiceThis as W, CallbackServiceThis as X, CustomServiceSchema as a, SchemaObject as b, CreateLoggerOptions as c, RequiredMembers as d, Transform as f, TransformLevel as g, TransformMap as h, TransformField as i, ContactObject as k, ServerVariableObject as l, ServerObject as m, PathsObject as n, ParameterObject as o, ParameterBaseObject as p, ExampleObject as q, EncodingObject as r, MediaTypeObject as s, RequestBodyObject as t, LinkObject as u, ResponseObject as v, ResponsesObject as w, SecurityRequirementObject as x, HttpSecurityScheme as y, ApiKeySecurityScheme as z };
+export { ZodValidator as Z, AjvValidator as d, ContextFactory as i };
+export type { Alias as A, SecurityRequirementObject as B, CustomActionSchema as C, Document as D, EncodingObject as E, SecuritySchemeObject as F, ServerObject as G, HeaderObject as H, InfoObject as I, JSONSchemaType as J, ServerVariableObject as K, LicenseObject as L, MoleculerLoggerConfigOptions as M, Transform as N, OperationObject as O, ParameterBaseObject as P, TransformField as Q, ReferenceObject as R, SomeJSONSchema as S, TagObject as T, TransformLevel as U, TransformMap as V, Transformer as W, ValidationSchema as X, CustomServiceSchema as a, SchemaObject as b, CreateLoggerOptions as c, ApiKeySecurityScheme as e, CallbackObject as f, ComponentsObject as g, ContactObject as h, ExampleObject as j, ExternalDocumentationObject as k, HttpSecurityScheme as l, CallbackServiceThis as m, ObjectServiceThis as n, LinkObject as o, MediaTypeObject as p, OAuth2SecurityScheme as q, OpenIdSecurityScheme as r, ParameterObject as s, PathItemObject as t, PathsObject as u, PropertiesSchema as v, RequestBodyObject as w, RequiredMembers as x, ResponseObject as y, ResponsesObject as z };

package/dist/{types-BEknQmfU.d.mts → types-DLBNHgt4.d.mts}

@@ -1,8 +1,8 @@
-import Moleculer__default, { RestSchema, ActionVisibility, Service, ActionCacheOptions, Context, TracingActionOptions, BulkheadOptions, BrokerCircuitBreakerOptions, RetryPolicyOptions, FallbackHandler, ActionHooks, Validators, ActionHandler, ActionSchema, ServiceEvent, ServiceDependency, ServiceHooks, GenericObject, ServiceBroker, Endpoint } from 'moleculer';
+import { ActionSchema, Context, Validators, Middleware, EventSchema, Service, ServiceHooks, Logger, ServiceBroker, ActionEndpoint, EventEndpoint, Span } from 'moleculer';
 import { ObjectId } from 'bson';
 import { ZodType, z } from 'zod/v4';
 import { Options, ErrorObject } from 'ajv/dist/2019.js';
-import { LoggerOptions, Logger } from 'pino';
+import { LoggerOptions, Logger as Logger$1 } from 'pino';
 import { PrettyOptions } from 'pino-pretty';
 
 type UnionToIntersection$1<U> = (U extends any ? (_: U) => void : never) extends (_: infer I) => void ? I : never;
@@ -333,24 +333,14 @@ interface Document {
     'x-express-openapi-validation-strict'?: boolean;
 }
 
-interface CustomActionSchema<T = unknown> {
-    name?: string;
-    rest?: RestSchema | RestSchema[] | string | string[];
-    visibility?: ActionVisibility;
-    service?: Service;
-    cache?: boolean | ActionCacheOptions;
-    handler?: (ctx: Context<never, never>) => Promise<T> | T;
-    tracing?: boolean | TracingActionOptions;
-    bulkhead?: BulkheadOptions;
-    circuitBreaker?: BrokerCircuitBreakerOptions;
-    retryPolicy?: RetryPolicyOptions;
-    fallback?: string | FallbackHandler;
-    hooks?: ActionHooks;
+interface CustomActionSchema<T = unknown> extends Omit<ActionSchema, 'params' | 'handler'> {
     params?: unknown;
+    handler?: (ctx: Context<never, never>) => Promise<T> | T;
     disableTransforms?: boolean;
     openAPINames?: string[] | null;
     openapi?: OperationObject;
     bodySchemaRefName?: string;
+    rest?: string | string[];
 }
 type Alias = {
     actionName: string;
@@ -383,6 +373,9 @@ interface Transformer<T, U> {
     findTransforms: (schema: ValidationSchema) => TransformField[];
 }
 
+type ZodActionOrEventSchema = {
+    params?: ZodType;
+};
 /**
  * Use zod for schema validation.
  * DO NOT support Async refinements/transforms yet.
@@ -390,19 +383,32 @@ interface Transformer<T, U> {
  * Transforms MUST BE handled by the consumer directly.
  */
 declare class ZodValidator extends Validators.Base {
-    compile(): () => void;
+    constructor();
+    compile(): Validators.Base.CheckerFunction;
     validate<S extends ZodType>(params: unknown, schema: S, ctx?: Context): z.output<S>;
     /**
      * Override BaseValidator middleware to handle our custom compile function.
      */
-    middleware(): (handler: ActionHandler, action: ActionSchema) => unknown;
+    middleware(): {
+        name: string;
+        localAction: (handler: any, action: ZodActionOrEventSchema) => any;
+        localEvent: (handler: any, event: ZodActionOrEventSchema) => any;
+    };
+    convertSchemaToMoleculer(): Record<string, unknown>;
 }
 declare module 'moleculer' {
-    interface BaseValidator {
-        validate<S extends ZodType>(params: unknown, schema: S): z.output<S>;
+    namespace Validators {
+        interface Base {
+            validate<S extends ZodType>(params: unknown, schema: S): z.output<S>;
+        }
     }
 }
 
+type AjvValidatorCheckFnOption = {
+    meta: {
+        ctx: Context;
+    };
+};
 /**
  * Moleculer validator using Ajv/zod for schema validation.
  *
@@ -417,7 +423,6 @@ declare module 'moleculer' {
 declare class AjvValidator<Mode extends string> extends Validators.Base {
     private readonly modes;
     private readonly defaultMode;
-    private readonly broker;
     readonly zodValidator?: ZodValidator;
     /**
      * Cache of compiled validation functions.
@@ -438,7 +443,7 @@ declare class AjvValidator<Mode extends string> extends Validators.Base {
      *
      * Compiling a schema is quite expensive, so it will only be done once per schema.
      */
-    compile(schema: ValidationSchema, mode?: Mode): (params: unknown, ctx?: Context) => boolean;
+    compile(schema: ValidationSchema, mode?: Mode): (params: unknown, opts?: AjvValidatorCheckFnOption) => boolean;
     /**
      * For debugging purposes, log the validation errors.
      * This is only enabled if the DETAILED_AJV_VALIDATION_ERRORS env var is set to 'yes'.
@@ -448,11 +453,14 @@ declare class AjvValidator<Mode extends string> extends Validators.Base {
      * We wrap the localAction and localEvent methods to add validation to the actions and events handlers.
      * Note that we lazy compile schemas in order to avoid a performance hit on startup.
      */
-    middleware(): (handler: ActionHandler, action: ActionSchema) => unknown;
+    middleware(): Middleware;
+    convertSchemaToMoleculer(): Record<string, unknown>;
 }
 declare module 'moleculer' {
-    interface BaseValidator {
-        validate(params: unknown, schema: ValidationSchema): true;
+    namespace Validators {
+        interface Base {
+            validate(params: unknown, schema: ValidationSchema): true;
+        }
     }
 }
 
@@ -460,7 +468,7 @@ type Unpacked<T> = T extends (infer U)[] ? U : never;
 type UnionToIntersection<U> = (U extends unknown ? (arg: U) => void : never) extends (arg: infer I) => void ? I : never;
 type OptionallyArray<T> = T | T[];
 
-type ServiceEventSchema = ServiceEvent & {
+type ServiceEventSchema = EventSchema & {
     params?: unknown;
 };
 
@@ -483,7 +491,7 @@ type CallbackServiceThis<Return, Settings, Methods, Mixins, Parameters extends u
 interface CustomServiceSchema<Settings, Methods, Mixins> {
     name: string;
     version?: string | number;
-    dependencies?: OptionallyArray<string | ServiceDependency>;
+    dependencies?: OptionallyArray<string | Service.ServiceDependency>;
     metadata?: Record<string, unknown>;
     settings?: Settings;
     hooks?: ServiceHooks;
@@ -503,9 +511,9 @@ interface CustomServiceSchema<Settings, Methods, Mixins> {
  * This class replace the default Context class in Moleculer to:
  * - Add a ctx.logger instance with the trace.id and span.id in the bindings
  */
-declare class ContextFactory<P = unknown, M extends object = {}, L = GenericObject> extends Context<P, M, L> {
-    constructor(broker: ServiceBroker, endpoint: Endpoint);
-    startSpan(name: string, opts?: Moleculer__default.GenericObject): Moleculer__default.Span;
+declare class ContextFactory<P = unknown, M extends object = {}, L = Record<string, unknown>, H = Record<string, unknown>> extends Context<P, M, L, H> {
+    constructor(broker: ServiceBroker, endpoint: ActionEndpoint | EventEndpoint);
+    startSpan(name: string, opts?: Record<string, unknown>): Span;
     /**
      * Get a logger for this specific span of the context.
      */
@@ -513,7 +521,7 @@ declare class ContextFactory<P = unknown, M extends object = {}, L = GenericObje
 }
 declare module 'moleculer' {
     interface Context {
-        logger: Moleculer__default.LoggerInstance;
+        logger: Logger;
     }
 }
 
@@ -545,7 +553,7 @@ type MoleculerLoggerConfigOptions = {
      *
      * @default createLogger()
      */
-    logger?: Logger;
+    logger?: Logger$1;
     /**
      * Name of the field added for context logging. `false` disable the field
      * @default 'trace.id'
@@ -566,5 +574,5 @@ declare module 'pino' {
     }
 }
 
-export { ZodValidator as Z, AjvValidator as e, ContextFactory as j };
-export type { Alias as A, OAuth2SecurityScheme as B, CustomActionSchema as C, Document as D, ExternalDocumentationObject as E, OpenIdSecurityScheme as F, SecuritySchemeObject as G, HeaderObject as H, InfoObject as I, JSONSchemaType as J, CallbackObject as K, LicenseObject as L, MoleculerLoggerConfigOptions as M, ComponentsObject as N, OperationObject as O, PropertiesSchema as P, TagObject as Q, ReferenceObject as R, SomeJSONSchema as S, Transformer as T, PathItemObject as U, ValidationSchema as V, ObjectServiceThis as W, CallbackServiceThis as X, CustomServiceSchema as a, SchemaObject as b, CreateLoggerOptions as c, RequiredMembers as d, Transform as f, TransformLevel as g, TransformMap as h, TransformField as i, ContactObject as k, ServerVariableObject as l, ServerObject as m, PathsObject as n, ParameterObject as o, ParameterBaseObject as p, ExampleObject as q, EncodingObject as r, MediaTypeObject as s, RequestBodyObject as t, LinkObject as u, ResponseObject as v, ResponsesObject as w, SecurityRequirementObject as x, HttpSecurityScheme as y, ApiKeySecurityScheme as z };
+export { ZodValidator as Z, AjvValidator as d, ContextFactory as i };
+export type { Alias as A, SecurityRequirementObject as B, CustomActionSchema as C, Document as D, EncodingObject as E, SecuritySchemeObject as F, ServerObject as G, HeaderObject as H, InfoObject as I, JSONSchemaType as J, ServerVariableObject as K, LicenseObject as L, MoleculerLoggerConfigOptions as M, Transform as N, OperationObject as O, ParameterBaseObject as P, TransformField as Q, ReferenceObject as R, SomeJSONSchema as S, TagObject as T, TransformLevel as U, TransformMap as V, Transformer as W, ValidationSchema as X, CustomServiceSchema as a, SchemaObject as b, CreateLoggerOptions as c, ApiKeySecurityScheme as e, CallbackObject as f, ComponentsObject as g, ContactObject as h, ExampleObject as j, ExternalDocumentationObject as k, HttpSecurityScheme as l, CallbackServiceThis as m, ObjectServiceThis as n, LinkObject as o, MediaTypeObject as p, OAuth2SecurityScheme as q, OpenIdSecurityScheme as r, ParameterObject as s, PathItemObject as t, PathsObject as u, PropertiesSchema as v, RequestBodyObject as w, RequiredMembers as x, ResponseObject as y, ResponsesObject as z };