@forklaunch/core 0.3.2 → 0.3.4

package/lib/services/index.d.ts

@@ -1,49 +1,111 @@
-import { AnySchemaValidator, IdiomaticSchema, Schema, ParseResult } from '@forklaunch/validator';
+import {
+  AnySchemaValidator,
+  IdiomaticSchema,
+  ParseResult,
+  Schema
+} from '@forklaunch/validator';
 import { EntityManager as EntityManager$1 } from '@mikro-orm/core';
 
 declare enum Lifetime {
-    Singleton = 0,
-    Transient = 1,
-    Scoped = 2
+  Singleton = 0,
+  Transient = 1,
+  Scoped = 2
 }
 type Singleton<Value> = {
-    lifetime: Lifetime.Singleton;
-    value: Value;
+  lifetime: Lifetime.Singleton;
+  value: Value;
 };
 type Constructed<Args, Return> = {
-    lifetime: Lifetime.Transient | Lifetime.Scoped;
-    factory: (args: Args, resolve: <T extends keyof Args>(token: T, context?: Record<string, unknown>) => Args[T], context: Record<string, unknown>) => Return;
+  lifetime: Lifetime.Transient | Lifetime.Scoped;
+  factory: (
+    args: Args,
+    resolve: <T extends keyof Args>(
+      token: T,
+      context?: Record<string, unknown>
+    ) => Args[T],
+    context: Record<string, unknown>
+  ) => Return;
 };
 type Constructor = new (...args: never[]) => unknown;
-type SchemaConstructor<SV extends AnySchemaValidator> = new (...args: unknown[]) => IdiomaticSchema<SV>;
+type SchemaConstructor<SV extends AnySchemaValidator> = new (
+  ...args: unknown[]
+) => IdiomaticSchema<SV>;
 type Function = (...args: never[]) => unknown;
-type SchemaFunction<SV extends AnySchemaValidator> = (args: unknown) => IdiomaticSchema<SV>;
-type ConfigValidator<SV extends AnySchemaValidator> = Record<string, Function | SchemaFunction<SV> | Constructor | SchemaConstructor<SV> | IdiomaticSchema<SV>>;
-type ResolvedConfigValidator<SV extends AnySchemaValidator, CV extends ConfigValidator<SV>> = {
-    [M in keyof CV]: CV[M] extends SchemaConstructor<SV> ? Schema<InstanceType<CV[M]>, SV> : CV[M] extends SchemaFunction<SV> ? Schema<ReturnType<CV[M]>, SV> : CV[M] extends Function ? ReturnType<CV[M]> : CV[M] extends Constructor ? InstanceType<CV[M]> : Schema<CV[M], SV>;
-};
-type ScopedDependencyFactory<SV extends AnySchemaValidator, CV extends ConfigValidator<SV>, M extends keyof CV> = (scope?: ConfigInjector<SV, CV>) => ResolvedConfigValidator<SV, CV>[M];
-type ValidConfigInjector<SV extends AnySchemaValidator, CV extends ConfigValidator<SV>> = ConfigInjector<SV, CV> & {
-    validResolvedConfigValidator: void;
+type SchemaFunction<SV extends AnySchemaValidator> = (
+  args: unknown
+) => IdiomaticSchema<SV>;
+type ConfigValidator<SV extends AnySchemaValidator> = Record<
+  string,
+  | Function
+  | SchemaFunction<SV>
+  | Constructor
+  | SchemaConstructor<SV>
+  | IdiomaticSchema<SV>
+>;
+type ResolvedConfigValidator<
+  SV extends AnySchemaValidator,
+  CV extends ConfigValidator<SV>
+> = {
+  [M in keyof CV]: CV[M] extends SchemaConstructor<SV>
+    ? Schema<InstanceType<CV[M]>, SV>
+    : CV[M] extends SchemaFunction<SV>
+      ? Schema<ReturnType<CV[M]>, SV>
+      : CV[M] extends Function
+        ? ReturnType<CV[M]>
+        : CV[M] extends Constructor
+          ? InstanceType<CV[M]>
+          : Schema<CV[M], SV>;
 };
+type ScopedDependencyFactory<
+  SV extends AnySchemaValidator,
+  CV extends ConfigValidator<SV>,
+  M extends keyof CV
+> = (scope?: ConfigInjector<SV, CV>) => ResolvedConfigValidator<SV, CV>[M];
 
-declare class ConfigInjector<SV extends AnySchemaValidator, CV extends ConfigValidator<SV>> {
-    private schemaValidator;
-    private configShapes;
-    private dependenciesDefinition;
-    instances: {
-        [K in keyof CV]?: ResolvedConfigValidator<SV, CV>[K];
-    };
-    private loadSingletons;
-    private resolveInstance;
-    constructor(schemaValidator: SV, configShapes: CV, dependenciesDefinition: {
-        [K in keyof CV]: Singleton<ResolvedConfigValidator<SV, CV>[K]> | Constructed<Omit<ResolvedConfigValidator<SV, CV>, K>, ResolvedConfigValidator<SV, CV>[K]>;
-    });
-    validateConfigSingletons(): ParseResult<ValidConfigInjector<SV, CV>>;
-    resolve<T extends keyof CV>(token: T, context?: Record<string, unknown>, resolutionPath?: (keyof CV)[]): ResolvedConfigValidator<SV, CV>[T];
-    scopedResolver<T extends keyof CV>(token: T, context?: Record<string, unknown>, resolutionPath?: (keyof CV)[]): (scope?: ConfigInjector<SV, CV>) => ResolvedConfigValidator<SV, CV>[T];
-    createScope(): ConfigInjector<SV, CV>;
-    dispose(): void;
+declare class ConfigInjector<
+  SV extends AnySchemaValidator,
+  CV extends ConfigValidator<SV>
+> {
+  private schemaValidator;
+  private configShapes;
+  private dependenciesDefinition;
+  instances: {
+    [K in keyof CV]?: ResolvedConfigValidator<SV, CV>[K];
+  };
+  private loadSingletons;
+  private resolveInstance;
+  constructor(
+    schemaValidator: SV,
+    configShapes: CV,
+    dependenciesDefinition: {
+      [K in keyof CV]:
+        | Singleton<ResolvedConfigValidator<SV, CV>[K]>
+        | Constructed<
+            Omit<ResolvedConfigValidator<SV, CV>, K>,
+            ResolvedConfigValidator<SV, CV>[K]
+          >;
+    }
+  );
+  safeValidateConfigSingletons(): ParseResult<ValidConfigInjector<SV, CV>>;
+  validateConfigSingletons(configName: string): ValidConfigInjector<SV, CV>;
+  resolve<T extends keyof CV>(
+    token: T,
+    context?: Record<string, unknown>,
+    resolutionPath?: (keyof CV)[]
+  ): ResolvedConfigValidator<SV, CV>[T];
+  scopedResolver<T extends keyof CV>(
+    token: T,
+    context?: Record<string, unknown>,
+    resolutionPath?: (keyof CV)[]
+  ): (scope?: ConfigInjector<SV, CV>) => ResolvedConfigValidator<SV, CV>[T];
+  createScope(): ConfigInjector<SV, CV>;
+  dispose(): void;
+}
+declare class ValidConfigInjector<
+  SV extends AnySchemaValidator,
+  CV extends ConfigValidator<SV>
+> extends ConfigInjector<SV, CV> {
+  validConfigInjector: void;
 }
 
 declare function getEnvVar(name: string): string;
@@ -54,16 +116,32 @@ declare function getEnvVar(name: string): string;
  * @interface BaseService
  */
 interface BaseService {
-    /**
-     * The EntityManager instance for managing entities.
-     *
-     * @type {EntityManager}
-     */
-    em: EntityManager$1;
+  /**
+   * The EntityManager instance for managing entities.
+   *
+   * @type {EntityManager}
+   */
+  em: EntityManager$1;
 }
 
 type EntityManager = {
-    fork: <Options>(options?: Options) => EntityManager;
+  fork: <Options>(options?: Options) => EntityManager;
 };
 
-export { type BaseService, ConfigInjector, type ConfigValidator, type Constructed, type Constructor, type EntityManager, type Function, Lifetime, type ResolvedConfigValidator, type SchemaConstructor, type SchemaFunction, type ScopedDependencyFactory, type Singleton, type ValidConfigInjector, getEnvVar };
+export {
+  ConfigInjector,
+  getEnvVar,
+  Lifetime,
+  ValidConfigInjector,
+  type BaseService,
+  type ConfigValidator,
+  type Constructed,
+  type Constructor,
+  type EntityManager,
+  type Function,
+  type ResolvedConfigValidator,
+  type SchemaConstructor,
+  type SchemaFunction,
+  type ScopedDependencyFactory,
+  type Singleton
+};

package/lib/services/index.js

@@ -22,12 +22,14 @@ var services_exports = {};
 __export(services_exports, {
   ConfigInjector: () => ConfigInjector,
   Lifetime: () => Lifetime,
+  ValidConfigInjector: () => ValidConfigInjector,
   getEnvVar: () => getEnvVar
 });
 module.exports = __toCommonJS(services_exports);
 
 // src/services/configInjector.ts
 var import_common = require("@forklaunch/common");
+var import_validator = require("@forklaunch/validator");
 
 // src/services/guards/isConstructed.ts
 function isConstructed(value) {
@@ -100,7 +102,7 @@ var ConfigInjector = class _ConfigInjector {
       context ?? {}
     );
   }
-  validateConfigSingletons() {
+  safeValidateConfigSingletons() {
     const validNonSchemaSingletons = Object.entries(this.configShapes).reduce(
       (acc, [key, value]) => {
         if (this.dependenciesDefinition[key].lifetime === 0 /* Singleton */ && !this.schemaValidator.isSchema(value) && isConstructor(value)) {
@@ -158,10 +160,11 @@ var ConfigInjector = class _ConfigInjector {
     const configKeys = Object.keys(this.configShapes);
     return validNonSchemaSingletons.ok && schemaSingletonParseResult.ok ? {
       ok: true,
-      value: {
-        validResolvedConfigValidator: void 0,
-        ...this
-      }
+      value: new ValidConfigInjector(
+        this.schemaValidator,
+        this.configShapes,
+        this.dependenciesDefinition
+      )
     } : {
       ok: false,
       errors: [
@@ -172,6 +175,15 @@ var ConfigInjector = class _ConfigInjector {
       )
     };
   }
+  validateConfigSingletons(configName) {
+    const safeValidateResult = this.safeValidateConfigSingletons();
+    if (safeValidateResult.ok) {
+      return safeValidateResult.value;
+    }
+    throw new Error(
+      (0, import_validator.prettyPrintParseErrors)(safeValidateResult.errors, configName)
+    );
+  }
   resolve(token, context, resolutionPath = []) {
     const instance = this.instances[token];
     if (!instance) {
@@ -229,6 +241,9 @@ var ConfigInjector = class _ConfigInjector {
     this.loadSingletons();
   }
 };
+var ValidConfigInjector = class extends ConfigInjector {
+  validConfigInjector;
+};
 
 // src/services/getEnvVar.ts
 function getEnvVar(name) {
@@ -239,5 +254,7 @@ function getEnvVar(name) {
 0 && (module.exports = {
   ConfigInjector,
   Lifetime,
+  ValidConfigInjector,
   getEnvVar
 });
+//# sourceMappingURL=index.js.map

package/lib/services/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/services/index.ts","../../src/services/configInjector.ts","../../src/services/guards/isConstructed.ts","../../src/services/guards/isConstructor.ts","../../src/services/types/configInjector.types.ts","../../src/services/getEnvVar.ts"],"sourcesContent":["export * from './configInjector';\nexport * from './getEnvVar';\nexport * from './interfaces/baseService';\nexport * from './types/configInjector.types';\nexport * from './types/entityManager.types';\n","import { extractArgumentNames, isNever } from '@forklaunch/common';\nimport {\n  AnySchemaValidator,\n  IdiomaticSchema,\n  ParseResult,\n  prettyPrintParseErrors,\n  SchemaValidator\n} from '@forklaunch/validator';\nimport { isConstructed } from './guards/isConstructed';\nimport { isConstructor } from './guards/isConstructor';\nimport {\n  ConfigValidator,\n  Constructed,\n  Lifetime,\n  ResolvedConfigValidator,\n  SchemaConstructor,\n  SchemaFunction,\n  Singleton\n} from './types/configInjector.types';\n\nexport class ConfigInjector<\n  SV extends AnySchemaValidator,\n  CV extends ConfigValidator<SV>\n> {\n  instances: {\n    [K in keyof CV]?: ResolvedConfigValidator<SV, CV>[K];\n  } = {};\n\n  private loadSingletons(): void {\n    for (const token in this.dependenciesDefinition) {\n      const definition = this.dependenciesDefinition[token];\n      if (definition.lifetime === Lifetime.Singleton) {\n        this.instances[token] = definition.value;\n      }\n    }\n  }\n\n  private resolveInstance<T extends keyof CV>(\n    token: T,\n    definition: Constructed<\n      Omit<ResolvedConfigValidator<SV, CV>, T>,\n      ResolvedConfigValidator<SV, CV>[T]\n    >,\n    context?: Record<string, unknown>,\n    resolutionPath: (keyof CV)[] = []\n  ): ResolvedConfigValidator<SV, CV>[T] {\n    const injectorArgument = extractArgumentNames(definition.factory)[0];\n    // short circuit as no args\n    if (injectorArgument === '_args') {\n      return definition.factory(\n        {} as Omit<ResolvedConfigValidator<SV, CV>, T>,\n        this.resolve.bind(this),\n        context ?? ({} as Record<string, unknown>)\n      );\n    }\n\n    if (!injectorArgument.startsWith('{') || !injectorArgument.endsWith('}')) {\n      throw new Error(\n        `Invalid injector argument for ${String(\n          token\n        )}: ${injectorArgument}. Please use object destructuring syntax: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment.`\n      );\n    }\n    const resolvedArguments = Object.fromEntries(\n      injectorArgument\n        .replace('{', '')\n        .replace('}', '')\n        .split(',')\n        .map((arg) => arg.split(':')[0].trim())\n        .map((arg) => {\n          const newResolutionPath = [...resolutionPath, token];\n          if (resolutionPath.includes(arg)) {\n            throw new Error(\n              `Circular dependency detected: ${newResolutionPath.join(\n                ' -> '\n              )} -> ${arg}`\n            );\n          }\n          const resolvedArg = this.resolve(arg, context, newResolutionPath);\n          return [arg, resolvedArg];\n        })\n    ) as unknown as Omit<ResolvedConfigValidator<SV, CV>, T>;\n    return definition.factory(\n      resolvedArguments,\n      this.resolve.bind(this),\n      context ?? ({} as Record<string, unknown>)\n    );\n  }\n\n  constructor(\n    private schemaValidator: SV,\n    private configShapes: CV,\n    private dependenciesDefinition: {\n      [K in keyof CV]:\n        | Singleton<ResolvedConfigValidator<SV, CV>[K]>\n        | Constructed<\n            Omit<ResolvedConfigValidator<SV, CV>, K>,\n            ResolvedConfigValidator<SV, CV>[K]\n          >;\n    }\n  ) {\n    this.loadSingletons();\n  }\n\n  safeValidateConfigSingletons(): ParseResult<ValidConfigInjector<SV, CV>> {\n    const validNonSchemaSingletons = Object.entries(this.configShapes).reduce<\n      ParseResult<ResolvedConfigValidator<SV, CV>>\n    >(\n      (acc, [key, value]) => {\n        if (\n          this.dependenciesDefinition[key].lifetime === Lifetime.Singleton &&\n          !(this.schemaValidator as SchemaValidator).isSchema<\n            SchemaFunction<SV> | SchemaConstructor<SV> | IdiomaticSchema<SV>\n          >(value) &&\n          isConstructor(value)\n        ) {\n          if (!(this.dependenciesDefinition[key].value instanceof value)) {\n            const expected = value.name;\n            const receivedValue: unknown =\n              this.dependenciesDefinition[key].value;\n            const received = isConstructed(receivedValue)\n              ? receivedValue.constructor.name\n              : typeof receivedValue;\n\n            if (acc.ok) {\n              acc = {\n                ok: false,\n                errors: []\n              };\n            }\n            acc.errors?.push({\n              message: `Expected ${expected}, received ${received}`,\n              path: [key]\n            });\n          } else {\n            if (acc.ok) {\n              acc = {\n                ok: true,\n                value: {\n                  ...acc.value,\n                  [key]: this.dependenciesDefinition[key].value\n                }\n              };\n            }\n          }\n          return acc;\n        }\n        return acc;\n      },\n      {\n        ok: true,\n        value: {} as ResolvedConfigValidator<SV, CV>\n      }\n    );\n\n    const singletons = Object.fromEntries(\n      Object.entries(this.configShapes).filter(\n        ([key, value]) =>\n          this.dependenciesDefinition[key].lifetime === Lifetime.Singleton &&\n          (this.schemaValidator as SchemaValidator).isSchema(value)\n      )\n    );\n    const schemaSingletonParseResult = (\n      this.schemaValidator as SchemaValidator\n    ).parse(\n      (this.schemaValidator as SchemaValidator).schemify(singletons),\n      Object.fromEntries(\n        Object.keys(singletons).map((key) => {\n          const dependency = this.dependenciesDefinition[key];\n          return [\n            key,\n            dependency.lifetime === Lifetime.Singleton\n              ? dependency.value\n              : undefined\n          ];\n        })\n      )\n    );\n\n    const configKeys = Object.keys(this.configShapes);\n\n    return validNonSchemaSingletons.ok && schemaSingletonParseResult.ok\n      ? {\n          ok: true as const,\n          value: new ValidConfigInjector<SV, CV>(\n            this.schemaValidator,\n            this.configShapes,\n            this.dependenciesDefinition\n          )\n        }\n      : {\n          ok: false as const,\n          errors: [\n            ...(!validNonSchemaSingletons.ok && validNonSchemaSingletons.errors\n              ? validNonSchemaSingletons.errors\n              : []),\n            ...(!schemaSingletonParseResult.ok &&\n            schemaSingletonParseResult.errors\n              ? schemaSingletonParseResult.errors\n              : [])\n          ].sort(\n            (a, b) =>\n              configKeys.indexOf(a.path[0]) - configKeys.indexOf(b.path[0])\n          )\n        };\n  }\n\n  validateConfigSingletons(configName: string): ValidConfigInjector<SV, CV> {\n    const safeValidateResult = this.safeValidateConfigSingletons();\n\n    if (safeValidateResult.ok) {\n      return safeValidateResult.value;\n    }\n\n    throw new Error(\n      prettyPrintParseErrors(safeValidateResult.errors, configName)\n    );\n  }\n\n  resolve<T extends keyof CV>(\n    token: T,\n    context?: Record<string, unknown>,\n    resolutionPath: (keyof CV)[] = []\n  ): ResolvedConfigValidator<SV, CV>[T] {\n    const instance = this.instances[token];\n    if (!instance) {\n      const definition = this.dependenciesDefinition[token];\n\n      if (!definition) {\n        throw new Error(`Unable to resolve dependency ${String(token)}`);\n      }\n\n      switch (definition.lifetime) {\n        case Lifetime.Singleton: {\n          return definition.value;\n        }\n        case Lifetime.Scoped: {\n          const scopedInstance = this.resolveInstance<T>(\n            token,\n            definition,\n            context,\n            resolutionPath\n          );\n          this.instances[token] = scopedInstance;\n          return scopedInstance;\n        }\n        case Lifetime.Transient: {\n          return this.resolveInstance<T>(\n            token,\n            definition,\n            context,\n            resolutionPath\n          );\n        }\n        default: {\n          isNever(definition);\n          throw new Error(\n            `Unable to resolve lifetime for dependency ${String(\n              token\n            )}, ${resolutionPath}`\n          );\n        }\n      }\n    } else {\n      return instance;\n    }\n  }\n\n  scopedResolver<T extends keyof CV>(\n    token: T,\n    context?: Record<string, unknown>,\n    resolutionPath: (keyof CV)[] = []\n  ): (scope?: ConfigInjector<SV, CV>) => ResolvedConfigValidator<SV, CV>[T] {\n    return (scope) =>\n      (scope ?? this.createScope()).resolve<T>(token, context, resolutionPath);\n  }\n\n  createScope(): ConfigInjector<SV, CV> {\n    return new ConfigInjector<SV, CV>(\n      this.schemaValidator,\n      this.configShapes,\n      this.dependenciesDefinition\n    );\n  }\n\n  dispose(): void {\n    this.instances = {};\n    this.loadSingletons();\n  }\n}\n\nexport class ValidConfigInjector<\n  SV extends AnySchemaValidator,\n  CV extends ConfigValidator<SV>\n> extends ConfigInjector<SV, CV> {\n  validConfigInjector!: void;\n}\n","import { Constructed } from '../types/configInjector.types';\n\nexport function isConstructed(\n  value: unknown\n): value is Constructed<unknown, unknown> {\n  return (\n    typeof value === 'object' &&\n    value != null &&\n    'constructor' in value &&\n    value.constructor != null\n  );\n}\n","import { Constructor } from '../types/configInjector.types';\n\nexport function isConstructor(value: unknown): value is Constructor {\n  return (\n    typeof value === 'function' &&\n    value.constructor != null &&\n    value.prototype != null\n  );\n}\n","import {\n  AnySchemaValidator,\n  IdiomaticSchema,\n  Schema\n} from '@forklaunch/validator';\nimport { ConfigInjector } from '../configInjector';\n\nexport enum Lifetime {\n  Singleton,\n  Transient,\n  Scoped\n}\n\nexport type Singleton<Value> = {\n  lifetime: Lifetime.Singleton;\n  value: Value;\n};\n\nexport type Constructed<Args, Return> = {\n  lifetime: Lifetime.Transient | Lifetime.Scoped;\n  factory: (\n    args: Args,\n    resolve: <T extends keyof Args>(\n      token: T,\n      context?: Record<string, unknown>\n    ) => Args[T],\n    context: Record<string, unknown>\n  ) => Return;\n};\n\nexport type Constructor = new (...args: never[]) => unknown;\nexport type SchemaConstructor<SV extends AnySchemaValidator> = new (\n  ...args: unknown[]\n) => IdiomaticSchema<SV>;\nexport type Function = (...args: never[]) => unknown;\nexport type SchemaFunction<SV extends AnySchemaValidator> = (\n  args: unknown\n) => IdiomaticSchema<SV>;\n\nexport type ConfigValidator<SV extends AnySchemaValidator> = Record<\n  string,\n  | Function\n  | SchemaFunction<SV>\n  | Constructor\n  | SchemaConstructor<SV>\n  | IdiomaticSchema<SV>\n>;\n\nexport type ResolvedConfigValidator<\n  SV extends AnySchemaValidator,\n  CV extends ConfigValidator<SV>\n> = {\n  [M in keyof CV]: CV[M] extends SchemaConstructor<SV>\n    ? Schema<InstanceType<CV[M]>, SV>\n    : CV[M] extends SchemaFunction<SV>\n      ? Schema<ReturnType<CV[M]>, SV>\n      : CV[M] extends Function\n        ? ReturnType<CV[M]>\n        : CV[M] extends Constructor\n          ? InstanceType<CV[M]>\n          : Schema<CV[M], SV>;\n};\n\nexport type ScopedDependencyFactory<\n  SV extends AnySchemaValidator,\n  CV extends ConfigValidator<SV>,\n  M extends keyof CV\n> = (scope?: ConfigInjector<SV, CV>) => ResolvedConfigValidator<SV, CV>[M];\n","// This is a simple function that returns the value of an environment variable.\n// It casts a potentially undefined value to a string, since it will be validated in order to be bootstrapped.\n\nexport function getEnvVar(name: string): string {\n  const value = process.env[name];\n  return value as string;\n}\n"],"mappings":"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","names":["Lifetime"]}

package/lib/services/index.mjs

@@ -1,5 +1,8 @@
 // src/services/configInjector.ts
 import { extractArgumentNames, isNever } from "@forklaunch/common";
+import {
+  prettyPrintParseErrors
+} from "@forklaunch/validator";
 
 // src/services/guards/isConstructed.ts
 function isConstructed(value) {
@@ -72,7 +75,7 @@ var ConfigInjector = class _ConfigInjector {
       context ?? {}
     );
   }
-  validateConfigSingletons() {
+  safeValidateConfigSingletons() {
     const validNonSchemaSingletons = Object.entries(this.configShapes).reduce(
       (acc, [key, value]) => {
         if (this.dependenciesDefinition[key].lifetime === 0 /* Singleton */ && !this.schemaValidator.isSchema(value) && isConstructor(value)) {
@@ -130,10 +133,11 @@ var ConfigInjector = class _ConfigInjector {
     const configKeys = Object.keys(this.configShapes);
     return validNonSchemaSingletons.ok && schemaSingletonParseResult.ok ? {
       ok: true,
-      value: {
-        validResolvedConfigValidator: void 0,
-        ...this
-      }
+      value: new ValidConfigInjector(
+        this.schemaValidator,
+        this.configShapes,
+        this.dependenciesDefinition
+      )
     } : {
       ok: false,
       errors: [
@@ -144,6 +148,15 @@ var ConfigInjector = class _ConfigInjector {
       )
     };
   }
+  validateConfigSingletons(configName) {
+    const safeValidateResult = this.safeValidateConfigSingletons();
+    if (safeValidateResult.ok) {
+      return safeValidateResult.value;
+    }
+    throw new Error(
+      prettyPrintParseErrors(safeValidateResult.errors, configName)
+    );
+  }
   resolve(token, context, resolutionPath = []) {
     const instance = this.instances[token];
     if (!instance) {
@@ -201,6 +214,9 @@ var ConfigInjector = class _ConfigInjector {
     this.loadSingletons();
   }
 };
+var ValidConfigInjector = class extends ConfigInjector {
+  validConfigInjector;
+};
 
 // src/services/getEnvVar.ts
 function getEnvVar(name) {
@@ -210,5 +226,7 @@ function getEnvVar(name) {
 export {
   ConfigInjector,
   Lifetime,
+  ValidConfigInjector,
   getEnvVar
 };
+//# sourceMappingURL=index.mjs.map

package/lib/services/index.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/services/configInjector.ts","../../src/services/guards/isConstructed.ts","../../src/services/guards/isConstructor.ts","../../src/services/types/configInjector.types.ts","../../src/services/getEnvVar.ts"],"sourcesContent":["import { extractArgumentNames, isNever } from '@forklaunch/common';\nimport {\n  AnySchemaValidator,\n  IdiomaticSchema,\n  ParseResult,\n  prettyPrintParseErrors,\n  SchemaValidator\n} from '@forklaunch/validator';\nimport { isConstructed } from './guards/isConstructed';\nimport { isConstructor } from './guards/isConstructor';\nimport {\n  ConfigValidator,\n  Constructed,\n  Lifetime,\n  ResolvedConfigValidator,\n  SchemaConstructor,\n  SchemaFunction,\n  Singleton\n} from './types/configInjector.types';\n\nexport class ConfigInjector<\n  SV extends AnySchemaValidator,\n  CV extends ConfigValidator<SV>\n> {\n  instances: {\n    [K in keyof CV]?: ResolvedConfigValidator<SV, CV>[K];\n  } = {};\n\n  private loadSingletons(): void {\n    for (const token in this.dependenciesDefinition) {\n      const definition = this.dependenciesDefinition[token];\n      if (definition.lifetime === Lifetime.Singleton) {\n        this.instances[token] = definition.value;\n      }\n    }\n  }\n\n  private resolveInstance<T extends keyof CV>(\n    token: T,\n    definition: Constructed<\n      Omit<ResolvedConfigValidator<SV, CV>, T>,\n      ResolvedConfigValidator<SV, CV>[T]\n    >,\n    context?: Record<string, unknown>,\n    resolutionPath: (keyof CV)[] = []\n  ): ResolvedConfigValidator<SV, CV>[T] {\n    const injectorArgument = extractArgumentNames(definition.factory)[0];\n    // short circuit as no args\n    if (injectorArgument === '_args') {\n      return definition.factory(\n        {} as Omit<ResolvedConfigValidator<SV, CV>, T>,\n        this.resolve.bind(this),\n        context ?? ({} as Record<string, unknown>)\n      );\n    }\n\n    if (!injectorArgument.startsWith('{') || !injectorArgument.endsWith('}')) {\n      throw new Error(\n        `Invalid injector argument for ${String(\n          token\n        )}: ${injectorArgument}. Please use object destructuring syntax: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment.`\n      );\n    }\n    const resolvedArguments = Object.fromEntries(\n      injectorArgument\n        .replace('{', '')\n        .replace('}', '')\n        .split(',')\n        .map((arg) => arg.split(':')[0].trim())\n        .map((arg) => {\n          const newResolutionPath = [...resolutionPath, token];\n          if (resolutionPath.includes(arg)) {\n            throw new Error(\n              `Circular dependency detected: ${newResolutionPath.join(\n                ' -> '\n              )} -> ${arg}`\n            );\n          }\n          const resolvedArg = this.resolve(arg, context, newResolutionPath);\n          return [arg, resolvedArg];\n        })\n    ) as unknown as Omit<ResolvedConfigValidator<SV, CV>, T>;\n    return definition.factory(\n      resolvedArguments,\n      this.resolve.bind(this),\n      context ?? ({} as Record<string, unknown>)\n    );\n  }\n\n  constructor(\n    private schemaValidator: SV,\n    private configShapes: CV,\n    private dependenciesDefinition: {\n      [K in keyof CV]:\n        | Singleton<ResolvedConfigValidator<SV, CV>[K]>\n        | Constructed<\n            Omit<ResolvedConfigValidator<SV, CV>, K>,\n            ResolvedConfigValidator<SV, CV>[K]\n          >;\n    }\n  ) {\n    this.loadSingletons();\n  }\n\n  safeValidateConfigSingletons(): ParseResult<ValidConfigInjector<SV, CV>> {\n    const validNonSchemaSingletons = Object.entries(this.configShapes).reduce<\n      ParseResult<ResolvedConfigValidator<SV, CV>>\n    >(\n      (acc, [key, value]) => {\n        if (\n          this.dependenciesDefinition[key].lifetime === Lifetime.Singleton &&\n          !(this.schemaValidator as SchemaValidator).isSchema<\n            SchemaFunction<SV> | SchemaConstructor<SV> | IdiomaticSchema<SV>\n          >(value) &&\n          isConstructor(value)\n        ) {\n          if (!(this.dependenciesDefinition[key].value instanceof value)) {\n            const expected = value.name;\n            const receivedValue: unknown =\n              this.dependenciesDefinition[key].value;\n            const received = isConstructed(receivedValue)\n              ? receivedValue.constructor.name\n              : typeof receivedValue;\n\n            if (acc.ok) {\n              acc = {\n                ok: false,\n                errors: []\n              };\n            }\n            acc.errors?.push({\n              message: `Expected ${expected}, received ${received}`,\n              path: [key]\n            });\n          } else {\n            if (acc.ok) {\n              acc = {\n                ok: true,\n                value: {\n                  ...acc.value,\n                  [key]: this.dependenciesDefinition[key].value\n                }\n              };\n            }\n          }\n          return acc;\n        }\n        return acc;\n      },\n      {\n        ok: true,\n        value: {} as ResolvedConfigValidator<SV, CV>\n      }\n    );\n\n    const singletons = Object.fromEntries(\n      Object.entries(this.configShapes).filter(\n        ([key, value]) =>\n          this.dependenciesDefinition[key].lifetime === Lifetime.Singleton &&\n          (this.schemaValidator as SchemaValidator).isSchema(value)\n      )\n    );\n    const schemaSingletonParseResult = (\n      this.schemaValidator as SchemaValidator\n    ).parse(\n      (this.schemaValidator as SchemaValidator).schemify(singletons),\n      Object.fromEntries(\n        Object.keys(singletons).map((key) => {\n          const dependency = this.dependenciesDefinition[key];\n          return [\n            key,\n            dependency.lifetime === Lifetime.Singleton\n              ? dependency.value\n              : undefined\n          ];\n        })\n      )\n    );\n\n    const configKeys = Object.keys(this.configShapes);\n\n    return validNonSchemaSingletons.ok && schemaSingletonParseResult.ok\n      ? {\n          ok: true as const,\n          value: new ValidConfigInjector<SV, CV>(\n            this.schemaValidator,\n            this.configShapes,\n            this.dependenciesDefinition\n          )\n        }\n      : {\n          ok: false as const,\n          errors: [\n            ...(!validNonSchemaSingletons.ok && validNonSchemaSingletons.errors\n              ? validNonSchemaSingletons.errors\n              : []),\n            ...(!schemaSingletonParseResult.ok &&\n            schemaSingletonParseResult.errors\n              ? schemaSingletonParseResult.errors\n              : [])\n          ].sort(\n            (a, b) =>\n              configKeys.indexOf(a.path[0]) - configKeys.indexOf(b.path[0])\n          )\n        };\n  }\n\n  validateConfigSingletons(configName: string): ValidConfigInjector<SV, CV> {\n    const safeValidateResult = this.safeValidateConfigSingletons();\n\n    if (safeValidateResult.ok) {\n      return safeValidateResult.value;\n    }\n\n    throw new Error(\n      prettyPrintParseErrors(safeValidateResult.errors, configName)\n    );\n  }\n\n  resolve<T extends keyof CV>(\n    token: T,\n    context?: Record<string, unknown>,\n    resolutionPath: (keyof CV)[] = []\n  ): ResolvedConfigValidator<SV, CV>[T] {\n    const instance = this.instances[token];\n    if (!instance) {\n      const definition = this.dependenciesDefinition[token];\n\n      if (!definition) {\n        throw new Error(`Unable to resolve dependency ${String(token)}`);\n      }\n\n      switch (definition.lifetime) {\n        case Lifetime.Singleton: {\n          return definition.value;\n        }\n        case Lifetime.Scoped: {\n          const scopedInstance = this.resolveInstance<T>(\n            token,\n            definition,\n            context,\n            resolutionPath\n          );\n          this.instances[token] = scopedInstance;\n          return scopedInstance;\n        }\n        case Lifetime.Transient: {\n          return this.resolveInstance<T>(\n            token,\n            definition,\n            context,\n            resolutionPath\n          );\n        }\n        default: {\n          isNever(definition);\n          throw new Error(\n            `Unable to resolve lifetime for dependency ${String(\n              token\n            )}, ${resolutionPath}`\n          );\n        }\n      }\n    } else {\n      return instance;\n    }\n  }\n\n  scopedResolver<T extends keyof CV>(\n    token: T,\n    context?: Record<string, unknown>,\n    resolutionPath: (keyof CV)[] = []\n  ): (scope?: ConfigInjector<SV, CV>) => ResolvedConfigValidator<SV, CV>[T] {\n    return (scope) =>\n      (scope ?? this.createScope()).resolve<T>(token, context, resolutionPath);\n  }\n\n  createScope(): ConfigInjector<SV, CV> {\n    return new ConfigInjector<SV, CV>(\n      this.schemaValidator,\n      this.configShapes,\n      this.dependenciesDefinition\n    );\n  }\n\n  dispose(): void {\n    this.instances = {};\n    this.loadSingletons();\n  }\n}\n\nexport class ValidConfigInjector<\n  SV extends AnySchemaValidator,\n  CV extends ConfigValidator<SV>\n> extends ConfigInjector<SV, CV> {\n  validConfigInjector!: void;\n}\n","import { Constructed } from '../types/configInjector.types';\n\nexport function isConstructed(\n  value: unknown\n): value is Constructed<unknown, unknown> {\n  return (\n    typeof value === 'object' &&\n    value != null &&\n    'constructor' in value &&\n    value.constructor != null\n  );\n}\n","import { Constructor } from '../types/configInjector.types';\n\nexport function isConstructor(value: unknown): value is Constructor {\n  return (\n    typeof value === 'function' &&\n    value.constructor != null &&\n    value.prototype != null\n  );\n}\n","import {\n  AnySchemaValidator,\n  IdiomaticSchema,\n  Schema\n} from '@forklaunch/validator';\nimport { ConfigInjector } from '../configInjector';\n\nexport enum Lifetime {\n  Singleton,\n  Transient,\n  Scoped\n}\n\nexport type Singleton<Value> = {\n  lifetime: Lifetime.Singleton;\n  value: Value;\n};\n\nexport type Constructed<Args, Return> = {\n  lifetime: Lifetime.Transient | Lifetime.Scoped;\n  factory: (\n    args: Args,\n    resolve: <T extends keyof Args>(\n      token: T,\n      context?: Record<string, unknown>\n    ) => Args[T],\n    context: Record<string, unknown>\n  ) => Return;\n};\n\nexport type Constructor = new (...args: never[]) => unknown;\nexport type SchemaConstructor<SV extends AnySchemaValidator> = new (\n  ...args: unknown[]\n) => IdiomaticSchema<SV>;\nexport type Function = (...args: never[]) => unknown;\nexport type SchemaFunction<SV extends AnySchemaValidator> = (\n  args: unknown\n) => IdiomaticSchema<SV>;\n\nexport type ConfigValidator<SV extends AnySchemaValidator> = Record<\n  string,\n  | Function\n  | SchemaFunction<SV>\n  | Constructor\n  | SchemaConstructor<SV>\n  | IdiomaticSchema<SV>\n>;\n\nexport type ResolvedConfigValidator<\n  SV extends AnySchemaValidator,\n  CV extends ConfigValidator<SV>\n> = {\n  [M in keyof CV]: CV[M] extends SchemaConstructor<SV>\n    ? Schema<InstanceType<CV[M]>, SV>\n    : CV[M] extends SchemaFunction<SV>\n      ? Schema<ReturnType<CV[M]>, SV>\n      : CV[M] extends Function\n        ? ReturnType<CV[M]>\n        : CV[M] extends Constructor\n          ? InstanceType<CV[M]>\n          : Schema<CV[M], SV>;\n};\n\nexport type ScopedDependencyFactory<\n  SV extends AnySchemaValidator,\n  CV extends ConfigValidator<SV>,\n  M extends keyof CV\n> = (scope?: ConfigInjector<SV, CV>) => ResolvedConfigValidator<SV, CV>[M];\n","// This is a simple function that returns the value of an environment variable.\n// It casts a potentially undefined value to a string, since it will be validated in order to be bootstrapped.\n\nexport function getEnvVar(name: string): string {\n  const value = process.env[name];\n  return value as string;\n}\n"],"mappings":"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","names":["Lifetime"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forklaunch/core",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "forklaunch-js core package. Contains useful building blocks.",
   "homepage": "https://github.com/forklaunch/forklaunch-js#readme",
   "bugs": {
@@ -25,12 +25,6 @@
       "require": "./lib/controllers/index.js",
       "default": "./lib/controllers/index.js"
     },
-    "./database": {
-      "types": "./lib/database/index.d.ts",
-      "import": "./lib/database/index.mjs",
-      "require": "./lib/database/index.js",
-      "default": "./lib/database/index.js"
-    },
     "./dtoMapper": {
       "types": "./lib/dtoMapper/index.d.ts",
       "import": "./lib/dtoMapper/index.mjs",
@@ -66,7 +60,7 @@
     "redis": "^4.7.0",
     "uuid": "^11.0.5",
     "@forklaunch/common": "0.2.0",
-    "@forklaunch/validator": "0.4.1"
+    "@forklaunch/validator": "0.4.2"
   },
   "devDependencies": {
     "@eslint/js": "^9.17.0",
@@ -86,7 +80,7 @@
     "typescript-eslint": "^8.19.1"
   },
   "scripts": {
-    "build": "tsc --noEmit && tsup ./src/cache/index.ts ./src/controllers/index.ts ./src/database/index.ts ./src/dtoMapper/index.ts ./src/http/index.ts ./src/services/index.ts --format cjs,esm --no-splitting --dts --tsconfig tsconfig.json --out-dir lib --clean",
+    "build": "tsc --noEmit && tsup ./src/cache/index.ts ./src/controllers/index.ts ./src/database/mikro/models/entities/base.entity.ts ./src/database/mikro/models/entities/mongo.base.entity.ts ./src/database/mikro/models/entities/role.entity.ts ./src/database/mikro/models/entities/user.entity.ts ./src/dtoMapper/index.ts ./src/http/index.ts ./src/services/index.ts --format cjs,esm --no-splitting --dts --tsconfig tsconfig.json --out-dir lib --clean --sourcemap",
     "clean": "rm -rf lib pnpm.lock.yaml node_modules",
     "docs": "typedoc --out docs *",
     "format": "prettier --ignore-path=.prettierignore --config .prettierrc '**/*.{ts,tsx,json}' --write",

package/lib/base.entity-DNfmMOgd.d.mts

@@ -1,27 +0,0 @@
-/**
- * Abstract class representing a base entity.
- */
-declare abstract class BaseEntity {
-    /**
-     * The unique identifier for the entity.
-     *
-     * @type {string}
-     * @readonly
-     */
-    id: string;
-    /**
-     * The date when the entity was created.
-     *
-     * @type {Date}
-     */
-    createdAt: Date;
-    /**
-     * The date when the entity was last updated.
-     *
-     * @type {Date}
-     * @readonly
-     */
-    updatedAt: Date;
-}
-
-export { BaseEntity as B };

package/lib/base.entity-DNfmMOgd.d.ts

@@ -1,27 +0,0 @@
-/**
- * Abstract class representing a base entity.
- */
-declare abstract class BaseEntity {
-    /**
-     * The unique identifier for the entity.
-     *
-     * @type {string}
-     * @readonly
-     */
-    id: string;
-    /**
-     * The date when the entity was created.
-     *
-     * @type {Date}
-     */
-    createdAt: Date;
-    /**
-     * The date when the entity was last updated.
-     *
-     * @type {Date}
-     * @readonly
-     */
-    updatedAt: Date;
-}
-
-export { BaseEntity as B };

package/lib/database/index.d.mts

@@ -1,37 +0,0 @@
-export { B as BaseEntity } from '../base.entity-DNfmMOgd.mjs';
-import { ObjectId } from '@mikro-orm/mongodb';
-
-/**
- * Abstract class representing a base entity.
- */
-declare abstract class MongoBaseEntity {
-    /**
-     * The serialized unique identifier for the entity.
-     *
-     * @type {string}
-     * @readonly
-     */
-    _id: ObjectId;
-    /**
-     * The unique identifier for the entity.
-     *
-     * @type {string}
-     * @readonly
-     */
-    id: string;
-    /**
-     * The date when the entity was created.
-     *
-     * @type {Date}
-     */
-    createdAt: Date;
-    /**
-     * The date when the entity was last updated.
-     *
-     * @type {Date}
-     * @readonly
-     */
-    updatedAt: Date;
-}
-
-export { MongoBaseEntity };

package/lib/database/index.d.ts

@@ -1,37 +0,0 @@
-export { B as BaseEntity } from '../base.entity-DNfmMOgd.js';
-import { ObjectId } from '@mikro-orm/mongodb';
-
-/**
- * Abstract class representing a base entity.
- */
-declare abstract class MongoBaseEntity {
-    /**
-     * The serialized unique identifier for the entity.
-     *
-     * @type {string}
-     * @readonly
-     */
-    _id: ObjectId;
-    /**
-     * The unique identifier for the entity.
-     *
-     * @type {string}
-     * @readonly
-     */
-    id: string;
-    /**
-     * The date when the entity was created.
-     *
-     * @type {Date}
-     */
-    createdAt: Date;
-    /**
-     * The date when the entity was last updated.
-     *
-     * @type {Date}
-     * @readonly
-     */
-    updatedAt: Date;
-}
-
-export { MongoBaseEntity };

package/lib/database/index.js

@@ -1,78 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __decorateClass = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
-  for (var i = decorators.length - 1, decorator; i >= 0; i--)
-    if (decorator = decorators[i])
-      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result) __defProp(target, key, result);
-  return result;
-};
-
-// src/database/index.ts
-var database_exports = {};
-__export(database_exports, {
-  BaseEntity: () => BaseEntity,
-  MongoBaseEntity: () => MongoBaseEntity
-});
-module.exports = __toCommonJS(database_exports);
-
-// src/database/mikro/models/entities/base.entity.ts
-var import_uuid = require("uuid");
-var import_core = require("@mikro-orm/core");
-var BaseEntity = class {
-  id = (0, import_uuid.v4)();
-  createdAt = /* @__PURE__ */ new Date();
-  updatedAt = /* @__PURE__ */ new Date();
-};
-__decorateClass([
-  (0, import_core.PrimaryKey)({ type: "uuid" })
-], BaseEntity.prototype, "id", 2);
-__decorateClass([
-  (0, import_core.Property)()
-], BaseEntity.prototype, "createdAt", 2);
-__decorateClass([
-  (0, import_core.Property)({ onUpdate: () => /* @__PURE__ */ new Date() })
-], BaseEntity.prototype, "updatedAt", 2);
-
-// src/database/mikro/models/entities/mongo.base.entity.ts
-var import_core2 = require("@mikro-orm/core");
-var MongoBaseEntity = class {
-  _id;
-  id;
-  createdAt = /* @__PURE__ */ new Date();
-  updatedAt = /* @__PURE__ */ new Date();
-};
-__decorateClass([
-  (0, import_core2.PrimaryKey)()
-], MongoBaseEntity.prototype, "_id", 2);
-__decorateClass([
-  (0, import_core2.SerializedPrimaryKey)()
-], MongoBaseEntity.prototype, "id", 2);
-__decorateClass([
-  (0, import_core2.Property)()
-], MongoBaseEntity.prototype, "createdAt", 2);
-__decorateClass([
-  (0, import_core2.Property)({ onUpdate: () => /* @__PURE__ */ new Date() })
-], MongoBaseEntity.prototype, "updatedAt", 2);
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BaseEntity,
-  MongoBaseEntity
-});