@treatwell/moleculer-essentials 2.0.1 → 2.1.0-beta.2

package/dist/index.d.cts

@@ -1,9 +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-CLAbRykR.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-CLAbRykR.cjs';
+import { S as SomeJSONSchema, J as JSONSchemaType, C as CustomActionSchema, A as Alias, P as PartialCustomServiceSchema, D as Document, a as SchemaObject, O as OperationObject, R as ReferenceObject, b as CustomServiceSchema, c as CreateLoggerOptions, M as MoleculerLoggerConfigOptions } from './types-Cdh7thEZ.cjs';
+export { d as AjvValidator, e as ApiKeySecurityScheme, f as CallbackObject, g as ComponentsObject, h as ContactObject, i as ContextFactory, E as EncodingObject, j as ExampleObject, k as ExternalDocumentationObject, H as HeaderObject, l as HttpSecurityScheme, I as InfoObject, m as InternalCallbackServiceThis, n as InternalObjectServiceThis, L as LicenseObject, o as LinkObject, p as MediaTypeObject, q as OAuth2SecurityScheme, r as OpenIdSecurityScheme, s as ParameterBaseObject, t as ParameterObject, u as PathItemObject, v as PathsObject, w as PropertiesSchema, x as RequestBodyObject, y as RequiredMembers, z as ResponseObject, B as ResponsesObject, F as SecurityRequirementObject, G as SecuritySchemeObject, K as ServerObject, N as ServerVariableObject, T as TagObject, Q as Transform, U as TransformField, V as TransformLevel, W as TransformMap, X as Transformer, Y as ValidationSchema, Z as ZodValidator } from './types-Cdh7thEZ.cjs';
 import { ObjectId } from 'bson';
 import { z, ZodType } from 'zod/v4';
 import { Ajv2019 } from 'ajv/dist/2019.js';
-import { Errors, Context, ServiceSchema, ServiceSettingSchema, Service, ServiceBroker, BrokerOptions, Middleware, LoggerConfig, TracerExporters, Logger as Logger$1, Tracer, Span, MetricReporters, MetricRegistry } from 'moleculer';
+import { Errors, Context, ServiceSettingSchema, ServiceSchema, Service, ServiceBroker, BrokerOptions, Middleware, LoggerConfig, TracerExporters, Logger as Logger$1, Tracer, Span, MetricReporters, MetricRegistry } from 'moleculer';
 import { Logger } from 'pino';
 import 'pino-pretty';
 
@@ -44,7 +44,7 @@ type OpenAPIMixinOptions = {
      */
     getSecuritySchemes?: (action: Alias) => string[] | undefined | false;
 };
-declare function OpenAPIMixin(options: OpenAPIMixinOptions): Partial<CustomServiceSchema<{
+declare function OpenAPIMixin(options: OpenAPIMixinOptions): PartialCustomServiceSchema<{
     openapi: {
         openapi: string;
         info: {
@@ -131,7 +131,7 @@ declare function OpenAPIMixin(options: OpenAPIMixinOptions): Partial<CustomServi
      * Generate the OpenAPI schema for the specified kind.
      */
     generateSchema(ctx: Context, kind?: string): Promise<Document>;
-}, unknown>>;
+}, unknown>;
 
 /**
  * This class walks through a JSON schema and extracts all the refs.
@@ -199,13 +199,13 @@ declare class AjvExtractor extends RefExtractor {
  *
  * For now, only methods are typed.
  */
-declare function wrapMixin<Settings, Methods, Mixins>(svc: Partial<CustomServiceSchema<Settings, Methods, Mixins>>): typeof svc;
+declare function wrapMixin<Settings, Methods, Mixins>(svc: PartialCustomServiceSchema<Settings, Methods, Mixins>): typeof svc;
 /**
  * In order to let TS emit types for inferred services, we return our own
  * type that extend the original one.
  * More on why: https://github.com/microsoft/TypeScript/pull/58176#issuecomment-2052698294
  */
-type _InferredServiceSchema = ServiceSchema;
+type _InferredServiceSchema<TSettings = ServiceSettingSchema> = ServiceSchema<TSettings>;
 /**
  * This function is a NO-OP and is only useful for Typescript types.
  * Using Generic arguments allows TS to infer types directly from the object
@@ -214,7 +214,7 @@ type _InferredServiceSchema = ServiceSchema;
  * For the wrapService fn, it will return a moleculer ServiceSchema that will stripe
  * out every smart typing of methods. This should never be used inside a mixin.
  */
-declare function wrapService<Settings, Methods, Mixins>(svc: CustomServiceSchema<Settings, Methods, Mixins>): _InferredServiceSchema;
+declare function wrapService<Settings, Methods, Mixins>(svc: CustomServiceSchema<Settings, Methods, Mixins>): _InferredServiceSchema<Settings>;
 
 /**
  * This class replace the default Service class in Moleculer to:
@@ -386,5 +386,5 @@ declare class NewrelicMetricsReporter extends MetricReporters.Base {
     generateMetricsPayload(): unknown[];
 }
 
-export { AjvExtractor, Alias, COERCE_ARRAY_ATTRIBUTE, CustomActionSchema, CustomServiceSchema, DATE_TYPE, Document, EMPTY_OBJECT_SCHEMA, HealthCheckMiddleware, JSONSchemaType, NewrelicMetricsReporter, NewrelicTraceExporter, OBJECTID_TYPE, OpenAPIExtractor, OpenAPIMixin, OperationObject, RefExtractor, ReferenceObject, SCHEMA_REF_NAME, SchemaObject, ServiceFactory, SomeJSONSchema, addFieldsToSchema, composeSchemas, createLogger, createLoggerConfig, createOpenAPIResponses, createServiceBroker, getMetadataFromService, isServiceSelected, isZodSchema, omitFields, optionalExceptFields, optionalFields, pickFields, toPartialSchema, wrapMixin, wrapService, zodCoerceArray, zodDate, zodObjectId, zodToOpenAPISchema };
+export { AjvExtractor, Alias, COERCE_ARRAY_ATTRIBUTE, CustomActionSchema, CustomServiceSchema, DATE_TYPE, Document, EMPTY_OBJECT_SCHEMA, HealthCheckMiddleware, JSONSchemaType, NewrelicMetricsReporter, NewrelicTraceExporter, OBJECTID_TYPE, OpenAPIExtractor, OpenAPIMixin, OperationObject, PartialCustomServiceSchema, RefExtractor, ReferenceObject, SCHEMA_REF_NAME, SchemaObject, ServiceFactory, SomeJSONSchema, addFieldsToSchema, composeSchemas, createLogger, createLoggerConfig, createOpenAPIResponses, createServiceBroker, getMetadataFromService, isServiceSelected, isZodSchema, omitFields, optionalExceptFields, optionalFields, pickFields, toPartialSchema, wrapMixin, wrapService, zodCoerceArray, zodDate, zodObjectId, zodToOpenAPISchema };
 export type { OpenAPIMixinOptions, OpenAPIResponses, Selector, _InferredServiceSchema };

package/dist/index.d.mts

@@ -1,9 +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-CLAbRykR.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-CLAbRykR.mjs';
+import { S as SomeJSONSchema, J as JSONSchemaType, C as CustomActionSchema, A as Alias, P as PartialCustomServiceSchema, D as Document, a as SchemaObject, O as OperationObject, R as ReferenceObject, b as CustomServiceSchema, c as CreateLoggerOptions, M as MoleculerLoggerConfigOptions } from './types-Cdh7thEZ.mjs';
+export { d as AjvValidator, e as ApiKeySecurityScheme, f as CallbackObject, g as ComponentsObject, h as ContactObject, i as ContextFactory, E as EncodingObject, j as ExampleObject, k as ExternalDocumentationObject, H as HeaderObject, l as HttpSecurityScheme, I as InfoObject, m as InternalCallbackServiceThis, n as InternalObjectServiceThis, L as LicenseObject, o as LinkObject, p as MediaTypeObject, q as OAuth2SecurityScheme, r as OpenIdSecurityScheme, s as ParameterBaseObject, t as ParameterObject, u as PathItemObject, v as PathsObject, w as PropertiesSchema, x as RequestBodyObject, y as RequiredMembers, z as ResponseObject, B as ResponsesObject, F as SecurityRequirementObject, G as SecuritySchemeObject, K as ServerObject, N as ServerVariableObject, T as TagObject, Q as Transform, U as TransformField, V as TransformLevel, W as TransformMap, X as Transformer, Y as ValidationSchema, Z as ZodValidator } from './types-Cdh7thEZ.mjs';
 import { ObjectId } from 'bson';
 import { z, ZodType } from 'zod/v4';
 import { Ajv2019 } from 'ajv/dist/2019.js';
-import { Errors, Context, ServiceSchema, ServiceSettingSchema, Service, ServiceBroker, BrokerOptions, Middleware, LoggerConfig, TracerExporters, Logger as Logger$1, Tracer, Span, MetricReporters, MetricRegistry } from 'moleculer';
+import { Errors, Context, ServiceSettingSchema, ServiceSchema, Service, ServiceBroker, BrokerOptions, Middleware, LoggerConfig, TracerExporters, Logger as Logger$1, Tracer, Span, MetricReporters, MetricRegistry } from 'moleculer';
 import { Logger } from 'pino';
 import 'pino-pretty';
 
@@ -44,7 +44,7 @@ type OpenAPIMixinOptions = {
      */
     getSecuritySchemes?: (action: Alias) => string[] | undefined | false;
 };
-declare function OpenAPIMixin(options: OpenAPIMixinOptions): Partial<CustomServiceSchema<{
+declare function OpenAPIMixin(options: OpenAPIMixinOptions): PartialCustomServiceSchema<{
     openapi: {
         openapi: string;
         info: {
@@ -131,7 +131,7 @@ declare function OpenAPIMixin(options: OpenAPIMixinOptions): Partial<CustomServi
      * Generate the OpenAPI schema for the specified kind.
      */
     generateSchema(ctx: Context, kind?: string): Promise<Document>;
-}, unknown>>;
+}, unknown>;
 
 /**
  * This class walks through a JSON schema and extracts all the refs.
@@ -199,13 +199,13 @@ declare class AjvExtractor extends RefExtractor {
  *
  * For now, only methods are typed.
  */
-declare function wrapMixin<Settings, Methods, Mixins>(svc: Partial<CustomServiceSchema<Settings, Methods, Mixins>>): typeof svc;
+declare function wrapMixin<Settings, Methods, Mixins>(svc: PartialCustomServiceSchema<Settings, Methods, Mixins>): typeof svc;
 /**
  * In order to let TS emit types for inferred services, we return our own
  * type that extend the original one.
  * More on why: https://github.com/microsoft/TypeScript/pull/58176#issuecomment-2052698294
  */
-type _InferredServiceSchema = ServiceSchema;
+type _InferredServiceSchema<TSettings = ServiceSettingSchema> = ServiceSchema<TSettings>;
 /**
  * This function is a NO-OP and is only useful for Typescript types.
  * Using Generic arguments allows TS to infer types directly from the object
@@ -214,7 +214,7 @@ type _InferredServiceSchema = ServiceSchema;
  * For the wrapService fn, it will return a moleculer ServiceSchema that will stripe
  * out every smart typing of methods. This should never be used inside a mixin.
  */
-declare function wrapService<Settings, Methods, Mixins>(svc: CustomServiceSchema<Settings, Methods, Mixins>): _InferredServiceSchema;
+declare function wrapService<Settings, Methods, Mixins>(svc: CustomServiceSchema<Settings, Methods, Mixins>): _InferredServiceSchema<Settings>;
 
 /**
  * This class replace the default Service class in Moleculer to:
@@ -386,5 +386,5 @@ declare class NewrelicMetricsReporter extends MetricReporters.Base {
     generateMetricsPayload(): unknown[];
 }
 
-export { AjvExtractor, Alias, COERCE_ARRAY_ATTRIBUTE, CustomActionSchema, CustomServiceSchema, DATE_TYPE, Document, EMPTY_OBJECT_SCHEMA, HealthCheckMiddleware, JSONSchemaType, NewrelicMetricsReporter, NewrelicTraceExporter, OBJECTID_TYPE, OpenAPIExtractor, OpenAPIMixin, OperationObject, RefExtractor, ReferenceObject, SCHEMA_REF_NAME, SchemaObject, ServiceFactory, SomeJSONSchema, addFieldsToSchema, composeSchemas, createLogger, createLoggerConfig, createOpenAPIResponses, createServiceBroker, getMetadataFromService, isServiceSelected, isZodSchema, omitFields, optionalExceptFields, optionalFields, pickFields, toPartialSchema, wrapMixin, wrapService, zodCoerceArray, zodDate, zodObjectId, zodToOpenAPISchema };
+export { AjvExtractor, Alias, COERCE_ARRAY_ATTRIBUTE, CustomActionSchema, CustomServiceSchema, DATE_TYPE, Document, EMPTY_OBJECT_SCHEMA, HealthCheckMiddleware, JSONSchemaType, NewrelicMetricsReporter, NewrelicTraceExporter, OBJECTID_TYPE, OpenAPIExtractor, OpenAPIMixin, OperationObject, PartialCustomServiceSchema, RefExtractor, ReferenceObject, SCHEMA_REF_NAME, SchemaObject, ServiceFactory, SomeJSONSchema, addFieldsToSchema, composeSchemas, createLogger, createLoggerConfig, createOpenAPIResponses, createServiceBroker, getMetadataFromService, isServiceSelected, isZodSchema, omitFields, optionalExceptFields, optionalFields, pickFields, toPartialSchema, wrapMixin, wrapService, zodCoerceArray, zodDate, zodObjectId, zodToOpenAPISchema };
 export type { OpenAPIMixinOptions, OpenAPIResponses, Selector, _InferredServiceSchema };

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

@@ -1,7 +1,7 @@
 import { Document, ObjectId, WithoutId, InferIdType, Filter, OptionalId, WithId, CountDocumentsOptions, DeleteOptions, FindOneAndDeleteOptions, FindOptions, BulkWriteOptions, FindOneAndUpdateOptions, UpdateOptions, FindOneAndReplaceOptions, CollationOptions, CreateCollectionOptions, MongoClient, CollectionOptions, Collection, UpdateFilter, FindCursor, UpdateResult } from 'mongodb';
 import { ActionVisibility, Validators, Errors, Context } from 'moleculer';
 import { ZodType, ZodObject } from 'zod/v4';
-import { X as ValidationSchema, J as JSONSchemaType, C as CustomActionSchema, a as CustomServiceSchema } from '../types-CLAbRykR.cjs';
+import { Y as ValidationSchema, J as JSONSchemaType, C as CustomActionSchema, P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.cjs';
 import { Readable } from 'stream';
 import 'bson';
 import 'ajv/dist/2019.js';
@@ -492,10 +492,10 @@ type DatabaseConnectionOptions = {
      */
     uri?: string;
 };
-declare function DatabaseConnectionMixin<TSchema extends Record<string, unknown> = never>(opts: DatabaseConnectionOptions): Partial<CustomServiceSchema<unknown, {
+declare function DatabaseConnectionMixin<TSchema extends Record<string, unknown> = never>(opts: DatabaseConnectionOptions): PartialCustomServiceSchema<unknown, {
     getMongoClient(): MongoClient;
     getCollection(options?: CollectionOptions): Collection<TSchema>;
-}, Partial<CustomServiceSchema<unknown, {
+}, PartialCustomServiceSchema<unknown, {
     getStore(storeName: string): Map<string, {
         services: Set<unknown>;
         client: MongoClient;
@@ -504,7 +504,7 @@ declare function DatabaseConnectionMixin<TSchema extends Record<string, unknown>
     getFromStore(storeName: string, key: string): MongoClient | null;
     removeServiceFromStore(storeName: string, key: string): Promise<boolean>;
     setClientToStore(storeName: string, key: string, client: MongoClient, onClose: () => Promise<void> | void): void;
-}, unknown>>[]>>;
+}, unknown>[]>;
 
 declare const MoleculerClientError: typeof Errors.MoleculerClientError;
 declare class EntityNotFoundError extends MoleculerClientError {
@@ -798,10 +798,10 @@ type SyncIndexesOptions = {
     dropIndexes: boolean;
 };
 declare const DATABASE_INDEXES_MIXIN_SYNC_EVENT = "database-indexes-mixin.sync";
-declare function DatabaseIndexesMixin(opts: DatabaseIndexesOptions): Partial<CustomServiceSchema<unknown, {
+declare function DatabaseIndexesMixin(opts: DatabaseIndexesOptions): PartialCustomServiceSchema<unknown, {
     _syncIndexes({ dropIndexes, createIndexes, }: SyncIndexesOptions): Promise<void>;
     _createIndexFromState(col: Collection, state: IndexState): Promise<void>;
-}, unknown>>;
+}, unknown>;
 
 declare function getDefaultIndexName(key: Record<string, 1 | -1>): string;
 declare function isIndexNameEqual(dbIdx: MongoIndex, idx: IndexTuple): boolean;
@@ -843,7 +843,7 @@ declare function getQueryFromList<T extends 'sort' | 'projection', NotOp extends
 
 declare function DatabaseMethodsMixin<TSchema extends Document & {
     _id: ObjectId | string;
-}, TenantField extends KeyString<TSchema> | false = false>(opts: DatabaseMethodsOptions<TSchema, TenantField>): Partial<CustomServiceSchema<unknown, {
+}, TenantField extends KeyString<TSchema> | false = false>(opts: DatabaseMethodsOptions<TSchema, TenantField>): PartialCustomServiceSchema<unknown, {
     /**
      * Helper function that clean an update aggregation pipeline from createdAt changes.
      * Note: This method mutate the array.
@@ -938,7 +938,7 @@ declare function DatabaseMethodsMixin<TSchema extends Document & {
      * WARNING: Do not send any events. You'll have to send an event yourself.
      */
     _deleteMany(query: Filter<TSchema>, params: TenantParams<TSchema, TenantField>, options?: DatabaseDeleteManyOptions): Promise<number>;
-}, unknown>>;
+}, unknown>;
 
 export { AjvActionSchemaFactory, DATABASE_INDEXES_MIXIN_SYNC_EVENT, DatabaseConnectionMixin, DatabaseIndexesMixin, DatabaseMethodsMixin, EntityNotFoundError, IndexStatus, QueryOp, ZodActionSchemaFactory, addQueryOps, addZodQueryOps, createActions, getDefaultIndexName, getIndexesDifference, getQueryFromList, isIndexEqual, isIndexNameEqual, isOnAtlas, optimizeQuery, optionalMongoId, parseAndValidateQuery, parseStringifiedQuery, removeMongoId, shouldAutoCreateIndexes, shouldAutoDropIndexes };
 export type { ActionCountParamsOptions, ActionCreateParamsOptions, ActionGetParamsOptions, ActionListParamsOptions, ActionSchemaFactory, ActionSchemaFactoryOptions, DatabaseActionCountInternalParams, DatabaseActionCountParams, DatabaseActionCreateParams, DatabaseActionEntityResult, DatabaseActionFindParams, DatabaseActionFindResult, DatabaseActionGetInternalParams, DatabaseActionGetParams, DatabaseActionInternalNames, DatabaseActionListParams, DatabaseActionListResult, DatabaseActionNames, DatabaseActionOptions, DatabaseActionPublishedNames, DatabaseActionRemoveParams, DatabaseActionUpdateParams, DatabaseConnectionOptions, DatabaseCountOptions, DatabaseDeleteManyOptions, DatabaseDeleteOneOptions, DatabaseEventDelete, DatabaseEventInsert, DatabaseEventUpdate, DatabaseFindOptions, DatabaseIndexesOptions, DatabaseInsertManyOptions, DatabaseInsertOneOptions, DatabaseMethodsOptions, DatabaseReplaceOneOptions, DatabaseSoftDeleteScope, DatabaseUpdateManyOptions, DatabaseUpdateOneOptions, IndexState, IndexTuple, KeyString, ListSearchIndex, MongoIndex, SearchIndexCustomAnalyzers, SearchIndexDefinition, SearchIndexField, SearchIndexFieldString, SyncIndexesOptions, TenantParams, WithDbFields, WithOptionalId };

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

@@ -1,7 +1,7 @@
 import { Document, ObjectId, WithoutId, InferIdType, Filter, OptionalId, WithId, CountDocumentsOptions, DeleteOptions, FindOneAndDeleteOptions, FindOptions, BulkWriteOptions, FindOneAndUpdateOptions, UpdateOptions, FindOneAndReplaceOptions, CollationOptions, CreateCollectionOptions, MongoClient, CollectionOptions, Collection, UpdateFilter, FindCursor, UpdateResult } from 'mongodb';
 import { ActionVisibility, Validators, Errors, Context } from 'moleculer';
 import { ZodType, ZodObject } from 'zod/v4';
-import { X as ValidationSchema, J as JSONSchemaType, C as CustomActionSchema, a as CustomServiceSchema } from '../types-CLAbRykR.mjs';
+import { Y as ValidationSchema, J as JSONSchemaType, C as CustomActionSchema, P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.mjs';
 import { Readable } from 'stream';
 import 'bson';
 import 'ajv/dist/2019.js';
@@ -492,10 +492,10 @@ type DatabaseConnectionOptions = {
      */
     uri?: string;
 };
-declare function DatabaseConnectionMixin<TSchema extends Record<string, unknown> = never>(opts: DatabaseConnectionOptions): Partial<CustomServiceSchema<unknown, {
+declare function DatabaseConnectionMixin<TSchema extends Record<string, unknown> = never>(opts: DatabaseConnectionOptions): PartialCustomServiceSchema<unknown, {
     getMongoClient(): MongoClient;
     getCollection(options?: CollectionOptions): Collection<TSchema>;
-}, Partial<CustomServiceSchema<unknown, {
+}, PartialCustomServiceSchema<unknown, {
     getStore(storeName: string): Map<string, {
         services: Set<unknown>;
         client: MongoClient;
@@ -504,7 +504,7 @@ declare function DatabaseConnectionMixin<TSchema extends Record<string, unknown>
     getFromStore(storeName: string, key: string): MongoClient | null;
     removeServiceFromStore(storeName: string, key: string): Promise<boolean>;
     setClientToStore(storeName: string, key: string, client: MongoClient, onClose: () => Promise<void> | void): void;
-}, unknown>>[]>>;
+}, unknown>[]>;
 
 declare const MoleculerClientError: typeof Errors.MoleculerClientError;
 declare class EntityNotFoundError extends MoleculerClientError {
@@ -798,10 +798,10 @@ type SyncIndexesOptions = {
     dropIndexes: boolean;
 };
 declare const DATABASE_INDEXES_MIXIN_SYNC_EVENT = "database-indexes-mixin.sync";
-declare function DatabaseIndexesMixin(opts: DatabaseIndexesOptions): Partial<CustomServiceSchema<unknown, {
+declare function DatabaseIndexesMixin(opts: DatabaseIndexesOptions): PartialCustomServiceSchema<unknown, {
     _syncIndexes({ dropIndexes, createIndexes, }: SyncIndexesOptions): Promise<void>;
     _createIndexFromState(col: Collection, state: IndexState): Promise<void>;
-}, unknown>>;
+}, unknown>;
 
 declare function getDefaultIndexName(key: Record<string, 1 | -1>): string;
 declare function isIndexNameEqual(dbIdx: MongoIndex, idx: IndexTuple): boolean;
@@ -843,7 +843,7 @@ declare function getQueryFromList<T extends 'sort' | 'projection', NotOp extends
 
 declare function DatabaseMethodsMixin<TSchema extends Document & {
     _id: ObjectId | string;
-}, TenantField extends KeyString<TSchema> | false = false>(opts: DatabaseMethodsOptions<TSchema, TenantField>): Partial<CustomServiceSchema<unknown, {
+}, TenantField extends KeyString<TSchema> | false = false>(opts: DatabaseMethodsOptions<TSchema, TenantField>): PartialCustomServiceSchema<unknown, {
     /**
      * Helper function that clean an update aggregation pipeline from createdAt changes.
      * Note: This method mutate the array.
@@ -938,7 +938,7 @@ declare function DatabaseMethodsMixin<TSchema extends Document & {
      * WARNING: Do not send any events. You'll have to send an event yourself.
      */
     _deleteMany(query: Filter<TSchema>, params: TenantParams<TSchema, TenantField>, options?: DatabaseDeleteManyOptions): Promise<number>;
-}, unknown>>;
+}, unknown>;
 
 export { AjvActionSchemaFactory, DATABASE_INDEXES_MIXIN_SYNC_EVENT, DatabaseConnectionMixin, DatabaseIndexesMixin, DatabaseMethodsMixin, EntityNotFoundError, IndexStatus, QueryOp, ZodActionSchemaFactory, addQueryOps, addZodQueryOps, createActions, getDefaultIndexName, getIndexesDifference, getQueryFromList, isIndexEqual, isIndexNameEqual, isOnAtlas, optimizeQuery, optionalMongoId, parseAndValidateQuery, parseStringifiedQuery, removeMongoId, shouldAutoCreateIndexes, shouldAutoDropIndexes };
 export type { ActionCountParamsOptions, ActionCreateParamsOptions, ActionGetParamsOptions, ActionListParamsOptions, ActionSchemaFactory, ActionSchemaFactoryOptions, DatabaseActionCountInternalParams, DatabaseActionCountParams, DatabaseActionCreateParams, DatabaseActionEntityResult, DatabaseActionFindParams, DatabaseActionFindResult, DatabaseActionGetInternalParams, DatabaseActionGetParams, DatabaseActionInternalNames, DatabaseActionListParams, DatabaseActionListResult, DatabaseActionNames, DatabaseActionOptions, DatabaseActionPublishedNames, DatabaseActionRemoveParams, DatabaseActionUpdateParams, DatabaseConnectionOptions, DatabaseCountOptions, DatabaseDeleteManyOptions, DatabaseDeleteOneOptions, DatabaseEventDelete, DatabaseEventInsert, DatabaseEventUpdate, DatabaseFindOptions, DatabaseIndexesOptions, DatabaseInsertManyOptions, DatabaseInsertOneOptions, DatabaseMethodsOptions, DatabaseReplaceOneOptions, DatabaseSoftDeleteScope, DatabaseUpdateManyOptions, DatabaseUpdateOneOptions, IndexState, IndexTuple, KeyString, ListSearchIndex, MongoIndex, SearchIndexCustomAnalyzers, SearchIndexDefinition, SearchIndexField, SearchIndexFieldString, SyncIndexesOptions, TenantParams, WithDbFields, WithOptionalId };

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

@@ -1,4 +1,4 @@
-import { a as CustomServiceSchema } from '../types-CLAbRykR.cjs';
+import { P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.cjs';
 import { buildClient, NodeCachingMaterialsManager } from '@aws-crypto/client-node';
 import 'moleculer';
 import 'bson';
@@ -16,7 +16,7 @@ type EncryptorMixinSettings = {
     cacheMaxMessagesEncrypted?: number;
     localMasterKey?: string;
 };
-declare function EncryptorMixin({ keyId, cacheMaxMessagesEncrypted, cacheMaxAge, cacheCapacity, cacheMaxBytesEncrypted, localMasterKey, }: EncryptorMixinSettings): Partial<CustomServiceSchema<unknown, {
+declare function EncryptorMixin({ keyId, cacheMaxMessagesEncrypted, cacheMaxAge, cacheCapacity, cacheMaxBytesEncrypted, localMasterKey, }: EncryptorMixinSettings): PartialCustomServiceSchema<unknown, {
     getEncryptorClient(): ReturnType<typeof buildClient>;
     /**
      * Get a keyring for a specific key ID
@@ -27,7 +27,7 @@ declare function EncryptorMixin({ keyId, cacheMaxMessagesEncrypted, cacheMaxAge,
     getEncryptorCmm(): NodeCachingMaterialsManager;
     encrypt(plainData: Buffer | string): Promise<Buffer>;
     decrypt(encryptedData: Uint8Array | string): Promise<Buffer>;
-}, unknown>>;
+}, unknown>;
 
 export { EncryptorMixin, kCmm };
 export type { EncryptorMixinSettings };

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

@@ -1,4 +1,4 @@
-import { a as CustomServiceSchema } from '../types-CLAbRykR.mjs';
+import { P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.mjs';
 import { buildClient, NodeCachingMaterialsManager } from '@aws-crypto/client-node';
 import 'moleculer';
 import 'bson';
@@ -16,7 +16,7 @@ type EncryptorMixinSettings = {
     cacheMaxMessagesEncrypted?: number;
     localMasterKey?: string;
 };
-declare function EncryptorMixin({ keyId, cacheMaxMessagesEncrypted, cacheMaxAge, cacheCapacity, cacheMaxBytesEncrypted, localMasterKey, }: EncryptorMixinSettings): Partial<CustomServiceSchema<unknown, {
+declare function EncryptorMixin({ keyId, cacheMaxMessagesEncrypted, cacheMaxAge, cacheCapacity, cacheMaxBytesEncrypted, localMasterKey, }: EncryptorMixinSettings): PartialCustomServiceSchema<unknown, {
     getEncryptorClient(): ReturnType<typeof buildClient>;
     /**
      * Get a keyring for a specific key ID
@@ -27,7 +27,7 @@ declare function EncryptorMixin({ keyId, cacheMaxMessagesEncrypted, cacheMaxAge,
     getEncryptorCmm(): NodeCachingMaterialsManager;
     encrypt(plainData: Buffer | string): Promise<Buffer>;
     decrypt(encryptedData: Uint8Array | string): Promise<Buffer>;
-}, unknown>>;
+}, unknown>;
 
 export { EncryptorMixin, kCmm };
 export type { EncryptorMixinSettings };

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

@@ -1,4 +1,4 @@
-import { a as CustomServiceSchema } from '../types-CLAbRykR.cjs';
+import { P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.cjs';
 import 'moleculer';
 import 'bson';
 import 'zod/v4';
@@ -17,7 +17,7 @@ type Wrapper<T> = {
  * - `storeName`, the name of the store (e.g. `mongodb`, `redis`, etc.)
  * - `key`, the key of the instance (e.g. `mongodb://localhost:27017`)
  */
-declare function GlobalStoreMixin<T = unknown>(): Partial<CustomServiceSchema<unknown, {
+declare function GlobalStoreMixin<T = unknown>(): PartialCustomServiceSchema<unknown, {
     /**
      * Global store to share the adapters between services on the same broker.
      */
@@ -36,6 +36,6 @@ declare function GlobalStoreMixin<T = unknown>(): Partial<CustomServiceSchema<un
      * Set the client in global store.
      */
     setClientToStore(storeName: string, key: string, client: T, onClose: Wrapper<T>["onClose"]): void;
-}, unknown>>;
+}, unknown>;
 
 export { GlobalStoreMixin };

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

@@ -1,4 +1,4 @@
-import { a as CustomServiceSchema } from '../types-CLAbRykR.mjs';
+import { P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.mjs';
 import 'moleculer';
 import 'bson';
 import 'zod/v4';
@@ -17,7 +17,7 @@ type Wrapper<T> = {
  * - `storeName`, the name of the store (e.g. `mongodb`, `redis`, etc.)
  * - `key`, the key of the instance (e.g. `mongodb://localhost:27017`)
  */
-declare function GlobalStoreMixin<T = unknown>(): Partial<CustomServiceSchema<unknown, {
+declare function GlobalStoreMixin<T = unknown>(): PartialCustomServiceSchema<unknown, {
     /**
      * Global store to share the adapters between services on the same broker.
      */
@@ -36,6 +36,6 @@ declare function GlobalStoreMixin<T = unknown>(): Partial<CustomServiceSchema<un
      * Set the client in global store.
      */
     setClientToStore(storeName: string, key: string, client: T, onClose: Wrapper<T>["onClose"]): void;
-}, unknown>>;
+}, unknown>;
 
 export { GlobalStoreMixin };

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

@@ -1,4 +1,4 @@
-import { a as CustomServiceSchema } from '../types-CLAbRykR.cjs';
+import { P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.cjs';
 import { SignOptions, PrivateKey, VerifyOptions, JwtHeader, SigningKeyCallback } from 'jsonwebtoken';
 import { Options, JwksClient } from 'jwks-rsa';
 import { Context } from 'moleculer';
@@ -20,14 +20,14 @@ type JwtSignerMixinSettings = {
      */
     disableAction?: boolean;
 };
-declare function JwtSignerMixin(opts: JwtSignerMixinSettings): Partial<CustomServiceSchema<unknown, {
+declare function JwtSignerMixin(opts: JwtSignerMixinSettings): PartialCustomServiceSchema<unknown, {
     generateJwt(payload?: string | Buffer | object): Promise<string>;
-}, unknown>>;
+}, unknown>;
 type JwtVerifierMixinSettings = {
     jwksOptions: Options;
     validClaim: VerifyOptions;
 };
-declare function JwtVerifierMixin(opts: JwtVerifierMixinSettings): Partial<CustomServiceSchema<unknown, {
+declare function JwtVerifierMixin(opts: JwtVerifierMixinSettings): PartialCustomServiceSchema<unknown, {
     getJwksClient(): JwksClient;
     /**
      * Used with jsonwebtoken verify function. Retrieves the signing public key
@@ -39,7 +39,7 @@ declare function JwtVerifierMixin(opts: JwtVerifierMixinSettings): Partial<Custo
      */
     verifyJwt(token: string): Promise<void>;
     verifyAuthorizationHeader(ctx: Context, value: string | undefined): Promise<void>;
-}, unknown>>;
+}, unknown>;
 
 export { JwtSignerMixin, JwtVerifierMixin };
 export type { JwtSignerMixinSettings, JwtVerifierMixinSettings };

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

@@ -1,4 +1,4 @@
-import { a as CustomServiceSchema } from '../types-CLAbRykR.mjs';
+import { P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.mjs';
 import { SignOptions, PrivateKey, VerifyOptions, JwtHeader, SigningKeyCallback } from 'jsonwebtoken';
 import { Options, JwksClient } from 'jwks-rsa';
 import { Context } from 'moleculer';
@@ -20,14 +20,14 @@ type JwtSignerMixinSettings = {
      */
     disableAction?: boolean;
 };
-declare function JwtSignerMixin(opts: JwtSignerMixinSettings): Partial<CustomServiceSchema<unknown, {
+declare function JwtSignerMixin(opts: JwtSignerMixinSettings): PartialCustomServiceSchema<unknown, {
     generateJwt(payload?: string | Buffer | object): Promise<string>;
-}, unknown>>;
+}, unknown>;
 type JwtVerifierMixinSettings = {
     jwksOptions: Options;
     validClaim: VerifyOptions;
 };
-declare function JwtVerifierMixin(opts: JwtVerifierMixinSettings): Partial<CustomServiceSchema<unknown, {
+declare function JwtVerifierMixin(opts: JwtVerifierMixinSettings): PartialCustomServiceSchema<unknown, {
     getJwksClient(): JwksClient;
     /**
      * Used with jsonwebtoken verify function. Retrieves the signing public key
@@ -39,7 +39,7 @@ declare function JwtVerifierMixin(opts: JwtVerifierMixinSettings): Partial<Custo
      */
     verifyJwt(token: string): Promise<void>;
     verifyAuthorizationHeader(ctx: Context, value: string | undefined): Promise<void>;
-}, unknown>>;
+}, unknown>;
 
 export { JwtSignerMixin, JwtVerifierMixin };
 export type { JwtSignerMixinSettings, JwtVerifierMixinSettings };

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

@@ -1,4 +1,4 @@
-import { a as CustomServiceSchema } from '../types-CLAbRykR.cjs';
+import { P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.cjs';
 import { Redis } from 'ioredis';
 import { QueueOptions, Queue, JobsOptions, Job, QueueEventsOptions, QueueEvents, QueueBaseOptions, FlowProducer, RepeatOptions, WorkerOptions, Worker } from 'bullmq';
 import { Service } from 'moleculer';
@@ -19,7 +19,7 @@ type WithoutConnection<T> = Omit<T, 'connection'>;
 /**
  * This Mixin add the capability to launch a job.
  */
-declare function QueueClient<N extends string>(queueName: N, opts: WithoutConnection<QueueOptions> & QueueMixinOptions): Partial<CustomServiceSchema<unknown, {
+declare function QueueClient<N extends string>(queueName: N, opts: WithoutConnection<QueueOptions> & QueueMixinOptions): PartialCustomServiceSchema<unknown, {
     _getQueues(): Map<string, Queue>;
     /**
      * Add a job to a specific queue. The queue name needs to be passed as parameters
@@ -35,7 +35,7 @@ declare function QueueClient<N extends string>(queueName: N, opts: WithoutConnec
      * Get a queue bundle if you need specific features
      */
     getQueue(qName: N): Queue;
-}, Partial<CustomServiceSchema<unknown, {
+}, PartialCustomServiceSchema<unknown, {
     getStore(storeName: string): Map<string, {
         services: Set<unknown>;
         client: Redis;
@@ -44,13 +44,13 @@ declare function QueueClient<N extends string>(queueName: N, opts: WithoutConnec
     getFromStore(storeName: string, key: string): Redis | null;
     removeServiceFromStore(storeName: string, key: string): Promise<boolean>;
     setClientToStore(storeName: string, key: string, client: Redis, onClose: () => Promise<void> | void): void;
-}, unknown>>[]>>;
+}, unknown>[]>;
 
 /**
  * This Mixin add the capability to wait on a job.
  * WARNING: Needs to be used with QueueClient mixin.
  */
-declare function QueueEventsClient<N extends string>(queueName: N, opts: WithoutConnection<QueueEventsOptions> & QueueMixinOptions): Partial<CustomServiceSchema<unknown, {
+declare function QueueEventsClient<N extends string>(queueName: N, opts: WithoutConnection<QueueEventsOptions> & QueueMixinOptions): PartialCustomServiceSchema<unknown, {
     _getQueueEvents(): Map<string, {
         events: QueueEvents;
         running: boolean;
@@ -69,7 +69,7 @@ declare function QueueEventsClient<N extends string>(queueName: N, opts: Without
      * Same as addBulkJob but will also wait for the jobs to finish before returning.
      */
     addBulkAndWait<T = unknown, D = unknown>(qName: N, name: string, data: D[], jOpts?: JobsOptions, ttl?: number): Promise<T[]>;
-}, Partial<CustomServiceSchema<unknown, {
+}, PartialCustomServiceSchema<unknown, {
     getStore(storeName: string): Map<string, {
         services: Set<unknown>;
         client: Redis;
@@ -78,14 +78,14 @@ declare function QueueEventsClient<N extends string>(queueName: N, opts: Without
     getFromStore(storeName: string, key: string): Redis | null;
     removeServiceFromStore(storeName: string, key: string): Promise<boolean>;
     setClientToStore(storeName: string, key: string, client: Redis, onClose: () => Promise<void> | void): void;
-}, unknown>>[]>>;
+}, unknown>[]>;
 
 /**
  * This Mixin add the capability to launch a BullMQ flows.
  */
-declare function QueueFlowProducerMixin(opts: WithoutConnection<QueueBaseOptions> & QueueMixinOptions): Partial<CustomServiceSchema<unknown, {
+declare function QueueFlowProducerMixin(opts: WithoutConnection<QueueBaseOptions> & QueueMixinOptions): PartialCustomServiceSchema<unknown, {
     getFlowProducer(): FlowProducer;
-}, unknown>>;
+}, unknown>;
 
 type RepeatableJob = {
     name: string;
@@ -101,9 +101,9 @@ type QueueStaticRepeatableJobsOptions = {
  * This Mixin allow to register repeatable jobs and remove other ones.
  * It should mainly be setup on the same service as the related QueueWorker.
  */
-declare function QueueStaticRepeatableJobs(queueName: string, jobs: RepeatableJob[], opts: QueueStaticRepeatableJobsOptions & QueueMixinOptions): Partial<CustomServiceSchema<unknown, {
+declare function QueueStaticRepeatableJobs(queueName: string, jobs: RepeatableJob[], opts: QueueStaticRepeatableJobsOptions & QueueMixinOptions): PartialCustomServiceSchema<unknown, {
     registerRepeatableJobs(): Promise<void>;
-}, Partial<CustomServiceSchema<unknown, {
+}, PartialCustomServiceSchema<unknown, {
     getStore(storeName: string): Map<string, {
         services: Set<unknown>;
         client: Redis;
@@ -112,7 +112,7 @@ declare function QueueStaticRepeatableJobs(queueName: string, jobs: RepeatableJo
     getFromStore(storeName: string, key: string): Redis | null;
     removeServiceFromStore(storeName: string, key: string): Promise<boolean>;
     setClientToStore(storeName: string, key: string, client: Redis, onClose: () => Promise<void> | void): void;
-}, unknown>>[]>>;
+}, unknown>[]>;
 
 type JobMeta = {
     job?: Job;
@@ -142,11 +142,11 @@ type JobProcessorOptions = {
 /**
  * This Mixin create the worker system.
  */
-declare function QueueWorker(queueName: string, opts: WithoutConnection<WorkerOptions> & QueueMixinOptions, processorOptions?: JobProcessorOptions): Partial<CustomServiceSchema<unknown, {
+declare function QueueWorker(queueName: string, opts: WithoutConnection<WorkerOptions> & QueueMixinOptions, processorOptions?: JobProcessorOptions): PartialCustomServiceSchema<unknown, {
     getWorker(): Worker;
     processJob(job: Job, token?: string): Promise<any>;
     _processJob(job: Job, token?: string): Promise<any>;
-}, unknown>>;
+}, unknown>;
 
 export { QueueClient, QueueEventsClient, QueueFlowProducerMixin, QueueStaticRepeatableJobs, QueueWorker };
 export type { JobMeta, JobProcessorOptions, QueueMixinOptions, QueueStaticRepeatableJobsOptions, RepeatableJob };

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

@@ -1,4 +1,4 @@
-import { a as CustomServiceSchema } from '../types-CLAbRykR.mjs';
+import { P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.mjs';
 import { Redis } from 'ioredis';
 import { QueueOptions, Queue, JobsOptions, Job, QueueEventsOptions, QueueEvents, QueueBaseOptions, FlowProducer, RepeatOptions, WorkerOptions, Worker } from 'bullmq';
 import { Service } from 'moleculer';
@@ -19,7 +19,7 @@ type WithoutConnection<T> = Omit<T, 'connection'>;
 /**
  * This Mixin add the capability to launch a job.
  */
-declare function QueueClient<N extends string>(queueName: N, opts: WithoutConnection<QueueOptions> & QueueMixinOptions): Partial<CustomServiceSchema<unknown, {
+declare function QueueClient<N extends string>(queueName: N, opts: WithoutConnection<QueueOptions> & QueueMixinOptions): PartialCustomServiceSchema<unknown, {
     _getQueues(): Map<string, Queue>;
     /**
      * Add a job to a specific queue. The queue name needs to be passed as parameters
@@ -35,7 +35,7 @@ declare function QueueClient<N extends string>(queueName: N, opts: WithoutConnec
      * Get a queue bundle if you need specific features
      */
     getQueue(qName: N): Queue;
-}, Partial<CustomServiceSchema<unknown, {
+}, PartialCustomServiceSchema<unknown, {
     getStore(storeName: string): Map<string, {
         services: Set<unknown>;
         client: Redis;
@@ -44,13 +44,13 @@ declare function QueueClient<N extends string>(queueName: N, opts: WithoutConnec
     getFromStore(storeName: string, key: string): Redis | null;
     removeServiceFromStore(storeName: string, key: string): Promise<boolean>;
     setClientToStore(storeName: string, key: string, client: Redis, onClose: () => Promise<void> | void): void;
-}, unknown>>[]>>;
+}, unknown>[]>;
 
 /**
  * This Mixin add the capability to wait on a job.
  * WARNING: Needs to be used with QueueClient mixin.
  */
-declare function QueueEventsClient<N extends string>(queueName: N, opts: WithoutConnection<QueueEventsOptions> & QueueMixinOptions): Partial<CustomServiceSchema<unknown, {
+declare function QueueEventsClient<N extends string>(queueName: N, opts: WithoutConnection<QueueEventsOptions> & QueueMixinOptions): PartialCustomServiceSchema<unknown, {
     _getQueueEvents(): Map<string, {
         events: QueueEvents;
         running: boolean;
@@ -69,7 +69,7 @@ declare function QueueEventsClient<N extends string>(queueName: N, opts: Without
      * Same as addBulkJob but will also wait for the jobs to finish before returning.
      */
     addBulkAndWait<T = unknown, D = unknown>(qName: N, name: string, data: D[], jOpts?: JobsOptions, ttl?: number): Promise<T[]>;
-}, Partial<CustomServiceSchema<unknown, {
+}, PartialCustomServiceSchema<unknown, {
     getStore(storeName: string): Map<string, {
         services: Set<unknown>;
         client: Redis;
@@ -78,14 +78,14 @@ declare function QueueEventsClient<N extends string>(queueName: N, opts: Without
     getFromStore(storeName: string, key: string): Redis | null;
     removeServiceFromStore(storeName: string, key: string): Promise<boolean>;
     setClientToStore(storeName: string, key: string, client: Redis, onClose: () => Promise<void> | void): void;
-}, unknown>>[]>>;
+}, unknown>[]>;
 
 /**
  * This Mixin add the capability to launch a BullMQ flows.
  */
-declare function QueueFlowProducerMixin(opts: WithoutConnection<QueueBaseOptions> & QueueMixinOptions): Partial<CustomServiceSchema<unknown, {
+declare function QueueFlowProducerMixin(opts: WithoutConnection<QueueBaseOptions> & QueueMixinOptions): PartialCustomServiceSchema<unknown, {
     getFlowProducer(): FlowProducer;
-}, unknown>>;
+}, unknown>;
 
 type RepeatableJob = {
     name: string;
@@ -101,9 +101,9 @@ type QueueStaticRepeatableJobsOptions = {
  * This Mixin allow to register repeatable jobs and remove other ones.
  * It should mainly be setup on the same service as the related QueueWorker.
  */
-declare function QueueStaticRepeatableJobs(queueName: string, jobs: RepeatableJob[], opts: QueueStaticRepeatableJobsOptions & QueueMixinOptions): Partial<CustomServiceSchema<unknown, {
+declare function QueueStaticRepeatableJobs(queueName: string, jobs: RepeatableJob[], opts: QueueStaticRepeatableJobsOptions & QueueMixinOptions): PartialCustomServiceSchema<unknown, {
     registerRepeatableJobs(): Promise<void>;
-}, Partial<CustomServiceSchema<unknown, {
+}, PartialCustomServiceSchema<unknown, {
     getStore(storeName: string): Map<string, {
         services: Set<unknown>;
         client: Redis;
@@ -112,7 +112,7 @@ declare function QueueStaticRepeatableJobs(queueName: string, jobs: RepeatableJo
     getFromStore(storeName: string, key: string): Redis | null;
     removeServiceFromStore(storeName: string, key: string): Promise<boolean>;
     setClientToStore(storeName: string, key: string, client: Redis, onClose: () => Promise<void> | void): void;
-}, unknown>>[]>>;
+}, unknown>[]>;
 
 type JobMeta = {
     job?: Job;
@@ -142,11 +142,11 @@ type JobProcessorOptions = {
 /**
  * This Mixin create the worker system.
  */
-declare function QueueWorker(queueName: string, opts: WithoutConnection<WorkerOptions> & QueueMixinOptions, processorOptions?: JobProcessorOptions): Partial<CustomServiceSchema<unknown, {
+declare function QueueWorker(queueName: string, opts: WithoutConnection<WorkerOptions> & QueueMixinOptions, processorOptions?: JobProcessorOptions): PartialCustomServiceSchema<unknown, {
     getWorker(): Worker;
     processJob(job: Job, token?: string): Promise<any>;
     _processJob(job: Job, token?: string): Promise<any>;
-}, unknown>>;
+}, unknown>;
 
 export { QueueClient, QueueEventsClient, QueueFlowProducerMixin, QueueStaticRepeatableJobs, QueueWorker };
 export type { JobMeta, JobProcessorOptions, QueueMixinOptions, QueueStaticRepeatableJobsOptions, RepeatableJob };

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

@@ -1,4 +1,4 @@
-import { a as CustomServiceSchema } from '../types-CLAbRykR.cjs';
+import { P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.cjs';
 import { RedisOptions, Redis } from 'ioredis';
 import { Service } from 'moleculer';
 import 'bson';
@@ -12,9 +12,9 @@ type RedisMixinOptions = {
     reuseClient?: boolean;
     getOptions?: <TService extends Service = Service>(svc: TService) => Promise<AllowedOptions>;
 };
-declare function RedisMixin(options: AllowedOptions, { reuseClient, getOptions }?: RedisMixinOptions): Partial<CustomServiceSchema<unknown, {
+declare function RedisMixin(options: AllowedOptions, { reuseClient, getOptions }?: RedisMixinOptions): PartialCustomServiceSchema<unknown, {
     getRedis(): Redis;
-}, Partial<CustomServiceSchema<unknown, {
+}, PartialCustomServiceSchema<unknown, {
     getStore(storeName: string): Map<string, {
         services: Set<unknown>;
         client: Redis;
@@ -23,7 +23,7 @@ declare function RedisMixin(options: AllowedOptions, { reuseClient, getOptions }
     getFromStore(storeName: string, key: string): Redis | null;
     removeServiceFromStore(storeName: string, key: string): Promise<boolean>;
     setClientToStore(storeName: string, key: string, client: Redis, onClose: () => Promise<void> | void): void;
-}, unknown>>[]>>;
+}, unknown>[]>;
 
 export { RedisMixin };
 export type { RedisMixinOptions };

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

@@ -1,4 +1,4 @@
-import { a as CustomServiceSchema } from '../types-CLAbRykR.mjs';
+import { P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.mjs';
 import { RedisOptions, Redis } from 'ioredis';
 import { Service } from 'moleculer';
 import 'bson';
@@ -12,9 +12,9 @@ type RedisMixinOptions = {
     reuseClient?: boolean;
     getOptions?: <TService extends Service = Service>(svc: TService) => Promise<AllowedOptions>;
 };
-declare function RedisMixin(options: AllowedOptions, { reuseClient, getOptions }?: RedisMixinOptions): Partial<CustomServiceSchema<unknown, {
+declare function RedisMixin(options: AllowedOptions, { reuseClient, getOptions }?: RedisMixinOptions): PartialCustomServiceSchema<unknown, {
     getRedis(): Redis;
-}, Partial<CustomServiceSchema<unknown, {
+}, PartialCustomServiceSchema<unknown, {
     getStore(storeName: string): Map<string, {
         services: Set<unknown>;
         client: Redis;
@@ -23,7 +23,7 @@ declare function RedisMixin(options: AllowedOptions, { reuseClient, getOptions }
     getFromStore(storeName: string, key: string): Redis | null;
     removeServiceFromStore(storeName: string, key: string): Promise<boolean>;
     setClientToStore(storeName: string, key: string, client: Redis, onClose: () => Promise<void> | void): void;
-}, unknown>>[]>>;
+}, unknown>[]>;
 
 export { RedisMixin };
 export type { RedisMixinOptions };

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

@@ -1,4 +1,4 @@
-import { a as CustomServiceSchema } from '../types-CLAbRykR.cjs';
+import { P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.cjs';
 import { Service } from 'moleculer';
 import { RedisOptions, Redis } from 'ioredis';
 import Redlock from 'redlock';
@@ -14,10 +14,10 @@ type RedlockMixinOptions = {
     reuseClient?: boolean;
     getOptions?: <TService extends Service = Service>(svc: TService) => Promise<AllowedOptions>;
 };
-declare function RedlockMixin(options: AllowedOptions, { reuseClient, redLockOptions, getOptions }: RedlockMixinOptions): Partial<CustomServiceSchema<unknown, {
+declare function RedlockMixin(options: AllowedOptions, { reuseClient, redLockOptions, getOptions }: RedlockMixinOptions): PartialCustomServiceSchema<unknown, {
     getRedlock(): Redlock;
     withLock<T>(lockKey: string, lockTTL: number, action: () => Promise<T>): Promise<T>;
-}, Partial<CustomServiceSchema<unknown, {
+}, PartialCustomServiceSchema<unknown, {
     getStore(storeName: string): Map<string, {
         services: Set<unknown>;
         client: Redis;
@@ -26,7 +26,7 @@ declare function RedlockMixin(options: AllowedOptions, { reuseClient, redLockOpt
     getFromStore(storeName: string, key: string): Redis | null;
     removeServiceFromStore(storeName: string, key: string): Promise<boolean>;
     setClientToStore(storeName: string, key: string, client: Redis, onClose: () => Promise<void> | void): void;
-}, unknown>>[]>>;
+}, unknown>[]>;
 
 export { RedlockMixin };
 export type { RedlockMixinOptions };

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

@@ -1,4 +1,4 @@
-import { a as CustomServiceSchema } from '../types-CLAbRykR.mjs';
+import { P as PartialCustomServiceSchema } from '../types-Cdh7thEZ.mjs';
 import { Service } from 'moleculer';
 import { RedisOptions, Redis } from 'ioredis';
 import Redlock from 'redlock';
@@ -14,10 +14,10 @@ type RedlockMixinOptions = {
     reuseClient?: boolean;
     getOptions?: <TService extends Service = Service>(svc: TService) => Promise<AllowedOptions>;
 };
-declare function RedlockMixin(options: AllowedOptions, { reuseClient, redLockOptions, getOptions }: RedlockMixinOptions): Partial<CustomServiceSchema<unknown, {
+declare function RedlockMixin(options: AllowedOptions, { reuseClient, redLockOptions, getOptions }: RedlockMixinOptions): PartialCustomServiceSchema<unknown, {
     getRedlock(): Redlock;
     withLock<T>(lockKey: string, lockTTL: number, action: () => Promise<T>): Promise<T>;
-}, Partial<CustomServiceSchema<unknown, {
+}, PartialCustomServiceSchema<unknown, {
     getStore(storeName: string): Map<string, {
         services: Set<unknown>;
         client: Redis;
@@ -26,7 +26,7 @@ declare function RedlockMixin(options: AllowedOptions, { reuseClient, redLockOpt
     getFromStore(storeName: string, key: string): Redis | null;
     removeServiceFromStore(storeName: string, key: string): Promise<boolean>;
     setClientToStore(storeName: string, key: string, client: Redis, onClose: () => Promise<void> | void): void;
-}, unknown>>[]>>;
+}, unknown>[]>;
 
 export { RedlockMixin };
 export type { RedlockMixinOptions };

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

@@ -350,7 +350,7 @@ interface CustomActionSchema<T = unknown> extends Omit<ActionSchema, 'params' |
     openAPINames?: string[] | null;
     openapi?: OperationObject;
     bodySchemaRefName?: string;
-    rest?: CustomRestSchema | CustomRestSchema[] | string | string[];
+    rest?: CustomRestSchema | CustomRestSchema[] | string | string[] | null;
 }
 type Alias = {
     actionName: string;
@@ -474,8 +474,7 @@ declare module 'moleculer' {
     }
 }
 
-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 UnionToIntersection<U> = (U extends unknown ? (arg: U) => void : never) extends (arg: infer I) => void ? I & U : never;
 type OptionallyArray<T> = T | T[];
 
 type ServiceEventSchema = EventSchema & {
@@ -483,23 +482,52 @@ type ServiceEventSchema = EventSchema & {
 };
 
 /**
- * This type represent what is accessible from the `this` in a service file.
+ * For ONE particular mixin, return methods and settings.
+ * Will recursively check mixins.
+ */
+type InjectedByMixin<Mixin> = (Mixin extends {
+    mixins?: infer NestedMixin;
+} ? InjectMixins<NonNullable<NestedMixin>> : object) & (Mixin extends {
+    methods?: infer Methods;
+} ? Methods : object) & (Mixin extends {
+    settings?: infer Settings;
+} ? {
+    settings: Settings;
+} : object);
+/**
+ * For a list of mixins, get the merged resulting object to be injected
  */
-type ServiceThis<Settings, Methods, Mixins> = {
+type InjectMixins<Mixins> = Mixins extends readonly unknown[] ? UnionToIntersection<InjectedByMixin<Mixins[number]>> : object;
+/**
+ * Outside injected props, we have some basic props.
+ * We also allow any "other" props as unknown to give back some freedom.
+ *
+ */
+interface BaseService<Settings> {
     actions: never;
     settings: Settings;
-} & Methods & Service & UnionToIntersection<Unpacked<Mixins>>['methods'] & Record<string | symbol, unknown>;
+    [key: string | symbol]: unknown;
+}
+/**
+ * This type represent what is accessible from the `this` in a service file.
+ * It tries to infer from generics:
+ * - Direct methods
+ * - Recursive mixins methods
+ *
+ * @internal Exported only for testing
+ */
+type ServiceWithInference<Settings, Methods, Mixins> = Service & Methods & InjectMixins<Mixins> & BaseService<Settings>;
 /**
  * Type used for injecting `this` in an object.
  */
-type ObjectServiceThis<T, Settings, Methods, Mixins> = T & ThisType<ServiceThis<Settings, Methods, Mixins>>;
+type ObjectServiceThis<T, Settings, Methods, Mixins> = T & ThisType<ServiceWithInference<Settings, Methods, Mixins>>;
 /**
  * Type used for injecting `this` in a simple function.
  */
-type CallbackServiceThis<Return, Settings, Methods, Mixins, Parameters extends unknown[] = []> = (this: ServiceThis<Settings, Methods, Mixins>, ...params: Parameters) => Return;
+type CallbackServiceThis<Return, Settings, Methods, Mixins, Parameters extends unknown[] = []> = (this: ServiceWithInference<Settings, Methods, Mixins>, ...params: Parameters) => Return;
 
-interface CustomServiceSchema<Settings, Methods, Mixins> {
-    name: string;
+interface PartialCustomServiceSchema<Settings, Methods, Mixins> {
+    name?: string;
     version?: string | number;
     dependencies?: OptionallyArray<string | Service.ServiceDependency>;
     metadata?: Record<string, unknown>;
@@ -513,9 +541,12 @@ interface CustomServiceSchema<Settings, Methods, Mixins> {
     started?: OptionallyArray<CallbackServiceThis<Promise<void> | void, Settings, Methods, Mixins>>;
     stopped?: OptionallyArray<CallbackServiceThis<Promise<void> | void, Settings, Methods, Mixins>>;
     merged?: OptionallyArray<CallbackServiceThis<Promise<void> | void, Settings, Methods, Mixins, [
-        CustomServiceSchema<Settings, Methods, Mixins>
+        PartialCustomServiceSchema<Settings, Methods, Mixins>
     ]>>;
 }
+interface CustomServiceSchema<Settings, Methods, Mixins> extends PartialCustomServiceSchema<Settings, Methods, Mixins> {
+    name: string;
+}
 
 /**
  * This class replace the default Context class in Moleculer to:
@@ -585,4 +616,4 @@ declare module 'pino' {
 }
 
 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 };
+export type { Alias as A, ResponsesObject as B, CustomActionSchema as C, Document as D, EncodingObject as E, SecurityRequirementObject as F, SecuritySchemeObject as G, HeaderObject as H, InfoObject as I, JSONSchemaType as J, ServerObject as K, LicenseObject as L, MoleculerLoggerConfigOptions as M, ServerVariableObject as N, OperationObject as O, PartialCustomServiceSchema as P, Transform as Q, ReferenceObject as R, SomeJSONSchema as S, TagObject as T, TransformField as U, TransformLevel as V, TransformMap as W, Transformer as X, ValidationSchema as Y, SchemaObject as a, CustomServiceSchema 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, ParameterBaseObject as s, ParameterObject as t, PathItemObject as u, PathsObject as v, PropertiesSchema as w, RequestBodyObject as x, RequiredMembers as y, ResponseObject as z };

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

@@ -350,7 +350,7 @@ interface CustomActionSchema<T = unknown> extends Omit<ActionSchema, 'params' |
     openAPINames?: string[] | null;
     openapi?: OperationObject;
     bodySchemaRefName?: string;
-    rest?: CustomRestSchema | CustomRestSchema[] | string | string[];
+    rest?: CustomRestSchema | CustomRestSchema[] | string | string[] | null;
 }
 type Alias = {
     actionName: string;
@@ -474,8 +474,7 @@ declare module 'moleculer' {
     }
 }
 
-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 UnionToIntersection<U> = (U extends unknown ? (arg: U) => void : never) extends (arg: infer I) => void ? I & U : never;
 type OptionallyArray<T> = T | T[];
 
 type ServiceEventSchema = EventSchema & {
@@ -483,23 +482,52 @@ type ServiceEventSchema = EventSchema & {
 };
 
 /**
- * This type represent what is accessible from the `this` in a service file.
+ * For ONE particular mixin, return methods and settings.
+ * Will recursively check mixins.
+ */
+type InjectedByMixin<Mixin> = (Mixin extends {
+    mixins?: infer NestedMixin;
+} ? InjectMixins<NonNullable<NestedMixin>> : object) & (Mixin extends {
+    methods?: infer Methods;
+} ? Methods : object) & (Mixin extends {
+    settings?: infer Settings;
+} ? {
+    settings: Settings;
+} : object);
+/**
+ * For a list of mixins, get the merged resulting object to be injected
  */
-type ServiceThis<Settings, Methods, Mixins> = {
+type InjectMixins<Mixins> = Mixins extends readonly unknown[] ? UnionToIntersection<InjectedByMixin<Mixins[number]>> : object;
+/**
+ * Outside injected props, we have some basic props.
+ * We also allow any "other" props as unknown to give back some freedom.
+ *
+ */
+interface BaseService<Settings> {
     actions: never;
     settings: Settings;
-} & Methods & Service & UnionToIntersection<Unpacked<Mixins>>['methods'] & Record<string | symbol, unknown>;
+    [key: string | symbol]: unknown;
+}
+/**
+ * This type represent what is accessible from the `this` in a service file.
+ * It tries to infer from generics:
+ * - Direct methods
+ * - Recursive mixins methods
+ *
+ * @internal Exported only for testing
+ */
+type ServiceWithInference<Settings, Methods, Mixins> = Service & Methods & InjectMixins<Mixins> & BaseService<Settings>;
 /**
  * Type used for injecting `this` in an object.
  */
-type ObjectServiceThis<T, Settings, Methods, Mixins> = T & ThisType<ServiceThis<Settings, Methods, Mixins>>;
+type ObjectServiceThis<T, Settings, Methods, Mixins> = T & ThisType<ServiceWithInference<Settings, Methods, Mixins>>;
 /**
  * Type used for injecting `this` in a simple function.
  */
-type CallbackServiceThis<Return, Settings, Methods, Mixins, Parameters extends unknown[] = []> = (this: ServiceThis<Settings, Methods, Mixins>, ...params: Parameters) => Return;
+type CallbackServiceThis<Return, Settings, Methods, Mixins, Parameters extends unknown[] = []> = (this: ServiceWithInference<Settings, Methods, Mixins>, ...params: Parameters) => Return;
 
-interface CustomServiceSchema<Settings, Methods, Mixins> {
-    name: string;
+interface PartialCustomServiceSchema<Settings, Methods, Mixins> {
+    name?: string;
     version?: string | number;
     dependencies?: OptionallyArray<string | Service.ServiceDependency>;
     metadata?: Record<string, unknown>;
@@ -513,9 +541,12 @@ interface CustomServiceSchema<Settings, Methods, Mixins> {
     started?: OptionallyArray<CallbackServiceThis<Promise<void> | void, Settings, Methods, Mixins>>;
     stopped?: OptionallyArray<CallbackServiceThis<Promise<void> | void, Settings, Methods, Mixins>>;
     merged?: OptionallyArray<CallbackServiceThis<Promise<void> | void, Settings, Methods, Mixins, [
-        CustomServiceSchema<Settings, Methods, Mixins>
+        PartialCustomServiceSchema<Settings, Methods, Mixins>
     ]>>;
 }
+interface CustomServiceSchema<Settings, Methods, Mixins> extends PartialCustomServiceSchema<Settings, Methods, Mixins> {
+    name: string;
+}
 
 /**
  * This class replace the default Context class in Moleculer to:
@@ -585,4 +616,4 @@ declare module 'pino' {
 }
 
 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 };
+export type { Alias as A, ResponsesObject as B, CustomActionSchema as C, Document as D, EncodingObject as E, SecurityRequirementObject as F, SecuritySchemeObject as G, HeaderObject as H, InfoObject as I, JSONSchemaType as J, ServerObject as K, LicenseObject as L, MoleculerLoggerConfigOptions as M, ServerVariableObject as N, OperationObject as O, PartialCustomServiceSchema as P, Transform as Q, ReferenceObject as R, SomeJSONSchema as S, TagObject as T, TransformField as U, TransformLevel as V, TransformMap as W, Transformer as X, ValidationSchema as Y, SchemaObject as a, CustomServiceSchema 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, ParameterBaseObject as s, ParameterObject as t, PathItemObject as u, PathsObject as v, PropertiesSchema as w, RequestBodyObject as x, RequiredMembers as y, ResponseObject as z };

package/package.json

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