opinionated-machine 2.1.0 → 2.3.0

package/README.md

@@ -86,18 +86,27 @@ const contract = buildDeleteRoute({
 
 export class MyController extends AbstractController<typeof MyController.contracts> {
   public static contracts = { deleteItem: contract } as const
+  private readonly service: Service
 
-  public buildRoutes() {
-    return {
-      deleteItem: buildFastifyNoPayloadRoute(
-          MyController.contracts.deleteItem,
+  constructor({ service }: ModuleDependencies) {
+      super()
+      this.service = testService
+  }
+
+    private deleteItem = buildFastifyNoPayloadRoute(
+        TestController.contracts.deleteItem,
         async (req, reply) => {
-          req.log.info(req.params.userId)
-          await reply.status(204).send()
+            req.log.info(req.params.userId)
+            this.service.execute()
+            await reply.status(204).send()
         },
-      ),
+    )
+
+    public buildRoutes() {
+        return {
+            deleteItem: this.deleteItem,
+        }
     }
-  }
 }
 ```
 

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-export { DIContext, type DependencyInjectionOptions, type registerDependenciesParams, } from './lib/DIContext.js';
-export { AbstractModule, type MandatoryNameAndRegistrationPair } from './lib/AbstractModule.js';
+export { DIContext, type DependencyInjectionOptions, type RegisterDependenciesParams, } from './lib/DIContext.js';
+export { AbstractModule, type MandatoryNameAndRegistrationPair, type UnionToIntersection, } from './lib/AbstractModule.js';
 export { ENABLE_ALL, resolveJobQueuesEnabled, isJobQueueEnabled, isMessageQueueConsumerEnabled, isJobWorkersEnabled, isPeriodicJobEnabled, } from './lib/diConfigUtils.js';
 export { AbstractController } from './lib/AbstractController.js';
-export { asJobQueueClass, asJobWorkerClass, asMessageQueueHandlerClass, asControllerClass, asSingletonClass, asPeriodicJobClass, } from './lib/resolverFunctions.js';
+export { asJobQueueClass, asJobWorkerClass, asMessageQueueHandlerClass, asControllerClass, asSingletonClass, asPeriodicJobClass, asSingletonFunction, asServiceClass, asRepositoryClass, asUseCaseClass, } from './lib/resolverFunctions.js';
 export type { PeriodicJobOptions, JobQueueModuleOptions, MessageQueueConsumerModuleOptions, JobWorkerModuleOptions, } from './lib/resolverFunctions.js';
-export type { InferRequestFromContract } from './lib/typeUtils.js';
+export { AbstractTestContextFactory, type CreateTestContextParams, type ConfigOverrides, } from './lib/AbstractTestContextFactory.js';

package/dist/index.js

@@ -1,6 +1,7 @@
 export { DIContext, } from './lib/DIContext.js';
-export { AbstractModule } from './lib/AbstractModule.js';
+export { AbstractModule, } from './lib/AbstractModule.js';
 export { ENABLE_ALL, resolveJobQueuesEnabled, isJobQueueEnabled, isMessageQueueConsumerEnabled, isJobWorkersEnabled, isPeriodicJobEnabled, } from './lib/diConfigUtils.js';
 export { AbstractController } from './lib/AbstractController.js';
-export { asJobQueueClass, asJobWorkerClass, asMessageQueueHandlerClass, asControllerClass, asSingletonClass, asPeriodicJobClass, } from './lib/resolverFunctions.js';
+export { asJobQueueClass, asJobWorkerClass, asMessageQueueHandlerClass, asControllerClass, asSingletonClass, asPeriodicJobClass, asSingletonFunction, asServiceClass, asRepositoryClass, asUseCaseClass, } from './lib/resolverFunctions.js';
+export { AbstractTestContextFactory, } from './lib/AbstractTestContextFactory.js';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,GAGV,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAE,cAAc,EAAyC,MAAM,yBAAyB,CAAA;AAC/F,OAAO,EACL,UAAU,EACV,uBAAuB,EACvB,iBAAiB,EACjB,6BAA6B,EAC7B,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,0BAA0B,EAC1B,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,4BAA4B,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,GAGV,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EACL,cAAc,GAGf,MAAM,yBAAyB,CAAA;AAChC,OAAO,EACL,UAAU,EACV,uBAAuB,EACvB,iBAAiB,EACjB,6BAA6B,EAC7B,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,0BAA0B,EAC1B,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,mBAAmB,EACnB,cAAc,EACd,iBAAiB,EACjB,cAAc,GACf,MAAM,4BAA4B,CAAA;AASnC,OAAO,EACL,0BAA0B,GAG3B,MAAM,qCAAqC,CAAA"}

package/dist/lib/AbstractModule.d.ts

@@ -3,6 +3,10 @@ import type { DependencyInjectionOptions } from './DIContext.js';
 export type MandatoryNameAndRegistrationPair<T> = {
     [U in keyof T]: Resolver<T[U]>;
 };
+/**
+ * Use this utility type to combine dependencies from multiple modules into full context list of dependencies
+ */
+export type UnionToIntersection<U> = (U extends any ? (x: U) => void : never) extends (x: infer I) => void ? I : never;
 export declare abstract class AbstractModule<ModuleDependencies, ExternalDependencies = never> {
     abstract resolveDependencies(diOptions: DependencyInjectionOptions, externalDependencies: ExternalDependencies): MandatoryNameAndRegistrationPair<ModuleDependencies>;
     abstract resolveControllers(): MandatoryNameAndRegistrationPair<unknown>;

package/dist/lib/AbstractModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractModule.js","sourceRoot":"","sources":["../../lib/AbstractModule.ts"],"names":[],"mappings":"AAOA,MAAM,OAAgB,cAAc;CAOnC"}
+{"version":3,"file":"AbstractModule.js","sourceRoot":"","sources":["../../lib/AbstractModule.ts"],"names":[],"mappings":"AAcA,MAAM,OAAgB,cAAc;CAOnC"}

package/dist/lib/AbstractTestContextFactory.d.ts

@@ -0,0 +1,23 @@
+import { type NameAndRegistrationPair } from 'awilix';
+import type { AbstractModule } from './AbstractModule.js';
+import { DIContext, type DependencyInjectionOptions } from './DIContext.js';
+type NestedPartial<T> = {
+    [P in keyof T]?: NestedPartial<T[P]>;
+};
+export type ConfigOverrides<Config> = NestedPartial<Config>;
+export type CreateTestContextParams<Dependencies, Config extends object> = {
+    modules?: readonly AbstractModule<unknown>[];
+    diOptions?: DependencyInjectionOptions;
+    dependencyOverrides?: NameAndRegistrationPair<Dependencies>;
+    configOverrides?: ConfigOverrides<Config>;
+};
+export declare abstract class AbstractTestContextFactory<Dependencies extends object, ExternalDependencies, Config extends object> {
+    private readonly externalDependencies;
+    protected configDependencyId: string;
+    private readonly allModules;
+    constructor(externalDependencies: ExternalDependencies, allModules: readonly AbstractModule<unknown>[]);
+    resetExternalDependencies(): void;
+    abstract resolveBaseAppConfig(): Config;
+    createTestContext(params?: CreateTestContextParams<Dependencies, Config>): Promise<DIContext<Dependencies, ExternalDependencies>>;
+}
+export {};

package/dist/lib/AbstractTestContextFactory.js

@@ -0,0 +1,39 @@
+import { createContainer } from 'awilix';
+import { merge } from 'ts-deepmerge';
+import { DIContext } from './DIContext.js';
+import { asSingletonFunction } from './resolverFunctions.js';
+export class AbstractTestContextFactory {
+    externalDependencies;
+    configDependencyId = 'config'; // override in subclass if different
+    allModules;
+    constructor(externalDependencies, allModules) {
+        this.externalDependencies = externalDependencies;
+        this.allModules = allModules;
+    }
+    resetExternalDependencies() {
+        // Override if necessary
+    }
+    async createTestContext(params = {}) {
+        const diContainer = createContainer({
+            injectionMode: 'PROXY',
+        });
+        const context = new DIContext(diContainer, params.diOptions ?? {});
+        const dependencyOverrides = params.configOverrides
+            ? {
+                ...params.dependencyOverrides,
+                [this.configDependencyId]: asSingletonFunction(() => {
+                    // biome-ignore lint/style/noNonNullAssertion: there is a ternary condition above
+                    return merge(this.resolveBaseAppConfig(), params.configOverrides);
+                }),
+            }
+            : params.dependencyOverrides;
+        const modules = params.modules ?? this.allModules;
+        context.registerDependencies({
+            dependencyOverrides,
+            modules,
+        }, this.externalDependencies, false);
+        await context.init();
+        return context;
+    }
+}
+//# sourceMappingURL=AbstractTestContextFactory.js.map

package/dist/lib/AbstractTestContextFactory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AbstractTestContextFactory.js","sourceRoot":"","sources":["../../lib/AbstractTestContextFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,eAAe,EAAE,MAAM,QAAQ,CAAA;AACtE,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AAEpC,OAAO,EAAE,SAAS,EAAmC,MAAM,gBAAgB,CAAA;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAe5D,MAAM,OAAgB,0BAA0B;IAK7B,oBAAoB,CAAsB;IACjD,kBAAkB,GAAG,QAAQ,CAAA,CAAC,oCAAoC;IAC3D,UAAU,CAAoC;IAE/D,YACE,oBAA0C,EAC1C,UAA8C;QAE9C,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;QAChD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAC9B,CAAC;IAED,yBAAyB;QACvB,wBAAwB;IAC1B,CAAC;IAID,KAAK,CAAC,iBAAiB,CACrB,SAAwD,EAAE;QAE1D,MAAM,WAAW,GAAG,eAAe,CAAC;YAClC,aAAa,EAAE,OAAO;SACvB,CAAC,CAAA;QAEF,MAAM,OAAO,GAAG,IAAI,SAAS,CAC3B,WAAW,EACX,MAAM,CAAC,SAAS,IAAI,EAAE,CACvB,CAAA;QAED,MAAM,mBAAmB,GAAG,MAAM,CAAC,eAAe;YAChD,CAAC,CAAE;gBACC,GAAG,MAAM,CAAC,mBAAmB;gBAC7B,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,mBAAmB,CAAC,GAAG,EAAE;oBAClD,iFAAiF;oBACjF,OAAO,KAAK,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,MAAM,CAAC,eAAgB,CAAC,CAAA;gBACpE,CAAC,CAAC;aACuC;YAC7C,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAA;QAE9B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,UAAU,CAAA;QACjD,OAAO,CAAC,oBAAoB,CAC1B;YACE,mBAAmB;YACnB,OAAO;SACR,EACD,IAAI,CAAC,oBAAoB,EACzB,KAAK,CACN,CAAA;QAED,MAAM,OAAO,CAAC,IAAI,EAAE,CAAA;QAEpB,OAAO,OAAO,CAAA;IAChB,CAAC;CACF"}

package/dist/lib/DIContext.d.ts

@@ -3,23 +3,25 @@ import { AwilixManager } from 'awilix-manager';
 import type { FastifyInstance } from 'fastify';
 import type { AbstractModule } from './AbstractModule.js';
 import type { ENABLE_ALL } from './diConfigUtils.js';
-export type registerDependenciesParams<Dependencies, ExternalDependencies> = {
+export type RegisterDependenciesParams<Dependencies, ExternalDependencies> = {
     modules: readonly AbstractModule<unknown, ExternalDependencies>[];
+    secondaryModules?: readonly AbstractModule<unknown, ExternalDependencies>[];
     dependencyOverrides?: NameAndRegistrationPair<Dependencies>;
 };
 export type DependencyInjectionOptions = {
     jobQueuesEnabled?: false | typeof ENABLE_ALL | string[];
     jobWorkersEnabled?: false | typeof ENABLE_ALL | string[];
     messageQueueConsumersEnabled?: false | typeof ENABLE_ALL | string[];
-    periodicJobsEnabled?: false | typeof ENABLE_ALL;
+    periodicJobsEnabled?: false | typeof ENABLE_ALL | string[];
 };
-export declare class DIContext<Dependencies extends object, ExternalDependencies = {}> {
+export declare class DIContext<Dependencies extends object, ExternalDependencies = undefined> {
     private readonly options;
     readonly awilixManager: AwilixManager;
     readonly diContainer: AwilixContainer<Dependencies>;
     private readonly controllerResolvers;
     constructor(diContainer: AwilixContainer, options: DependencyInjectionOptions);
-    registerDependencies(params: registerDependenciesParams<Dependencies, ExternalDependencies>, externalDependencies: ExternalDependencies): void;
+    private registerModule;
+    registerDependencies(params: RegisterDependenciesParams<Dependencies, ExternalDependencies>, externalDependencies: ExternalDependencies, resolveControllers?: boolean): void;
     registerRoutes(app: FastifyInstance): void;
     destroy(): Promise<void>;
     init(): Promise<void>;

package/dist/lib/DIContext.js

@@ -1,5 +1,4 @@
 import { AwilixManager } from 'awilix-manager';
-// biome-ignore lint/complexity/noBannedTypes: default is empty object
 export class DIContext {
     options;
     awilixManager;
@@ -18,18 +17,31 @@ export class DIContext {
         });
         this.controllerResolvers = [];
     }
-    registerDependencies(params, externalDependencies) {
-        const _dependencyOverrides = params.dependencyOverrides ?? {};
-        const diConfig = {};
-        for (const module of params.modules) {
-            const resolvedDIConfig = module.resolveDependencies(this.options, externalDependencies);
-            for (const key in resolvedDIConfig) {
+    registerModule(module, targetDiConfig, externalDependencies, resolveControllers, isPrimaryModule) {
+        const resolvedDIConfig = module.resolveDependencies(this.options, externalDependencies);
+        for (const key in resolvedDIConfig) {
+            // @ts-expect-error we can't really ensure type-safety here
+            if (isPrimaryModule || resolvedDIConfig[key].public) {
                 // @ts-expect-error we can't really ensure type-safety here
-                diConfig[key] = resolvedDIConfig[key];
+                targetDiConfig[key] = resolvedDIConfig[key];
             }
+        }
+        if (isPrimaryModule && resolveControllers) {
             this.controllerResolvers.push(...Object.values(module.resolveControllers()));
         }
-        this.diContainer.register(diConfig);
+    }
+    registerDependencies(params, externalDependencies, resolveControllers = true) {
+        const _dependencyOverrides = params.dependencyOverrides ?? {};
+        const targetDiConfig = {};
+        for (const primaryModule of params.modules) {
+            this.registerModule(primaryModule, targetDiConfig, externalDependencies, resolveControllers, true);
+        }
+        if (params.secondaryModules) {
+            for (const secondaryModule of params.secondaryModules) {
+                this.registerModule(secondaryModule, targetDiConfig, externalDependencies, resolveControllers, false);
+            }
+        }
+        this.diContainer.register(targetDiConfig);
         for (const [dependencyKey, _dependencyValue] of Object.entries(_dependencyOverrides)) {
             const dependencyValue = { ..._dependencyValue };
             // preserve lifetime from original resolver

package/dist/lib/DIContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"DIContext.js","sourceRoot":"","sources":["../../lib/DIContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAkB9C,sEAAsE;AACtE,MAAM,OAAO,SAAS;IACH,OAAO,CAA4B;IACpC,aAAa,CAAe;IAC5B,WAAW,CAA+B;IAC1D,8EAA8E;IAC7D,mBAAmB,CAAiB;IAErD,YAAY,WAA4B,EAAE,OAAmC;QAC3E,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,aAAa,GAAG,IAAI,aAAa,CAAC;YACrC,YAAY,EAAE,IAAI;YAClB,SAAS,EAAE,IAAI;YACf,WAAW;YACX,WAAW,EAAE,IAAI;YACjB,qBAAqB,EAAE,IAAI;SAC5B,CAAC,CAAA;QACF,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAA;IAC/B,CAAC;IAED,oBAAoB,CAClB,MAAsE,EACtE,oBAA0C;QAE1C,MAAM,oBAAoB,GAAG,MAAM,CAAC,mBAAmB,IAAI,EAAE,CAAA;QAC7D,MAAM,QAAQ,GAA0C,EAAE,CAAA;QAE1D,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACpC,MAAM,gBAAgB,GAAG,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAA;YAEvF,KAAK,MAAM,GAAG,IAAI,gBAAgB,EAAE,CAAC;gBACnC,2DAA2D;gBAC3D,QAAQ,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAA;YACvC,CAAC;YAED,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAC3B,GAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAyB,CACvE,CAAA;QACH,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;QAEnC,KAAK,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,CAAC;YACrF,MAAM,eAAe,GAAG,EAAE,GAAI,gBAAsC,EAAE,CAAA;YAEtE,2CAA2C;YAC3C,MAAM,gBAAgB,GAAG,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,aAAa,CAAC,CAAA;YACxE,aAAa;YACb,IAAI,eAAe,CAAC,QAAQ,KAAK,gBAAgB,CAAC,QAAQ,EAAE,CAAC;gBAC3D,aAAa;gBACb,eAAe,CAAC,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,CAAA;YACtD,CAAC;YAED,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,aAAa,EAAE,eAAe,CAAC,CAAA;QAC3D,CAAC;IACH,CAAC;IAED,cAAc,CAAC,GAAoB;QACjC,KAAK,MAAM,kBAAkB,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC1D,wEAAwE;YACxE,MAAM,UAAU,GAA4B,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YACxF,MAAM,MAAM,GAAG,UAAU,CAAC,WAAW,EAAE,CAAA;YACvC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC1C,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YAClB,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,CAAA;QACzC,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAA;IAClC,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,CAAA;IACxC,CAAC;CACF"}
+{"version":3,"file":"DIContext.js","sourceRoot":"","sources":["../../lib/DIContext.ts"],"names":[],"mappings":"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"}

package/dist/lib/resolverFunctions.d.ts

@@ -1,6 +1,16 @@
 import type { BuildResolver, BuildResolverOptions, Constructor, DisposableResolver } from 'awilix';
+import type { FunctionReturning } from 'awilix/lib/container';
 import type { DependencyInjectionOptions } from './DIContext.js';
+declare module 'awilix' {
+    interface ResolverOptions<T> {
+        public?: boolean;
+    }
+}
 export declare function asSingletonClass<T = object>(Type: Constructor<T>, opts?: BuildResolverOptions<T>): BuildResolver<T> & DisposableResolver<T>;
+export declare function asSingletonFunction<T>(fn: FunctionReturning<T>, opts?: BuildResolverOptions<T>): BuildResolver<T> & DisposableResolver<T>;
+export declare function asServiceClass<T = object>(Type: Constructor<T>, opts?: BuildResolverOptions<T>): BuildResolver<T> & DisposableResolver<T>;
+export declare function asUseCaseClass<T = object>(Type: Constructor<T>, opts?: BuildResolverOptions<T>): BuildResolver<T> & DisposableResolver<T>;
+export declare function asRepositoryClass<T = object>(Type: Constructor<T>, opts?: BuildResolverOptions<T>): BuildResolver<T> & DisposableResolver<T>;
 export declare function asControllerClass<T = object>(Type: Constructor<T>, opts?: BuildResolverOptions<T>): BuildResolver<T> & DisposableResolver<T>;
 export type MessageQueueConsumerModuleOptions = {
     queueName: string;

package/dist/lib/resolverFunctions.js

@@ -1,4 +1,4 @@
-import { asClass } from 'awilix';
+import { asClass, asFunction } from 'awilix';
 import { isJobQueueEnabled, isJobWorkersEnabled, isMessageQueueConsumerEnabled, isPeriodicJobEnabled, } from './diConfigUtils.js';
 export function asSingletonClass(Type, opts) {
     return asClass(Type, {
@@ -6,8 +6,36 @@ export function asSingletonClass(Type, opts) {
         lifetime: 'SINGLETON',
     });
 }
+export function asSingletonFunction(fn, opts) {
+    return asFunction(fn, {
+        ...opts,
+        lifetime: 'SINGLETON',
+    });
+}
+export function asServiceClass(Type, opts) {
+    return asClass(Type, {
+        public: true,
+        ...opts,
+        lifetime: 'SINGLETON',
+    });
+}
+export function asUseCaseClass(Type, opts) {
+    return asClass(Type, {
+        public: true,
+        ...opts,
+        lifetime: 'SINGLETON',
+    });
+}
+export function asRepositoryClass(Type, opts) {
+    return asClass(Type, {
+        public: false,
+        ...opts,
+        lifetime: 'SINGLETON',
+    });
+}
 export function asControllerClass(Type, opts) {
     return asClass(Type, {
+        public: false,
         ...opts,
         lifetime: 'SINGLETON',
     });
@@ -20,6 +48,7 @@ export function asMessageQueueHandlerClass(Type, mqOptions, opts) {
         asyncDisposePriority: 10,
         enabled: isMessageQueueConsumerEnabled(mqOptions.diOptions.messageQueueConsumersEnabled, mqOptions.queueName),
         lifetime: 'SINGLETON',
+        public: false,
         ...opts,
     });
 }
@@ -28,7 +57,8 @@ export function asJobWorkerClass(Type, workerOptions, opts) {
         // these follow background-jobs-common conventions
         asyncInit: 'start',
         asyncDispose: 'dispose',
-        asyncDisposePriority: 10,
+        asyncDisposePriority: 15,
+        public: false,
         enabled: isJobWorkersEnabled(workerOptions.diOptions.jobWorkersEnabled, workerOptions.queueName),
         lifetime: 'SINGLETON',
         ...opts,
@@ -38,6 +68,8 @@ export function asPeriodicJobClass(Type, workerOptions, opts) {
     return asClass(Type, {
         // this follows background-jobs-common conventions
         eagerInject: 'register',
+        asyncDispose: 'dispose',
+        public: false,
         enabled: isPeriodicJobEnabled(workerOptions.diOptions.periodicJobsEnabled, workerOptions.jobName),
         lifetime: 'SINGLETON',
         ...opts,
@@ -49,6 +81,7 @@ export function asJobQueueClass(Type, queueOptions, opts) {
         asyncInit: 'start',
         asyncDispose: 'dispose',
         asyncDisposePriority: 20,
+        public: true,
         enabled: isJobQueueEnabled(queueOptions.diOptions.jobQueuesEnabled, queueOptions.queueName),
         lifetime: 'SINGLETON',
         ...opts,

package/dist/lib/resolverFunctions.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolverFunctions.js","sourceRoot":"","sources":["../../lib/resolverFunctions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAGhC,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,6BAA6B,EAC7B,oBAAoB,GACrB,MAAM,oBAAoB,CAAA;AAE3B,MAAM,UAAU,gBAAgB,CAC9B,IAAoB,EACpB,IAA8B;IAE9B,OAAO,OAAO,CAAC,IAAI,EAAE;QACnB,GAAG,IAAI;QACP,QAAQ,EAAE,WAAW;KACtB,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,IAAoB,EACpB,IAA8B;IAE9B,OAAO,OAAO,CAAC,IAAI,EAAE;QACnB,GAAG,IAAI;QACP,QAAQ,EAAE,WAAW;KACtB,CAAC,CAAA;AACJ,CAAC;AAOD,MAAM,UAAU,0BAA0B,CACxC,IAAoB,EACpB,SAA4C,EAC5C,IAA8B;IAE9B,OAAO,OAAO,CAAC,IAAI,EAAE;QACnB,iDAAiD;QACjD,SAAS,EAAE,OAAO;QAClB,YAAY,EAAE,OAAO;QACrB,oBAAoB,EAAE,EAAE;QAExB,OAAO,EAAE,6BAA6B,CACpC,SAAS,CAAC,SAAS,CAAC,4BAA4B,EAChD,SAAS,CAAC,SAAS,CACpB;QACD,QAAQ,EAAE,WAAW;QACrB,GAAG,IAAI;KACR,CAAC,CAAA;AACJ,CAAC;AAOD,MAAM,UAAU,gBAAgB,CAC9B,IAAoB,EACpB,aAAqC,EACrC,IAA8B;IAE9B,OAAO,OAAO,CAAC,IAAI,EAAE;QACnB,kDAAkD;QAClD,SAAS,EAAE,OAAO;QAClB,YAAY,EAAE,SAAS;QACvB,oBAAoB,EAAE,EAAE;QAExB,OAAO,EAAE,mBAAmB,CAC1B,aAAa,CAAC,SAAS,CAAC,iBAAiB,EACzC,aAAa,CAAC,SAAS,CACxB;QACD,QAAQ,EAAE,WAAW;QACrB,GAAG,IAAI;KACR,CAAC,CAAA;AACJ,CAAC;AAOD,MAAM,UAAU,kBAAkB,CAChC,IAAoB,EACpB,aAAiC,EACjC,IAA8B;IAE9B,OAAO,OAAO,CAAC,IAAI,EAAE;QACnB,kDAAkD;QAClD,WAAW,EAAE,UAAU;QAEvB,OAAO,EAAE,oBAAoB,CAC3B,aAAa,CAAC,SAAS,CAAC,mBAAmB,EAC3C,aAAa,CAAC,OAAO,CACtB;QACD,QAAQ,EAAE,WAAW;QACrB,GAAG,IAAI;KACR,CAAC,CAAA;AACJ,CAAC;AAOD,MAAM,UAAU,eAAe,CAC7B,IAAoB,EACpB,YAAmC,EACnC,IAA8B;IAE9B,OAAO,OAAO,CAAC,IAAI,EAAE;QACnB,kDAAkD;QAClD,SAAS,EAAE,OAAO;QAClB,YAAY,EAAE,SAAS;QACvB,oBAAoB,EAAE,EAAE;QAExB,OAAO,EAAE,iBAAiB,CAAC,YAAY,CAAC,SAAS,CAAC,gBAAgB,EAAE,YAAY,CAAC,SAAS,CAAC;QAC3F,QAAQ,EAAE,WAAW;QACrB,GAAG,IAAI;KACR,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"resolverFunctions.js","sourceRoot":"","sources":["../../lib/resolverFunctions.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,10 +1,14 @@
 {
     "name": "opinionated-machine",
-    "version": "2.1.0",
+    "version": "2.3.0",
     "description": "Very opinionated DI framework for fastify, built on top of awilix ",
     "type": "module",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
+    "exports": {
+        ".": "./dist/index.js",
+        "./package.json": "./package.json"
+    },
     "maintainers": [
         {
             "name": "Igor Savin",
@@ -12,7 +16,7 @@
         }
     ],
     "scripts": {
-        "build": "tsc -p tsconfig.build.json",
+        "build": "rimraf dist && tsc -p tsconfig.build.json",
         "lint": "biome check . && tsc",
         "lint:fix": "biome check --write .",
         "test": "vitest --coverage",
@@ -22,6 +26,9 @@
         "type": "git",
         "url": "git+https://github.com/kibertoad/opinionated-machine.git"
     },
+    "dependencies": {
+        "ts-deepmerge": "^7.0.2"
+    },
     "peerDependencies": {
         "@lokalise/fastify-api-contracts": ">=1.4.4",
         "@lokalise/universal-ts-utils": ">=4.2.0",
@@ -44,6 +51,7 @@
         "fastify": "^5.2.2",
         "fastify-type-provider-zod": "^4.0.2",
         "vitest": "^3.0.9",
+        "rimraf": "^6.0.1",
         "typescript": "^5.8.2",
         "zod": "^3.24.2"
     },

package/dist/lib/typeUtils.d.ts

@@ -1,19 +0,0 @@
-import type { FastifyRequest } from 'fastify';
-import type { z } from 'zod';
-type InferredOptionalSchema<Schema> = Schema extends z.Schema ? z.infer<Schema> : never;
-/**
- * Infer fastify request type from a contract
- */
-export type InferRequestFromContract<Contract extends {
-    requestHeaderSchema?: z.Schema;
-    requestPathParamsSchema?: z.Schema;
-    requestQuerySchema?: z.Schema;
-    successResponseBodySchema: z.Schema;
-}> = FastifyRequest<{
-    Body: never;
-    Headers: InferredOptionalSchema<Contract['requestHeaderSchema']>;
-    Params: InferredOptionalSchema<Contract['requestPathParamsSchema']>;
-    Querystring: InferredOptionalSchema<Contract['requestQuerySchema']>;
-    Reply: InferredOptionalSchema<Contract['successResponseBodySchema']>;
-}>;
-export {};

package/dist/lib/typeUtils.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=typeUtils.js.map

package/dist/lib/typeUtils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"typeUtils.js","sourceRoot":"","sources":["../../lib/typeUtils.ts"],"names":[],"mappings":""}