patch: mapFirst move breakout conditionals inside

ealush · Jun 14, 2022 · 28db6c7 · 28db6c7 · vercel · Jun 14, 2022
1 parent a6a86a7
commit 28db6c7
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 30 deletions.
diff --git a/packages/n4s/src/exports/compose.ts b/packages/n4s/src/exports/compose.ts
@@ -31,7 +31,7 @@ export default function compose(
           composites,
           (
             composite: LazyRuleRunners,
-            breakout: (res: RuleDetailedResult) => void
+            breakout: (conditional: boolean, res: RuleDetailedResult) => void
           ) => {
             /* HACK: Just a small white lie. ~~HELP WANTED~~.
                The ideal is that instead of `LazyRuleRunners` We would simply use `Lazy` to begin with.
@@ -41,9 +41,7 @@ export default function compose(
 
             const res = runLazyRule(composite, value);
 
-            if (!res.pass) {
-              breakout(res);
-            }
+            breakout(!res.pass, res);
           }
         )
       );

diff --git a/packages/n4s/src/plugins/compounds/allOf.ts b/packages/n4s/src/plugins/compounds/allOf.ts
@@ -9,9 +9,7 @@ export function allOf(value: unknown, ...rules: Lazy[]): RuleDetailedResult {
   return ruleReturn.defaultToPassing(
     mapFirst(rules, (rule, breakout) => {
       const res = runLazyRule(rule, value);
-      if (!res.pass) {
-        breakout(res);
-      }
+      breakout(!res.pass, res);
     })
   );
 }
diff --git a/packages/n4s/src/plugins/compounds/anyOf.ts b/packages/n4s/src/plugins/compounds/anyOf.ts
@@ -9,9 +9,7 @@ export function anyOf(value: unknown, ...rules: Lazy[]): RuleDetailedResult {
   return ruleReturn.defaultToFailing(
     mapFirst(rules, (rule, breakout) => {
       const res = runLazyRule(rule, value);
-      if (res.pass) {
-        breakout(res);
-      }
+      breakout(res.pass, res);
     })
   );
 }
diff --git a/packages/n4s/src/plugins/compounds/noneOf.ts b/packages/n4s/src/plugins/compounds/noneOf.ts
@@ -10,9 +10,7 @@ export function noneOf(value: unknown, ...rules: Lazy[]): RuleDetailedResult {
     mapFirst(rules, (rule, breakout) => {
       const res = runLazyRule(rule, value);
 
-      if (res.pass) {
-        breakout(ruleReturn.failing());
-      }
+      breakout(res.pass, ruleReturn.failing());
     })
   );
 }
diff --git a/packages/n4s/src/plugins/schema/isArrayOf.ts b/packages/n4s/src/plugins/schema/isArrayOf.ts
@@ -1,7 +1,7 @@
 import mapFirst from 'mapFirst';
+import { ctx } from 'n4s';
 
 import type { LazyRuleRunners } from 'genEnforceLazy';
-import { ctx } from 'n4s';
 import type { RuleDetailedResult } from 'ruleReturn';
 import * as ruleReturn from 'ruleReturn';
 import runLazyRule from 'runLazyRule';
@@ -17,9 +17,7 @@ export function isArrayOf(
         () => runLazyRule(currentRule, currentValue)
       );
 
-      if (!res.pass) {
-        breakout(res);
-      }
+      breakout(!res.pass, res);
     })
   );
 }
diff --git a/packages/n4s/src/runtime/genEnforceLazy.ts b/packages/n4s/src/runtime/genEnforceLazy.ts
@@ -32,15 +32,14 @@ export default function genEnforceLazy(key: string) {
             mapFirst(registeredRules, (rule, breakout) => {
               const res = ctx.run({ value }, () => rule(value));
 
-              if (!res.pass) {
-                breakout(
-                  ruleReturn(
-                    !!res.pass,
-                    optionalFunctionValue(lazyMessage, value, res.message) ??
-                      res.message
-                  )
-                );
-              }
+              breakout(
+                !res.pass,
+                ruleReturn(
+                  !!res.pass,
+                  optionalFunctionValue(lazyMessage, value, res.message) ??
+                    res.message
+                )
+              );
             })
           );
         },

diff --git a/packages/shared/src/mapFirst.ts b/packages/shared/src/mapFirst.ts
@@ -2,7 +2,7 @@ export default function mapFirst<T>(
   array: T[],
   callback: (
     item: T,
-    breakout: (value: unknown) => void,
+    breakout: (conditional: boolean, value: unknown) => void,
     index: number
   ) => unknown
 ): any {
@@ -16,8 +16,10 @@ export default function mapFirst<T>(
     }
   }
 
-  function breakout(value: unknown) {
-    broke = true;
-    breakoutValue = value;
+  function breakout(conditional: boolean, value: unknown) {
+    if (conditional) {
+      broke = true;
+      breakoutValue = value;
+    }
   }
 }