decoders 2.12.1 → 2.12.3

package/dist/index.cjs

@@ -1,4 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }// src/lib/utils.ts
+var MAX_ERRORS = 3;
 // @__NO_SIDE_EFFECTS__
 function qty(n, unit) {
   return n === 1 ? `${n} ${unit}` : `${n} ${unit}s`;
@@ -220,8 +221,12 @@ function serializeArray(annotation, prefix) {
     return "[]";
   }
   const result = [];
-  for (const item of items) {
-    const [ser, ann] = serializeAnnotation(item, `${prefix}${INDENT}`);
+  for (let i = 0; i < items.length; ++i) {
+    const [ser, ann] = serializeAnnotation(
+      items[i],
+      `${prefix}${INDENT}`,
+      `(at index ${i})`
+    );
     result.push(`${prefix}${INDENT}${ser},`);
     if (ann !== void 0) {
       result.push(indent(ann, `${prefix}${INDENT}`));
@@ -267,7 +272,7 @@ function serializeValue(value) {
     }
   }
 }
-function serializeAnnotation(ann, prefix = "") {
+function serializeAnnotation(ann, prefix = "", location) {
   let serialized;
   if (ann.type === "array") {
     serialized = serializeArray(ann, prefix);
@@ -283,7 +288,8 @@ function serializeAnnotation(ann, prefix = "") {
   const text = ann.text;
   if (text !== void 0) {
     const sep = "^".repeat(isMultiline(serialized) ? 1 : serialized.length);
-    return [serialized, [sep, text].join(isMultiline(text) ? "\n" : " ")];
+    const annotation = isMultiline(text) ? [location ? `${sep} ${location}` : sep, text].join("\n") : [sep, text, location].filter(Boolean).join(" ");
+    return [serialized, annotation];
   } else {
     return [serialized, void 0];
   }
@@ -623,24 +629,25 @@ function array(decoder, options) {
   const base = options !== void 0 ? sized(poja, options) : poja;
   return base.chain((inputs, ok2, err2) => {
     const results = [];
+    let clone = null;
+    let errorCount = 0;
     for (let i = 0; i < inputs.length; ++i) {
       const blob = inputs[i];
       const result = decodeFn(blob);
       if (result.ok) {
-        results.push(result.value);
+        if (clone === null) {
+          results.push(result.value);
+        }
       } else {
         results.length = 0;
-        const ann = result.error;
-        const clone = inputs.slice();
-        clone.splice(
-          i,
-          1,
-          public_annotate(ann, ann.text ? `${ann.text} (at index ${i})` : `index ${i}`)
-        );
-        return err2(public_annotate(clone));
+        clone ??= inputs.slice();
+        clone[i] = result.error;
+        if (++errorCount >= MAX_ERRORS) {
+          break;
+        }
       }
     }
-    return ok2(results);
+    return clone !== null ? err2(public_annotate(clone)) : ok2(results);
   });
 }
 // @__NO_SIDE_EFFECTS__
@@ -670,18 +677,6 @@ function tuple(...decoders) {
   });
 }
 
-// src/lib/set-methods.ts
-// @__NO_SIDE_EFFECTS__
-function difference(xs, ys) {
-  const result = /* @__PURE__ */ new Set();
-  for (const x of xs) {
-    if (!ys.has(x)) {
-      result.add(x);
-    }
-  }
-  return result;
-}
-
 // src/objects.ts
 // @__NO_SIDE_EFFECTS__
 function rejectUnsafeKey(decoders) {
@@ -703,13 +698,12 @@ var pojo = define(
 );
 // @__NO_SIDE_EFFECTS__
 function buildObject(decoders) {
-  const knownKeys = new Set(Object.keys(decoders));
+  const knownKeys = Object.keys(decoders);
   return pojo.chain((plainObj, ok2, err2) => {
-    const actualKeys = new Set(Object.keys(plainObj));
-    const missingKeys = difference(knownKeys, actualKeys);
     const record2 = {};
     let errors = null;
-    for (const key of Object.keys(decoders)) {
+    let missingKeys = null;
+    for (const key of knownKeys) {
       const decoder = decoders[key];
       const rawValue = plainObj[key];
       const result = decoder.decode(rawValue);
@@ -718,25 +712,23 @@ function buildObject(decoders) {
         if (value !== void 0) {
           record2[key] = value;
         }
-        missingKeys.delete(key);
       } else {
         const ann = result.error;
         if (rawValue === void 0) {
-          missingKeys.add(key);
+          (missingKeys ??= []).push(key);
         } else {
-          errors ??= /* @__PURE__ */ new Map();
-          errors.set(key, ann);
+          (errors ??= /* @__PURE__ */ new Map()).set(key, ann);
         }
       }
     }
-    if (errors || missingKeys.size > 0) {
+    if (errors || missingKeys) {
       let objAnn = public_annotateObject(plainObj);
       if (errors) {
         objAnn = merge(objAnn, errors);
       }
-      if (missingKeys.size > 0) {
-        const errMsg = Array.from(missingKeys).map(quote).join(", ");
-        const pluralized = missingKeys.size > 1 ? "keys" : "key";
+      if (missingKeys) {
+        const errMsg = missingKeys.map(quote).join(", ");
+        const pluralized = missingKeys.length > 1 ? "keys" : "key";
         objAnn = updateText(objAnn, `Missing ${pluralized}: ${errMsg}`);
       }
       return err2(objAnn);
@@ -753,41 +745,50 @@ function object(decoders) {
 function exact(decoders) {
   /* @__PURE__ */ rejectUnsafeKey(decoders);
   const allowedKeys = new Set(Object.keys(decoders));
-  const checked = pojo.chain((plainObj, ok2, err2) => {
-    const actualKeys = new Set(Object.keys(plainObj));
-    if (actualKeys.has("__proto__")) {
-      return err2(/* @__PURE__ */ annotateUnsafeKey(plainObj));
+  const objDecoder = /* @__PURE__ */ buildObject(decoders);
+  return pojo.chain((plainObj, _ok, err2) => {
+    let extraKeys = null;
+    for (const key of Object.keys(plainObj)) {
+      if (key === "__proto__") {
+        return err2(/* @__PURE__ */ annotateUnsafeKey(plainObj));
+      }
+      if (!allowedKeys.has(key)) {
+        (extraKeys ??= []).push(key);
+      }
+    }
+    if (extraKeys) {
+      return err2(`Unexpected extra keys: ${extraKeys.map(quote).join(", ")}`);
     }
-    const extraKeys = difference(actualKeys, allowedKeys);
-    return extraKeys.size > 0 ? err2(`Unexpected extra keys: ${Array.from(extraKeys).map(quote).join(", ")}`) : ok2(plainObj);
+    return objDecoder.decode(plainObj);
   });
-  return checked.pipe(/* @__PURE__ */ buildObject(decoders));
 }
 // @__NO_SIDE_EFFECTS__
 function inexact(decoders) {
   /* @__PURE__ */ rejectUnsafeKey(decoders);
+  const safekeys = new Set(Object.keys(decoders));
+  const safeDecoder = /* @__PURE__ */ buildObject(decoders);
   return pojo.chain(
-    (plainObj, _ok, err2) => {
+    (plainObj, ok2, err2) => {
       const allkeys = new Set(Object.keys(plainObj));
       if (allkeys.has("__proto__")) {
         return err2(/* @__PURE__ */ annotateUnsafeKey(plainObj));
       }
-      return (/* @__PURE__ */ buildObject(decoders)).transform((safepart) => {
-        const safekeys = new Set(Object.keys(decoders));
-        for (const k of safekeys) allkeys.add(k);
-        const rv = {};
-        for (const k of allkeys) {
-          if (safekeys.has(k)) {
-            const value = safepart[k];
-            if (value !== void 0) {
-              rv[k] = value;
-            }
-          } else {
-            rv[k] = plainObj[k];
+      const result = safeDecoder.decode(plainObj);
+      if (!result.ok) return result;
+      const safepart = result.value;
+      for (const k of safekeys) allkeys.add(k);
+      const rv = {};
+      for (const k of allkeys) {
+        if (safekeys.has(k)) {
+          const value = safepart[k];
+          if (value !== void 0) {
+            rv[k] = value;
           }
+        } else {
+          rv[k] = plainObj[k];
         }
-        return rv;
-      });
+      }
+      return ok2(rv);
     }
   );
 }
@@ -945,6 +946,9 @@ function record(fst, snd) {
         errors.set(key, result.error);
         rv = {};
       }
+      if (errors.size >= MAX_ERRORS) {
+        break;
+      }
     }
     if (errors.size > 0) {
       return err2(merge(public_annotateObject(input), errors));

package/dist/index.js

@@ -1,4 +1,5 @@
 // src/lib/utils.ts
+var MAX_ERRORS = 3;
 // @__NO_SIDE_EFFECTS__
 function qty(n, unit) {
   return n === 1 ? `${n} ${unit}` : `${n} ${unit}s`;
@@ -220,8 +221,12 @@ function serializeArray(annotation, prefix) {
     return "[]";
   }
   const result = [];
-  for (const item of items) {
-    const [ser, ann] = serializeAnnotation(item, `${prefix}${INDENT}`);
+  for (let i = 0; i < items.length; ++i) {
+    const [ser, ann] = serializeAnnotation(
+      items[i],
+      `${prefix}${INDENT}`,
+      `(at index ${i})`
+    );
     result.push(`${prefix}${INDENT}${ser},`);
     if (ann !== void 0) {
       result.push(indent(ann, `${prefix}${INDENT}`));
@@ -267,7 +272,7 @@ function serializeValue(value) {
     }
   }
 }
-function serializeAnnotation(ann, prefix = "") {
+function serializeAnnotation(ann, prefix = "", location) {
   let serialized;
   if (ann.type === "array") {
     serialized = serializeArray(ann, prefix);
@@ -283,7 +288,8 @@ function serializeAnnotation(ann, prefix = "") {
   const text = ann.text;
   if (text !== void 0) {
     const sep = "^".repeat(isMultiline(serialized) ? 1 : serialized.length);
-    return [serialized, [sep, text].join(isMultiline(text) ? "\n" : " ")];
+    const annotation = isMultiline(text) ? [location ? `${sep} ${location}` : sep, text].join("\n") : [sep, text, location].filter(Boolean).join(" ");
+    return [serialized, annotation];
   } else {
     return [serialized, void 0];
   }
@@ -623,24 +629,25 @@ function array(decoder, options) {
   const base = options !== void 0 ? sized(poja, options) : poja;
   return base.chain((inputs, ok2, err2) => {
     const results = [];
+    let clone = null;
+    let errorCount = 0;
     for (let i = 0; i < inputs.length; ++i) {
       const blob = inputs[i];
       const result = decodeFn(blob);
       if (result.ok) {
-        results.push(result.value);
+        if (clone === null) {
+          results.push(result.value);
+        }
       } else {
         results.length = 0;
-        const ann = result.error;
-        const clone = inputs.slice();
-        clone.splice(
-          i,
-          1,
-          public_annotate(ann, ann.text ? `${ann.text} (at index ${i})` : `index ${i}`)
-        );
-        return err2(public_annotate(clone));
+        clone ??= inputs.slice();
+        clone[i] = result.error;
+        if (++errorCount >= MAX_ERRORS) {
+          break;
+        }
       }
     }
-    return ok2(results);
+    return clone !== null ? err2(public_annotate(clone)) : ok2(results);
   });
 }
 // @__NO_SIDE_EFFECTS__
@@ -670,18 +677,6 @@ function tuple(...decoders) {
   });
 }
 
-// src/lib/set-methods.ts
-// @__NO_SIDE_EFFECTS__
-function difference(xs, ys) {
-  const result = /* @__PURE__ */ new Set();
-  for (const x of xs) {
-    if (!ys.has(x)) {
-      result.add(x);
-    }
-  }
-  return result;
-}
-
 // src/objects.ts
 // @__NO_SIDE_EFFECTS__
 function rejectUnsafeKey(decoders) {
@@ -703,13 +698,12 @@ var pojo = define(
 );
 // @__NO_SIDE_EFFECTS__
 function buildObject(decoders) {
-  const knownKeys = new Set(Object.keys(decoders));
+  const knownKeys = Object.keys(decoders);
   return pojo.chain((plainObj, ok2, err2) => {
-    const actualKeys = new Set(Object.keys(plainObj));
-    const missingKeys = difference(knownKeys, actualKeys);
     const record2 = {};
     let errors = null;
-    for (const key of Object.keys(decoders)) {
+    let missingKeys = null;
+    for (const key of knownKeys) {
       const decoder = decoders[key];
       const rawValue = plainObj[key];
       const result = decoder.decode(rawValue);
@@ -718,25 +712,23 @@ function buildObject(decoders) {
         if (value !== void 0) {
           record2[key] = value;
         }
-        missingKeys.delete(key);
       } else {
         const ann = result.error;
         if (rawValue === void 0) {
-          missingKeys.add(key);
+          (missingKeys ??= []).push(key);
         } else {
-          errors ??= /* @__PURE__ */ new Map();
-          errors.set(key, ann);
+          (errors ??= /* @__PURE__ */ new Map()).set(key, ann);
         }
       }
     }
-    if (errors || missingKeys.size > 0) {
+    if (errors || missingKeys) {
       let objAnn = public_annotateObject(plainObj);
       if (errors) {
         objAnn = merge(objAnn, errors);
       }
-      if (missingKeys.size > 0) {
-        const errMsg = Array.from(missingKeys).map(quote).join(", ");
-        const pluralized = missingKeys.size > 1 ? "keys" : "key";
+      if (missingKeys) {
+        const errMsg = missingKeys.map(quote).join(", ");
+        const pluralized = missingKeys.length > 1 ? "keys" : "key";
         objAnn = updateText(objAnn, `Missing ${pluralized}: ${errMsg}`);
       }
       return err2(objAnn);
@@ -753,41 +745,50 @@ function object(decoders) {
 function exact(decoders) {
   /* @__PURE__ */ rejectUnsafeKey(decoders);
   const allowedKeys = new Set(Object.keys(decoders));
-  const checked = pojo.chain((plainObj, ok2, err2) => {
-    const actualKeys = new Set(Object.keys(plainObj));
-    if (actualKeys.has("__proto__")) {
-      return err2(/* @__PURE__ */ annotateUnsafeKey(plainObj));
+  const objDecoder = /* @__PURE__ */ buildObject(decoders);
+  return pojo.chain((plainObj, _ok, err2) => {
+    let extraKeys = null;
+    for (const key of Object.keys(plainObj)) {
+      if (key === "__proto__") {
+        return err2(/* @__PURE__ */ annotateUnsafeKey(plainObj));
+      }
+      if (!allowedKeys.has(key)) {
+        (extraKeys ??= []).push(key);
+      }
+    }
+    if (extraKeys) {
+      return err2(`Unexpected extra keys: ${extraKeys.map(quote).join(", ")}`);
     }
-    const extraKeys = difference(actualKeys, allowedKeys);
-    return extraKeys.size > 0 ? err2(`Unexpected extra keys: ${Array.from(extraKeys).map(quote).join(", ")}`) : ok2(plainObj);
+    return objDecoder.decode(plainObj);
   });
-  return checked.pipe(/* @__PURE__ */ buildObject(decoders));
 }
 // @__NO_SIDE_EFFECTS__
 function inexact(decoders) {
   /* @__PURE__ */ rejectUnsafeKey(decoders);
+  const safekeys = new Set(Object.keys(decoders));
+  const safeDecoder = /* @__PURE__ */ buildObject(decoders);
   return pojo.chain(
-    (plainObj, _ok, err2) => {
+    (plainObj, ok2, err2) => {
       const allkeys = new Set(Object.keys(plainObj));
       if (allkeys.has("__proto__")) {
         return err2(/* @__PURE__ */ annotateUnsafeKey(plainObj));
       }
-      return (/* @__PURE__ */ buildObject(decoders)).transform((safepart) => {
-        const safekeys = new Set(Object.keys(decoders));
-        for (const k of safekeys) allkeys.add(k);
-        const rv = {};
-        for (const k of allkeys) {
-          if (safekeys.has(k)) {
-            const value = safepart[k];
-            if (value !== void 0) {
-              rv[k] = value;
-            }
-          } else {
-            rv[k] = plainObj[k];
+      const result = safeDecoder.decode(plainObj);
+      if (!result.ok) return result;
+      const safepart = result.value;
+      for (const k of safekeys) allkeys.add(k);
+      const rv = {};
+      for (const k of allkeys) {
+        if (safekeys.has(k)) {
+          const value = safepart[k];
+          if (value !== void 0) {
+            rv[k] = value;
           }
+        } else {
+          rv[k] = plainObj[k];
         }
-        return rv;
-      });
+      }
+      return ok2(rv);
     }
   );
 }
@@ -945,6 +946,9 @@ function record(fst, snd) {
         errors.set(key, result.error);
         rv = {};
       }
+      if (errors.size >= MAX_ERRORS) {
+        break;
+      }
     }
     if (errors.size > 0) {
       return err2(merge(public_annotateObject(input), errors));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "decoders",
-  "version": "2.12.1",
+  "version": "2.12.3",
   "description": "Elegant and battle-tested validation library for type-safe input data for TypeScript",
   "license": "MIT",
   "repository": {