decoders 2.12.1 → 2.12.2

package/dist/index.cjs

@@ -670,18 +670,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 +691,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 +705,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 +738,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);
     }
   );
 }

package/dist/index.js

@@ -670,18 +670,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 +691,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 +705,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 +738,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);
     }
   );
 }

package/package.json

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