@bgord/bun 1.4.14 → 1.4.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bgord/bun",
-  "version": "1.4.14",
+  "version": "1.4.15",
   "license": "MIT",
   "type": "module",
   "author": "Bartosz Gordon",

package/src/environment-validator.service.ts

@@ -1,32 +1,16 @@
 import type { z } from "zod/v4";
-import { NodeEnvironment } from "../src/node-env.vo";
+import { NodeEnvironment, type NodeEnvironmentEnum } from "../src/node-env.vo";
 
-type NodeEnvironmentEnumType = z.infer<typeof NodeEnvironment>;
-type AnyZodSchema = z.ZodSchema<any, any>;
-type EnvironmentValidatorConfig = { type: unknown; schema: AnyZodSchema };
+export class EnvironmentValidator<Schema extends z.ZodObject<any>> {
+  private readonly type: NodeEnvironmentEnum;
+  private readonly schema: Schema;
 
-export type EnvironmentResultType<SchemaType> = SchemaType & { type: NodeEnvironmentEnumType };
-
-export const EnvironmentValidatorError = { Invalid: "environment.validator.invalid" } as const;
-
-export class EnvironmentValidator<SchemaType> {
-  type: NodeEnvironmentEnumType;
-  schema: z.Schema<SchemaType>;
-
-  constructor(config: EnvironmentValidatorConfig) {
+  constructor(config: { type: string | undefined; schema: Schema }) {
     this.schema = config.schema;
-
-    const result = NodeEnvironment.safeParse(config.type);
-
-    if (result.success) {
-      this.type = result.data;
-      return;
-    }
-
-    throw new Error(EnvironmentValidatorError.Invalid);
+    this.type = NodeEnvironment.parse(config.type);
   }
 
-  load(): EnvironmentResultType<SchemaType> {
-    return { ...this.schema.parse(process.env), type: this.type };
+  load(env: NodeJS.ProcessEnv): z.infer<Schema> & { type: NodeEnvironmentEnum } {
+    return { ...this.schema.parse(env), type: this.type };
   }
 }

package/src/node-env.vo.ts

@@ -7,4 +7,6 @@ export enum NodeEnvironmentEnum {
   production = "production",
 }
 
-export const NodeEnvironment = z.enum(NodeEnvironmentEnum);
+export const NodeEnvironmentError = { Invalid: "node.environment.invalid" } as const;
+
+export const NodeEnvironment = z.enum(NodeEnvironmentEnum, { error: NodeEnvironmentError.Invalid });