@atproto/lex-schema 0.0.2 → 0.0.4

package/dist/schema/bytes.js.map

@@ -1 +1 @@
-{"version":3,"file":"bytes.js","sourceRoot":"","sources":["../../src/schema/bytes.ts"],"names":[],"mappings":";;;AAAA,gDAAgD;AAChD,oDAAgF;AAOhF,MAAa,WAAY,SAAQ,yBAAqB;IAG/B;IAFZ,WAAW,GAAG,OAAgB,CAAA;IAEvC,YAAqB,OAA2B;QAC9C,KAAK,EAAE,CAAA;QADY,YAAO,GAAP,OAAO,CAAoB;IAEhD,CAAC;IAEQ,iBAAiB,CACxB,KAAc,EACd,GAAqB;QAErB,kDAAkD;QAClD,MAAM,KAAK,GAAG,IAAA,uBAAY,EAAC,KAAK,CAAC,CAAA;QACjC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QAC7C,CAAC;QAED,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,OAAO,CAAA;QAClC,IAAI,SAAS,IAAI,IAAI,IAAI,KAAK,CAAC,MAAM,GAAG,SAAS,EAAE,CAAC;YAClD,OAAO,GAAG,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QACnE,CAAC;QAED,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,OAAO,CAAA;QAClC,IAAI,SAAS,IAAI,IAAI,IAAI,KAAK,CAAC,MAAM,GAAG,SAAS,EAAE,CAAC;YAClD,OAAO,GAAG,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QACjE,CAAC;QAED,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC3B,CAAC;CACF;AA7BD,kCA6BC","sourcesContent":["import { asUint8Array } from '@atproto/lex-data'\nimport { ValidationResult, Validator, ValidatorContext } from '../validation.js'\n\nexport type BytesSchemaOptions = {\n  minLength?: number\n  maxLength?: number\n}\n\nexport class BytesSchema extends Validator<Uint8Array> {\n  readonly lexiconType = 'bytes' as const\n\n  constructor(readonly options: BytesSchemaOptions) {\n    super()\n  }\n\n  override validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<Uint8Array> {\n    // Coerce different binary formats into Uint8Array\n    const bytes = asUint8Array(input)\n    if (!bytes) {\n      return ctx.issueInvalidType(input, 'bytes')\n    }\n\n    const { minLength } = this.options\n    if (minLength != null && bytes.length < minLength) {\n      return ctx.issueTooSmall(bytes, 'bytes', minLength, bytes.length)\n    }\n\n    const { maxLength } = this.options\n    if (maxLength != null && bytes.length > maxLength) {\n      return ctx.issueTooBig(bytes, 'bytes', maxLength, bytes.length)\n    }\n\n    return ctx.success(bytes)\n  }\n}\n"]}
+{"version":3,"file":"bytes.js","sourceRoot":"","sources":["../../src/schema/bytes.ts"],"names":[],"mappings":";;;AAAA,gDAAgD;AAChD,oDAA6E;AAO7E,MAAa,WAAY,SAAQ,sBAAkB;IAC5B;IAArB,YAAqB,UAA8B,EAAE;QACnD,KAAK,EAAE,CAAA;QADY,YAAO,GAAP,OAAO,CAAyB;IAErD,CAAC;IAED,iBAAiB,CACf,KAAc,EACd,GAAqB;QAErB,kDAAkD;QAClD,MAAM,KAAK,GAAG,IAAA,uBAAY,EAAC,KAAK,CAAC,CAAA;QACjC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QAC7C,CAAC;QAED,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,OAAO,CAAA;QAClC,IAAI,SAAS,IAAI,IAAI,IAAI,KAAK,CAAC,MAAM,GAAG,SAAS,EAAE,CAAC;YAClD,OAAO,GAAG,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QACnE,CAAC;QAED,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,OAAO,CAAA;QAClC,IAAI,SAAS,IAAI,IAAI,IAAI,KAAK,CAAC,MAAM,GAAG,SAAS,EAAE,CAAC;YAClD,OAAO,GAAG,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QACjE,CAAC;QAED,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC3B,CAAC;CACF;AA3BD,kCA2BC","sourcesContent":["import { asUint8Array } from '@atproto/lex-data'\nimport { Schema, ValidationResult, ValidatorContext } from '../validation.js'\n\nexport type BytesSchemaOptions = {\n  minLength?: number\n  maxLength?: number\n}\n\nexport class BytesSchema extends Schema<Uint8Array> {\n  constructor(readonly options: BytesSchemaOptions = {}) {\n    super()\n  }\n\n  validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<Uint8Array> {\n    // Coerce different binary formats into Uint8Array\n    const bytes = asUint8Array(input)\n    if (!bytes) {\n      return ctx.issueInvalidType(input, 'bytes')\n    }\n\n    const { minLength } = this.options\n    if (minLength != null && bytes.length < minLength) {\n      return ctx.issueTooSmall(bytes, 'bytes', minLength, bytes.length)\n    }\n\n    const { maxLength } = this.options\n    if (maxLength != null && bytes.length > maxLength) {\n      return ctx.issueTooBig(bytes, 'bytes', maxLength, bytes.length)\n    }\n\n    return ctx.success(bytes)\n  }\n}\n"]}

package/dist/schema/cid.d.ts

@@ -1,13 +1,20 @@
-import { CID } from '@atproto/lex-data';
-import { ValidationResult, Validator, ValidatorContext } from '../validation.js';
-export { CID };
+import { Cid } from '@atproto/lex-data';
+import { Schema, ValidationResult, ValidatorContext } from '../validation.js';
+export type { Cid };
 export type CidSchemaOptions = {
+    /**
+     * In strict mode, only CID with the following properties are accepted:
+     * - version: 1
+     * - codec: raw binary (0x55) or DAG-CBOR (0x71)
+     * - hash function: SHA-256 (0x12)
+     *
+     * @default false
+     */
     strict?: boolean;
 };
-export declare class CidSchema extends Validator<CID> {
+export declare class CidSchema extends Schema<Cid> {
     readonly options: CidSchemaOptions;
-    readonly lexiconType: "cid-link";
     constructor(options?: CidSchemaOptions);
-    validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<CID>;
+    validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<Cid>;
 }
 //# sourceMappingURL=cid.d.ts.map

package/dist/schema/cid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cid.d.ts","sourceRoot":"","sources":["../../src/schema/cid.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAS,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAEhF,OAAO,EAAE,GAAG,EAAE,CAAA;AAEd,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,qBAAa,SAAU,SAAQ,SAAS,CAAC,GAAG,CAAC;IAG/B,QAAQ,CAAC,OAAO,EAAE,gBAAgB;IAF9C,QAAQ,CAAC,WAAW,EAAG,UAAU,CAAS;gBAErB,OAAO,GAAE,gBAAqB;IAI1C,iBAAiB,CACxB,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,GAAG,CAAC;CAOzB"}
+{"version":3,"file":"cid.d.ts","sourceRoot":"","sources":["../../src/schema/cid.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAS,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAE7E,YAAY,EAAE,GAAG,EAAE,CAAA;AAEnB,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,qBAAa,SAAU,SAAQ,MAAM,CAAC,GAAG,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,gBAAgB;gBAAzB,OAAO,GAAE,gBAAqB;IAInD,iBAAiB,CACf,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,GAAG,CAAC;CAOzB"}

package/dist/schema/cid.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CidSchema = exports.CID = void 0;
+exports.CidSchema = void 0;
 const lex_data_1 = require("@atproto/lex-data");
-Object.defineProperty(exports, "CID", { enumerable: true, get: function () { return lex_data_1.CID; } });
 const validation_js_1 = require("../validation.js");
-class CidSchema extends validation_js_1.Validator {
+class CidSchema extends validation_js_1.Schema {
     options;
-    lexiconType = 'cid-link';
     constructor(options = {}) {
         super();
         this.options = options;

package/dist/schema/cid.js.map

@@ -1 +1 @@
-{"version":3,"file":"cid.js","sourceRoot":"","sources":["../../src/schema/cid.ts"],"names":[],"mappings":";;;AAAA,gDAA8C;AAGrC,oFAHA,cAAG,OAGA;AAFZ,oDAAgF;AAQhF,MAAa,SAAU,SAAQ,yBAAc;IAGtB;IAFZ,WAAW,GAAG,UAAmB,CAAA;IAE1C,YAAqB,UAA4B,EAAE;QACjD,KAAK,EAAE,CAAA;QADY,YAAO,GAAP,OAAO,CAAuB;IAEnD,CAAC;IAEQ,iBAAiB,CACxB,KAAc,EACd,GAAqB;QAErB,IAAI,CAAC,IAAA,gBAAK,EAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;QAC3C,CAAC;QAED,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC3B,CAAC;CACF;AAjBD,8BAiBC","sourcesContent":["import { CID, isCid } from '@atproto/lex-data'\nimport { ValidationResult, Validator, ValidatorContext } from '../validation.js'\n\nexport { CID }\n\nexport type CidSchemaOptions = {\n  strict?: boolean\n}\n\nexport class CidSchema extends Validator<CID> {\n  readonly lexiconType = 'cid-link' as const\n\n  constructor(readonly options: CidSchemaOptions = {}) {\n    super()\n  }\n\n  override validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<CID> {\n    if (!isCid(input, this.options)) {\n      return ctx.issueInvalidType(input, 'cid')\n    }\n\n    return ctx.success(input)\n  }\n}\n"]}
+{"version":3,"file":"cid.js","sourceRoot":"","sources":["../../src/schema/cid.ts"],"names":[],"mappings":";;;AAAA,gDAA8C;AAC9C,oDAA6E;AAgB7E,MAAa,SAAU,SAAQ,sBAAW;IACnB;IAArB,YAAqB,UAA4B,EAAE;QACjD,KAAK,EAAE,CAAA;QADY,YAAO,GAAP,OAAO,CAAuB;IAEnD,CAAC;IAED,iBAAiB,CACf,KAAc,EACd,GAAqB;QAErB,IAAI,CAAC,IAAA,gBAAK,EAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;QAC3C,CAAC;QAED,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC3B,CAAC;CACF;AAfD,8BAeC","sourcesContent":["import { Cid, isCid } from '@atproto/lex-data'\nimport { Schema, ValidationResult, ValidatorContext } from '../validation.js'\n\nexport type { Cid }\n\nexport type CidSchemaOptions = {\n  /**\n   * In strict mode, only CID with the following properties are accepted:\n   * - version: 1\n   * - codec: raw binary (0x55) or DAG-CBOR (0x71)\n   * - hash function: SHA-256 (0x12)\n   *\n   * @default false\n   */\n  strict?: boolean\n}\n\nexport class CidSchema extends Schema<Cid> {\n  constructor(readonly options: CidSchemaOptions = {}) {\n    super()\n  }\n\n  validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<Cid> {\n    if (!isCid(input, this.options)) {\n      return ctx.issueInvalidType(input, 'cid')\n    }\n\n    return ctx.success(input)\n  }\n}\n"]}

package/dist/schema/custom.d.ts

@@ -1,11 +1,10 @@
-import { PropertyKey } from '../validation/property-key.js';
-import { ContextualIssue, ValidationResult, Validator, ValidatorContext } from '../validation/validator.js';
+import { Issue, PropertyKey, Schema, ValidationResult, ValidatorContext } from '../validation.js';
 export type CustomAssertionContext = {
     path: PropertyKey[];
-    addIssue(issue: ContextualIssue): void;
+    addIssue(issue: Issue): void;
 };
 export type CustomAssertion<T = any> = (this: null, input: unknown, ctx: CustomAssertionContext) => input is T;
-export declare class CustomSchema<T = unknown> extends Validator<T> {
+export declare class CustomSchema<T = unknown> extends Schema<T> {
     private readonly assertion;
     private readonly message;
     private readonly path?;

package/dist/schema/custom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../src/schema/custom.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EACjB,MAAM,4BAA4B,CAAA;AAEnC,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,WAAW,EAAE,CAAA;IACnB,QAAQ,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,CAAA;CACvC,CAAA;AAED,MAAM,MAAM,eAAe,CAAC,CAAC,GAAG,GAAG,IAAI,CACrC,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,sBAAsB,KACxB,KAAK,IAAI,CAAC,CAAA;AAEf,qBAAa,YAAY,CAAC,CAAC,GAAG,OAAO,CAAE,SAAQ,SAAS,CAAC,CAAC,CAAC;IAEvD,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAFL,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC,EAC7B,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,GAAE,WAAW,GAAG,SAAS,WAAW,EAAE,aAAA;IAKrD,iBAAiB,CACxB,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,CAAC,CAAC;CAIvB"}
+{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../src/schema/custom.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAEL,WAAW,EACX,MAAM,EACN,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,kBAAkB,CAAA;AAEzB,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,WAAW,EAAE,CAAA;IACnB,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAA;CAC7B,CAAA;AAED,MAAM,MAAM,eAAe,CAAC,CAAC,GAAG,GAAG,IAAI,CACrC,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,sBAAsB,KACxB,KAAK,IAAI,CAAC,CAAA;AAEf,qBAAa,YAAY,CAAC,CAAC,GAAG,OAAO,CAAE,SAAQ,MAAM,CAAC,CAAC,CAAC;IAEpD,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAFL,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC,EAC7B,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,GAAE,WAAW,GAAG,SAAS,WAAW,EAAE,aAAA;IAK9D,iBAAiB,CACf,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,CAAC,CAAC;CAKvB"}

package/dist/schema/custom.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomSchema = void 0;
-const validator_js_1 = require("../validation/validator.js");
-class CustomSchema extends validator_js_1.Validator {
+const validation_js_1 = require("../validation.js");
+class CustomSchema extends validation_js_1.Schema {
     assertion;
     message;
     path;
@@ -15,7 +15,8 @@ class CustomSchema extends validator_js_1.Validator {
     validateInContext(input, ctx) {
         if (this.assertion.call(null, input, ctx))
             return ctx.success(input);
-        return ctx.custom(input, this.message, this.path);
+        const path = ctx.concatPath(this.path);
+        return ctx.failure(new validation_js_1.IssueCustom(path, input, this.message));
     }
 }
 exports.CustomSchema = CustomSchema;

package/dist/schema/custom.js.map

@@ -1 +1 @@
-{"version":3,"file":"custom.js","sourceRoot":"","sources":["../../src/schema/custom.ts"],"names":[],"mappings":";;;AACA,6DAKmC;AAanC,MAAa,YAA0B,SAAQ,wBAAY;IAEtC;IACA;IACA;IAHnB,YACmB,SAA6B,EAC7B,OAAe,EACf,IAA2C;QAE5D,KAAK,EAAE,CAAA;QAJU,cAAS,GAAT,SAAS,CAAoB;QAC7B,YAAO,GAAP,OAAO,CAAQ;QACf,SAAI,GAAJ,IAAI,CAAuC;IAG9D,CAAC;IAEQ,iBAAiB,CACxB,KAAc,EACd,GAAqB;QAErB,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC;YAAE,OAAO,GAAG,CAAC,OAAO,CAAC,KAAU,CAAC,CAAA;QACzE,OAAO,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;IACnD,CAAC;CACF;AAhBD,oCAgBC","sourcesContent":["import { PropertyKey } from '../validation/property-key.js'\nimport {\n  ContextualIssue,\n  ValidationResult,\n  Validator,\n  ValidatorContext,\n} from '../validation/validator.js'\n\nexport type CustomAssertionContext = {\n  path: PropertyKey[]\n  addIssue(issue: ContextualIssue): void\n}\n\nexport type CustomAssertion<T = any> = (\n  this: null,\n  input: unknown,\n  ctx: CustomAssertionContext,\n) => input is T\n\nexport class CustomSchema<T = unknown> extends Validator<T> {\n  constructor(\n    private readonly assertion: CustomAssertion<T>,\n    private readonly message: string,\n    private readonly path?: PropertyKey | readonly PropertyKey[],\n  ) {\n    super()\n  }\n\n  override validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<T> {\n    if (this.assertion.call(null, input, ctx)) return ctx.success(input as T)\n    return ctx.custom(input, this.message, this.path)\n  }\n}\n"]}
+{"version":3,"file":"custom.js","sourceRoot":"","sources":["../../src/schema/custom.ts"],"names":[],"mappings":";;;AAAA,oDAOyB;AAazB,MAAa,YAA0B,SAAQ,sBAAS;IAEnC;IACA;IACA;IAHnB,YACmB,SAA6B,EAC7B,OAAe,EACf,IAA2C;QAE5D,KAAK,EAAE,CAAA;QAJU,cAAS,GAAT,SAAS,CAAoB;QAC7B,YAAO,GAAP,OAAO,CAAQ;QACf,SAAI,GAAJ,IAAI,CAAuC;IAG9D,CAAC;IAED,iBAAiB,CACf,KAAc,EACd,GAAqB;QAErB,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC;YAAE,OAAO,GAAG,CAAC,OAAO,CAAC,KAAU,CAAC,CAAA;QACzE,MAAM,IAAI,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACtC,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,2BAAW,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;IAChE,CAAC;CACF;AAjBD,oCAiBC","sourcesContent":["import {\n  Issue,\n  IssueCustom,\n  PropertyKey,\n  Schema,\n  ValidationResult,\n  ValidatorContext,\n} from '../validation.js'\n\nexport type CustomAssertionContext = {\n  path: PropertyKey[]\n  addIssue(issue: Issue): void\n}\n\nexport type CustomAssertion<T = any> = (\n  this: null,\n  input: unknown,\n  ctx: CustomAssertionContext,\n) => input is T\n\nexport class CustomSchema<T = unknown> extends Schema<T> {\n  constructor(\n    private readonly assertion: CustomAssertion<T>,\n    private readonly message: string,\n    private readonly path?: PropertyKey | readonly PropertyKey[],\n  ) {\n    super()\n  }\n\n  validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<T> {\n    if (this.assertion.call(null, input, ctx)) return ctx.success(input as T)\n    const path = ctx.concatPath(this.path)\n    return ctx.failure(new IssueCustom(path, input, this.message))\n  }\n}\n"]}

package/dist/schema/dict.d.ts

@@ -1,11 +1,11 @@
-import { Infer, ValidationResult, Validator, ValidatorContext } from '../validation.js';
-export type DictSchemaOutput<KeySchema extends Validator, ValueSchema extends Validator> = Infer<KeySchema> extends never ? Record<string, never> : Record<Infer<KeySchema> & string, Infer<ValueSchema>>;
+import { Infer, Schema, ValidationResult, Validator, ValidatorContext } from '../validation.js';
+export type DictSchemaOutput<KeySchema extends Validator<string>, ValueSchema extends Validator> = Record<Infer<KeySchema>, Infer<ValueSchema>>;
 /**
  * @note There is no dictionary in Lexicon schemas. This is a custom extension
  * to allow map-like objects when using the lex library programmatically (i.e.
  * not code generated from a lexicon schema).
  */
-export declare class DictSchema<const KeySchema extends Validator = any, const ValueSchema extends Validator = any> extends Validator<DictSchemaOutput<KeySchema, ValueSchema>> {
+export declare class DictSchema<const KeySchema extends Validator<string> = any, const ValueSchema extends Validator = any> extends Schema<DictSchemaOutput<KeySchema, ValueSchema>> {
     readonly keySchema: KeySchema;
     readonly valueSchema: ValueSchema;
     constructor(keySchema: KeySchema, valueSchema: ValueSchema);

package/dist/schema/dict.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dict.d.ts","sourceRoot":"","sources":["../../src/schema/dict.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,EACL,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EACjB,MAAM,kBAAkB,CAAA;AAEzB,MAAM,MAAM,gBAAgB,CAC1B,SAAS,SAAS,SAAS,EAC3B,WAAW,SAAS,SAAS,IAE7B,KAAK,CAAC,SAAS,CAAC,SAAS,KAAK,GAC1B,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GACrB,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CAAA;AAE3D;;;;GAIG;AACH,qBAAa,UAAU,CACrB,KAAK,CAAC,SAAS,SAAS,SAAS,GAAG,GAAG,EACvC,KAAK,CAAC,WAAW,SAAS,SAAS,GAAG,GAAG,CACzC,SAAQ,SAAS,CAAC,gBAAgB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAEzD,QAAQ,CAAC,SAAS,EAAE,SAAS;IAC7B,QAAQ,CAAC,WAAW,EAAE,WAAW;gBADxB,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW;IAK1B,iBAAiB,CACxB,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,EACrB,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE;YAAE,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;SAAE,CAAA;KAAE,GACtD,gBAAgB,CAAC,gBAAgB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;CAgC9D"}
+{"version":3,"file":"dict.d.ts","sourceRoot":"","sources":["../../src/schema/dict.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,EACL,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EACjB,MAAM,kBAAkB,CAAA;AAEzB,MAAM,MAAM,gBAAgB,CAC1B,SAAS,SAAS,SAAS,CAAC,MAAM,CAAC,EACnC,WAAW,SAAS,SAAS,IAC3B,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CAAA;AAEhD;;;;GAIG;AACH,qBAAa,UAAU,CACrB,KAAK,CAAC,SAAS,SAAS,SAAS,CAAC,MAAM,CAAC,GAAG,GAAG,EAC/C,KAAK,CAAC,WAAW,SAAS,SAAS,GAAG,GAAG,CACzC,SAAQ,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAEtD,QAAQ,CAAC,SAAS,EAAE,SAAS;IAC7B,QAAQ,CAAC,WAAW,EAAE,WAAW;gBADxB,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW;IAKnC,iBAAiB,CACf,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,EACrB,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE;YAAE,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;SAAE,CAAA;KAAE,GACtD,gBAAgB,CAAC,gBAAgB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;CAgC9D"}

package/dist/schema/dict.js

@@ -8,7 +8,7 @@ const validation_js_1 = require("../validation.js");
  * to allow map-like objects when using the lex library programmatically (i.e.
  * not code generated from a lexicon schema).
  */
-class DictSchema extends validation_js_1.Validator {
+class DictSchema extends validation_js_1.Schema {
     keySchema;
     valueSchema;
     constructor(keySchema, valueSchema) {

package/dist/schema/dict.js.map

@@ -1 +1 @@
-{"version":3,"file":"dict.js","sourceRoot":"","sources":["../../src/schema/dict.ts"],"names":[],"mappings":";;;AAAA,gDAAiD;AACjD,oDAKyB;AAUzB;;;;GAIG;AACH,MAAa,UAGX,SAAQ,yBAAmD;IAEhD;IACA;IAFX,YACW,SAAoB,EACpB,WAAwB;QAEjC,KAAK,EAAE,CAAA;QAHE,cAAS,GAAT,SAAS,CAAW;QACpB,gBAAW,GAAX,WAAW,CAAa;IAGnC,CAAC;IAEQ,iBAAiB,CACxB,KAAc,EACd,GAAqB,EACrB,OAAuD;QAEvD,IAAI,CAAC,IAAA,wBAAa,EAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QAC5C,CAAC;QAED,IAAI,IAAyC,CAAA;QAE7C,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,IAAI,OAAO,EAAE,WAAW,EAAE,GAAG,CAAC,GAAG,CAAC;gBAAE,SAAQ;YAE5C,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;YACnD,IAAI,CAAC,SAAS,CAAC,OAAO;gBAAE,OAAO,SAAS,CAAA;YACxC,IAAI,SAAS,CAAC,KAAK,KAAK,GAAG,EAAE,CAAC;gBAC5B,mEAAmE;gBACnE,uEAAuE;gBACvE,6DAA6D;gBAC7D,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;YACzC,CAAC;YAED,MAAM,WAAW,GAAG,GAAG,CAAC,aAAa,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;YACnE,IAAI,CAAC,WAAW,CAAC,OAAO;gBAAE,OAAO,WAAW,CAAA;YAE5C,IAAI,WAAW,CAAC,KAAK,KAAK,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrC,IAAI,KAAK,EAAE,GAAG,KAAK,EAAE,CAAA;gBACrB,IAAI,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,KAAK,CAAA;YAC/B,CAAC;QACH,CAAC;QAED,OAAO,GAAG,CAAC,OAAO,CAChB,CAAC,IAAI,IAAI,KAAK,CAA6C,CAC5D,CAAA;IACH,CAAC;CACF;AA/CD,gCA+CC","sourcesContent":["import { isPlainObject } from '@atproto/lex-data'\nimport {\n  Infer,\n  ValidationResult,\n  Validator,\n  ValidatorContext,\n} from '../validation.js'\n\nexport type DictSchemaOutput<\n  KeySchema extends Validator,\n  ValueSchema extends Validator,\n> =\n  Infer<KeySchema> extends never\n    ? Record<string, never>\n    : Record<Infer<KeySchema> & string, Infer<ValueSchema>>\n\n/**\n * @note There is no dictionary in Lexicon schemas. This is a custom extension\n * to allow map-like objects when using the lex library programmatically (i.e.\n * not code generated from a lexicon schema).\n */\nexport class DictSchema<\n  const KeySchema extends Validator = any,\n  const ValueSchema extends Validator = any,\n> extends Validator<DictSchemaOutput<KeySchema, ValueSchema>> {\n  constructor(\n    readonly keySchema: KeySchema,\n    readonly valueSchema: ValueSchema,\n  ) {\n    super()\n  }\n\n  override validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n    options?: { ignoredKeys?: { has(k: string): boolean } },\n  ): ValidationResult<DictSchemaOutput<KeySchema, ValueSchema>> {\n    if (!isPlainObject(input)) {\n      return ctx.issueInvalidType(input, 'dict')\n    }\n\n    let copy: undefined | Record<string, unknown>\n\n    for (const key in input) {\n      if (options?.ignoredKeys?.has(key)) continue\n\n      const keyResult = ctx.validate(key, this.keySchema)\n      if (!keyResult.success) return keyResult\n      if (keyResult.value !== key) {\n        // We can't safely \"move\" the key to a different name in the output\n        // object (because there may already be something there), so we issue a\n        // \"required key\" error if the key validation changes the key\n        return ctx.issueRequiredKey(input, key)\n      }\n\n      const valueResult = ctx.validateChild(input, key, this.valueSchema)\n      if (!valueResult.success) return valueResult\n\n      if (valueResult.value !== input[key]) {\n        copy ??= { ...input }\n        copy[key] = valueResult.value\n      }\n    }\n\n    return ctx.success(\n      (copy ?? input) as DictSchemaOutput<KeySchema, ValueSchema>,\n    )\n  }\n}\n"]}
+{"version":3,"file":"dict.js","sourceRoot":"","sources":["../../src/schema/dict.ts"],"names":[],"mappings":";;;AAAA,gDAAiD;AACjD,oDAMyB;AAOzB;;;;GAIG;AACH,MAAa,UAGX,SAAQ,sBAAgD;IAE7C;IACA;IAFX,YACW,SAAoB,EACpB,WAAwB;QAEjC,KAAK,EAAE,CAAA;QAHE,cAAS,GAAT,SAAS,CAAW;QACpB,gBAAW,GAAX,WAAW,CAAa;IAGnC,CAAC;IAED,iBAAiB,CACf,KAAc,EACd,GAAqB,EACrB,OAAuD;QAEvD,IAAI,CAAC,IAAA,wBAAa,EAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QAC5C,CAAC;QAED,IAAI,IAAyC,CAAA;QAE7C,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,IAAI,OAAO,EAAE,WAAW,EAAE,GAAG,CAAC,GAAG,CAAC;gBAAE,SAAQ;YAE5C,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;YACnD,IAAI,CAAC,SAAS,CAAC,OAAO;gBAAE,OAAO,SAAS,CAAA;YACxC,IAAI,SAAS,CAAC,KAAK,KAAK,GAAG,EAAE,CAAC;gBAC5B,mEAAmE;gBACnE,uEAAuE;gBACvE,6DAA6D;gBAC7D,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;YACzC,CAAC;YAED,MAAM,WAAW,GAAG,GAAG,CAAC,aAAa,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;YACnE,IAAI,CAAC,WAAW,CAAC,OAAO;gBAAE,OAAO,WAAW,CAAA;YAE5C,IAAI,WAAW,CAAC,KAAK,KAAK,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrC,IAAI,KAAK,EAAE,GAAG,KAAK,EAAE,CAAA;gBACrB,IAAI,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,KAAK,CAAA;YAC/B,CAAC;QACH,CAAC;QAED,OAAO,GAAG,CAAC,OAAO,CAChB,CAAC,IAAI,IAAI,KAAK,CAA6C,CAC5D,CAAA;IACH,CAAC;CACF;AA/CD,gCA+CC","sourcesContent":["import { isPlainObject } from '@atproto/lex-data'\nimport {\n  Infer,\n  Schema,\n  ValidationResult,\n  Validator,\n  ValidatorContext,\n} from '../validation.js'\n\nexport type DictSchemaOutput<\n  KeySchema extends Validator<string>,\n  ValueSchema extends Validator,\n> = Record<Infer<KeySchema>, Infer<ValueSchema>>\n\n/**\n * @note There is no dictionary in Lexicon schemas. This is a custom extension\n * to allow map-like objects when using the lex library programmatically (i.e.\n * not code generated from a lexicon schema).\n */\nexport class DictSchema<\n  const KeySchema extends Validator<string> = any,\n  const ValueSchema extends Validator = any,\n> extends Schema<DictSchemaOutput<KeySchema, ValueSchema>> {\n  constructor(\n    readonly keySchema: KeySchema,\n    readonly valueSchema: ValueSchema,\n  ) {\n    super()\n  }\n\n  validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n    options?: { ignoredKeys?: { has(k: string): boolean } },\n  ): ValidationResult<DictSchemaOutput<KeySchema, ValueSchema>> {\n    if (!isPlainObject(input)) {\n      return ctx.issueInvalidType(input, 'dict')\n    }\n\n    let copy: undefined | Record<string, unknown>\n\n    for (const key in input) {\n      if (options?.ignoredKeys?.has(key)) continue\n\n      const keyResult = ctx.validate(key, this.keySchema)\n      if (!keyResult.success) return keyResult\n      if (keyResult.value !== key) {\n        // We can't safely \"move\" the key to a different name in the output\n        // object (because there may already be something there), so we issue a\n        // \"required key\" error if the key validation changes the key\n        return ctx.issueRequiredKey(input, key)\n      }\n\n      const valueResult = ctx.validateChild(input, key, this.valueSchema)\n      if (!valueResult.success) return valueResult\n\n      if (valueResult.value !== input[key]) {\n        copy ??= { ...input }\n        copy[key] = valueResult.value\n      }\n    }\n\n    return ctx.success(\n      (copy ?? input) as DictSchemaOutput<KeySchema, ValueSchema>,\n    )\n  }\n}\n"]}

package/dist/schema/discriminated-union.d.ts

@@ -1,34 +1,25 @@
-import { ArrayContaining } from '../core.js';
-import { ValidationResult, Validator, ValidatorContext } from '../validation.js';
+import { Infer, Schema, ValidationResult, Validator, ValidatorContext } from '../validation.js';
+import { EnumSchema } from './enum.js';
+import { LiteralSchema } from './literal.js';
 import { ObjectSchema } from './object.js';
-export type DiscriminatedUnionSchemaVariant<Discriminator extends string> = ObjectSchema<{
-    [_ in Discriminator]: Validator;
-}, {
-    required: ArrayContaining<Discriminator, string>;
-}>;
-export type DiscriminatedUnionSchemaVariants<Discriminator extends string> = readonly [
-    DiscriminatedUnionSchemaVariant<Discriminator>,
-    ...DiscriminatedUnionSchemaVariant<Discriminator>[]
+export type DiscriminatedUnionVariant<Discriminator extends string> = ObjectSchema<Record<Discriminator, EnumSchema | LiteralSchema>>;
+export type DiscriminatedUnionVariants<Discriminator extends string> = readonly [
+    DiscriminatedUnionVariant<Discriminator>,
+    ...DiscriminatedUnionVariant<Discriminator>[]
 ];
-export type DiscriminatedUnionSchemaOutput<Options extends readonly Validator[]> = Options extends readonly [Validator<infer V>] ? V : Options extends readonly [
-    Validator<infer V>,
-    ...infer Rest extends Validator[]
-] ? V | DiscriminatedUnionSchemaOutput<Rest> : never;
+export type DiscriminatedUnionSchemaOutput<Variants extends readonly Validator[]> = Variants extends readonly [
+    infer V extends Validator,
+    ...infer Rest extends readonly Validator[]
+] ? Infer<V> | DiscriminatedUnionSchemaOutput<Rest> : never;
 /**
  * @note There is no discriminated union in Lexicon schemas. This is a custom
  * extension to allow optimized validation of union of objects when using the
  * lex library programmatically (i.e. not code generated from a lexicon schema).
  */
-export declare class DiscriminatedUnionSchema<const Discriminator extends string = any, const Options extends DiscriminatedUnionSchemaVariants<Discriminator> = any> extends Validator<DiscriminatedUnionSchemaOutput<Options>> {
+export declare class DiscriminatedUnionSchema<const Discriminator extends string = any, const Variants extends DiscriminatedUnionVariants<Discriminator> = any> extends Schema<DiscriminatedUnionSchemaOutput<Variants>> {
     readonly discriminator: Discriminator;
-    readonly variants: Options;
-    constructor(discriminator: Discriminator, variants: Options);
-    /**
-     * If all variants have a literal or enum for the discriminator property,
-     * and there are no overlapping values, returns a map of discriminator values
-     * to variants. Otherwise, returns null.
-     */
-    protected get variantsMap(): Map<unknown, DiscriminatedUnionSchemaVariant<Discriminator>> | null;
-    validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<DiscriminatedUnionSchemaOutput<Options>>;
+    readonly variantsMap: Map<unknown, DiscriminatedUnionVariant<Discriminator>>;
+    constructor(discriminator: Discriminator, variants: Variants);
+    validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<DiscriminatedUnionSchemaOutput<Variants>>;
 }
 //# sourceMappingURL=discriminated-union.d.ts.map

package/dist/schema/discriminated-union.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"discriminated-union.d.ts","sourceRoot":"","sources":["../../src/schema/discriminated-union.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,EAGL,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EACjB,MAAM,kBAAkB,CAAA;AAGzB,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1C,MAAM,MAAM,+BAA+B,CAAC,aAAa,SAAS,MAAM,IACtE,YAAY,CACV;KAAG,CAAC,IAAI,aAAa,GAAG,SAAS;CAAE,EACnC;IAAE,QAAQ,EAAE,eAAe,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;CAAE,CACrD,CAAA;AAEH,MAAM,MAAM,gCAAgC,CAAC,aAAa,SAAS,MAAM,IACvE,SAAS;IACP,+BAA+B,CAAC,aAAa,CAAC;IAC9C,GAAG,+BAA+B,CAAC,aAAa,CAAC,EAAE;CACpD,CAAA;AAEH,MAAM,MAAM,8BAA8B,CACxC,OAAO,SAAS,SAAS,SAAS,EAAE,IAClC,OAAO,SAAS,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,GAC7C,CAAC,GACD,OAAO,SAAS,SAAS;IACrB,SAAS,CAAC,MAAM,CAAC,CAAC;IAClB,GAAG,MAAM,IAAI,SAAS,SAAS,EAAE;CAClC,GACD,CAAC,GAAG,8BAA8B,CAAC,IAAI,CAAC,GACxC,KAAK,CAAA;AAEX;;;;GAIG;AACH,qBAAa,wBAAwB,CACnC,KAAK,CAAC,aAAa,SAAS,MAAM,GAAG,GAAG,EACxC,KAAK,CAAC,OAAO,SAAS,gCAAgC,CAAC,aAAa,CAAC,GAAG,GAAG,CAC3E,SAAQ,SAAS,CAAC,8BAA8B,CAAC,OAAO,CAAC,CAAC;IAExD,QAAQ,CAAC,aAAa,EAAE,aAAa;IACrC,QAAQ,CAAC,QAAQ,EAAE,OAAO;gBADjB,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,OAAO;IAK5B;;;;OAIG;IACH,SAAS,KAAK,WAAW,wEA6BxB;IAEQ,iBAAiB,CACxB,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,8BAA8B,CAAC,OAAO,CAAC,CAAC;CAoD7D"}
+{"version":3,"file":"discriminated-union.d.ts","sourceRoot":"","sources":["../../src/schema/discriminated-union.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,EACL,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EACjB,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1C,MAAM,MAAM,yBAAyB,CAAC,aAAa,SAAS,MAAM,IAChE,YAAY,CAAC,MAAM,CAAC,aAAa,EAAE,UAAU,GAAG,aAAa,CAAC,CAAC,CAAA;AAEjE,MAAM,MAAM,0BAA0B,CAAC,aAAa,SAAS,MAAM,IACjE,SAAS;IACP,yBAAyB,CAAC,aAAa,CAAC;IACxC,GAAG,yBAAyB,CAAC,aAAa,CAAC,EAAE;CAC9C,CAAA;AAEH,MAAM,MAAM,8BAA8B,CACxC,QAAQ,SAAS,SAAS,SAAS,EAAE,IACnC,QAAQ,SAAS,SAAS;IAC5B,MAAM,CAAC,SAAS,SAAS;IACzB,GAAG,MAAM,IAAI,SAAS,SAAS,SAAS,EAAE;CAC3C,GACG,KAAK,CAAC,CAAC,CAAC,GAAG,8BAA8B,CAAC,IAAI,CAAC,GAC/C,KAAK,CAAA;AAET;;;;GAIG;AACH,qBAAa,wBAAwB,CACnC,KAAK,CAAC,aAAa,SAAS,MAAM,GAAG,GAAG,EACxC,KAAK,CAAC,QAAQ,SAAS,0BAA0B,CAAC,aAAa,CAAC,GAAG,GAAG,CACtE,SAAQ,MAAM,CAAC,8BAA8B,CAAC,QAAQ,CAAC,CAAC;IAItD,QAAQ,CAAC,aAAa,EAAE,aAAa;IAHvC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,OAAO,EAAE,yBAAyB,CAAC,aAAa,CAAC,CAAC,CAAA;gBAGjE,aAAa,EAAE,aAAa,EACrC,QAAQ,EAAE,QAAQ;IAUpB,iBAAiB,CACf,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,8BAA8B,CAAC,QAAQ,CAAC,CAAC;CAwB9D"}

package/dist/schema/discriminated-union.js

@@ -10,84 +10,60 @@ const literal_js_1 = require("./literal.js");
  * extension to allow optimized validation of union of objects when using the
  * lex library programmatically (i.e. not code generated from a lexicon schema).
  */
-class DiscriminatedUnionSchema extends validation_js_1.Validator {
+class DiscriminatedUnionSchema extends validation_js_1.Schema {
     discriminator;
-    variants;
+    variantsMap;
     constructor(discriminator, variants) {
         super();
         this.discriminator = discriminator;
-        this.variants = variants;
-    }
-    /**
-     * If all variants have a literal or enum for the discriminator property,
-     * and there are no overlapping values, returns a map of discriminator values
-     * to variants. Otherwise, returns null.
-     */
-    get variantsMap() {
-        const map = new Map();
-        for (const variant of this.variants) {
-            const schema = variant.validators[this.discriminator];
-            if (schema instanceof literal_js_1.LiteralSchema) {
-                if (map.has(schema.value))
-                    return null; // overlapping value
-                map.set(schema.value, variant);
-            }
-            else if (schema instanceof enum_js_1.EnumSchema) {
-                for (const val of schema.values) {
-                    if (map.has(val))
-                        return null; // overlapping value
-                    map.set(val, variant);
-                }
-            }
-            else {
-                return null; // not a literal or enum
-            }
-        }
-        // Cache the map on the instance (to avoid re-computing)
-        Object.defineProperty(this, 'variantsMap', {
-            value: map,
-            writable: false,
-            enumerable: false,
-            configurable: true,
-        });
-        return map;
+        // Although we usually try to avoid initialization work in constructors,
+        // here it is necessary to ensure that invalid discriminated throw from the
+        // place of construction, rather than later during validation.
+        this.variantsMap = buildVariantsMap(discriminator, variants);
     }
     validateInContext(input, ctx) {
         if (!(0, lex_data_1.isPlainObject)(input)) {
             return ctx.issueInvalidType(input, 'object');
         }
-        if (!Object.hasOwn(input, this.discriminator)) {
-            return ctx.issueRequiredKey(input, this.discriminator);
+        const { discriminator } = this;
+        if (!Object.hasOwn(input, discriminator)) {
+            return ctx.issueRequiredKey(input, discriminator);
         }
-        // Fast path: if we have a mapping of discriminator values to variants,
-        // we can directly select the correct variant to validate against. This also
-        // outputs a better error (with a single failure issue) when the discriminator.
-        if (this.variantsMap) {
-            const variant = this.variantsMap.get(input[this.discriminator]);
-            if (!variant) {
-                return ctx.issueInvalidPropertyValue(input, this.discriminator, [
-                    ...this.variantsMap.keys(),
-                ]);
-            }
+        const discriminatorValue = input[discriminator];
+        const variant = this.variantsMap.get(discriminatorValue);
+        if (variant) {
             return ctx.validate(input, variant);
         }
-        // Slow path: try validating against each variant and return the first
-        // successful one (or aggregate all failures if none match).
-        const failures = [];
-        for (const variant of this.variants) {
-            const discSchema = variant.validators[this.discriminator];
-            const discResult = ctx.validateChild(input, this.discriminator, discSchema);
-            if (!discResult.success) {
-                failures.push(discResult);
-                continue;
+        return ctx.issueInvalidPropertyValue(input, discriminator, [
+            ...this.variantsMap.keys(),
+        ]);
+    }
+}
+exports.DiscriminatedUnionSchema = DiscriminatedUnionSchema;
+function buildVariantsMap(discriminator, variants) {
+    const variantsMap = new Map();
+    for (const variant of variants) {
+        const schema = variant.shape[discriminator];
+        if (schema instanceof literal_js_1.LiteralSchema) {
+            if (variantsMap.has(schema.value)) {
+                throw new TypeError(`Overlapping discriminator value: ${schema.value}`);
+            }
+            variantsMap.set(schema.value, variant);
+        }
+        else if (schema instanceof enum_js_1.EnumSchema) {
+            for (const val of schema.values) {
+                if (variantsMap.has(val)) {
+                    throw new TypeError(`Overlapping discriminator value: ${val}`);
+                }
+                variantsMap.set(val, variant);
             }
-            return ctx.validate(input, variant);
         }
-        return {
-            success: false,
-            error: validation_js_1.ValidationError.fromFailures(failures),
-        };
+        else {
+            // Only enumerable discriminator schemas are supported
+            // Should never happen if types are used correctly
+            throw new TypeError(`Discriminator schema must be a LiteralSchema or EnumSchema`);
+        }
     }
+    return variantsMap;
 }
-exports.DiscriminatedUnionSchema = DiscriminatedUnionSchema;
 //# sourceMappingURL=discriminated-union.js.map

package/dist/schema/discriminated-union.js.map

@@ -1 +1 @@
-{"version":3,"file":"discriminated-union.js","sourceRoot":"","sources":["../../src/schema/discriminated-union.ts"],"names":[],"mappings":";;;AAAA,gDAAiD;AAEjD,oDAMyB;AACzB,uCAAsC;AACtC,6CAA4C;AA0B5C;;;;GAIG;AACH,MAAa,wBAGX,SAAQ,yBAAkD;IAE/C;IACA;IAFX,YACW,aAA4B,EAC5B,QAAiB;QAE1B,KAAK,EAAE,CAAA;QAHE,kBAAa,GAAb,aAAa,CAAe;QAC5B,aAAQ,GAAR,QAAQ,CAAS;IAG5B,CAAC;IAED;;;;OAIG;IACH,IAAc,WAAW;QACvB,MAAM,GAAG,GAAG,IAAI,GAAG,EAGhB,CAAA;QACH,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpC,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;YACrD,IAAI,MAAM,YAAY,0BAAa,EAAE,CAAC;gBACpC,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC;oBAAE,OAAO,IAAI,CAAA,CAAC,oBAAoB;gBAC3D,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;YAChC,CAAC;iBAAM,IAAI,MAAM,YAAY,oBAAU,EAAE,CAAC;gBACxC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;oBAChC,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC;wBAAE,OAAO,IAAI,CAAA,CAAC,oBAAoB;oBAClD,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;gBACvB,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAI,CAAA,CAAC,wBAAwB;YACtC,CAAC;QACH,CAAC;QAED,wDAAwD;QACxD,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,aAAa,EAAE;YACzC,KAAK,EAAE,GAAG;YACV,QAAQ,EAAE,KAAK;YACf,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,IAAI;SACnB,CAAC,CAAA;QAEF,OAAO,GAAG,CAAA;IACZ,CAAC;IAEQ,iBAAiB,CACxB,KAAc,EACd,GAAqB;QAErB,IAAI,CAAC,IAAA,wBAAa,EAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QAC9C,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;YAC9C,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,CAAA;QACxD,CAAC;QAED,uEAAuE;QACvE,4EAA4E;QAC5E,+EAA+E;QAC/E,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAA;YAC/D,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,GAAG,CAAC,yBAAyB,CAAC,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE;oBAC9D,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE;iBAC3B,CAAC,CAAA;YACJ,CAAC;YAED,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAEjC,CAAA;QACH,CAAC;QAED,sEAAsE;QACtE,4DAA4D;QAC5D,MAAM,QAAQ,GAAwB,EAAE,CAAA;QAExC,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpC,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;YACzD,MAAM,UAAU,GAAG,GAAG,CAAC,aAAa,CAClC,KAAK,EACL,IAAI,CAAC,aAAa,EAClB,UAAU,CACX,CAAA;YAED,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;gBACxB,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;gBACzB,SAAQ;YACV,CAAC;YAED,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAEjC,CAAA;QACH,CAAC;QAED,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,+BAAe,CAAC,YAAY,CAAC,QAAQ,CAAC;SAC9C,CAAA;IACH,CAAC;CACF;AAtGD,4DAsGC","sourcesContent":["import { isPlainObject } from '@atproto/lex-data'\nimport { ArrayContaining } from '../core.js'\nimport {\n  ValidationError,\n  ValidationFailure,\n  ValidationResult,\n  Validator,\n  ValidatorContext,\n} from '../validation.js'\nimport { EnumSchema } from './enum.js'\nimport { LiteralSchema } from './literal.js'\nimport { ObjectSchema } from './object.js'\n\nexport type DiscriminatedUnionSchemaVariant<Discriminator extends string> =\n  ObjectSchema<\n    { [_ in Discriminator]: Validator },\n    { required: ArrayContaining<Discriminator, string> }\n  >\n\nexport type DiscriminatedUnionSchemaVariants<Discriminator extends string> =\n  readonly [\n    DiscriminatedUnionSchemaVariant<Discriminator>,\n    ...DiscriminatedUnionSchemaVariant<Discriminator>[],\n  ]\n\nexport type DiscriminatedUnionSchemaOutput<\n  Options extends readonly Validator[],\n> = Options extends readonly [Validator<infer V>]\n  ? V\n  : Options extends readonly [\n        Validator<infer V>,\n        ...infer Rest extends Validator[],\n      ]\n    ? V | DiscriminatedUnionSchemaOutput<Rest>\n    : never\n\n/**\n * @note There is no discriminated union in Lexicon schemas. This is a custom\n * extension to allow optimized validation of union of objects when using the\n * lex library programmatically (i.e. not code generated from a lexicon schema).\n */\nexport class DiscriminatedUnionSchema<\n  const Discriminator extends string = any,\n  const Options extends DiscriminatedUnionSchemaVariants<Discriminator> = any,\n> extends Validator<DiscriminatedUnionSchemaOutput<Options>> {\n  constructor(\n    readonly discriminator: Discriminator,\n    readonly variants: Options,\n  ) {\n    super()\n  }\n\n  /**\n   * If all variants have a literal or enum for the discriminator property,\n   * and there are no overlapping values, returns a map of discriminator values\n   * to variants. Otherwise, returns null.\n   */\n  protected get variantsMap() {\n    const map = new Map<\n      unknown,\n      DiscriminatedUnionSchemaVariant<Discriminator>\n    >()\n    for (const variant of this.variants) {\n      const schema = variant.validators[this.discriminator]\n      if (schema instanceof LiteralSchema) {\n        if (map.has(schema.value)) return null // overlapping value\n        map.set(schema.value, variant)\n      } else if (schema instanceof EnumSchema) {\n        for (const val of schema.values) {\n          if (map.has(val)) return null // overlapping value\n          map.set(val, variant)\n        }\n      } else {\n        return null // not a literal or enum\n      }\n    }\n\n    // Cache the map on the instance (to avoid re-computing)\n    Object.defineProperty(this, 'variantsMap', {\n      value: map,\n      writable: false,\n      enumerable: false,\n      configurable: true,\n    })\n\n    return map\n  }\n\n  override validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<DiscriminatedUnionSchemaOutput<Options>> {\n    if (!isPlainObject(input)) {\n      return ctx.issueInvalidType(input, 'object')\n    }\n\n    if (!Object.hasOwn(input, this.discriminator)) {\n      return ctx.issueRequiredKey(input, this.discriminator)\n    }\n\n    // Fast path: if we have a mapping of discriminator values to variants,\n    // we can directly select the correct variant to validate against. This also\n    // outputs a better error (with a single failure issue) when the discriminator.\n    if (this.variantsMap) {\n      const variant = this.variantsMap.get(input[this.discriminator])\n      if (!variant) {\n        return ctx.issueInvalidPropertyValue(input, this.discriminator, [\n          ...this.variantsMap.keys(),\n        ])\n      }\n\n      return ctx.validate(input, variant) as ValidationResult<\n        DiscriminatedUnionSchemaOutput<Options>\n      >\n    }\n\n    // Slow path: try validating against each variant and return the first\n    // successful one (or aggregate all failures if none match).\n    const failures: ValidationFailure[] = []\n\n    for (const variant of this.variants) {\n      const discSchema = variant.validators[this.discriminator]\n      const discResult = ctx.validateChild(\n        input,\n        this.discriminator,\n        discSchema,\n      )\n\n      if (!discResult.success) {\n        failures.push(discResult)\n        continue\n      }\n\n      return ctx.validate(input, variant) as ValidationResult<\n        DiscriminatedUnionSchemaOutput<Options>\n      >\n    }\n\n    return {\n      success: false,\n      error: ValidationError.fromFailures(failures),\n    }\n  }\n}\n"]}
+{"version":3,"file":"discriminated-union.js","sourceRoot":"","sources":["../../src/schema/discriminated-union.ts"],"names":[],"mappings":";;;AAAA,gDAAiD;AACjD,oDAMyB;AACzB,uCAAsC;AACtC,6CAA4C;AAqB5C;;;;GAIG;AACH,MAAa,wBAGX,SAAQ,sBAAgD;IAI7C;IAHF,WAAW,CAAwD;IAE5E,YACW,aAA4B,EACrC,QAAkB;QAElB,KAAK,EAAE,CAAA;QAHE,kBAAa,GAAb,aAAa,CAAe;QAKrC,wEAAwE;QACxE,2EAA2E;QAC3E,8DAA8D;QAC9D,IAAI,CAAC,WAAW,GAAG,gBAAgB,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAA;IAC9D,CAAC;IAED,iBAAiB,CACf,KAAc,EACd,GAAqB;QAErB,IAAI,CAAC,IAAA,wBAAa,EAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QAC9C,CAAC;QAED,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAA;QAE9B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,aAAa,CAAC,EAAE,CAAC;YACzC,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,aAAa,CAAC,CAAA;QACnD,CAAC;QAED,MAAM,kBAAkB,GAAG,KAAK,CAAC,aAAa,CAAC,CAAA;QAE/C,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;QACxD,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAEjC,CAAA;QACH,CAAC;QAED,OAAO,GAAG,CAAC,yBAAyB,CAAC,KAAK,EAAE,aAAa,EAAE;YACzD,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE;SAC3B,CAAC,CAAA;IACJ,CAAC;CACF;AA7CD,4DA6CC;AAED,SAAS,gBAAgB,CACvB,aAA4B,EAC5B,QAAmD;IAEnD,MAAM,WAAW,GAAG,IAAI,GAAG,EAGxB,CAAA;IAEH,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;QAC3C,IAAI,MAAM,YAAY,0BAAa,EAAE,CAAC;YACpC,IAAI,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClC,MAAM,IAAI,SAAS,CAAC,oCAAoC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;YACzE,CAAC;YACD,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QACxC,CAAC;aAAM,IAAI,MAAM,YAAY,oBAAU,EAAE,CAAC;YACxC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBAChC,IAAI,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;oBACzB,MAAM,IAAI,SAAS,CAAC,oCAAoC,GAAG,EAAE,CAAC,CAAA;gBAChE,CAAC;gBACD,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;YAC/B,CAAC;QACH,CAAC;aAAM,CAAC;YACN,sDAAsD;YAEtD,kDAAkD;YAClD,MAAM,IAAI,SAAS,CACjB,4DAA4D,CAC7D,CAAA;QACH,CAAC;IACH,CAAC;IAED,OAAO,WAAW,CAAA;AACpB,CAAC","sourcesContent":["import { isPlainObject } from '@atproto/lex-data'\nimport {\n  Infer,\n  Schema,\n  ValidationResult,\n  Validator,\n  ValidatorContext,\n} from '../validation.js'\nimport { EnumSchema } from './enum.js'\nimport { LiteralSchema } from './literal.js'\nimport { ObjectSchema } from './object.js'\n\nexport type DiscriminatedUnionVariant<Discriminator extends string> =\n  ObjectSchema<Record<Discriminator, EnumSchema | LiteralSchema>>\n\nexport type DiscriminatedUnionVariants<Discriminator extends string> =\n  readonly [\n    DiscriminatedUnionVariant<Discriminator>,\n    ...DiscriminatedUnionVariant<Discriminator>[],\n  ]\n\nexport type DiscriminatedUnionSchemaOutput<\n  Variants extends readonly Validator[],\n> = Variants extends readonly [\n  infer V extends Validator,\n  ...infer Rest extends readonly Validator[],\n]\n  ? Infer<V> | DiscriminatedUnionSchemaOutput<Rest>\n  : never\n\n/**\n * @note There is no discriminated union in Lexicon schemas. This is a custom\n * extension to allow optimized validation of union of objects when using the\n * lex library programmatically (i.e. not code generated from a lexicon schema).\n */\nexport class DiscriminatedUnionSchema<\n  const Discriminator extends string = any,\n  const Variants extends DiscriminatedUnionVariants<Discriminator> = any,\n> extends Schema<DiscriminatedUnionSchemaOutput<Variants>> {\n  readonly variantsMap: Map<unknown, DiscriminatedUnionVariant<Discriminator>>\n\n  constructor(\n    readonly discriminator: Discriminator,\n    variants: Variants,\n  ) {\n    super()\n\n    // Although we usually try to avoid initialization work in constructors,\n    // here it is necessary to ensure that invalid discriminated throw from the\n    // place of construction, rather than later during validation.\n    this.variantsMap = buildVariantsMap(discriminator, variants)\n  }\n\n  validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<DiscriminatedUnionSchemaOutput<Variants>> {\n    if (!isPlainObject(input)) {\n      return ctx.issueInvalidType(input, 'object')\n    }\n\n    const { discriminator } = this\n\n    if (!Object.hasOwn(input, discriminator)) {\n      return ctx.issueRequiredKey(input, discriminator)\n    }\n\n    const discriminatorValue = input[discriminator]\n\n    const variant = this.variantsMap.get(discriminatorValue)\n    if (variant) {\n      return ctx.validate(input, variant) as ValidationResult<\n        DiscriminatedUnionSchemaOutput<Variants>\n      >\n    }\n\n    return ctx.issueInvalidPropertyValue(input, discriminator, [\n      ...this.variantsMap.keys(),\n    ])\n  }\n}\n\nfunction buildVariantsMap<Discriminator extends string>(\n  discriminator: Discriminator,\n  variants: DiscriminatedUnionVariants<Discriminator>,\n) {\n  const variantsMap = new Map<\n    unknown,\n    DiscriminatedUnionVariant<Discriminator>\n  >()\n\n  for (const variant of variants) {\n    const schema = variant.shape[discriminator]\n    if (schema instanceof LiteralSchema) {\n      if (variantsMap.has(schema.value)) {\n        throw new TypeError(`Overlapping discriminator value: ${schema.value}`)\n      }\n      variantsMap.set(schema.value, variant)\n    } else if (schema instanceof EnumSchema) {\n      for (const val of schema.values) {\n        if (variantsMap.has(val)) {\n          throw new TypeError(`Overlapping discriminator value: ${val}`)\n        }\n        variantsMap.set(val, variant)\n      }\n    } else {\n      // Only enumerable discriminator schemas are supported\n\n      // Should never happen if types are used correctly\n      throw new TypeError(\n        `Discriminator schema must be a LiteralSchema or EnumSchema`,\n      )\n    }\n  }\n\n  return variantsMap\n}\n"]}

package/dist/schema/enum.d.ts

@@ -1,7 +1,11 @@
-import { ValidationResult, Validator, ValidatorContext } from '../validation.js';
-export declare class EnumSchema<Output extends null | string | number | boolean = any> extends Validator<Output> {
+import { Schema, ValidationResult, ValidatorContext } from '../validation.js';
+export type EnumSchemaOptions<T extends null | string | number | boolean> = {
+    default?: T;
+};
+export declare class EnumSchema<Output extends null | string | number | boolean = any> extends Schema<Output> {
     readonly values: readonly Output[];
-    constructor(values: readonly Output[]);
-    validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<Output>;
+    readonly options?: EnumSchemaOptions<Output> | undefined;
+    constructor(values: readonly Output[], options?: EnumSchemaOptions<Output> | undefined);
+    validateInContext(input: unknown | undefined, ctx: ValidatorContext): ValidationResult<Output>;
 }
 //# sourceMappingURL=enum.d.ts.map

package/dist/schema/enum.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enum.d.ts","sourceRoot":"","sources":["../../src/schema/enum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAEhF,qBAAa,UAAU,CACrB,MAAM,SAAS,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,GAAG,CACrD,SAAQ,SAAS,CAAC,MAAM,CAAC;IACb,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE;gBAAzB,MAAM,EAAE,SAAS,MAAM,EAAE;IAIrC,iBAAiB,CACxB,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,MAAM,CAAC;CAO5B"}
+{"version":3,"file":"enum.d.ts","sourceRoot":"","sources":["../../src/schema/enum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAE7E,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,IAAI;IAC1E,OAAO,CAAC,EAAE,CAAC,CAAA;CACZ,CAAA;AAED,qBAAa,UAAU,CACrB,MAAM,SAAS,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,GAAG,CACrD,SAAQ,MAAM,CAAC,MAAM,CAAC;IAEpB,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE;IAClC,QAAQ,CAAC,OAAO,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC;gBADnC,MAAM,EAAE,SAAS,MAAM,EAAE,EACzB,OAAO,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,YAAA;IAK9C,iBAAiB,CACf,KAAK,EAAE,OAAO,YAAwB,EACtC,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,MAAM,CAAC;CAO5B"}

package/dist/schema/enum.js

@@ -2,13 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EnumSchema = void 0;
 const validation_js_1 = require("../validation.js");
-class EnumSchema extends validation_js_1.Validator {
+class EnumSchema extends validation_js_1.Schema {
     values;
-    constructor(values) {
+    options;
+    constructor(values, options) {
         super();
         this.values = values;
+        this.options = options;
     }
-    validateInContext(input, ctx) {
+    validateInContext(input = this.options?.default, ctx) {
         if (!this.values.includes(input)) {
             return ctx.issueInvalidValue(input, this.values);
         }

package/dist/schema/enum.js.map

@@ -1 +1 @@
-{"version":3,"file":"enum.js","sourceRoot":"","sources":["../../src/schema/enum.ts"],"names":[],"mappings":";;;AAAA,oDAAgF;AAEhF,MAAa,UAEX,SAAQ,yBAAiB;IACJ;IAArB,YAAqB,MAAyB;QAC5C,KAAK,EAAE,CAAA;QADY,WAAM,GAAN,MAAM,CAAmB;IAE9C,CAAC;IAEQ,iBAAiB,CACxB,KAAc,EACd,GAAqB;QAErB,IAAI,CAAE,IAAI,CAAC,MAA6B,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACzD,OAAO,GAAG,CAAC,iBAAiB,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAClD,CAAC;QAED,OAAO,GAAG,CAAC,OAAO,CAAC,KAAe,CAAC,CAAA;IACrC,CAAC;CACF;AAjBD,gCAiBC","sourcesContent":["import { ValidationResult, Validator, ValidatorContext } from '../validation.js'\n\nexport class EnumSchema<\n  Output extends null | string | number | boolean = any,\n> extends Validator<Output> {\n  constructor(readonly values: readonly Output[]) {\n    super()\n  }\n\n  override validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<Output> {\n    if (!(this.values as readonly unknown[]).includes(input)) {\n      return ctx.issueInvalidValue(input, this.values)\n    }\n\n    return ctx.success(input as Output)\n  }\n}\n"]}
+{"version":3,"file":"enum.js","sourceRoot":"","sources":["../../src/schema/enum.ts"],"names":[],"mappings":";;;AAAA,oDAA6E;AAM7E,MAAa,UAEX,SAAQ,sBAAc;IAEX;IACA;IAFX,YACW,MAAyB,EACzB,OAAmC;QAE5C,KAAK,EAAE,CAAA;QAHE,WAAM,GAAN,MAAM,CAAmB;QACzB,YAAO,GAAP,OAAO,CAA4B;IAG9C,CAAC;IAED,iBAAiB,CACf,QAAiB,IAAI,CAAC,OAAO,EAAE,OAAO,EACtC,GAAqB;QAErB,IAAI,CAAE,IAAI,CAAC,MAA6B,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACzD,OAAO,GAAG,CAAC,iBAAiB,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAClD,CAAC;QAED,OAAO,GAAG,CAAC,OAAO,CAAC,KAAe,CAAC,CAAA;IACrC,CAAC;CACF;AApBD,gCAoBC","sourcesContent":["import { Schema, ValidationResult, ValidatorContext } from '../validation.js'\n\nexport type EnumSchemaOptions<T extends null | string | number | boolean> = {\n  default?: T\n}\n\nexport class EnumSchema<\n  Output extends null | string | number | boolean = any,\n> extends Schema<Output> {\n  constructor(\n    readonly values: readonly Output[],\n    readonly options?: EnumSchemaOptions<Output>,\n  ) {\n    super()\n  }\n\n  validateInContext(\n    input: unknown = this.options?.default,\n    ctx: ValidatorContext,\n  ): ValidationResult<Output> {\n    if (!(this.values as readonly unknown[]).includes(input)) {\n      return ctx.issueInvalidValue(input, this.values)\n    }\n\n    return ctx.success(input as Output)\n  }\n}\n"]}

package/dist/schema/integer.d.ts

@@ -1,13 +1,12 @@
-import { ValidationResult, Validator, ValidatorContext } from '../validation.js';
+import { Schema, ValidationResult, ValidatorContext } from '../validation.js';
 export type IntegerSchemaOptions = {
     default?: number;
     minimum?: number;
     maximum?: number;
 };
-export declare class IntegerSchema extends Validator<number> {
+export declare class IntegerSchema extends Schema<number> {
     readonly options: IntegerSchemaOptions;
-    readonly lexiconType: "integer";
-    constructor(options: IntegerSchemaOptions);
+    constructor(options?: IntegerSchemaOptions);
     validateInContext(input: unknown | undefined, ctx: ValidatorContext): ValidationResult<number>;
 }
 //# sourceMappingURL=integer.d.ts.map

package/dist/schema/integer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"integer.d.ts","sourceRoot":"","sources":["../../src/schema/integer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAEhF,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,qBAAa,aAAc,SAAQ,SAAS,CAAC,MAAM,CAAC;IAGtC,QAAQ,CAAC,OAAO,EAAE,oBAAoB;IAFlD,QAAQ,CAAC,WAAW,EAAG,SAAS,CAAS;gBAEpB,OAAO,EAAE,oBAAoB;IAIzC,iBAAiB,CACxB,KAAK,EAAE,OAAO,YAAuB,EACrC,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,MAAM,CAAC;CAe5B"}
+{"version":3,"file":"integer.d.ts","sourceRoot":"","sources":["../../src/schema/integer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAE7E,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,qBAAa,aAAc,SAAQ,MAAM,CAAC,MAAM,CAAC;IACnC,QAAQ,CAAC,OAAO,EAAE,oBAAoB;gBAA7B,OAAO,GAAE,oBAAyB;IAIvD,iBAAiB,CACf,KAAK,EAAE,OAAO,YAAwB,EACtC,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,MAAM,CAAC;CAe5B"}

package/dist/schema/integer.js

@@ -2,14 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IntegerSchema = void 0;
 const validation_js_1 = require("../validation.js");
-class IntegerSchema extends validation_js_1.Validator {
+class IntegerSchema extends validation_js_1.Schema {
     options;
-    lexiconType = 'integer';
-    constructor(options) {
+    constructor(options = {}) {
         super();
         this.options = options;
     }
-    validateInContext(input = this.options.default, ctx) {
+    validateInContext(input = this.options?.default, ctx) {
         if (!isInteger(input)) {
             return ctx.issueInvalidType(input, 'integer');
         }

package/dist/schema/integer.js.map

@@ -1 +1 @@
-{"version":3,"file":"integer.js","sourceRoot":"","sources":["../../src/schema/integer.ts"],"names":[],"mappings":";;;AAAA,oDAAgF;AAQhF,MAAa,aAAc,SAAQ,yBAAiB;IAG7B;IAFZ,WAAW,GAAG,SAAkB,CAAA;IAEzC,YAAqB,OAA6B;QAChD,KAAK,EAAE,CAAA;QADY,YAAO,GAAP,OAAO,CAAsB;IAElD,CAAC;IAEQ,iBAAiB,CACxB,QAAiB,IAAI,CAAC,OAAO,CAAC,OAAO,EACrC,GAAqB;QAErB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACtB,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;QAC/C,CAAC;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,SAAS,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACvE,OAAO,GAAG,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QACzE,CAAC;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,SAAS,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACvE,OAAO,GAAG,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QACvE,CAAC;QAED,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC3B,CAAC;CACF;AAzBD,sCAyBC;AAED;;GAEG;AACH,SAAS,SAAS,CAAC,KAAc;IAC/B,OAAO,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;AAChC,CAAC","sourcesContent":["import { ValidationResult, Validator, ValidatorContext } from '../validation.js'\n\nexport type IntegerSchemaOptions = {\n  default?: number\n  minimum?: number\n  maximum?: number\n}\n\nexport class IntegerSchema extends Validator<number> {\n  readonly lexiconType = 'integer' as const\n\n  constructor(readonly options: IntegerSchemaOptions) {\n    super()\n  }\n\n  override validateInContext(\n    input: unknown = this.options.default,\n    ctx: ValidatorContext,\n  ): ValidationResult<number> {\n    if (!isInteger(input)) {\n      return ctx.issueInvalidType(input, 'integer')\n    }\n\n    if (this.options.minimum !== undefined && input < this.options.minimum) {\n      return ctx.issueTooSmall(input, 'integer', this.options.minimum, input)\n    }\n\n    if (this.options.maximum !== undefined && input > this.options.maximum) {\n      return ctx.issueTooBig(input, 'integer', this.options.maximum, input)\n    }\n\n    return ctx.success(input)\n  }\n}\n\n/**\n * Simple wrapper around {@link Number.isInteger} that acts as a type guard.\n */\nfunction isInteger(input: unknown): input is number {\n  return Number.isInteger(input)\n}\n"]}
+{"version":3,"file":"integer.js","sourceRoot":"","sources":["../../src/schema/integer.ts"],"names":[],"mappings":";;;AAAA,oDAA6E;AAQ7E,MAAa,aAAc,SAAQ,sBAAc;IAC1B;IAArB,YAAqB,UAAgC,EAAE;QACrD,KAAK,EAAE,CAAA;QADY,YAAO,GAAP,OAAO,CAA2B;IAEvD,CAAC;IAED,iBAAiB,CACf,QAAiB,IAAI,CAAC,OAAO,EAAE,OAAO,EACtC,GAAqB;QAErB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACtB,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;QAC/C,CAAC;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,SAAS,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACvE,OAAO,GAAG,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QACzE,CAAC;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,SAAS,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACvE,OAAO,GAAG,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QACvE,CAAC;QAED,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC3B,CAAC;CACF;AAvBD,sCAuBC;AAED;;GAEG;AACH,SAAS,SAAS,CAAC,KAAc;IAC/B,OAAO,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;AAChC,CAAC","sourcesContent":["import { Schema, ValidationResult, ValidatorContext } from '../validation.js'\n\nexport type IntegerSchemaOptions = {\n  default?: number\n  minimum?: number\n  maximum?: number\n}\n\nexport class IntegerSchema extends Schema<number> {\n  constructor(readonly options: IntegerSchemaOptions = {}) {\n    super()\n  }\n\n  validateInContext(\n    input: unknown = this.options?.default,\n    ctx: ValidatorContext,\n  ): ValidationResult<number> {\n    if (!isInteger(input)) {\n      return ctx.issueInvalidType(input, 'integer')\n    }\n\n    if (this.options.minimum !== undefined && input < this.options.minimum) {\n      return ctx.issueTooSmall(input, 'integer', this.options.minimum, input)\n    }\n\n    if (this.options.maximum !== undefined && input > this.options.maximum) {\n      return ctx.issueTooBig(input, 'integer', this.options.maximum, input)\n    }\n\n    return ctx.success(input)\n  }\n}\n\n/**\n * Simple wrapper around {@link Number.isInteger} that acts as a type guard.\n */\nfunction isInteger(input: unknown): input is number {\n  return Number.isInteger(input)\n}\n"]}

package/dist/schema/intersection.d.ts

@@ -1,16 +1,24 @@
-import { Infer, ValidationResult, Validator, ValidatorContext } from '../validation.js';
-export type IntersectionSchemaValidators = readonly [
-    Validator,
-    Validator,
-    ...Validator[]
-];
-export type IntersectionSchemaOutput<V extends readonly Validator[], Base = unknown> = V extends readonly [
-    infer First extends Validator,
-    ...infer Rest extends Validator[]
-] ? IntersectionSchemaOutput<Rest, Base & Infer<First>> : Base;
-export declare class IntersectionSchema<V extends IntersectionSchemaValidators = any> extends Validator<IntersectionSchemaOutput<V>> {
-    protected readonly validators: V;
-    constructor(validators: V);
-    validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<IntersectionSchemaOutput<V>>;
+import { Simplify } from '../core.js';
+import { Infer, Schema, ValidationResult, ValidatorContext } from '../validation.js';
+import { DictSchema } from './dict.js';
+import { ObjectSchema } from './object.js';
+/**
+ * Allows to more accurately represent the intersection of two object types
+ * where both types may share some keys, and one of them uses an index
+ * signature.
+ *
+ * @see {@link https://www.typescriptlang.org/play/?#code/C4TwDgpgBAglC8UDeUBmB7dAuKByARgIYBOuUAvlAGTJQDaA+lAJYB2UAzsMWwOYC6OVgFcAtvgjEKAKGkATCAGMANiWiL0rLlEI4YsjVuBQA1hBA4uPVrwRQARBnT2Dm7QDdCy4dESE6ZiD8UAD0IVAi4pJQABQcABbowspyUBIORMT2AJSyEAAeYOjExqCQUACSrMCSHErAzJoAPNJQsFAFNaxyHFAASkrFck1WfAA0UMKsJqzoAO6sAHxjrVAAQh35XT39g8TDozYTUzPzSyuLdqtwVKttMYHoqO00j88bnRDdvawQ7pJ3NpQAD860BbRwSHBQLadAA0ix2G91oJ1vDggAfWABcxPF5QOH8aFtci5aRlaAwVDMfIQVKIKo1Yh1RQNZq0Jw4AgkMjkCYoRiIzjcPioyISKTkRayBQqNRQQzaQgAMRpdL01NpclcRignm8EFVWrsKrVchxQVC4XF0SxmSAA Playground link}
+ */
+export type Intersect<A, B> = B[keyof B] extends never ? A : keyof A & keyof B extends never ? // If A and B don't overlap, just return A & B
+A & B : // Otherwise, properly represent the fact that accessing using an
+A & {
+    [K in keyof B]: B[K] | A[keyof A & K];
+};
+export type IntersectionSchemaOutput<Left extends ObjectSchema, Right extends DictSchema> = Simplify<Intersect<Infer<Left>, Infer<Right>>>;
+export declare class IntersectionSchema<const Left extends ObjectSchema = any, const Right extends DictSchema = any> extends Schema<IntersectionSchemaOutput<Left, Right>> {
+    protected readonly left: Left;
+    protected readonly right: Right;
+    constructor(left: Left, right: Right);
+    validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<IntersectionSchemaOutput<Left, Right>>;
 }
 //# sourceMappingURL=intersection.d.ts.map

package/dist/schema/intersection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"intersection.d.ts","sourceRoot":"","sources":["../../src/schema/intersection.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EACjB,MAAM,kBAAkB,CAAA;AAEzB,MAAM,MAAM,4BAA4B,GAAG,SAAS;IAClD,SAAS;IACT,SAAS;IACT,GAAG,SAAS,EAAE;CACf,CAAA;AACD,MAAM,MAAM,wBAAwB,CAClC,CAAC,SAAS,SAAS,SAAS,EAAE,EAC9B,IAAI,GAAG,OAAO,IACZ,CAAC,SAAS,SAAS;IACrB,MAAM,KAAK,SAAS,SAAS;IAC7B,GAAG,MAAM,IAAI,SAAS,SAAS,EAAE;CAClC,GACG,wBAAwB,CAAC,IAAI,EAAE,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,GACnD,IAAI,CAAA;AAER,qBAAa,kBAAkB,CAC7B,CAAC,SAAS,4BAA4B,GAAG,GAAG,CAC5C,SAAQ,SAAS,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;IAClC,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;gBAAb,UAAU,EAAE,CAAC;IAInC,iBAAiB,CACxB,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;CAwBjD"}
+{"version":3,"file":"intersection.d.ts","sourceRoot":"","sources":["../../src/schema/intersection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EACL,KAAK,EACL,MAAM,EACN,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1C;;;;;;GAMG;AACH,MAAM,MAAM,SAAS,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,KAAK,GAClD,CAAC,GACD,MAAM,CAAC,GAAG,MAAM,CAAC,SAAS,KAAK,GAE7B,AADA,8CAA8C;AAC9C,CAAC,GAAG,CAAC,GAGL,AAFA,iEAAiE;AAEjE,CAAC,GAAG;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;CAAE,CAAA;AAEnD,MAAM,MAAM,wBAAwB,CAClC,IAAI,SAAS,YAAY,EACzB,KAAK,SAAS,UAAU,IACtB,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;AAElD,qBAAa,kBAAkB,CAC7B,KAAK,CAAC,IAAI,SAAS,YAAY,GAAG,GAAG,EACrC,KAAK,CAAC,KAAK,SAAS,UAAU,GAAG,GAAG,CACpC,SAAQ,MAAM,CAAC,wBAAwB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAEnD,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI;IAC7B,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK;gBADZ,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK;IAKjC,iBAAiB,CACf,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,wBAAwB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;CAQ3D"}