decoders 2.12.2 → 2.13.0

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__
@@ -939,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));
@@ -1016,6 +1026,16 @@ var uuidv4 = (
   // https://en.wikipedia.org/wiki/Universally_unique_identifier#Version_4_(random)
   /* @__PURE__ */ uuid.refine((value) => value[14] === "4", "Must be uuidv4")
 );
+function isKsuid(value) {
+  return /^[0-9a-z]{27}$/i.test(value) && // Base62 alphabet sorts like ASCII, so the 2^160 - 1 upper bound is a
+  // string comparison
+  value <= "aWgEPTl1tmebfsQzFP4bxwgy80V";
+}
+// @__NO_SIDE_EFFECTS__
+function ksuid(options) {
+  const prefix = _optionalChain([options, 'optionalAccess', _8 => _8.prefix]);
+  return prefix ? (/* @__PURE__ */ startsWith(prefix)).refine((s) => isKsuid(s.slice(prefix.length)), "Must be ksuid") : string.refine(isKsuid, "Must be ksuid");
+}
 var decimal = /* @__PURE__ */ regex(/^[0-9]+$/, "Must only contain digits");
 var hexadecimal = /* @__PURE__ */ regex(
   /^[0-9a-f]+$/i,
@@ -1183,6 +1203,7 @@ var json = /* @__PURE__ */ either(
 
 
 
-exports._annotate = public_annotate; exports.always = always; exports.anyNumber = anyNumber; exports.anything = anything; exports.array = array; exports.between = between; exports.bigint = bigint; exports.boolean = boolean; exports.constant = constant; exports.date = date; exports.dateString = dateString; exports.datelike = datelike; exports.decimal = decimal; exports.define = define; exports.either = either; exports.email = email; exports.endsWith = endsWith; exports.enum_ = enum_; exports.err = err; exports.exact = exact; exports.fail = fail; exports.flexDate = flexDate; exports.formatInline = formatInline; exports.formatShort = formatShort; exports.hexadecimal = hexadecimal; exports.httpsUrl = httpsUrl; exports.identifier = identifier; exports.inexact = inexact; exports.instanceOf = instanceOf; exports.integer = integer; exports.isDate = isDate; exports.isDecoder = isDecoder; exports.isPlainObject = isPlainObject; exports.isPromiseLike = isPromiseLike; exports.iso8601 = iso8601; exports.isoDate = isoDate; exports.isoDateString = isoDateString; exports.json = json; exports.jsonArray = jsonArray; exports.jsonObject = jsonObject; exports.lazy = lazy; exports.mapping = mapping; exports.max = max; exports.min = min; exports.nanoid = nanoid; exports.natural = natural; exports.never = never; exports.nonEmptyArray = nonEmptyArray; exports.nonEmptyString = nonEmptyString; exports.nonNegativeNumber = nonNegativeNumber; exports.null_ = null_; exports.nullable = nullable; exports.nullish = nullish; exports.number = number; exports.numeric = numeric; 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.record = record; exports.regex = regex; exports.select = select; exports.setFromArray = setFromArray; exports.sized = sized; exports.startsWith = startsWith; exports.string = string; exports.taggedUnion = taggedUnion; exports.truthy = truthy; exports.tuple = tuple; exports.undefined_ = undefined_; exports.unknown = unknown; exports.url = url; exports.urlString = urlString; exports.uuid = uuid; exports.uuidv1 = uuidv1; exports.uuidv4 = uuidv4;
+
+exports._annotate = public_annotate; exports.always = always; exports.anyNumber = anyNumber; exports.anything = anything; exports.array = array; exports.between = between; exports.bigint = bigint; exports.boolean = boolean; exports.constant = constant; exports.date = date; exports.dateString = dateString; exports.datelike = datelike; exports.decimal = decimal; exports.define = define; exports.either = either; exports.email = email; exports.endsWith = endsWith; exports.enum_ = enum_; exports.err = err; exports.exact = exact; exports.fail = fail; exports.flexDate = flexDate; exports.formatInline = formatInline; exports.formatShort = formatShort; exports.hexadecimal = hexadecimal; exports.httpsUrl = httpsUrl; exports.identifier = identifier; exports.inexact = inexact; exports.instanceOf = instanceOf; exports.integer = integer; exports.isDate = isDate; exports.isDecoder = isDecoder; exports.isPlainObject = isPlainObject; exports.isPromiseLike = isPromiseLike; exports.iso8601 = iso8601; exports.isoDate = isoDate; exports.isoDateString = isoDateString; exports.json = json; exports.jsonArray = jsonArray; exports.jsonObject = jsonObject; exports.ksuid = ksuid; exports.lazy = lazy; exports.mapping = mapping; exports.max = max; exports.min = min; exports.nanoid = nanoid; exports.natural = natural; exports.never = never; exports.nonEmptyArray = nonEmptyArray; exports.nonEmptyString = nonEmptyString; exports.nonNegativeNumber = nonNegativeNumber; exports.null_ = null_; exports.nullable = nullable; exports.nullish = nullish; exports.number = number; exports.numeric = numeric; 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.record = record; exports.regex = regex; exports.select = select; exports.setFromArray = setFromArray; exports.sized = sized; exports.startsWith = startsWith; exports.string = string; exports.taggedUnion = taggedUnion; exports.truthy = truthy; exports.tuple = tuple; exports.undefined_ = undefined_; exports.unknown = unknown; exports.url = url; exports.urlString = urlString; exports.uuid = uuid; exports.uuidv1 = uuidv1; exports.uuidv4 = uuidv4;
 // istanbul ignore next -- @preserve
 // istanbul ignore else -- @preserve

package/dist/index.d.cts

@@ -645,6 +645,16 @@ declare const uuidv1: Decoder<string>;
  * strings.
  */
 declare const uuidv4: Decoder<string>;
+/**
+ * Accepts and returns [KSUID](https://github.com/segmentio/ksuid) strings
+ * (K-Sortable Unique IDentifier): 27 base62 chars, encoding a 160-bit value.
+ * Optionally, specify a prefix the KSUID must be preceded by, e.g.
+ * `ksuid({ prefix: 'msg_' })` accepts `msg_0ujtsYcgvSTl8PAuAdqWYSMnLOv`.
+ */
+declare function ksuid(): Decoder<string>;
+declare function ksuid<P extends string>(options: {
+    prefix: P;
+}): Decoder<`${P}${string}`>;
 /**
  * Accepts and returns strings with decimal digits only (base-10).
  * To convert these to numbers, use the `numeric` decoder.
@@ -733,4 +743,4 @@ declare function isPromiseLike(value: unknown): value is PromiseLike<unknown>;
  */
 declare function isPlainObject(value: unknown): value is Record<string, unknown>;
 
-export { type Annotation, type ArrayAnnotation, type DecodeResult, type Decoder, type DecoderType, type Err, type Formatter, type JSONArray, type JSONObject, type JSONValue, type ObjectAnnotation, type Ok, type OpaqueAnnotation, type Relax, type Result, type Scalar, type ScalarAnnotation, type SizeOptions, type Sized, public_annotate as _annotate, always, anyNumber, anything, array, between, bigint, boolean, constant, date, dateString, datelike, decimal, define, either, email, endsWith, enum_, err, exact, fail, flexDate, formatInline, formatShort, hexadecimal, httpsUrl, identifier, inexact, instanceOf, integer, isDate, isDecoder, isPlainObject, isPromiseLike, iso8601, isoDate, isoDateString, json, jsonArray, jsonObject, lazy, mapping, max, min, nanoid, natural, never, nonEmptyArray, nonEmptyString, nonNegativeNumber, null_, nullable, nullish, number, numeric, object, ok, oneOf, optional, poja, pojo, positiveInteger, positiveNumber, prep, record, regex, select, setFromArray, sized, startsWith, string, taggedUnion, truthy, tuple, undefined_, unknown, url, urlString, uuid, uuidv1, uuidv4 };
+export { type Annotation, type ArrayAnnotation, type DecodeResult, type Decoder, type DecoderType, type Err, type Formatter, type JSONArray, type JSONObject, type JSONValue, type ObjectAnnotation, type Ok, type OpaqueAnnotation, type Relax, type Result, type Scalar, type ScalarAnnotation, type SizeOptions, type Sized, public_annotate as _annotate, always, anyNumber, anything, array, between, bigint, boolean, constant, date, dateString, datelike, decimal, define, either, email, endsWith, enum_, err, exact, fail, flexDate, formatInline, formatShort, hexadecimal, httpsUrl, identifier, inexact, instanceOf, integer, isDate, isDecoder, isPlainObject, isPromiseLike, iso8601, isoDate, isoDateString, json, jsonArray, jsonObject, ksuid, lazy, mapping, max, min, nanoid, natural, never, nonEmptyArray, nonEmptyString, nonNegativeNumber, null_, nullable, nullish, number, numeric, object, ok, oneOf, optional, poja, pojo, positiveInteger, positiveNumber, prep, record, regex, select, setFromArray, sized, startsWith, string, taggedUnion, truthy, tuple, undefined_, unknown, url, urlString, uuid, uuidv1, uuidv4 };

package/dist/index.d.ts

@@ -645,6 +645,16 @@ declare const uuidv1: Decoder<string>;
  * strings.
  */
 declare const uuidv4: Decoder<string>;
+/**
+ * Accepts and returns [KSUID](https://github.com/segmentio/ksuid) strings
+ * (K-Sortable Unique IDentifier): 27 base62 chars, encoding a 160-bit value.
+ * Optionally, specify a prefix the KSUID must be preceded by, e.g.
+ * `ksuid({ prefix: 'msg_' })` accepts `msg_0ujtsYcgvSTl8PAuAdqWYSMnLOv`.
+ */
+declare function ksuid(): Decoder<string>;
+declare function ksuid<P extends string>(options: {
+    prefix: P;
+}): Decoder<`${P}${string}`>;
 /**
  * Accepts and returns strings with decimal digits only (base-10).
  * To convert these to numbers, use the `numeric` decoder.
@@ -733,4 +743,4 @@ declare function isPromiseLike(value: unknown): value is PromiseLike<unknown>;
  */
 declare function isPlainObject(value: unknown): value is Record<string, unknown>;
 
-export { type Annotation, type ArrayAnnotation, type DecodeResult, type Decoder, type DecoderType, type Err, type Formatter, type JSONArray, type JSONObject, type JSONValue, type ObjectAnnotation, type Ok, type OpaqueAnnotation, type Relax, type Result, type Scalar, type ScalarAnnotation, type SizeOptions, type Sized, public_annotate as _annotate, always, anyNumber, anything, array, between, bigint, boolean, constant, date, dateString, datelike, decimal, define, either, email, endsWith, enum_, err, exact, fail, flexDate, formatInline, formatShort, hexadecimal, httpsUrl, identifier, inexact, instanceOf, integer, isDate, isDecoder, isPlainObject, isPromiseLike, iso8601, isoDate, isoDateString, json, jsonArray, jsonObject, lazy, mapping, max, min, nanoid, natural, never, nonEmptyArray, nonEmptyString, nonNegativeNumber, null_, nullable, nullish, number, numeric, object, ok, oneOf, optional, poja, pojo, positiveInteger, positiveNumber, prep, record, regex, select, setFromArray, sized, startsWith, string, taggedUnion, truthy, tuple, undefined_, unknown, url, urlString, uuid, uuidv1, uuidv4 };
+export { type Annotation, type ArrayAnnotation, type DecodeResult, type Decoder, type DecoderType, type Err, type Formatter, type JSONArray, type JSONObject, type JSONValue, type ObjectAnnotation, type Ok, type OpaqueAnnotation, type Relax, type Result, type Scalar, type ScalarAnnotation, type SizeOptions, type Sized, public_annotate as _annotate, always, anyNumber, anything, array, between, bigint, boolean, constant, date, dateString, datelike, decimal, define, either, email, endsWith, enum_, err, exact, fail, flexDate, formatInline, formatShort, hexadecimal, httpsUrl, identifier, inexact, instanceOf, integer, isDate, isDecoder, isPlainObject, isPromiseLike, iso8601, isoDate, isoDateString, json, jsonArray, jsonObject, ksuid, lazy, mapping, max, min, nanoid, natural, never, nonEmptyArray, nonEmptyString, nonNegativeNumber, null_, nullable, nullish, number, numeric, object, ok, oneOf, optional, poja, pojo, positiveInteger, positiveNumber, prep, record, regex, select, setFromArray, sized, startsWith, string, taggedUnion, truthy, tuple, undefined_, unknown, url, urlString, uuid, uuidv1, uuidv4 };

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__
@@ -939,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));
@@ -1016,6 +1026,16 @@ var uuidv4 = (
   // https://en.wikipedia.org/wiki/Universally_unique_identifier#Version_4_(random)
   /* @__PURE__ */ uuid.refine((value) => value[14] === "4", "Must be uuidv4")
 );
+function isKsuid(value) {
+  return /^[0-9a-z]{27}$/i.test(value) && // Base62 alphabet sorts like ASCII, so the 2^160 - 1 upper bound is a
+  // string comparison
+  value <= "aWgEPTl1tmebfsQzFP4bxwgy80V";
+}
+// @__NO_SIDE_EFFECTS__
+function ksuid(options) {
+  const prefix = options?.prefix;
+  return prefix ? (/* @__PURE__ */ startsWith(prefix)).refine((s) => isKsuid(s.slice(prefix.length)), "Must be ksuid") : string.refine(isKsuid, "Must be ksuid");
+}
 var decimal = /* @__PURE__ */ regex(/^[0-9]+$/, "Must only contain digits");
 var hexadecimal = /* @__PURE__ */ regex(
   /^[0-9a-f]+$/i,
@@ -1142,6 +1162,7 @@ export {
   json,
   jsonArray,
   jsonObject,
+  ksuid,
   lazy,
   mapping,
   max,

package/package.json

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