opinionated-machine 2.6.0 → 2.7.0

package/dist/index.d.ts

@@ -4,4 +4,5 @@ export { ENABLE_ALL, resolveJobQueuesEnabled, isAnyMessageQueueConsumerEnabled,
 export { AbstractController } from './lib/AbstractController.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 { AbstractTestContextFactory, type CreateTestContextParams, type ConfigOverrides, } from './lib/AbstractTestContextFactory.js';
+export { AbstractTestContextFactory, type CreateTestContextParams, } from './lib/AbstractTestContextFactory.js';
+export type { NestedPartial } from './lib/configUtils.ts';

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,EACL,cAAc,GAGf,MAAM,yBAAyB,CAAA;AAChC,OAAO,EACL,UAAU,EACV,uBAAuB,EACvB,gCAAgC,EAChC,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"}
+{"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,gCAAgC,EAChC,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,GAE3B,MAAM,qCAAqC,CAAA"}

package/dist/lib/AbstractTestContextFactory.d.ts

@@ -1,15 +1,12 @@
 import { type AwilixContainer, 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>;
+import type { NestedPartial } from './configUtils.js';
 export type CreateTestContextParams<Dependencies, Config extends object> = {
     modules?: readonly AbstractModule<unknown>[];
     diOptions?: DependencyInjectionOptions;
     dependencyOverrides?: NameAndRegistrationPair<Dependencies>;
-    configOverrides?: ConfigOverrides<Config>;
+    configOverrides?: NestedPartial<Config>;
 };
 export declare abstract class AbstractTestContextFactory<Dependencies extends object, ExternalDependencies, Config extends object> {
     diContainer: AwilixContainer<Dependencies>;
@@ -19,6 +16,5 @@ export declare abstract class AbstractTestContextFactory<Dependencies extends ob
     constructor(externalDependencies: ExternalDependencies, allModules: readonly AbstractModule<unknown>[], diContainer?: AwilixContainer);
     resetExternalDependencies(): void;
     abstract resolveBaseAppConfig(): Config;
-    createTestContext(params?: CreateTestContextParams<Dependencies, Config>): Promise<DIContext<Dependencies, ExternalDependencies>>;
+    createTestContext(params?: CreateTestContextParams<Dependencies, Config>): Promise<DIContext<Dependencies, Config, ExternalDependencies>>;
 }
-export {};

package/dist/lib/AbstractTestContextFactory.js

@@ -1,7 +1,5 @@
 import { createContainer } from 'awilix';
-import { merge } from 'ts-deepmerge';
 import { DIContext } from './DIContext.js';
-import { asSingletonFunction } from './resolverFunctions.js';
 export class AbstractTestContextFactory {
     diContainer;
     externalDependencies;
@@ -20,19 +18,11 @@ export class AbstractTestContextFactory {
         // Override if necessary
     }
     async createTestContext(params = {}) {
-        const context = new DIContext(this.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 context = new DIContext(this.diContainer, params.diOptions ?? {}, this.resolveBaseAppConfig());
         const modules = params.modules ?? this.allModules;
         context.registerDependencies({
-            dependencyOverrides,
+            dependencyOverrides: params.dependencyOverrides,
+            configOverrides: params.configOverrides,
             modules,
         }, this.externalDependencies, false);
         await context.init();

package/dist/lib/AbstractTestContextFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractTestContextFactory.js","sourceRoot":"","sources":["../../lib/AbstractTestContextFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsD,eAAe,EAAE,MAAM,QAAQ,CAAA;AAC5F,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;IAKvC,WAAW,CAA+B;IAChC,oBAAoB,CAAsB;IACjD,kBAAkB,GAAG,QAAQ,CAAA,CAAC,oCAAoC;IAC3D,UAAU,CAAoC;IAE/D,YACE,oBAA0C,EAC1C,UAA8C,EAC9C,WAA6B;QAE7B,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;QAChD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,WAAW;YACd,WAAW;gBACX,eAAe,CAAC;oBACd,aAAa,EAAE,OAAO;iBACvB,CAAC,CAAA;IACN,CAAC;IAED,yBAAyB;QACvB,wBAAwB;IAC1B,CAAC;IAID,KAAK,CAAC,iBAAiB,CACrB,SAAwD,EAAE;QAE1D,MAAM,OAAO,GAAG,IAAI,SAAS,CAC3B,IAAI,CAAC,WAAW,EAChB,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"}
+{"version":3,"file":"AbstractTestContextFactory.js","sourceRoot":"","sources":["../../lib/AbstractTestContextFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsD,eAAe,EAAE,MAAM,QAAQ,CAAA;AAE5F,OAAO,EAAE,SAAS,EAAmC,MAAM,gBAAgB,CAAA;AAU3E,MAAM,OAAgB,0BAA0B;IAKvC,WAAW,CAA+B;IAChC,oBAAoB,CAAsB;IACjD,kBAAkB,GAAG,QAAQ,CAAA,CAAC,oCAAoC;IAC3D,UAAU,CAAoC;IAE/D,YACE,oBAA0C,EAC1C,UAA8C,EAC9C,WAA6B;QAE7B,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;QAChD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,WAAW;YACd,WAAW;gBACX,eAAe,CAAC;oBACd,aAAa,EAAE,OAAO;iBACvB,CAAC,CAAA;IACN,CAAC;IAED,yBAAyB;QACvB,wBAAwB;IAC1B,CAAC;IAID,KAAK,CAAC,iBAAiB,CACrB,SAAwD,EAAE;QAE1D,MAAM,OAAO,GAAG,IAAI,SAAS,CAC3B,IAAI,CAAC,WAAW,EAChB,MAAM,CAAC,SAAS,IAAI,EAAE,EACtB,IAAI,CAAC,oBAAoB,EAAE,CAC5B,CAAA;QAED,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,UAAU,CAAA;QACjD,OAAO,CAAC,oBAAoB,CAC1B;YACE,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;YAC/C,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,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

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

package/dist/lib/DIContext.js

@@ -1,13 +1,16 @@
 import { AwilixManager } from 'awilix-manager';
+import { mergeConfigAndDependencyOverrides } from './configUtils.js';
 export class DIContext {
     options;
     awilixManager;
     diContainer;
     // biome-ignore lint/suspicious/noExplicitAny: all controllers are controllers
     controllerResolvers;
-    constructor(diContainer, options, awilixManager) {
+    appConfig;
+    constructor(diContainer, options, appConfig, awilixManager) {
         this.options = options;
         this.diContainer = diContainer;
+        this.appConfig = appConfig;
         this.awilixManager =
             awilixManager ??
                 new AwilixManager({
@@ -33,7 +36,7 @@ export class DIContext {
         }
     }
     registerDependencies(params, externalDependencies, resolveControllers = true) {
-        const _dependencyOverrides = params.dependencyOverrides ?? {};
+        const mergedOverrides = mergeConfigAndDependencyOverrides(this.appConfig, params.configOverrides, params.dependencyOverrides ?? {});
         const targetDiConfig = {};
         for (const primaryModule of params.modules) {
             this.registerModule(primaryModule, targetDiConfig, externalDependencies, resolveControllers, true);
@@ -44,7 +47,9 @@ export class DIContext {
             }
         }
         this.diContainer.register(targetDiConfig);
-        for (const [dependencyKey, _dependencyValue] of Object.entries(_dependencyOverrides)) {
+        // append dependency overrides
+        // @ts-expect-error FixMe check this later
+        for (const [dependencyKey, _dependencyValue] of Object.entries(mergedOverrides)) {
             const dependencyValue = { ..._dependencyValue };
             // preserve lifetime from original resolver
             const originalResolver = this.diContainer.getRegistration(dependencyKey);

package/dist/lib/DIContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"DIContext.js","sourceRoot":"","sources":["../../lib/DIContext.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DIContext.js","sourceRoot":"","sources":["../../lib/DIContext.ts"],"names":[],"mappings":"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"}

package/dist/lib/configUtils.d.ts

@@ -0,0 +1,8 @@
+import type { NameAndRegistrationPair } from 'awilix';
+export type NestedPartial<T> = {
+    [P in keyof T]?: NestedPartial<T[P]>;
+};
+/**
+ * Merges incremental changes for config entity with general dependency config overrides
+ */
+export declare function mergeConfigAndDependencyOverrides<Dependencies, Config extends object>(baseConfig: Config, configOverrides?: NestedPartial<Config>, dependencyOverrides?: NameAndRegistrationPair<Dependencies>): NameAndRegistrationPair<Dependencies> | undefined;

package/dist/lib/configUtils.js

@@ -0,0 +1,18 @@
+import { merge } from 'ts-deepmerge';
+import { asSingletonFunction } from './resolverFunctions.js';
+/**
+ * Merges incremental changes for config entity with general dependency config overrides
+ */
+export function mergeConfigAndDependencyOverrides(baseConfig, configOverrides, dependencyOverrides) {
+    return configOverrides
+        ? {
+            ...dependencyOverrides,
+            // @ts-expect-error we can't make this type-safe
+            [this.configDependencyId]: asSingletonFunction(() => {
+                // biome-ignore lint/style/noNonNullAssertion: there is a ternary condition above
+                return merge(baseConfig, configOverrides);
+            }),
+        }
+        : dependencyOverrides;
+}
+//# sourceMappingURL=configUtils.js.map

package/dist/lib/configUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"configUtils.js","sourceRoot":"","sources":["../../lib/configUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AACpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAM5D;;GAEG;AACH,MAAM,UAAU,iCAAiC,CAC/C,UAAkB,EAClB,eAAuC,EACvC,mBAA2D;IAE3D,OAAO,eAAe;QACpB,CAAC,CAAE;YACC,GAAG,mBAAmB;YACtB,gDAAgD;YAChD,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,mBAAmB,CAAC,GAAG,EAAE;gBAClD,iFAAiF;gBACjF,OAAO,KAAK,CAAC,UAAU,EAAE,eAAgB,CAAC,CAAA;YAC5C,CAAC,CAAC;SACuC;QAC7C,CAAC,CAAC,mBAAmB,CAAA;AACzB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "opinionated-machine",
-    "version": "2.6.0",
+    "version": "2.7.0",
     "description": "Very opinionated DI framework for fastify, built on top of awilix ",
     "type": "module",
     "main": "dist/index.js",