Light refactoring

Author: benjie

src/index.ts

@@ -37,12 +37,8 @@ function toeObj<TData extends Record<string, any>>(
   for (const key of Object.keys(data)) {
     const value = data[key];
     if (keys.includes(key)) {
-      // Guaranteed to have at least one entry
-      const filteredErrors = errors.filter((e) => e.path[depth] === key);
-
-      if (value === null) {
-        // CONSIDER: error wrap? E.g. so it's `instanceof Error`?
-        const error = filteredErrors[0];
+      if (value == null) {
+        const error = errors.find((e) => e.path[depth] === key);
         // This is where the error is!
         // obj[key] = value;
         Object.defineProperty(obj, key, {
@@ -52,12 +48,12 @@ function toeObj<TData extends Record<string, any>>(
           },
         });
       } else {
+        // Guaranteed to have at least one entry
+        const filteredErrors = errors.filter((e) => e.path[depth] === key);
         // Recurse
-        if (Array.isArray(value)) {
-          obj[key] = toeArr(value, depth + 1, filteredErrors) as any;
-        } else {
-          obj[key] = toeObj(value, depth + 1, filteredErrors);
-        }
+        obj[key] = Array.isArray(value)
+          ? (toeArr(value, depth + 1, filteredErrors) as any)
+          : toeObj(value, depth + 1, filteredErrors);
       }
     } else {
       obj[key] = value;
@@ -77,12 +73,8 @@ function toeArr<TData>(
   for (let index = 0, l = data.length; index < l; index++) {
     const value = data[index];
     if (keys.includes(index)) {
-      // Guaranteed to have at least one entry
-      const filteredErrors = errors.filter((e) => e.path[depth] === index);
-
-      if (value === null) {
-        // CONSIDER: error wrap? E.g. so it's `instanceof Error`?
-        const error = filteredErrors[0];
+      if (value == null) {
+        const error = errors.find((e) => e.path[depth] === index);
         // This is where the error is!
         // arr[index] = value;
         Object.defineProperty(arr, index, {
@@ -92,12 +84,12 @@ function toeArr<TData>(
           },
         });
       } else {
+        // Guaranteed to have at least one entry
+        const filteredErrors = errors.filter((e) => e.path[depth] === index);
         // Recurse
-        if (Array.isArray(value)) {
-          arr[index] = toeArr(value, depth + 1, filteredErrors);
-        } else {
-          arr[index] = toeObj(value as any, depth + 1, filteredErrors);
-        }
+        arr[index] = Array.isArray(value)
+          ? toeArr(value, depth + 1, filteredErrors)
+          : toeObj(value as any, depth + 1, filteredErrors);
       }
     } else {
       arr[index] = value;