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

package/README.md

@@ -16,6 +16,9 @@
 - [License](#license)
 <!-- TOC -->
 
+> [!WARNING]
+> Starting v2.0.0-beta.4, this package is only compatible with moleculer v0.15+
+
 ## Purpose
 
 `@treatwell/moleculer-essentials` is a collection of essential utilities and helpers for building

package/dist/index.cjs

@@ -30,6 +30,16 @@ function getSchemaFromMoleculer(schema) {
   }
   return void 0;
 }
+function getContextSchemaField(ctx, prop) {
+  if (!ctx) {
+    return;
+  }
+  const schema = ctx.action ?? ctx.event;
+  if (!schema) {
+    return;
+  }
+  return schema[prop];
+}
 
 class RefExtractor {
   refs = /* @__PURE__ */ new Map();
@@ -730,8 +740,6 @@ class AjvExtractor extends RefExtractor {
 class AjvValidator extends moleculer.Validators.Base {
   modes;
   defaultMode;
-  // broker is a property of the base class
-  broker;
   zodValidator;
   /**
    * Cache of compiled validation functions.
@@ -739,7 +747,7 @@ class AjvValidator extends moleculer.Validators.Base {
    */
   compiledFns = /* @__PURE__ */ new WeakMap();
   constructor(opts, defaultMode, zodValidator) {
-    super();
+    super({});
     this.defaultMode = defaultMode;
     this.zodValidator = zodValidator;
     this.modes = /* @__PURE__ */ new Map();
@@ -795,8 +803,10 @@ class AjvValidator extends moleculer.Validators.Base {
     }
     const { validator, extractor } = validatorMode;
     const refSchema = extractor.extract(schema);
-    const fn = (params, ctx) => {
-      if (!ctx?.action?.disableTransforms) {
+    const fn = (params, opts) => {
+      const ctx = opts?.meta.ctx;
+      const disableTransforms = getContextSchemaField(ctx, "disableTransforms");
+      if (!disableTransforms) {
         applyBeforeTransforms(schema, params);
       }
       const validate = validator.compile(refSchema);
@@ -812,7 +822,7 @@ class AjvValidator extends moleculer.Validators.Base {
           validate.errors || []
         );
       }
-      if (!ctx?.action?.disableTransforms) {
+      if (!disableTransforms) {
         applyAfterTransforms(schema, params);
       }
       return true;
@@ -868,7 +878,7 @@ ${(errors || []).map(
         }
         const validate = this.compile(schema, action.validatorMode);
         return async (ctx) => {
-          validate(ctx.params != null ? ctx.params : {}, ctx);
+          validate(ctx.params != null ? ctx.params : {}, { meta: { ctx } });
           return handler(ctx);
         };
       },
@@ -885,15 +895,21 @@ ${(errors || []).map(
         }
         const validate = this.compile(schema, event.validatorMode);
         return async (ctx) => {
-          validate(ctx.params != null ? ctx.params : {}, ctx);
+          validate(ctx.params != null ? ctx.params : {}, { meta: { ctx } });
           return handler(ctx);
         };
       }
     };
   }
+  convertSchemaToMoleculer() {
+    throw new Error("Not implemented");
+  }
 }
 
 class ZodValidator extends moleculer.Validators.Base {
+  constructor() {
+    super({});
+  }
   compile() {
     throw new Error("compile should not be used, use validate instead");
   }
@@ -916,6 +932,7 @@ ${v4.z.prettifyError(res.error)}`,
   middleware() {
     return {
       name: "Validator",
+      // @ts-expect-error Moleculer wants action.params to be an object
       localAction: (handler, action) => {
         const schema = getSchemaFromMoleculer(action.params);
         if (!schema) {
@@ -926,6 +943,7 @@ ${v4.z.prettifyError(res.error)}`,
           return handler(ctx);
         };
       },
+      // @ts-expect-error Moleculer wants action.params to be an object
       localEvent: (handler, event) => {
         const schema = getSchemaFromMoleculer(event.params);
         if (!schema) {
@@ -938,6 +956,9 @@ ${v4.z.prettifyError(res.error)}`,
       }
     };
   }
+  convertSchemaToMoleculer() {
+    throw new Error("Not implemented");
+  }
 }
 
 class ContextFactory extends moleculer.Context {
@@ -1316,18 +1337,18 @@ function HealthCheckMiddleware(_opts) {
       });
     },
     // After broker started
-    started() {
+    async started() {
       const timeout = setTimeout(() => {
         state = "up";
       }, opts.startDebounce);
       timeout.unref();
     },
     // Before broker stopping
-    stopping() {
+    async stopping() {
       state = "stopping";
     },
     // After broker stopped
-    stopped() {
+    async stopped() {
       state = "down";
       server.close();
     }
@@ -1336,23 +1357,27 @@ function HealthCheckMiddleware(_opts) {
 
 function flattenTags(obj, convertToString = false, path = "") {
   if (!obj) return null;
-  return Object.keys(obj).reduce((res, k) => {
-    const o = obj[k];
-    const pp = (path ? `${path}.` : "") + k;
-    if (compat.isObject(o)) {
-      if ("toHexString" in o) {
-        res[pp] = o.toString();
-      } else {
-        Object.assign(res, flattenTags(o, convertToString, pp));
+  return Object.keys(obj).reduce(
+    (res, k) => {
+      const o = obj[k];
+      const pp = (path ? `${path}.` : "") + k;
+      if (compat.isObject(o)) {
+        if ("toHexString" in o) {
+          res[pp] = o.toString();
+        } else {
+          Object.assign(res, flattenTags(o, convertToString, pp));
+        }
+      } else if (o !== void 0 && o !== null) {
+        res[pp] = convertToString ? String(o) : o;
       }
-    } else if (o !== void 0 && o !== null) {
-      res[pp] = convertToString ? String(o) : o;
-    }
-    return res;
-  }, {});
+      return res;
+    },
+    {}
+  );
 }
 
 class NewrelicTraceExporter extends moleculer.TracerExporters.Base {
+  opts = {};
   queue;
   timer = null;
   defaultTags = {};
@@ -1372,11 +1397,11 @@ class NewrelicTraceExporter extends moleculer.TracerExporters.Base {
    */
   init(tracer) {
     super.init(tracer);
-    if (this.opts.interval > 0) {
+    if (this.opts.interval && this.opts.interval > 0) {
       this.timer = setInterval(() => this.flush(), this.opts.interval * 1e3);
       this.timer.unref();
     }
-    this.defaultTags = typeof this.opts.defaultTags === "function" ? this.opts.defaultTags.call(this, tracer) : this.opts.defaultTags;
+    this.defaultTags = (typeof this.opts.defaultTags === "function" ? this.opts.defaultTags.call(this, tracer) : this.opts.defaultTags) || null;
     if (this.defaultTags) {
       this.defaultTags = flattenTags(this.defaultTags, true);
     }
@@ -1459,7 +1484,6 @@ class NewrelicTraceExporter extends moleculer.TracerExporters.Base {
         "duration.ms": span.duration,
         name: span.name,
         "parent.id": span.parentID,
-        // @ts-expect-error fullName isn't declared on span yet
         "service.name": span.service?.fullName || null,
         ...flattenTags(span.tags, true),
         ...flattenTags(this.errorToObject(span.error), true, "error") || {}
@@ -1469,9 +1493,7 @@ class NewrelicTraceExporter extends moleculer.TracerExporters.Base {
 }
 
 class NewrelicMetricsReporter extends moleculer.MetricReporters.Base {
-  // Those fields are not declared on the Base class.
-  registry;
-  logger;
+  opts = {};
   timer = null;
   defaultTags = {};
   constructor(opts) {
@@ -1487,7 +1509,7 @@ class NewrelicMetricsReporter extends moleculer.MetricReporters.Base {
    */
   init(registry) {
     super.init(registry);
-    if (this.opts.interval > 0) {
+    if (this.opts.interval && this.opts.interval > 0) {
       this.timer = setInterval(() => this.flush(), this.opts.interval * 1e3);
       this.timer.unref();
     }
@@ -1589,7 +1611,7 @@ class NewrelicMetricsReporter extends moleculer.MetricReporters.Base {
               attributes: labels,
               timestamp,
               value: { count, sum, min: min || 0, max: max || 0 },
-              "interval.ms": this.opts.interval * 1e3
+              "interval.ms": (this.opts.interval || 0) * 1e3
             });
             if (buckets) {
               Object.entries(buckets).forEach(([key, val]) => {

package/dist/index.d.cts

@@ -1,10 +1,9 @@
-import { S as SomeJSONSchema, J as JSONSchemaType, C as CustomActionSchema, A as Alias, a as CustomServiceSchema, D as Document, b as SchemaObject, O as OperationObject, R as ReferenceObject, c as CreateLoggerOptions, M as MoleculerLoggerConfigOptions } from './types-CSx6iC1f.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, P as ParameterBaseObject, s as ParameterObject, t as PathItemObject, u as PathsObject, v as PropertiesSchema, w as RequestBodyObject, x as RequiredMembers, y as ResponseObject, z as ResponsesObject, B as SecurityRequirementObject, F as SecuritySchemeObject, G as ServerObject, K as ServerVariableObject, T as TagObject, N as Transform, Q as TransformField, U as TransformLevel, V as TransformMap, W as Transformer, X as ValidationSchema, Z as ZodValidator } from './types-CSx6iC1f.cjs';
+import { S as SomeJSONSchema, J as JSONSchemaType, C as CustomActionSchema, A as Alias, a as CustomServiceSchema, D as Document, b as SchemaObject, O as OperationObject, R as ReferenceObject, c as CreateLoggerOptions, M as MoleculerLoggerConfigOptions } from './types-DLBNHgt4.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, P as ParameterBaseObject, s as ParameterObject, t as PathItemObject, u as PathsObject, v as PropertiesSchema, w as RequestBodyObject, x as RequiredMembers, y as ResponseObject, z as ResponsesObject, B as SecurityRequirementObject, F as SecuritySchemeObject, G as ServerObject, K as ServerVariableObject, T as TagObject, N as Transform, Q as TransformField, U as TransformLevel, V as TransformMap, W as Transformer, X as ValidationSchema, Z as ZodValidator } from './types-DLBNHgt4.cjs';
 import { ObjectId } from 'bson';
 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, LoggerConfig, TracerExporters, LoggerInstance, Tracer, Span, MetricReporters, MetricRegistry, MetricReporterOptions } from 'moleculer';
+import { Errors, Context, ServiceSchema, ServiceSettingSchema, Service, ServiceBroker, BrokerOptions, Middleware, LoggerConfig, TracerExporters, Logger as Logger$1, Tracer, Span, MetricReporters, MetricRegistry } from 'moleculer';
 import { Logger } from 'pino';
 import 'pino-pretty';
 
@@ -60,7 +59,7 @@ declare function OpenAPIMixin(options: OpenAPIMixinOptions): Partial<CustomServi
                     description: string;
                     content: {
                         'application/json': {
-                            schema: JSONSchemaType<Omit<Moleculer.Errors.MoleculerServerError, "cause">>;
+                            schema: JSONSchemaType<Omit<Errors.MoleculerServerError, "cause">>;
                         };
                     };
                 };
@@ -92,7 +91,7 @@ declare function OpenAPIMixin(options: OpenAPIMixinOptions): Partial<CustomServi
                     description: string;
                     content: {
                         'application/json': {
-                            schema: JSONSchemaType<Omit<Moleculer.Errors.ValidationError, "cause">>;
+                            schema: JSONSchemaType<Omit<Errors.ValidationError, "cause">>;
                         };
                     };
                 };
@@ -271,7 +270,7 @@ declare function createLogger(opts?: CreateLoggerOptions): Logger;
 declare function createLoggerConfig(opts?: MoleculerLoggerConfigOptions): LoggerConfig;
 
 type NewrelicTraceExporterOptions = {
-    logger?: LoggerInstance;
+    logger?: Logger$1;
     safetyTags?: boolean;
     /**
      * Base URL for NewRelic server.
@@ -292,7 +291,7 @@ type NewrelicTraceExporterOptions = {
     /**
      * Default span tags.
      */
-    defaultTags?: Record<string, unknown> | (() => Record<string, unknown>);
+    defaultTags?: Record<string, unknown> | ((tracer?: unknown) => Record<string, unknown>);
 };
 /**
  * >>> Hard copy of the moleculer NewRelic provider. It didn't handle errors correctly
@@ -303,6 +302,7 @@ type NewrelicTraceExporterOptions = {
  * API v2: https://zipkin.io/zipkin-api/#/
  */
 declare class NewrelicTraceExporter extends TracerExporters.Base {
+    private readonly opts;
     private queue;
     private timer;
     private defaultTags;
@@ -334,7 +334,7 @@ declare class NewrelicTraceExporter extends TracerExporters.Base {
 }
 
 type DefaultTags = Record<string, unknown> | ((registry: MetricRegistry) => Record<string, unknown>);
-type NewrelicMetricsOptions = MetricReporterOptions & {
+type NewrelicMetricsOptions = MetricReporters.Base.MetricReporterOptions & {
     /**
      * Base URL for NewRelic server.
      */
@@ -358,8 +358,7 @@ type NewrelicMetricsOptions = MetricReporterOptions & {
  * NewRelic API: https://docs.newrelic.com/docs/data-apis/understand-data/metric-data/metric-data-type/
  */
 declare class NewrelicMetricsReporter extends MetricReporters.Base {
-    registry: MetricRegistry;
-    logger: LoggerInstance;
+    private readonly opts;
     private timer;
     private defaultTags;
     constructor(opts: NewrelicMetricsOptions);

package/dist/index.d.mts

@@ -1,10 +1,9 @@
-import { S as SomeJSONSchema, J as JSONSchemaType, C as CustomActionSchema, A as Alias, a as CustomServiceSchema, D as Document, b as SchemaObject, O as OperationObject, R as ReferenceObject, c as CreateLoggerOptions, M as MoleculerLoggerConfigOptions } from './types-CSx6iC1f.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, P as ParameterBaseObject, s as ParameterObject, t as PathItemObject, u as PathsObject, v as PropertiesSchema, w as RequestBodyObject, x as RequiredMembers, y as ResponseObject, z as ResponsesObject, B as SecurityRequirementObject, F as SecuritySchemeObject, G as ServerObject, K as ServerVariableObject, T as TagObject, N as Transform, Q as TransformField, U as TransformLevel, V as TransformMap, W as Transformer, X as ValidationSchema, Z as ZodValidator } from './types-CSx6iC1f.mjs';
+import { S as SomeJSONSchema, J as JSONSchemaType, C as CustomActionSchema, A as Alias, a as CustomServiceSchema, D as Document, b as SchemaObject, O as OperationObject, R as ReferenceObject, c as CreateLoggerOptions, M as MoleculerLoggerConfigOptions } from './types-DLBNHgt4.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, P as ParameterBaseObject, s as ParameterObject, t as PathItemObject, u as PathsObject, v as PropertiesSchema, w as RequestBodyObject, x as RequiredMembers, y as ResponseObject, z as ResponsesObject, B as SecurityRequirementObject, F as SecuritySchemeObject, G as ServerObject, K as ServerVariableObject, T as TagObject, N as Transform, Q as TransformField, U as TransformLevel, V as TransformMap, W as Transformer, X as ValidationSchema, Z as ZodValidator } from './types-DLBNHgt4.mjs';
 import { ObjectId } from 'bson';
 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, LoggerConfig, TracerExporters, LoggerInstance, Tracer, Span, MetricReporters, MetricRegistry, MetricReporterOptions } from 'moleculer';
+import { Errors, Context, ServiceSchema, ServiceSettingSchema, Service, ServiceBroker, BrokerOptions, Middleware, LoggerConfig, TracerExporters, Logger as Logger$1, Tracer, Span, MetricReporters, MetricRegistry } from 'moleculer';
 import { Logger } from 'pino';
 import 'pino-pretty';
 
@@ -60,7 +59,7 @@ declare function OpenAPIMixin(options: OpenAPIMixinOptions): Partial<CustomServi
                     description: string;
                     content: {
                         'application/json': {
-                            schema: JSONSchemaType<Omit<Moleculer.Errors.MoleculerServerError, "cause">>;
+                            schema: JSONSchemaType<Omit<Errors.MoleculerServerError, "cause">>;
                         };
                     };
                 };
@@ -92,7 +91,7 @@ declare function OpenAPIMixin(options: OpenAPIMixinOptions): Partial<CustomServi
                     description: string;
                     content: {
                         'application/json': {
-                            schema: JSONSchemaType<Omit<Moleculer.Errors.ValidationError, "cause">>;
+                            schema: JSONSchemaType<Omit<Errors.ValidationError, "cause">>;
                         };
                     };
                 };
@@ -271,7 +270,7 @@ declare function createLogger(opts?: CreateLoggerOptions): Logger;
 declare function createLoggerConfig(opts?: MoleculerLoggerConfigOptions): LoggerConfig;
 
 type NewrelicTraceExporterOptions = {
-    logger?: LoggerInstance;
+    logger?: Logger$1;
     safetyTags?: boolean;
     /**
      * Base URL for NewRelic server.
@@ -292,7 +291,7 @@ type NewrelicTraceExporterOptions = {
     /**
      * Default span tags.
      */
-    defaultTags?: Record<string, unknown> | (() => Record<string, unknown>);
+    defaultTags?: Record<string, unknown> | ((tracer?: unknown) => Record<string, unknown>);
 };
 /**
  * >>> Hard copy of the moleculer NewRelic provider. It didn't handle errors correctly
@@ -303,6 +302,7 @@ type NewrelicTraceExporterOptions = {
  * API v2: https://zipkin.io/zipkin-api/#/
  */
 declare class NewrelicTraceExporter extends TracerExporters.Base {
+    private readonly opts;
     private queue;
     private timer;
     private defaultTags;
@@ -334,7 +334,7 @@ declare class NewrelicTraceExporter extends TracerExporters.Base {
 }
 
 type DefaultTags = Record<string, unknown> | ((registry: MetricRegistry) => Record<string, unknown>);
-type NewrelicMetricsOptions = MetricReporterOptions & {
+type NewrelicMetricsOptions = MetricReporters.Base.MetricReporterOptions & {
     /**
      * Base URL for NewRelic server.
      */
@@ -358,8 +358,7 @@ type NewrelicMetricsOptions = MetricReporterOptions & {
  * NewRelic API: https://docs.newrelic.com/docs/data-apis/understand-data/metric-data/metric-data-type/
  */
 declare class NewrelicMetricsReporter extends MetricReporters.Base {
-    registry: MetricRegistry;
-    logger: LoggerInstance;
+    private readonly opts;
     private timer;
     private defaultTags;
     constructor(opts: NewrelicMetricsOptions);

package/dist/index.mjs

@@ -30,6 +30,16 @@ function getSchemaFromMoleculer(schema) {
   }
   return void 0;
 }
+function getContextSchemaField(ctx, prop) {
+  if (!ctx) {
+    return;
+  }
+  const schema = ctx.action ?? ctx.event;
+  if (!schema) {
+    return;
+  }
+  return schema[prop];
+}
 
 class RefExtractor {
   refs = /* @__PURE__ */ new Map();
@@ -730,8 +740,6 @@ class AjvExtractor extends RefExtractor {
 class AjvValidator extends Validators.Base {
   modes;
   defaultMode;
-  // broker is a property of the base class
-  broker;
   zodValidator;
   /**
    * Cache of compiled validation functions.
@@ -739,7 +747,7 @@ class AjvValidator extends Validators.Base {
    */
   compiledFns = /* @__PURE__ */ new WeakMap();
   constructor(opts, defaultMode, zodValidator) {
-    super();
+    super({});
     this.defaultMode = defaultMode;
     this.zodValidator = zodValidator;
     this.modes = /* @__PURE__ */ new Map();
@@ -795,8 +803,10 @@ class AjvValidator extends Validators.Base {
     }
     const { validator, extractor } = validatorMode;
     const refSchema = extractor.extract(schema);
-    const fn = (params, ctx) => {
-      if (!ctx?.action?.disableTransforms) {
+    const fn = (params, opts) => {
+      const ctx = opts?.meta.ctx;
+      const disableTransforms = getContextSchemaField(ctx, "disableTransforms");
+      if (!disableTransforms) {
         applyBeforeTransforms(schema, params);
       }
       const validate = validator.compile(refSchema);
@@ -812,7 +822,7 @@ class AjvValidator extends Validators.Base {
           validate.errors || []
         );
       }
-      if (!ctx?.action?.disableTransforms) {
+      if (!disableTransforms) {
         applyAfterTransforms(schema, params);
       }
       return true;
@@ -868,7 +878,7 @@ ${(errors || []).map(
         }
         const validate = this.compile(schema, action.validatorMode);
         return async (ctx) => {
-          validate(ctx.params != null ? ctx.params : {}, ctx);
+          validate(ctx.params != null ? ctx.params : {}, { meta: { ctx } });
           return handler(ctx);
         };
       },
@@ -885,15 +895,21 @@ ${(errors || []).map(
         }
         const validate = this.compile(schema, event.validatorMode);
         return async (ctx) => {
-          validate(ctx.params != null ? ctx.params : {}, ctx);
+          validate(ctx.params != null ? ctx.params : {}, { meta: { ctx } });
           return handler(ctx);
         };
       }
     };
   }
+  convertSchemaToMoleculer() {
+    throw new Error("Not implemented");
+  }
 }
 
 class ZodValidator extends Validators.Base {
+  constructor() {
+    super({});
+  }
   compile() {
     throw new Error("compile should not be used, use validate instead");
   }
@@ -916,6 +932,7 @@ ${z.prettifyError(res.error)}`,
   middleware() {
     return {
       name: "Validator",
+      // @ts-expect-error Moleculer wants action.params to be an object
       localAction: (handler, action) => {
         const schema = getSchemaFromMoleculer(action.params);
         if (!schema) {
@@ -926,6 +943,7 @@ ${z.prettifyError(res.error)}`,
           return handler(ctx);
         };
       },
+      // @ts-expect-error Moleculer wants action.params to be an object
       localEvent: (handler, event) => {
         const schema = getSchemaFromMoleculer(event.params);
         if (!schema) {
@@ -938,6 +956,9 @@ ${z.prettifyError(res.error)}`,
       }
     };
   }
+  convertSchemaToMoleculer() {
+    throw new Error("Not implemented");
+  }
 }
 
 class ContextFactory extends Context {
@@ -1316,18 +1337,18 @@ function HealthCheckMiddleware(_opts) {
       });
     },
     // After broker started
-    started() {
+    async started() {
       const timeout = setTimeout(() => {
         state = "up";
       }, opts.startDebounce);
       timeout.unref();
     },
     // Before broker stopping
-    stopping() {
+    async stopping() {
       state = "stopping";
     },
     // After broker stopped
-    stopped() {
+    async stopped() {
       state = "down";
       server.close();
     }
@@ -1336,23 +1357,27 @@ function HealthCheckMiddleware(_opts) {
 
 function flattenTags(obj, convertToString = false, path = "") {
   if (!obj) return null;
-  return Object.keys(obj).reduce((res, k) => {
-    const o = obj[k];
-    const pp = (path ? `${path}.` : "") + k;
-    if (isObject(o)) {
-      if ("toHexString" in o) {
-        res[pp] = o.toString();
-      } else {
-        Object.assign(res, flattenTags(o, convertToString, pp));
+  return Object.keys(obj).reduce(
+    (res, k) => {
+      const o = obj[k];
+      const pp = (path ? `${path}.` : "") + k;
+      if (isObject(o)) {
+        if ("toHexString" in o) {
+          res[pp] = o.toString();
+        } else {
+          Object.assign(res, flattenTags(o, convertToString, pp));
+        }
+      } else if (o !== void 0 && o !== null) {
+        res[pp] = convertToString ? String(o) : o;
       }
-    } else if (o !== void 0 && o !== null) {
-      res[pp] = convertToString ? String(o) : o;
-    }
-    return res;
-  }, {});
+      return res;
+    },
+    {}
+  );
 }
 
 class NewrelicTraceExporter extends TracerExporters.Base {
+  opts = {};
   queue;
   timer = null;
   defaultTags = {};
@@ -1372,11 +1397,11 @@ class NewrelicTraceExporter extends TracerExporters.Base {
    */
   init(tracer) {
     super.init(tracer);
-    if (this.opts.interval > 0) {
+    if (this.opts.interval && this.opts.interval > 0) {
       this.timer = setInterval(() => this.flush(), this.opts.interval * 1e3);
       this.timer.unref();
     }
-    this.defaultTags = typeof this.opts.defaultTags === "function" ? this.opts.defaultTags.call(this, tracer) : this.opts.defaultTags;
+    this.defaultTags = (typeof this.opts.defaultTags === "function" ? this.opts.defaultTags.call(this, tracer) : this.opts.defaultTags) || null;
     if (this.defaultTags) {
       this.defaultTags = flattenTags(this.defaultTags, true);
     }
@@ -1459,7 +1484,6 @@ class NewrelicTraceExporter extends TracerExporters.Base {
         "duration.ms": span.duration,
         name: span.name,
         "parent.id": span.parentID,
-        // @ts-expect-error fullName isn't declared on span yet
         "service.name": span.service?.fullName || null,
         ...flattenTags(span.tags, true),
         ...flattenTags(this.errorToObject(span.error), true, "error") || {}
@@ -1469,9 +1493,7 @@ class NewrelicTraceExporter extends TracerExporters.Base {
 }
 
 class NewrelicMetricsReporter extends MetricReporters.Base {
-  // Those fields are not declared on the Base class.
-  registry;
-  logger;
+  opts = {};
   timer = null;
   defaultTags = {};
   constructor(opts) {
@@ -1487,7 +1509,7 @@ class NewrelicMetricsReporter extends MetricReporters.Base {
    */
   init(registry) {
     super.init(registry);
-    if (this.opts.interval > 0) {
+    if (this.opts.interval && this.opts.interval > 0) {
       this.timer = setInterval(() => this.flush(), this.opts.interval * 1e3);
       this.timer.unref();
     }
@@ -1589,7 +1611,7 @@ class NewrelicMetricsReporter extends MetricReporters.Base {
               attributes: labels,
               timestamp,
               value: { count, sum, min: min || 0, max: max || 0 },
-              "interval.ms": this.opts.interval * 1e3
+              "interval.ms": (this.opts.interval || 0) * 1e3
             });
             if (buckets) {
               Object.entries(buckets).forEach(([key, val]) => {

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, BaseValidator, Errors, Context } from 'moleculer';
+import { ActionVisibility, Validators, Errors, Context } from 'moleculer';
 import { ZodType, ZodObject } from 'zod/v4';
-import { X as ValidationSchema, J as JSONSchemaType, C as CustomActionSchema, a as CustomServiceSchema } from '../types-CSx6iC1f.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, 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, BaseValidator, Errors, Context } from 'moleculer';
+import { ActionVisibility, Validators, Errors, Context } from 'moleculer';
 import { ZodType, ZodObject } from 'zod/v4';
-import { X as ValidationSchema, J as JSONSchemaType, C as CustomActionSchema, a as CustomServiceSchema } from '../types-CSx6iC1f.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/encryptor.mixin.d.cts

@@ -1,4 +1,4 @@
-import { a as CustomServiceSchema } from '../types-CSx6iC1f.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-CSx6iC1f.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-CSx6iC1f.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-CSx6iC1f.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-CSx6iC1f.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-CSx6iC1f.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-CSx6iC1f.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-CSx6iC1f.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-CSx6iC1f.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-CSx6iC1f.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-CSx6iC1f.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-CSx6iC1f.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-CSx6iC1f.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'

package/dist/{types-CSx6iC1f.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'

package/package.json

@@ -6,7 +6,7 @@
     "type": "git",
     "url": "https://github.com/treatwell/moleculer-essentials"
   },
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.5",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.cts",
@@ -118,7 +118,7 @@
     "ioredis": "^5.2.3",
     "jsonwebtoken": "^9.0.2",
     "jwks-rsa": "^3.0.1",
-    "moleculer": "^0.14.33",
+    "moleculer": "^0.15.0",
     "mongodb": "^6.15.0 || ^7.1.0",
     "redlock": "^4.2.0",
     "zod": "^3.25.0 || ^4.0.0"
@@ -164,7 +164,7 @@
     "jiti": "^2.6.1",
     "jsonwebtoken": "^9.0.3",
     "jwks-rsa": "^4.0.1",
-    "moleculer": "^0.14.35",
+    "moleculer": "^0.15.0",
     "mongodb": "^7.1.1",
     "mongodb-memory-server": "^11.0.1",
     "pkgroll": "2.27.0",