fix: update tests & deepMerge

Author: tunnckoCore

README.md

@@ -1,6 +1,6 @@
 # Zagora
 
-[![ci](https://github.com/tunnckoCore/zagora/actions/workflows/ci.yml/badge.svg)](https://github.com/tunnckoCore/zagora/actions/workflows/ci.yml) <!-- COV_BADGE:START -->![coverage](https://badgen.net/badge/coverage/99.49%25/99CC09)<!-- COV_BADGE:END -->
+[![ci](https://github.com/tunnckoCore/zagora/actions/workflows/ci.yml/badge.svg)](https://github.com/tunnckoCore/zagora/actions/workflows/ci.yml) <!-- COV_BADGE:START -->![coverage](https://badgen.net/badge/coverage/98.32%25/99CC09)<!-- COV_BADGE:END -->
 
 Elevate your TypeScript workflow with Zagora: a sleek, bulletproof toolkit for forging type-safe, error-proof functions and libraries that never throw. Powered by StandardSchema-compliant validators like Zod, Valibot, and Arktype, it delivers rock-solid input/output validation and richly typed errors. No routers, no network baggage — just pure, exportable functions ready to supercharge your code. The ultimate streamlined alternative to oRPC and tRPC, stripping away the network layer for unmatched type-safety, simplicity and robustness.
 

src/index.ts

@@ -323,7 +323,7 @@ export class Zagora<
     const envVarsMapSchema = zagora.envVarsMapSchema;
     const baseEnvVars = zagora.envVars;
 
-    const mergedEnvVars = baseEnvVars ? deepMerge(baseEnvVars, env) : env;
+    const mergedEnvVars = deepMerge(baseEnvVars || {}, env || {});
 
     // biome-ignore lint/complexity/noExcessiveCognitiveComplexity: -- ok
     const forwardProcedure = (...args: unknown[]) => {

src/utils.ts

@@ -268,19 +268,30 @@ export function handleTupleDefaults(
 
   return rawArgs;
 }
+function isPlainObject(obj: any) {
+  return obj && typeof obj === "object";
+}
+
+export function deepMerge(aaa: any, bbb: any) {
+  if (!isPlainObject(aaa)) {
+    throw new Error("Expects an object args");
+  }
+
+  const result = { ...aaa };
 
-export function deepMerge(target: any, source: any): any {
-  if (source == null || typeof source !== "object") return source;
-  if (target == null || typeof target !== "object") return source;
-  const result = Array.isArray(target) ? [...target] : { ...target };
-  for (const key in source) {
-    if (Object.hasOwn(source, key)) {
-      if (typeof source[key] === "object" && source[key] !== null) {
-        result[key] = deepMerge(target[key], source[key]);
+  if (!isPlainObject(bbb)) {
+    return result;
+  }
+
+  for (const key in bbb) {
+    if (Object.hasOwn(bbb, key)) {
+      if (isPlainObject(result[key]) && isPlainObject(bbb[key])) {
+        result[key] = deepMerge(result[key], bbb[key]);
       } else {
-        result[key] = source[key];
+        result[key] = bbb[key];
       }
     }
   }
+
   return result;
 }

test/types-testing.test.ts

@@ -703,6 +703,7 @@ test("should have ~zagora property typed correctly on buiulder and on callable",
   const _inputSchema = meta.inputSchema;
   const _outputSchema = meta.outputSchema;
   const _errorsMap = meta.errorsMap;
+  const _envMap = meta.envVarsMapSchema;
 
   const builder = zagora()
     .input(z.string())
@@ -715,6 +716,7 @@ test("should have ~zagora property typed correctly on buiulder and on callable",
   const _in = metaFromBuilder.inputSchema;
   const _out = metaFromBuilder.outputSchema;
   const _err = metaFromBuilder.errorsMap;
+  const _env = metaFromBuilder.envVarsMapSchema;
 });
 
 test("SpreadTuple works for 4-argument tuple", () => {

test/utils.test.ts

@@ -30,8 +30,7 @@ test("validateInputOutput - async validation success path (line 82)", async () =
     .output(z.string())
     .handler((input) => input.toUpperCase());
 
-  // TODO / DOCUMENT: Having an ASYNC validation at any place,
-  //                  always require the procedure to be awaited
+  // NOTE: Having an ASYNC validation at any place, always require the procedure to be awaited
   const res = await fn("valid");
 
   expect(res.ok).toBe(true);
@@ -132,29 +131,3 @@ test("deepMerge - merge nested objects", () => {
   expect(result.b.e).toBe(5);
   expect(result.f).toBe(6);
 });
-
-test("deepMerge - merge arrays", () => {
-  const target = [1, 2, 3];
-  const source = [4, 5];
-  const result = deepMerge(target, source);
-
-  expect(result).toEqual([4, 5, 3]);
-});
-
-test("deepMerge - source is null", () => {
-  const target = { a: 1 };
-  const result = deepMerge(target, null);
-  expect(result).toBe(null);
-});
-
-test("deepMerge - target is null", () => {
-  const source = { a: 1 };
-  const result = deepMerge(null, source);
-  expect(result).toEqual({ a: 1 });
-});
-
-test("deepMerge - source is primitive", () => {
-  const target = { a: 1 };
-  const result = deepMerge(target, "string");
-  expect(result).toBe("string");
-});