@forklaunch/core 0.3.0 → 0.3.1

package/lib/dtoMapper/index.js

@@ -25,7 +25,11 @@ __export(dtoMapper_exports, {
 });
 module.exports = __toCommonJS(dtoMapper_exports);
 
+// src/dtoMapper/models/requestDtoMapper.model.ts
+var import_validator2 = require("@forklaunch/validator");
+
 // src/dtoMapper/models/baseDtoMapper.model.ts
+var import_validator = require("@forklaunch/validator");
 function construct(self, schemaValidator) {
   return new self(schemaValidator || {});
 }
@@ -67,7 +71,7 @@ var BaseDtoMapper = class {
       _dto
     );
     if (!parsedSchema.ok) {
-      throw new Error(`Invalid DTO: ${parsedSchema.error}`);
+      throw new Error((0, import_validator.prettyPrintParseErrors)(parsedSchema.errors, "DTO"));
     }
     this._dto = _dto;
   }
@@ -112,7 +116,7 @@ var RequestDtoMapper = class extends BaseDtoMapper {
       json
     );
     if (!parsedSchema.ok) {
-      throw new Error(`Invalid DTO: ${parsedSchema.error}`);
+      throw new Error((0, import_validator2.prettyPrintParseErrors)(parsedSchema.errors, "DTO"));
     }
     this.dto = json;
     return this;
@@ -159,6 +163,7 @@ var RequestDtoMapper = class extends BaseDtoMapper {
 };
 
 // src/dtoMapper/models/responseDtoMapper.model.ts
+var import_validator3 = require("@forklaunch/validator");
 var ResponseDtoMapper = class extends BaseDtoMapper {
   /**
    * The entity type.
@@ -178,7 +183,7 @@ var ResponseDtoMapper = class extends BaseDtoMapper {
       this.dto
     );
     if (!parsedSchema.ok) {
-      throw new Error(`Invalid DTO: ${parsedSchema.error}`);
+      throw new Error((0, import_validator3.prettyPrintParseErrors)(parsedSchema.errors, "DTO"));
     }
     return this.dto;
   }

package/lib/dtoMapper/index.mjs

@@ -1,4 +1,12 @@
+// src/dtoMapper/models/requestDtoMapper.model.ts
+import {
+  prettyPrintParseErrors as prettyPrintParseErrors2
+} from "@forklaunch/validator";
+
 // src/dtoMapper/models/baseDtoMapper.model.ts
+import {
+  prettyPrintParseErrors
+} from "@forklaunch/validator";
 function construct(self, schemaValidator) {
   return new self(schemaValidator || {});
 }
@@ -40,7 +48,7 @@ var BaseDtoMapper = class {
       _dto
     );
     if (!parsedSchema.ok) {
-      throw new Error(`Invalid DTO: ${parsedSchema.error}`);
+      throw new Error(prettyPrintParseErrors(parsedSchema.errors, "DTO"));
     }
     this._dto = _dto;
   }
@@ -85,7 +93,7 @@ var RequestDtoMapper = class extends BaseDtoMapper {
       json
     );
     if (!parsedSchema.ok) {
-      throw new Error(`Invalid DTO: ${parsedSchema.error}`);
+      throw new Error(prettyPrintParseErrors2(parsedSchema.errors, "DTO"));
     }
     this.dto = json;
     return this;
@@ -132,6 +140,9 @@ var RequestDtoMapper = class extends BaseDtoMapper {
 };
 
 // src/dtoMapper/models/responseDtoMapper.model.ts
+import {
+  prettyPrintParseErrors as prettyPrintParseErrors3
+} from "@forklaunch/validator";
 var ResponseDtoMapper = class extends BaseDtoMapper {
   /**
    * The entity type.
@@ -151,7 +162,7 @@ var ResponseDtoMapper = class extends BaseDtoMapper {
       this.dto
     );
     if (!parsedSchema.ok) {
-      throw new Error(`Invalid DTO: ${parsedSchema.error}`);
+      throw new Error(prettyPrintParseErrors3(parsedSchema.errors, "DTO"));
     }
     return this.dto;
   }

package/lib/http/index.js

@@ -271,6 +271,9 @@ function enrichDetails(contractDetails, requestSchema, responseSchemas) {
   };
 }
 
+// src/http/middleware/request/parse.middleware.ts
+var import_validator = require("@forklaunch/validator");
+
 // src/http/guards/isResponseShape.ts
 function isResponseShape(maybeResponseShape) {
   return maybeResponseShape != null && "body" in maybeResponseShape && "query" in maybeResponseShape && "params" in maybeResponseShape && "headers" in maybeResponseShape;
@@ -296,10 +299,12 @@ function parse(req, _res, next) {
     switch (req.contractDetails.options?.requestValidation) {
       default:
       case "error":
-        next?.(new Error(`Invalid request: ${parsedRequest.error}`));
+        next?.(
+          new Error((0, import_validator.prettyPrintParseErrors)(parsedRequest.errors, "Request"))
+        );
         break;
       case "warning":
-        console.warn(`Invalid request: ${parsedRequest.error}`);
+        console.warn((0, import_validator.prettyPrintParseErrors)(parsedRequest.errors, "Request"));
         break;
       case "none":
         break;
@@ -2004,10 +2009,7 @@ function generateSwaggerDocument(schemaValidator, port, routers) {
       description: `${controllerName} Operations`
     });
     router.routes.forEach((route) => {
-      const fullPath = `${router.basePath}${route.path === "/" ? "" : route.path}`.replace(
-        /:(\w+)/g,
-        "{$1}"
-      );
+      const fullPath = `${router.basePath}${route.path === "/" ? "" : route.path}`.replace(/:(\w+)/g, "{$1}");
       if (!paths[fullPath]) {
         paths[fullPath] = {};
       }
@@ -2087,6 +2089,7 @@ function generateSwaggerDocument(schemaValidator, port, routers) {
 }
 
 // src/http/middleware/response/parse.middleware.ts
+var import_validator2 = require("@forklaunch/validator");
 function parse2(req, res, next) {
   console.debug("[MIDDLEWARE] parseResponse started");
   const { headers, responses } = res.responseSchemas;
@@ -2100,14 +2103,19 @@ function parse2(req, res, next) {
   );
   const parseErrors = [];
   if (!parsedHeaders.ok) {
-    parseErrors.push(
-      `${parsedHeaders.error ? `Header ${parsedHeaders.error}` : ""}`
-    );
+    const headerErrors = (0, import_validator2.prettyPrintParseErrors)(parsedHeaders.errors, "Header");
+    if (headerErrors) {
+      parseErrors.push(headerErrors);
+    }
   }
   if (!parsedResponse.ok) {
-    parseErrors.push(
-      `${parsedResponse.error ? `Response ${parsedResponse.error}` : ""}`
+    const responseErrors = (0, import_validator2.prettyPrintParseErrors)(
+      parsedResponse.errors,
+      "Response"
     );
+    if (responseErrors) {
+      parseErrors.push(responseErrors);
+    }
   }
   if (parseErrors.length > 0) {
     switch (req.contractDetails.options?.responseValidation) {

package/lib/http/index.mjs

@@ -213,6 +213,11 @@ function enrichDetails(contractDetails, requestSchema, responseSchemas) {
   };
 }
 
+// src/http/middleware/request/parse.middleware.ts
+import {
+  prettyPrintParseErrors
+} from "@forklaunch/validator";
+
 // src/http/guards/isResponseShape.ts
 function isResponseShape(maybeResponseShape) {
   return maybeResponseShape != null && "body" in maybeResponseShape && "query" in maybeResponseShape && "params" in maybeResponseShape && "headers" in maybeResponseShape;
@@ -238,10 +243,12 @@ function parse(req, _res, next) {
     switch (req.contractDetails.options?.requestValidation) {
       default:
       case "error":
-        next?.(new Error(`Invalid request: ${parsedRequest.error}`));
+        next?.(
+          new Error(prettyPrintParseErrors(parsedRequest.errors, "Request"))
+        );
         break;
       case "warning":
-        console.warn(`Invalid request: ${parsedRequest.error}`);
+        console.warn(prettyPrintParseErrors(parsedRequest.errors, "Request"));
         break;
       case "none":
         break;
@@ -1946,10 +1953,7 @@ function generateSwaggerDocument(schemaValidator, port, routers) {
       description: `${controllerName} Operations`
     });
     router.routes.forEach((route) => {
-      const fullPath = `${router.basePath}${route.path === "/" ? "" : route.path}`.replace(
-        /:(\w+)/g,
-        "{$1}"
-      );
+      const fullPath = `${router.basePath}${route.path === "/" ? "" : route.path}`.replace(/:(\w+)/g, "{$1}");
       if (!paths[fullPath]) {
         paths[fullPath] = {};
       }
@@ -2029,6 +2033,9 @@ function generateSwaggerDocument(schemaValidator, port, routers) {
 }
 
 // src/http/middleware/response/parse.middleware.ts
+import {
+  prettyPrintParseErrors as prettyPrintParseErrors2
+} from "@forklaunch/validator";
 function parse2(req, res, next) {
   console.debug("[MIDDLEWARE] parseResponse started");
   const { headers, responses } = res.responseSchemas;
@@ -2042,14 +2049,19 @@ function parse2(req, res, next) {
   );
   const parseErrors = [];
   if (!parsedHeaders.ok) {
-    parseErrors.push(
-      `${parsedHeaders.error ? `Header ${parsedHeaders.error}` : ""}`
-    );
+    const headerErrors = prettyPrintParseErrors2(parsedHeaders.errors, "Header");
+    if (headerErrors) {
+      parseErrors.push(headerErrors);
+    }
   }
   if (!parsedResponse.ok) {
-    parseErrors.push(
-      `${parsedResponse.error ? `Response ${parsedResponse.error}` : ""}`
+    const responseErrors = prettyPrintParseErrors2(
+      parsedResponse.errors,
+      "Response"
     );
+    if (responseErrors) {
+      parseErrors.push(responseErrors);
+    }
   }
   if (parseErrors.length > 0) {
     switch (req.contractDetails.options?.responseValidation) {

package/lib/services/index.d.mts

@@ -22,6 +22,9 @@ type ConfigValidator<SV extends AnySchemaValidator> = Record<string, Function |
 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 ValidResolvedConfigValidator<SV extends AnySchemaValidator, CV extends ConfigValidator<SV>> = ResolvedConfigValidator<SV, CV> & {
+    validResolvedConfigValidator: void;
+};
 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>> {
@@ -36,13 +39,15 @@ declare class ConfigInjector<SV extends AnySchemaValidator, CV extends ConfigVal
     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(config: Partial<ResolvedConfigValidator<SV, CV>>): ParseResult<unknown>;
+    validateConfigSingletons(): ParseResult<ValidResolvedConfigValidator<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 function getEnvVar(name: string): string;
+
 /**
  * Interface representing a base service.
  *
@@ -61,4 +66,4 @@ type 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 };
+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 ValidResolvedConfigValidator, getEnvVar };

package/lib/services/index.d.ts

@@ -22,6 +22,9 @@ type ConfigValidator<SV extends AnySchemaValidator> = Record<string, Function |
 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 ValidResolvedConfigValidator<SV extends AnySchemaValidator, CV extends ConfigValidator<SV>> = ResolvedConfigValidator<SV, CV> & {
+    validResolvedConfigValidator: void;
+};
 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>> {
@@ -36,13 +39,15 @@ declare class ConfigInjector<SV extends AnySchemaValidator, CV extends ConfigVal
     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(config: Partial<ResolvedConfigValidator<SV, CV>>): ParseResult<unknown>;
+    validateConfigSingletons(): ParseResult<ValidResolvedConfigValidator<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 function getEnvVar(name: string): string;
+
 /**
  * Interface representing a base service.
  *
@@ -61,4 +66,4 @@ type 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 };
+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 ValidResolvedConfigValidator, getEnvVar };

package/lib/services/index.js

@@ -21,13 +21,24 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var services_exports = {};
 __export(services_exports, {
   ConfigInjector: () => ConfigInjector,
-  Lifetime: () => Lifetime
+  Lifetime: () => Lifetime,
+  getEnvVar: () => getEnvVar
 });
 module.exports = __toCommonJS(services_exports);
 
 // src/services/configInjector.ts
 var import_common = require("@forklaunch/common");
 
+// src/services/guards/isConstructed.ts
+function isConstructed(value) {
+  return typeof value === "object" && value != null && "constructor" in value && value.constructor != null;
+}
+
+// src/services/guards/isConstructor.ts
+function isConstructor(value) {
+  return typeof value === "function" && value.constructor != null && value.prototype != null;
+}
+
 // src/services/types/configInjector.types.ts
 var Lifetime = /* @__PURE__ */ ((Lifetime2) => {
   Lifetime2[Lifetime2["Singleton"] = 0] = "Singleton";
@@ -64,7 +75,9 @@ var ConfigInjector = class _ConfigInjector {
     }
     if (!injectorArgument.startsWith("{") || !injectorArgument.endsWith("}")) {
       throw new Error(
-        `Invalid injector argument for ${String(token)}: ${injectorArgument}. Please use object destructuring syntax: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment.`
+        `Invalid injector argument for ${String(
+          token
+        )}: ${injectorArgument}. Please use object destructuring syntax: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment.`
       );
     }
     const resolvedArguments = Object.fromEntries(
@@ -72,7 +85,9 @@ var ConfigInjector = class _ConfigInjector {
         const newResolutionPath = [...resolutionPath, token];
         if (resolutionPath.includes(arg)) {
           throw new Error(
-            `Circular dependency detected: ${newResolutionPath.join(" -> ")} -> ${arg}`
+            `Circular dependency detected: ${newResolutionPath.join(
+              " -> "
+            )} -> ${arg}`
           );
         }
         const resolvedArg = this.resolve(arg, context, newResolutionPath);
@@ -85,17 +100,78 @@ var ConfigInjector = class _ConfigInjector {
       context ?? {}
     );
   }
-  validateConfigSingletons(config) {
-    return this.schemaValidator.parse(
-      this.schemaValidator.schemify(
-        Object.fromEntries(
-          Object.entries(this.configShapes).filter(
-            ([key, value]) => this.dependenciesDefinition[key].lifetime === 0 /* Singleton */ && this.schemaValidator.isSchema(value)
-          )
-        )
-      ),
-      config
+  validateConfigSingletons() {
+    const validNonSchemaSingletons = Object.entries(this.configShapes).reduce(
+      (acc, [key, value]) => {
+        if (this.dependenciesDefinition[key].lifetime === 0 /* Singleton */ && !this.schemaValidator.isSchema(value) && isConstructor(value)) {
+          if (!(this.dependenciesDefinition[key].value instanceof value)) {
+            const expected = value.name;
+            const receivedValue = this.dependenciesDefinition[key].value;
+            const received = isConstructed(receivedValue) ? receivedValue.constructor.name : typeof receivedValue;
+            if (acc.ok) {
+              acc = {
+                ok: false,
+                errors: []
+              };
+            }
+            acc.errors?.push({
+              message: `Expected ${expected}, received ${received}`,
+              path: [key]
+            });
+          } else {
+            if (acc.ok) {
+              acc = {
+                ok: true,
+                value: {
+                  ...acc.value,
+                  [key]: this.dependenciesDefinition[key].value
+                }
+              };
+            }
+          }
+          return acc;
+        }
+        return acc;
+      },
+      {
+        ok: true,
+        value: {}
+      }
     );
+    const singletons = Object.fromEntries(
+      Object.entries(this.configShapes).filter(
+        ([key, value]) => this.dependenciesDefinition[key].lifetime === 0 /* Singleton */ && this.schemaValidator.isSchema(value)
+      )
+    );
+    const schemaSingletonParseResult = this.schemaValidator.parse(
+      this.schemaValidator.schemify(singletons),
+      Object.fromEntries(
+        Object.keys(singletons).map((key) => {
+          const dependency = this.dependenciesDefinition[key];
+          return [
+            key,
+            dependency.lifetime === 0 /* Singleton */ ? dependency.value : void 0
+          ];
+        })
+      )
+    );
+    const configKeys = Object.keys(this.configShapes);
+    return validNonSchemaSingletons.ok && schemaSingletonParseResult.ok ? {
+      ok: true,
+      value: {
+        validResolvedConfigValidator: void 0,
+        ...validNonSchemaSingletons.value,
+        ...schemaSingletonParseResult.value
+      }
+    } : {
+      ok: false,
+      errors: [
+        ...!validNonSchemaSingletons.ok && validNonSchemaSingletons.errors ? validNonSchemaSingletons.errors : [],
+        ...!schemaSingletonParseResult.ok && schemaSingletonParseResult.errors ? schemaSingletonParseResult.errors : []
+      ].sort(
+        (a, b) => configKeys.indexOf(a.path[0]) - configKeys.indexOf(b.path[0])
+      )
+    };
   }
   resolve(token, context, resolutionPath = []) {
     const instance = this.instances[token];
@@ -129,7 +205,9 @@ var ConfigInjector = class _ConfigInjector {
         default: {
           (0, import_common.isNever)(definition);
           throw new Error(
-            `Unable to resolve lifetime for dependency ${String(token)}, ${resolutionPath}`
+            `Unable to resolve lifetime for dependency ${String(
+              token
+            )}, ${resolutionPath}`
           );
         }
       }
@@ -152,8 +230,15 @@ var ConfigInjector = class _ConfigInjector {
     this.loadSingletons();
   }
 };
+
+// src/services/getEnvVar.ts
+function getEnvVar(name) {
+  const value = process.env[name];
+  return value;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ConfigInjector,
-  Lifetime
+  Lifetime,
+  getEnvVar
 });

package/lib/services/index.mjs

@@ -1,6 +1,16 @@
 // src/services/configInjector.ts
 import { extractArgumentNames, isNever } from "@forklaunch/common";
 
+// src/services/guards/isConstructed.ts
+function isConstructed(value) {
+  return typeof value === "object" && value != null && "constructor" in value && value.constructor != null;
+}
+
+// src/services/guards/isConstructor.ts
+function isConstructor(value) {
+  return typeof value === "function" && value.constructor != null && value.prototype != null;
+}
+
 // src/services/types/configInjector.types.ts
 var Lifetime = /* @__PURE__ */ ((Lifetime2) => {
   Lifetime2[Lifetime2["Singleton"] = 0] = "Singleton";
@@ -37,7 +47,9 @@ var ConfigInjector = class _ConfigInjector {
     }
     if (!injectorArgument.startsWith("{") || !injectorArgument.endsWith("}")) {
       throw new Error(
-        `Invalid injector argument for ${String(token)}: ${injectorArgument}. Please use object destructuring syntax: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment.`
+        `Invalid injector argument for ${String(
+          token
+        )}: ${injectorArgument}. Please use object destructuring syntax: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment.`
       );
     }
     const resolvedArguments = Object.fromEntries(
@@ -45,7 +57,9 @@ var ConfigInjector = class _ConfigInjector {
         const newResolutionPath = [...resolutionPath, token];
         if (resolutionPath.includes(arg)) {
           throw new Error(
-            `Circular dependency detected: ${newResolutionPath.join(" -> ")} -> ${arg}`
+            `Circular dependency detected: ${newResolutionPath.join(
+              " -> "
+            )} -> ${arg}`
           );
         }
         const resolvedArg = this.resolve(arg, context, newResolutionPath);
@@ -58,17 +72,78 @@ var ConfigInjector = class _ConfigInjector {
       context ?? {}
     );
   }
-  validateConfigSingletons(config) {
-    return this.schemaValidator.parse(
-      this.schemaValidator.schemify(
-        Object.fromEntries(
-          Object.entries(this.configShapes).filter(
-            ([key, value]) => this.dependenciesDefinition[key].lifetime === 0 /* Singleton */ && this.schemaValidator.isSchema(value)
-          )
-        )
-      ),
-      config
+  validateConfigSingletons() {
+    const validNonSchemaSingletons = Object.entries(this.configShapes).reduce(
+      (acc, [key, value]) => {
+        if (this.dependenciesDefinition[key].lifetime === 0 /* Singleton */ && !this.schemaValidator.isSchema(value) && isConstructor(value)) {
+          if (!(this.dependenciesDefinition[key].value instanceof value)) {
+            const expected = value.name;
+            const receivedValue = this.dependenciesDefinition[key].value;
+            const received = isConstructed(receivedValue) ? receivedValue.constructor.name : typeof receivedValue;
+            if (acc.ok) {
+              acc = {
+                ok: false,
+                errors: []
+              };
+            }
+            acc.errors?.push({
+              message: `Expected ${expected}, received ${received}`,
+              path: [key]
+            });
+          } else {
+            if (acc.ok) {
+              acc = {
+                ok: true,
+                value: {
+                  ...acc.value,
+                  [key]: this.dependenciesDefinition[key].value
+                }
+              };
+            }
+          }
+          return acc;
+        }
+        return acc;
+      },
+      {
+        ok: true,
+        value: {}
+      }
     );
+    const singletons = Object.fromEntries(
+      Object.entries(this.configShapes).filter(
+        ([key, value]) => this.dependenciesDefinition[key].lifetime === 0 /* Singleton */ && this.schemaValidator.isSchema(value)
+      )
+    );
+    const schemaSingletonParseResult = this.schemaValidator.parse(
+      this.schemaValidator.schemify(singletons),
+      Object.fromEntries(
+        Object.keys(singletons).map((key) => {
+          const dependency = this.dependenciesDefinition[key];
+          return [
+            key,
+            dependency.lifetime === 0 /* Singleton */ ? dependency.value : void 0
+          ];
+        })
+      )
+    );
+    const configKeys = Object.keys(this.configShapes);
+    return validNonSchemaSingletons.ok && schemaSingletonParseResult.ok ? {
+      ok: true,
+      value: {
+        validResolvedConfigValidator: void 0,
+        ...validNonSchemaSingletons.value,
+        ...schemaSingletonParseResult.value
+      }
+    } : {
+      ok: false,
+      errors: [
+        ...!validNonSchemaSingletons.ok && validNonSchemaSingletons.errors ? validNonSchemaSingletons.errors : [],
+        ...!schemaSingletonParseResult.ok && schemaSingletonParseResult.errors ? schemaSingletonParseResult.errors : []
+      ].sort(
+        (a, b) => configKeys.indexOf(a.path[0]) - configKeys.indexOf(b.path[0])
+      )
+    };
   }
   resolve(token, context, resolutionPath = []) {
     const instance = this.instances[token];
@@ -102,7 +177,9 @@ var ConfigInjector = class _ConfigInjector {
         default: {
           isNever(definition);
           throw new Error(
-            `Unable to resolve lifetime for dependency ${String(token)}, ${resolutionPath}`
+            `Unable to resolve lifetime for dependency ${String(
+              token
+            )}, ${resolutionPath}`
           );
         }
       }
@@ -125,7 +202,14 @@ var ConfigInjector = class _ConfigInjector {
     this.loadSingletons();
   }
 };
+
+// src/services/getEnvVar.ts
+function getEnvVar(name) {
+  const value = process.env[name];
+  return value;
+}
 export {
   ConfigInjector,
-  Lifetime
+  Lifetime,
+  getEnvVar
 };

package/package.json

@@ -1,52 +1,17 @@
 {
   "name": "@forklaunch/core",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "forklaunch-js core package. Contains useful building blocks.",
-  "files": [
-    "lib"
-  ],
-  "types": "lib/index.d.ts",
-  "author": "Rohin Bhargava",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/forklaunch/forklaunch-js.git"
-  },
+  "homepage": "https://github.com/forklaunch/forklaunch-js#readme",
   "bugs": {
     "url": "https://github.com/forklaunch/forklaunch-js/issues"
   },
-  "homepage": "https://github.com/forklaunch/forklaunch-js#readme",
-  "dependencies": {
-    "@mikro-orm/core": "^6.4.3",
-    "@mikro-orm/mongodb": "^6.4.3",
-    "cors": "^2.8.5",
-    "jose": "^5.9.6",
-    "openapi3-ts": "^4.4.0",
-    "redis": "^4.7.0",
-    "uuid": "^11.0.5",
-    "@forklaunch/common": "0.2.0",
-    "@forklaunch/validator": "0.4.0"
-  },
-  "devDependencies": {
-    "@eslint/js": "^9.17.0",
-    "@types/cors": "^2.8.17",
-    "@types/jest": "^29.5.14",
-    "@types/qs": "^6.9.17",
-    "@types/uuid": "^10.0.0",
-    "globals": "^15.14.0",
-    "jest": "^29.7.0",
-    "prettier": "^3.4.2",
-    "testcontainers": "^10.16.0",
-    "ts-jest": "^29.2.5",
-    "ts-node": "^10.9.2",
-    "tsup": "^8.3.5",
-    "typedoc": "^0.27.6",
-    "typescript": "^5.7.3",
-    "typescript-eslint": "^8.19.1"
-  },
-  "directories": {
-    "test": "tests"
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/forklaunch/forklaunch-js.git"
   },
+  "license": "MIT",
+  "author": "Rohin Bhargava",
   "exports": {
     "./cache": {
       "types": "./lib/cache/index.d.ts",
@@ -85,14 +50,49 @@
       "default": "./lib/services/index.js"
     }
   },
+  "types": "lib/index.d.ts",
+  "directories": {
+    "test": "tests"
+  },
+  "files": [
+    "lib"
+  ],
+  "dependencies": {
+    "@mikro-orm/core": "^6.4.3",
+    "@mikro-orm/mongodb": "^6.4.3",
+    "cors": "^2.8.5",
+    "jose": "^5.9.6",
+    "openapi3-ts": "^4.4.0",
+    "redis": "^4.7.0",
+    "uuid": "^11.0.5",
+    "@forklaunch/common": "0.2.0",
+    "@forklaunch/validator": "0.4.1"
+  },
+  "devDependencies": {
+    "@eslint/js": "^9.17.0",
+    "@types/cors": "^2.8.17",
+    "@types/jest": "^29.5.14",
+    "@types/qs": "^6.9.17",
+    "@types/uuid": "^10.0.0",
+    "globals": "^15.14.0",
+    "jest": "^29.7.0",
+    "prettier": "^3.4.2",
+    "testcontainers": "^10.16.0",
+    "ts-jest": "^29.2.5",
+    "ts-node": "^10.9.2",
+    "tsup": "^8.3.5",
+    "typedoc": "^0.27.6",
+    "typescript": "^5.7.3",
+    "typescript-eslint": "^8.19.1"
+  },
   "scripts": {
-    "test": "vitest --passWithNoTests",
     "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",
     "clean": "rm -rf lib pnpm.lock.yaml node_modules",
     "docs": "typedoc --out docs *",
+    "format": "prettier --ignore-path=.prettierignore --config .prettierrc '**/*.{ts,tsx,json}' --write",
     "lint": "eslint . -c eslint.config.mjs",
     "lint:fix": "eslint . -c eslint.config.mjs --fix",
-    "format": "prettier --ignore-path=.prettierignore --config .prettierrc '**/*.ts' --write",
-    "publish:package": "./publish-package.bash"
+    "publish:package": "./publish-package.bash",
+    "test": "vitest --passWithNoTests"
   }
 }