decoders 2.2.0 → 2.3.0-beta.1

package/dist/index.cjs

@@ -1,110 +1,36 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }// src/_utils.ts
-var INDENT = "  ";
-function lazyval(value) {
-  return typeof value === "function" ? value() : value;
-}
-function subtract(xs, ys) {
-  const result = /* @__PURE__ */ new Set();
-  for (const x of xs) {
-    if (!ys.has(x)) {
-      result.add(x);
-    }
-  }
-  return result;
-}
-function asDate(value) {
-  return !!value && Object.prototype.toString.call(value) === "[object Date]" && !isNaN(value) ? value : null;
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }// src/lib/utils.ts
+function isDate(value) {
+  return !!value && Object.prototype.toString.call(value) === "[object Date]" && !isNaN(value);
 }
 function isPojo(value) {
   return value !== null && value !== void 0 && typeof value === "object" && // This still seems to be the only reliable way to determine whether
   // something is a pojo... ¯\_(ツ)_/¯
   Object.prototype.toString.call(value) === "[object Object]";
 }
-function isMultiline(s) {
-  return s.indexOf("\n") >= 0;
-}
-function indent(s, prefix = INDENT) {
-  if (isMultiline(s)) {
-    return s.split("\n").map((line) => `${prefix}${line}`).join("\n");
-  } else {
-    return `${prefix}${s}`;
-  }
-}
-function summarize(ann, keypath = []) {
-  const result = [];
-  if (ann.type === "array") {
-    const items = ann.items;
-    let index = 0;
-    for (const ann2 of items) {
-      for (const item of summarize(ann2, [...keypath, index++])) {
-        result.push(item);
-      }
-    }
-  } else if (ann.type === "object") {
-    const fields = ann.fields;
-    for (const key of Object.keys(fields)) {
-      const value = fields[key];
-      for (const item of summarize(value, [...keypath, key])) {
-        result.push(item);
-      }
-    }
-  }
-  const text = ann.text;
-  if (!text) {
-    return result;
-  }
-  let prefix;
-  if (keypath.length === 0) {
-    prefix = "";
-  } else if (keypath.length === 1) {
-    prefix = typeof keypath[0] === "number" ? `Value at index ${keypath[0]}: ` : `Value at key ${JSON.stringify(keypath[0])}: `;
-  } else {
-    prefix = `Value at keypath ${keypath.map(String).join(".")}: `;
-  }
-  return [...result, `${prefix}${text}`];
-}
 
-// src/annotate.ts
+// src/core/annotate.ts
 var _register = /* @__PURE__ */ new WeakSet();
 function brand(ann) {
   _register.add(ann);
   return ann;
 }
-function object(fields, text) {
+function makeObjectAnn(fields, text) {
   return brand({ type: "object", fields, text });
 }
-function array(items, text) {
-  return brand({
-    type: "array",
-    items,
-    text
-  });
+function makeArrayAnn(items, text) {
+  return brand({ type: "array", items, text });
 }
-function func(text) {
-  return brand({
-    type: "function",
-    text
-  });
+function makeFunctionAnn(text) {
+  return brand({ type: "function", text });
 }
-function unknown(value, text) {
-  return brand({
-    type: "unknown",
-    value,
-    text
-  });
+function makeUnknownAnn(value, text) {
+  return brand({ type: "unknown", value, text });
 }
-function scalar(value, text) {
-  return brand({
-    type: "scalar",
-    value,
-    text
-  });
+function makeScalarAnn(value, text) {
+  return brand({ type: "scalar", value, text });
 }
-function circularRef(text) {
-  return brand({
-    type: "circular-ref",
-    text
-  });
+function makeCircularRefAnn(text) {
+  return brand({ type: "circular-ref", text });
 }
 function updateText(annotation, text) {
   if (text !== void 0) {
@@ -114,52 +40,53 @@ function updateText(annotation, text) {
   }
 }
 function merge(objAnnotation, fields) {
-  const newFields = { ...objAnnotation.fields, ...fields };
-  return object(newFields, objAnnotation.text);
+  const newFields = new Map([...objAnnotation.fields, ...fields]);
+  return makeObjectAnn(newFields, objAnnotation.text);
 }
-function asAnnotation(thing) {
-  return typeof thing === "object" && thing !== null && _register.has(thing) ? thing : void 0;
+function isAnnotation(thing) {
+  return _register.has(thing);
 }
-function annotateArray(value, text, seen) {
-  seen.add(value);
-  const items = value.map((v) => annotate(v, void 0, seen));
-  return array(items, text);
+function annotateArray(arr, text, seen) {
+  seen.add(arr);
+  const items = [];
+  for (const value of arr) {
+    items.push(annotate(value, void 0, seen));
+  }
+  return makeArrayAnn(items, text);
 }
 function annotateObject(obj, text, seen) {
   seen.add(obj);
-  const fields = {};
-  for (const key of Object.keys(obj)) {
-    const value = obj[key];
-    fields[key] = annotate(value, void 0, seen);
+  const fields = /* @__PURE__ */ new Map();
+  for (const [key, value] of Object.entries(obj)) {
+    fields.set(key, annotate(value, void 0, seen));
   }
-  return object(fields, text);
+  return makeObjectAnn(fields, text);
 }
 function annotate(value, text, seen) {
   if (value === null || value === void 0 || typeof value === "string" || typeof value === "number" || typeof value === "boolean" || typeof value === "symbol" || typeof value.getMonth === "function") {
-    return scalar(value, text);
+    return makeScalarAnn(value, text);
   }
-  const ann = asAnnotation(value);
-  if (ann) {
-    return updateText(ann, text);
+  if (isAnnotation(value)) {
+    return updateText(value, text);
   }
   if (Array.isArray(value)) {
     if (seen.has(value)) {
-      return circularRef(text);
+      return makeCircularRefAnn(text);
     } else {
       return annotateArray(value, text, seen);
     }
   }
   if (isPojo(value)) {
     if (seen.has(value)) {
-      return circularRef(text);
+      return makeCircularRefAnn(text);
     } else {
       return annotateObject(value, text, seen);
     }
   }
   if (typeof value === "function") {
-    return func(text);
+    return makeFunctionAnn(text);
   }
-  return unknown(value, text);
+  return makeUnknownAnn(value, text);
 }
 function public_annotate(value, text) {
   return annotate(value, text, /* @__PURE__ */ new WeakSet());
@@ -168,7 +95,52 @@ function public_annotateObject(obj, text) {
   return annotateObject(obj, text, /* @__PURE__ */ new WeakSet());
 }
 
-// src/format.ts
+// src/lib/text.ts
+var INDENT = "  ";
+function isMultiline(s) {
+  return s.indexOf("\n") >= 0;
+}
+function indent(s, prefix = INDENT) {
+  if (isMultiline(s)) {
+    return s.split("\n").map((line) => `${prefix}${line}`).join("\n");
+  } else {
+    return `${prefix}${s}`;
+  }
+}
+
+// src/core/format.ts
+function summarize(ann, keypath = []) {
+  const result = [];
+  if (ann.type === "array") {
+    const items = ann.items;
+    let index = 0;
+    for (const ann2 of items) {
+      for (const item of summarize(ann2, [...keypath, index++])) {
+        result.push(item);
+      }
+    }
+  } else if (ann.type === "object") {
+    const fields = ann.fields;
+    for (const [key, value] of fields) {
+      for (const item of summarize(value, [...keypath, key])) {
+        result.push(item);
+      }
+    }
+  }
+  const text = ann.text;
+  if (!text) {
+    return result;
+  }
+  let prefix;
+  if (keypath.length === 0) {
+    prefix = "";
+  } else if (keypath.length === 1) {
+    prefix = typeof keypath[0] === "number" ? `Value at index ${keypath[0]}: ` : `Value at key ${JSON.stringify(keypath[0])}: `;
+  } else {
+    prefix = `Value at keypath ${keypath.map(String).join(".")}: `;
+  }
+  return [...result, `${prefix}${text}`];
+}
 function serializeString(s, width = 80) {
   let ser = JSON.stringify(s);
   if (ser.length <= width) {
@@ -195,13 +167,11 @@ function serializeArray(annotation, prefix) {
 }
 function serializeObject(annotation, prefix) {
   const { fields } = annotation;
-  const fieldNames = Object.keys(fields);
-  if (fieldNames.length === 0) {
+  if (fields.size === 0) {
     return "{}";
   }
   const result = [];
-  for (const key of fieldNames) {
-    const valueAnnotation = fields[key];
+  for (const [key, valueAnnotation] of fields) {
     const kser = serializeValue(key);
     const valPrefix = `${prefix}${INDENT}${" ".repeat(kser.length + 2)}`;
     const [vser, vann] = serializeAnnotation(valueAnnotation, `${prefix}${INDENT}`);
@@ -215,16 +185,15 @@ function serializeObject(annotation, prefix) {
 function serializeValue(value) {
   if (typeof value === "string") {
     return serializeString(value);
-  } else if (typeof value === "number" || typeof value === "boolean") {
+  } else if (typeof value === "number" || typeof value === "boolean" || typeof value === "symbol") {
     return value.toString();
   } else if (value === null) {
     return "null";
   } else if (value === void 0) {
     return "undefined";
   } else {
-    const valueAsDate = asDate(value);
-    if (valueAsDate !== null) {
-      return `new Date(${JSON.stringify(valueAsDate.toISOString())})`;
+    if (isDate(value)) {
+      return `new Date(${JSON.stringify(value.toISOString())})`;
     } else if (value instanceof Date) {
       return "(Invalid Date)";
     } else {
@@ -268,7 +237,7 @@ function formatShort(ann) {
   return summarize(ann, []).join("\n");
 }
 
-// src/result.ts
+// src/core/Result.ts
 function ok(value) {
   return { ok: true, value, error: void 0 };
 }
@@ -276,7 +245,7 @@ function err(error) {
   return { ok: false, value: void 0, error };
 }
 
-// src/Decoder.ts
+// src/core/Decoder.ts
 function noThrow(fn) {
   return (t) => {
     try {
@@ -303,7 +272,7 @@ function define(fn) {
     return fn(
       blob,
       ok,
-      (msg) => err(typeof msg === "string" ? public_annotate(blob, msg) : msg)
+      (msg) => err(isAnnotation(msg) ? msg : public_annotate(blob, msg))
     );
   }
   function verify(blob, formatter = formatInline) {
@@ -338,9 +307,9 @@ function define(fn) {
     });
   }
   function reject(rejectFn) {
-    return then((value2, ok2, err2) => {
-      const errmsg = rejectFn(value2);
-      return errmsg === null ? ok2(value2) : err2(typeof errmsg === "string" ? public_annotate(value2, errmsg) : errmsg);
+    return then((blob, ok2, err2) => {
+      const errmsg = rejectFn(blob);
+      return errmsg === null ? ok2(blob) : err2(typeof errmsg === "string" ? public_annotate(blob, errmsg) : errmsg);
     });
   }
   function describe(message) {
@@ -353,7 +322,7 @@ function define(fn) {
       }
     });
   }
-  function peek_UNSTABLE(next) {
+  function peek(next) {
     return define((blob, ok2, err2) => {
       const result = decode(blob);
       return result.ok ? next([blob, result.value], ok2, err2) : result;
@@ -368,24 +337,126 @@ function define(fn) {
     reject,
     describe,
     then,
-    // EXPERIMENTAL - please DO NOT rely on this method
-    peek_UNSTABLE
+    peek
   });
 }
 
-// src/lib/objects.ts
+// src/arrays.ts
+var poja = define((blob, ok2, err2) => {
+  if (!Array.isArray(blob)) {
+    return err2("Must be an array");
+  }
+  return ok2(blob);
+});
+function all(items, blobs, ok2, err2) {
+  const results = [];
+  for (let index = 0; index < items.length; ++index) {
+    const result = items[index];
+    if (result.ok) {
+      results.push(result.value);
+    } else {
+      const ann = result.error;
+      const clone = blobs.slice();
+      clone.splice(
+        index,
+        1,
+        public_annotate(ann, ann.text ? `${ann.text} (at index ${index})` : `index ${index}`)
+      );
+      return err2(public_annotate(clone));
+    }
+  }
+  return ok2(results);
+}
+function array(decoder) {
+  const decodeFn = decoder.decode;
+  return poja.then((blobs, ok2, err2) => {
+    const results = blobs.map(decodeFn);
+    return all(results, blobs, ok2, err2);
+  });
+}
+function isNonEmpty(arr) {
+  return arr.length > 0;
+}
+function nonEmptyArray(decoder) {
+  return array(decoder).refine(isNonEmpty, "Must be non-empty array");
+}
+function set(decoder) {
+  return array(decoder).transform((items) => new Set(items));
+}
+var ntuple = (n) => poja.refine((arr) => arr.length === n, `Must be a ${n}-tuple`);
+function tuple(...decoders) {
+  return ntuple(decoders.length).then((blobs, ok2, err2) => {
+    let allOk = true;
+    const rvs = decoders.map((decoder, i) => {
+      const blob = blobs[i];
+      const result = decoder.decode(blob);
+      if (result.ok) {
+        return result.value;
+      } else {
+        allOk = false;
+        return result.error;
+      }
+    });
+    if (allOk) {
+      return ok2(rvs);
+    } else {
+      return err2(public_annotate(rvs));
+    }
+  });
+}
+
+// src/misc.ts
+function instanceOf(klass) {
+  return define(
+    (blob, ok2, err2) => blob instanceof klass ? ok2(blob) : err2(`Must be ${klass.name} instance`)
+  );
+}
+function lazy(decoderFn) {
+  return define((blob) => decoderFn().decode(blob));
+}
+function prep(mapperFn, decoder) {
+  return define((originalInput, _, err2) => {
+    let blob;
+    try {
+      blob = mapperFn(originalInput);
+    } catch (e) {
+      return err2(
+        public_annotate(
+          originalInput,
+          // istanbul ignore next
+          e instanceof Error ? e.message : String(e)
+        )
+      );
+    }
+    const r = decoder.decode(blob);
+    return r.ok ? r : err2(public_annotate(originalInput, r.error.text));
+  });
+}
+
+// src/lib/set-methods.ts
+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
 var pojo = define(
   (blob, ok2, err2) => isPojo(blob) ? ok2(blob) : err2("Must be an object")
 );
-function object2(decodersByKey) {
-  const knownKeys = new Set(Object.keys(decodersByKey));
+function object(decoders) {
+  const knownKeys = new Set(Object.keys(decoders));
   return pojo.then((plainObj, ok2, err2) => {
     const actualKeys = new Set(Object.keys(plainObj));
-    const missingKeys = subtract(knownKeys, actualKeys);
+    const missingKeys = difference(knownKeys, actualKeys);
     const record = {};
     let errors = null;
-    for (const key of Object.keys(decodersByKey)) {
-      const decoder = decodersByKey[key];
+    for (const key of Object.keys(decoders)) {
+      const decoder = decoders[key];
       const rawValue = plainObj[key];
       const result = decoder.decode(rawValue);
       if (result.ok) {
@@ -400,9 +471,9 @@ function object2(decodersByKey) {
           missingKeys.add(key);
         } else {
           if (errors === null) {
-            errors = {};
+            errors = /* @__PURE__ */ new Map();
           }
-          errors[key] = ann;
+          errors.set(key, ann);
         }
       }
     }
@@ -421,23 +492,23 @@ function object2(decodersByKey) {
     return ok2(record);
   });
 }
-function exact(decodersByKey) {
-  const allowedKeys = new Set(Object.keys(decodersByKey));
+function exact(decoders) {
+  const allowedKeys = new Set(Object.keys(decoders));
   const checked = pojo.reject((plainObj) => {
     const actualKeys = new Set(Object.keys(plainObj));
-    const extraKeys = subtract(actualKeys, allowedKeys);
+    const extraKeys = difference(actualKeys, allowedKeys);
     return extraKeys.size > 0 ? `Unexpected extra keys: ${Array.from(extraKeys).join(", ")}` : (
       // Don't reject
       null
     );
   });
-  return checked.then(object2(decodersByKey).decode);
+  return checked.then(object(decoders).decode);
 }
-function inexact(decodersByKey) {
+function inexact(decoders) {
   return pojo.then((plainObj) => {
     const allkeys = new Set(Object.keys(plainObj));
-    const decoder = object2(decodersByKey).transform((safepart) => {
-      const safekeys = new Set(Object.keys(decodersByKey));
+    const decoder = object(decoders).transform((safepart) => {
+      const safekeys = new Set(Object.keys(decoders));
       for (const k of safekeys)
         allkeys.add(k);
       const rv = {};
@@ -470,9 +541,9 @@ function dict(decoder) {
       } else {
         rv = {};
         if (errors === null) {
-          errors = {};
+          errors = /* @__PURE__ */ new Map();
         }
-        errors[key] = result.error;
+        errors.set(key, result.error);
       }
     }
     if (errors !== null) {
@@ -492,45 +563,13 @@ function mapping(decoder) {
   );
 }
 
-// src/lib/utilities.ts
-function instanceOf(klass) {
-  return define(
-    (blob, ok2, err2) => blob instanceof klass ? ok2(blob) : err2(`Must be ${klass.name} instance`)
-  );
-}
-function lazy(decoderFn) {
-  return define((blob) => decoderFn().decode(blob));
-}
-function prep(mapperFn, decoder) {
-  return define((originalInput, _, err2) => {
-    let blob;
-    try {
-      blob = mapperFn(originalInput);
-    } catch (e) {
-      return err2(
-        public_annotate(
-          originalInput,
-          // istanbul ignore next
-          e instanceof Error ? e.message : String(e)
-        )
-      );
-    }
-    const r = decoder.decode(blob);
-    return r.ok ? r : err2(public_annotate(originalInput, r.error.text));
-  });
-}
-function never(msg) {
-  return define((_, __, err2) => err2(msg));
-}
-var fail = never;
-
-// src/lib/unions.ts
+// src/unions.ts
 var EITHER_PREFIX = "Either:\n";
 function itemize(s) {
   return `-${indent(s).substring(1)}`;
 }
 function nest(errText) {
-  return errText.startsWith(EITHER_PREFIX) ? errText.substr(EITHER_PREFIX.length) : itemize(errText);
+  return errText.startsWith(EITHER_PREFIX) ? errText.substring(EITHER_PREFIX.length) : itemize(errText);
 }
 function either(...decoders) {
   if (decoders.length === 0) {
@@ -562,24 +601,31 @@ function oneOf(constants) {
   });
 }
 function taggedUnion(field, mapping2) {
-  const base = object2({
+  const scout = object({
     [field]: prep(String, oneOf(Object.keys(mapping2)))
   }).transform((o) => o[field]);
-  return base.peek_UNSTABLE(([blob, key]) => {
-    const decoder = mapping2[key];
+  return select(
+    scout,
+    // peek...
+    (key) => mapping2[key]
+    // ...then select
+  );
+}
+function select(scout, selectFn) {
+  return scout.peek(([blob, peekResult]) => {
+    const decoder = selectFn(peekResult);
     return decoder.decode(blob);
   });
 }
 
-// src/lib/basics.ts
-var null_ = define(
-  (blob, ok2, err2) => blob === null ? ok2(blob) : err2("Must be null")
-);
-var undefined_ = define(
-  (blob, ok2, err2) => blob === void 0 ? ok2(blob) : err2("Must be undefined")
-);
-var undefined_or_null = define(
-  (blob, ok2, err2) => blob === void 0 || blob === null ? ok2(blob) : (
+// src/basics.ts
+function lazyval(value) {
+  return typeof value === "function" ? value() : value;
+}
+var null_ = constant(null);
+var undefined_ = constant(void 0);
+var nullish_ = define(
+  (blob, ok2, err2) => blob == null ? ok2(blob) : (
     // Combine error message into a single line for readability
     err2("Must be undefined or null")
   )
@@ -592,13 +638,16 @@ function nullable(decoder, defaultValue) {
   const rv = either(null_, decoder);
   return arguments.length >= 2 ? rv.transform((value) => _nullishCoalesce(value, () => ( lazyval(defaultValue)))) : rv;
 }
-function maybe(decoder, defaultValue) {
-  const rv = either(undefined_or_null, decoder);
+var maybe = nullish;
+function nullish(decoder, defaultValue) {
+  const rv = either(nullish_, decoder);
   return arguments.length >= 2 ? rv.transform((value) => _nullishCoalesce(value, () => ( lazyval(defaultValue)))) : rv;
 }
 function constant(value) {
   return define(
-    (blob, ok2, err2) => blob === value ? ok2(value) : err2(`Must be constant ${String(value)}`)
+    (blob, ok2, err2) => blob === value ? ok2(value) : err2(
+      `Must be ${typeof value === "symbol" ? String(value) : JSON.stringify(value)}`
+    )
   );
 }
 function always(value) {
@@ -606,75 +655,15 @@ function always(value) {
     typeof value === "function" ? (_, ok2) => ok2(value()) : (_, ok2) => ok2(value)
   );
 }
-var hardcoded = always;
-var unknown2 = define((blob, ok2, _) => ok2(blob));
-var mixed = unknown2;
-
-// src/lib/arrays.ts
-var poja = define((blob, ok2, err2) => {
-  if (!Array.isArray(blob)) {
-    return err2("Must be an array");
-  }
-  return ok2(blob);
-});
-function all(items, blobs, ok2, err2) {
-  const results = [];
-  for (let index = 0; index < items.length; ++index) {
-    const result = items[index];
-    if (result.ok) {
-      results.push(result.value);
-    } else {
-      const ann = result.error;
-      const clone = blobs.slice();
-      clone.splice(
-        index,
-        1,
-        public_annotate(ann, ann.text ? `${ann.text} (at index ${index})` : `index ${index}`)
-      );
-      return err2(public_annotate(clone));
-    }
-  }
-  return ok2(results);
-}
-function array2(decoder) {
-  const decodeFn = decoder.decode;
-  return poja.then((blobs, ok2, err2) => {
-    const results = blobs.map(decodeFn);
-    return all(results, blobs, ok2, err2);
-  });
-}
-function isNonEmpty(arr) {
-  return arr.length > 0;
-}
-function nonEmptyArray(decoder) {
-  return array2(decoder).refine(isNonEmpty, "Must be non-empty array");
-}
-function set(decoder) {
-  return array2(decoder).transform((items) => new Set(items));
-}
-var ntuple = (n) => poja.refine((arr) => arr.length === n, `Must be a ${n}-tuple`);
-function tuple(...decoders) {
-  return ntuple(decoders.length).then((blobs, ok2, err2) => {
-    let allOk = true;
-    const rvs = decoders.map((decoder, i) => {
-      const blob = blobs[i];
-      const result = decoder.decode(blob);
-      if (result.ok) {
-        return result.value;
-      } else {
-        allOk = false;
-        return result.error;
-      }
-    });
-    if (allOk) {
-      return ok2(rvs);
-    } else {
-      return err2(public_annotate(rvs));
-    }
-  });
+function never(msg) {
+  return define((_, __, err2) => err2(msg));
 }
+var fail = never;
+var hardcoded = always;
+var unknown = define((blob, ok2, _) => ok2(blob));
+var mixed = unknown;
 
-// src/lib/numbers.ts
+// src/numbers.ts
 var anyNumber = define(
   (blob, ok2, err2) => typeof blob === "number" ? ok2(blob) : err2("Must be number")
 );
@@ -688,15 +677,18 @@ var integer = number.refine(
 );
 var positiveNumber = number.refine((n) => n >= 0, "Number must be positive").transform(Math.abs);
 var positiveInteger = integer.refine((n) => n >= 0, "Number must be positive").transform(Math.abs);
+var bigint = define(
+  (blob, ok2, err2) => typeof blob === "bigint" ? ok2(blob) : err2("Must be bigint")
+);
 
-// src/lib/booleans.ts
+// src/booleans.ts
 var boolean = define((blob, ok2, err2) => {
   return typeof blob === "boolean" ? ok2(blob) : err2("Must be boolean");
 });
 var truthy = define((blob, ok2, _) => ok2(!!blob));
 var numericBoolean = number.transform((n) => !!n);
 
-// src/lib/strings.ts
+// src/strings.ts
 var url_re = /^([A-Za-z]{3,9}(?:[+][A-Za-z]{3,9})?):\/\/(?:([-;:&=+$,\w]+)@)?(?:([A-Za-z0-9.-]+)(?::([0-9]{2,5}))?)(\/(?:[-+~%/.,\w]*)?(?:\?[-+=&;%@.,/\w]*)?(?:#[.,!/\w]*)?)?$/;
 var string = define(
   (blob, ok2, err2) => typeof blob === "string" ? ok2(blob) : err2("Must be string")
@@ -731,11 +723,10 @@ var uuidv4 = (
   uuid.refine((value) => value[14] === "4", "Must be uuidv4")
 );
 
-// src/lib/dates.ts
+// src/dates.ts
 var iso8601_re = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:[.]\d+)?(?:Z|[+-]\d{2}:?\d{2})$/;
 var date = define((blob, ok2, err2) => {
-  const date2 = asDate(blob);
-  return date2 !== null ? ok2(date2) : err2("Must be a Date");
+  return isDate(blob) ? ok2(blob) : err2("Must be a Date");
 });
 var iso8601 = (
   // Input itself needs to match the ISO8601 regex...
@@ -751,9 +742,9 @@ var iso8601 = (
   )
 );
 
-// src/lib/json.ts
+// src/json.ts
 var jsonObject = lazy(() => dict(json));
-var jsonArray = lazy(() => array2(json));
+var jsonArray = lazy(() => array(json));
 var json = either(
   null_,
   string,
@@ -819,5 +810,7 @@ var json = either(
 
 
 
-exports.always = always; exports.anyNumber = anyNumber; exports.array = array2; exports.boolean = boolean; exports.constant = constant; exports.date = date; exports.define = define; exports.dict = dict; exports.either = either; exports.email = email; exports.err = err; exports.exact = exact; exports.fail = fail; exports.formatInline = formatInline; exports.formatShort = formatShort; exports.hardcoded = hardcoded; exports.httpsUrl = httpsUrl; exports.inexact = inexact; exports.instanceOf = instanceOf; exports.integer = integer; exports.iso8601 = iso8601; exports.json = json; exports.jsonArray = jsonArray; exports.jsonObject = jsonObject; exports.lazy = lazy; exports.mapping = mapping; exports.maybe = maybe; exports.mixed = mixed; exports.never = never; exports.nonEmptyArray = nonEmptyArray; exports.nonEmptyString = nonEmptyString; exports.null_ = null_; exports.nullable = nullable; exports.number = number; exports.numericBoolean = numericBoolean; exports.object = object2; exports.ok = ok; exports.oneOf = oneOf; exports.optional = optional; exports.poja = poja; exports.pojo = pojo; exports.positiveInteger = positiveInteger; exports.positiveNumber = positiveNumber; exports.prep = prep; exports.regex = regex; exports.set = set; exports.string = string; exports.taggedUnion = taggedUnion; exports.truthy = truthy; exports.tuple = tuple; exports.undefined_ = undefined_; exports.unknown = unknown2; exports.url = url; exports.uuid = uuid; exports.uuidv1 = uuidv1; exports.uuidv4 = uuidv4;
-//# sourceMappingURL=index.cjs.map
+
+
+
+exports.always = always; exports.anyNumber = anyNumber; exports.array = array; exports.bigint = bigint; exports.boolean = boolean; exports.constant = constant; exports.date = date; exports.define = define; exports.dict = dict; exports.either = either; exports.email = email; exports.err = err; exports.exact = exact; exports.fail = fail; exports.formatInline = formatInline; exports.formatShort = formatShort; exports.hardcoded = hardcoded; exports.httpsUrl = httpsUrl; exports.inexact = inexact; exports.instanceOf = instanceOf; exports.integer = integer; exports.iso8601 = iso8601; exports.json = json; exports.jsonArray = jsonArray; exports.jsonObject = jsonObject; exports.lazy = lazy; exports.mapping = mapping; exports.maybe = maybe; exports.mixed = mixed; exports.never = never; exports.nonEmptyArray = nonEmptyArray; exports.nonEmptyString = nonEmptyString; exports.null_ = null_; exports.nullable = nullable; exports.nullish = nullish; exports.number = number; exports.numericBoolean = numericBoolean; exports.object = object; exports.ok = ok; exports.oneOf = oneOf; exports.optional = optional; exports.poja = poja; exports.pojo = pojo; exports.positiveInteger = positiveInteger; exports.positiveNumber = positiveNumber; exports.prep = prep; exports.regex = regex; exports.select = select; exports.set = set; exports.string = string; exports.taggedUnion = taggedUnion; exports.truthy = truthy; exports.tuple = tuple; exports.undefined_ = undefined_; exports.unknown = unknown; exports.url = url; exports.uuid = uuid; exports.uuidv1 = uuidv1; exports.uuidv4 = uuidv4;