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

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.6",
   "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",