@atproto/lex-schema 0.0.2 → 0.0.3

package/dist/schema/intersection.js

@@ -2,31 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IntersectionSchema = void 0;
 const validation_js_1 = require("../validation.js");
-class IntersectionSchema extends validation_js_1.Validator {
-    validators;
-    constructor(validators) {
+class IntersectionSchema extends validation_js_1.Schema {
+    left;
+    right;
+    constructor(left, right) {
         super();
-        this.validators = validators;
+        this.left = left;
+        this.right = right;
     }
     validateInContext(input, ctx) {
-        for (let i = 0; i < this.validators.length; i++) {
-            const result = ctx.validate(input, this.validators[i]);
-            if (!result.success) {
-                return result;
-            }
-            // @NOTE because transforming the value could make it invalid for previous
-            // validators, we need to ensure the input remains unchanged only gets
-            // transformed by the first validator.
-            if (i !== 0 && input !== result.value) {
-                // The alternative would be to allow transforms on a first pass
-                // (ignoring errors) and then re-validate the final value against all
-                // validators (without allowing further transforms). This would be way
-                // less efficient (we could make this optional).
-                return ctx.issueInvalidValue(input, [result.value]);
-            }
-            input = result.value;
-        }
-        return ctx.success(input);
+        const leftResult = ctx.validate(input, this.left);
+        if (!leftResult.success)
+            return leftResult;
+        return this.right.validateInContext(leftResult.value, ctx, {
+            ignoredKeys: this.left.validatorsMap,
+        });
     }
 }
 exports.IntersectionSchema = IntersectionSchema;

package/dist/schema/intersection.js.map

@@ -1 +1 @@
-{"version":3,"file":"intersection.js","sourceRoot":"","sources":["../../src/schema/intersection.ts"],"names":[],"mappings":";;;AAAA,oDAKyB;AAiBzB,MAAa,kBAEX,SAAQ,yBAAsC;IACf;IAA/B,YAA+B,UAAa;QAC1C,KAAK,EAAE,CAAA;QADsB,eAAU,GAAV,UAAU,CAAG;IAE5C,CAAC;IAEQ,iBAAiB,CACxB,KAAc,EACd,GAAqB;QAErB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChD,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;YAEtD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBACpB,OAAO,MAAM,CAAA;YACf,CAAC;YAED,0EAA0E;YAC1E,sEAAsE;YACtE,sCAAsC;YACtC,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,MAAM,CAAC,KAAK,EAAE,CAAC;gBACtC,+DAA+D;gBAC/D,qEAAqE;gBACrE,sEAAsE;gBACtE,gDAAgD;gBAChD,OAAO,GAAG,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;YACrD,CAAC;YAED,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;QACtB,CAAC;QAED,OAAO,GAAG,CAAC,OAAO,CAAC,KAAoC,CAAC,CAAA;IAC1D,CAAC;CACF;AAlCD,gDAkCC","sourcesContent":["import {\n  Infer,\n  ValidationResult,\n  Validator,\n  ValidatorContext,\n} from '../validation.js'\n\nexport type IntersectionSchemaValidators = readonly [\n  Validator,\n  Validator,\n  ...Validator[],\n]\nexport type IntersectionSchemaOutput<\n  V extends readonly Validator[],\n  Base = unknown,\n> = V extends readonly [\n  infer First extends Validator,\n  ...infer Rest extends Validator[],\n]\n  ? IntersectionSchemaOutput<Rest, Base & Infer<First>>\n  : Base\n\nexport class IntersectionSchema<\n  V extends IntersectionSchemaValidators = any,\n> extends Validator<IntersectionSchemaOutput<V>> {\n  constructor(protected readonly validators: V) {\n    super()\n  }\n\n  override validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<IntersectionSchemaOutput<V>> {\n    for (let i = 0; i < this.validators.length; i++) {\n      const result = ctx.validate(input, this.validators[i])\n\n      if (!result.success) {\n        return result\n      }\n\n      // @NOTE because transforming the value could make it invalid for previous\n      // validators, we need to ensure the input remains unchanged only gets\n      // transformed by the first validator.\n      if (i !== 0 && input !== result.value) {\n        // The alternative would be to allow transforms on a first pass\n        // (ignoring errors) and then re-validate the final value against all\n        // validators (without allowing further transforms). This would be way\n        // less efficient (we could make this optional).\n        return ctx.issueInvalidValue(input, [result.value])\n      }\n\n      input = result.value\n    }\n\n    return ctx.success(input as IntersectionSchemaOutput<V>)\n  }\n}\n"]}
+{"version":3,"file":"intersection.js","sourceRoot":"","sources":["../../src/schema/intersection.ts"],"names":[],"mappings":";;;AACA,oDAKyB;AAyBzB,MAAa,kBAGX,SAAQ,sBAA6C;IAEhC;IACA;IAFrB,YACqB,IAAU,EACV,KAAY;QAE/B,KAAK,EAAE,CAAA;QAHY,SAAI,GAAJ,IAAI,CAAM;QACV,UAAK,GAAL,KAAK,CAAO;IAGjC,CAAC;IAED,iBAAiB,CACf,KAAc,EACd,GAAqB;QAErB,MAAM,UAAU,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;QACjD,IAAI,CAAC,UAAU,CAAC,OAAO;YAAE,OAAO,UAAU,CAAA;QAE1C,OAAO,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,EAAE;YACzD,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,aAAa;SACrC,CAA4D,CAAA;IAC/D,CAAC;CACF;AAtBD,gDAsBC","sourcesContent":["import { Simplify } from '../core.js'\nimport {\n  Infer,\n  Schema,\n  ValidationResult,\n  ValidatorContext,\n} from '../validation.js'\nimport { DictSchema } from './dict.js'\nimport { ObjectSchema } from './object.js'\n\n/**\n * Allows to more accurately represent the intersection of two object types\n * where both types may share some keys, and one of them uses an index\n * signature.\n *\n * @see {@link https://www.typescriptlang.org/play/?#code/C4TwDgpgBAglC8UDeUBmB7dAuKByARgIYBOuUAvlAGTJQDaA+lAJYB2UAzsMWwOYC6OVgFcAtvgjEKAKGkATCAGMANiWiL0rLlEI4YsjVuBQA1hBA4uPVrwRQARBnT2Dm7QDdCy4dESE6ZiD8UAD0IVAi4pJQABQcABbowspyUBIORMT2AJSyEAAeYOjExqCQUACSrMCSHErAzJoAPNJQsFAFNaxyHFAASkrFck1WfAA0UMKsJqzoAO6sAHxjrVAAQh35XT39g8TDozYTUzPzSyuLdqtwVKttMYHoqO00j88bnRDdvawQ7pJ3NpQAD860BbRwSHBQLadAA0ix2G91oJ1vDggAfWABcxPF5QOH8aFtci5aRlaAwVDMfIQVKIKo1Yh1RQNZq0Jw4AgkMjkCYoRiIzjcPioyISKTkRayBQqNRQQzaQgAMRpdL01NpclcRignm8EFVWrsKrVchxQVC4XF0SxmSAA Playground link}\n */\nexport type Intersect<A, B> = B[keyof B] extends never\n  ? A\n  : keyof A & keyof B extends never\n    ? // If A and B don't overlap, just return A & B\n      A & B\n    : // Otherwise, properly represent the fact that accessing using an\n      // index signature could return a value from either A or B\n      A & { [K in keyof B]: B[K] | A[keyof A & K] }\n\nexport type IntersectionSchemaOutput<\n  Left extends ObjectSchema,\n  Right extends DictSchema,\n> = Simplify<Intersect<Infer<Left>, Infer<Right>>>\n\nexport class IntersectionSchema<\n  const Left extends ObjectSchema = any,\n  const Right extends DictSchema = any,\n> extends Schema<IntersectionSchemaOutput<Left, Right>> {\n  constructor(\n    protected readonly left: Left,\n    protected readonly right: Right,\n  ) {\n    super()\n  }\n\n  validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<IntersectionSchemaOutput<Left, Right>> {\n    const leftResult = ctx.validate(input, this.left)\n    if (!leftResult.success) return leftResult\n\n    return this.right.validateInContext(leftResult.value, ctx, {\n      ignoredKeys: this.left.validatorsMap,\n    }) as ValidationResult<IntersectionSchemaOutput<Left, Right>>\n  }\n}\n"]}

package/dist/schema/literal.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"literal.d.ts","sourceRoot":"","sources":["../../src/schema/literal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAEhF,qBAAa,aAAa,CACxB,MAAM,SAAS,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,GAAG,CACrD,SAAQ,SAAS,CAAC,MAAM,CAAC;IACb,QAAQ,CAAC,KAAK,EAAE,MAAM;gBAAb,KAAK,EAAE,MAAM;IAIzB,iBAAiB,CACxB,KAAK,EAAE,OAAO,YAAa,EAC3B,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,MAAM,CAAC;CAO5B"}
+{"version":3,"file":"literal.d.ts","sourceRoot":"","sources":["../../src/schema/literal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAE7E,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,IAAI;IAC7E,OAAO,CAAC,EAAE,CAAC,CAAA;CACZ,CAAA;AAED,qBAAa,aAAa,CACxB,MAAM,SAAS,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,GAAG,CACrD,SAAQ,MAAM,CAAC,MAAM,CAAC;IAEpB,QAAQ,CAAC,KAAK,EAAE,MAAM;IACtB,QAAQ,CAAC,OAAO,CAAC,EAAE,oBAAoB,CAAC,MAAM,CAAC;gBADtC,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,oBAAoB,CAAC,MAAM,CAAC,YAAA;IAKjD,iBAAiB,CACf,KAAK,EAAE,OAAO,YAAwB,EACtC,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,MAAM,CAAC;CAO5B"}

package/dist/schema/literal.js

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

package/dist/schema/literal.js.map

@@ -1 +1 @@
-{"version":3,"file":"literal.js","sourceRoot":"","sources":["../../src/schema/literal.ts"],"names":[],"mappings":";;;AAAA,oDAAgF;AAEhF,MAAa,aAEX,SAAQ,yBAAiB;IACJ;IAArB,YAAqB,KAAa;QAChC,KAAK,EAAE,CAAA;QADY,UAAK,GAAL,KAAK,CAAQ;IAElC,CAAC;IAEQ,iBAAiB,CACxB,QAAiB,IAAI,CAAC,KAAK,EAC3B,GAAqB;QAErB,IAAI,KAAK,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;YACzB,OAAO,GAAG,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;QACnD,CAAC;QAED,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAChC,CAAC;CACF;AAjBD,sCAiBC","sourcesContent":["import { ValidationResult, Validator, ValidatorContext } from '../validation.js'\n\nexport class LiteralSchema<\n  Output extends null | string | number | boolean = any,\n> extends Validator<Output> {\n  constructor(readonly value: Output) {\n    super()\n  }\n\n  override validateInContext(\n    input: unknown = this.value,\n    ctx: ValidatorContext,\n  ): ValidationResult<Output> {\n    if (input !== this.value) {\n      return ctx.issueInvalidValue(input, [this.value])\n    }\n\n    return ctx.success(this.value)\n  }\n}\n"]}
+{"version":3,"file":"literal.js","sourceRoot":"","sources":["../../src/schema/literal.ts"],"names":[],"mappings":";;;AAAA,oDAA6E;AAM7E,MAAa,aAEX,SAAQ,sBAAc;IAEX;IACA;IAFX,YACW,KAAa,EACb,OAAsC;QAE/C,KAAK,EAAE,CAAA;QAHE,UAAK,GAAL,KAAK,CAAQ;QACb,YAAO,GAAP,OAAO,CAA+B;IAGjD,CAAC;IAED,iBAAiB,CACf,QAAiB,IAAI,CAAC,OAAO,EAAE,OAAO,EACtC,GAAqB;QAErB,IAAI,KAAK,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;YACzB,OAAO,GAAG,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;QACnD,CAAC;QAED,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAChC,CAAC;CACF;AApBD,sCAoBC","sourcesContent":["import { Schema, ValidationResult, ValidatorContext } from '../validation.js'\n\nexport type LiteralSchemaOptions<T extends null | string | number | boolean> = {\n  default?: T\n}\n\nexport class LiteralSchema<\n  Output extends null | string | number | boolean = any,\n> extends Schema<Output> {\n  constructor(\n    readonly value: Output,\n    readonly options?: LiteralSchemaOptions<Output>,\n  ) {\n    super()\n  }\n\n  validateInContext(\n    input: unknown = this.options?.default,\n    ctx: ValidatorContext,\n  ): ValidationResult<Output> {\n    if (input !== this.value) {\n      return ctx.issueInvalidValue(input, [this.value])\n    }\n\n    return ctx.success(this.value)\n  }\n}\n"]}

package/dist/schema/never.d.ts

@@ -1,5 +1,5 @@
-import { ValidationFailure, Validator, ValidatorContext } from '../validation.js';
-export declare class NeverSchema extends Validator<never> {
+import { Schema, ValidationFailure, ValidatorContext } from '../validation.js';
+export declare class NeverSchema extends Schema<never> {
     validateInContext(input: unknown, ctx: ValidatorContext): ValidationFailure;
 }
 //# sourceMappingURL=never.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"never.d.ts","sourceRoot":"","sources":["../../src/schema/never.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,SAAS,EACT,gBAAgB,EACjB,MAAM,kBAAkB,CAAA;AAEzB,qBAAa,WAAY,SAAQ,SAAS,CAAC,KAAK,CAAC;IACtC,iBAAiB,CACxB,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,iBAAiB;CAGrB"}
+{"version":3,"file":"never.d.ts","sourceRoot":"","sources":["../../src/schema/never.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAE9E,qBAAa,WAAY,SAAQ,MAAM,CAAC,KAAK,CAAC;IAC5C,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,gBAAgB,GAAG,iBAAiB;CAG5E"}

package/dist/schema/never.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NeverSchema = void 0;
 const validation_js_1 = require("../validation.js");
-class NeverSchema extends validation_js_1.Validator {
+class NeverSchema extends validation_js_1.Schema {
     validateInContext(input, ctx) {
         return ctx.issueInvalidType(input, 'never');
     }

package/dist/schema/never.js.map

@@ -1 +1 @@
-{"version":3,"file":"never.js","sourceRoot":"","sources":["../../src/schema/never.ts"],"names":[],"mappings":";;;AAAA,oDAIyB;AAEzB,MAAa,WAAY,SAAQ,yBAAgB;IACtC,iBAAiB,CACxB,KAAc,EACd,GAAqB;QAErB,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;IAC7C,CAAC;CACF;AAPD,kCAOC","sourcesContent":["import {\n  ValidationFailure,\n  Validator,\n  ValidatorContext,\n} from '../validation.js'\n\nexport class NeverSchema extends Validator<never> {\n  override validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationFailure {\n    return ctx.issueInvalidType(input, 'never')\n  }\n}\n"]}
+{"version":3,"file":"never.js","sourceRoot":"","sources":["../../src/schema/never.ts"],"names":[],"mappings":";;;AAAA,oDAA8E;AAE9E,MAAa,WAAY,SAAQ,sBAAa;IAC5C,iBAAiB,CAAC,KAAc,EAAE,GAAqB;QACrD,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;IAC7C,CAAC;CACF;AAJD,kCAIC","sourcesContent":["import { Schema, ValidationFailure, ValidatorContext } from '../validation.js'\n\nexport class NeverSchema extends Schema<never> {\n  validateInContext(input: unknown, ctx: ValidatorContext): ValidationFailure {\n    return ctx.issueInvalidType(input, 'never')\n  }\n}\n"]}

package/dist/schema/null.d.ts

@@ -1,6 +1,5 @@
-import { ValidationResult, Validator, ValidatorContext } from '../validation.js';
-export declare class NullSchema extends Validator<null> {
-    readonly lexiconType: "null";
+import { Schema, ValidationResult, ValidatorContext } from '../validation.js';
+export declare class NullSchema extends Schema<null> {
     constructor();
     validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<null>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"null.d.ts","sourceRoot":"","sources":["../../src/schema/null.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAEhF,qBAAa,UAAW,SAAQ,SAAS,CAAC,IAAI,CAAC;IAC7C,QAAQ,CAAC,WAAW,EAAG,MAAM,CAAS;;IAM7B,iBAAiB,CACxB,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,IAAI,CAAC;CAO1B"}
+{"version":3,"file":"null.d.ts","sourceRoot":"","sources":["../../src/schema/null.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAE7E,qBAAa,UAAW,SAAQ,MAAM,CAAC,IAAI,CAAC;;IAK1C,iBAAiB,CACf,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,IAAI,CAAC;CAO1B"}

package/dist/schema/null.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NullSchema = void 0;
 const validation_js_1 = require("../validation.js");
-class NullSchema extends validation_js_1.Validator {
-    lexiconType = 'null';
+class NullSchema extends validation_js_1.Schema {
     constructor() {
         super();
     }

package/dist/schema/null.js.map

@@ -1 +1 @@
-{"version":3,"file":"null.js","sourceRoot":"","sources":["../../src/schema/null.ts"],"names":[],"mappings":";;;AAAA,oDAAgF;AAEhF,MAAa,UAAW,SAAQ,yBAAe;IACpC,WAAW,GAAG,MAAe,CAAA;IAEtC;QACE,KAAK,EAAE,CAAA;IACT,CAAC;IAEQ,iBAAiB,CACxB,KAAc,EACd,GAAqB;QAErB,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACnB,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QAC5C,CAAC;QAED,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,CAAC;CACF;AAjBD,gCAiBC","sourcesContent":["import { ValidationResult, Validator, ValidatorContext } from '../validation.js'\n\nexport class NullSchema extends Validator<null> {\n  readonly lexiconType = 'null' as const\n\n  constructor() {\n    super()\n  }\n\n  override validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<null> {\n    if (input !== null) {\n      return ctx.issueInvalidType(input, 'null')\n    }\n\n    return ctx.success(null)\n  }\n}\n"]}
+{"version":3,"file":"null.js","sourceRoot":"","sources":["../../src/schema/null.ts"],"names":[],"mappings":";;;AAAA,oDAA6E;AAE7E,MAAa,UAAW,SAAQ,sBAAY;IAC1C;QACE,KAAK,EAAE,CAAA;IACT,CAAC;IAED,iBAAiB,CACf,KAAc,EACd,GAAqB;QAErB,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACnB,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QAC5C,CAAC;QAED,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,CAAC;CACF;AAfD,gCAeC","sourcesContent":["import { Schema, ValidationResult, ValidatorContext } from '../validation.js'\n\nexport class NullSchema extends Schema<null> {\n  constructor() {\n    super()\n  }\n\n  validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<null> {\n    if (input !== null) {\n      return ctx.issueInvalidType(input, 'null')\n    }\n\n    return ctx.success(null)\n  }\n}\n"]}

package/dist/schema/nullable.d.ts

@@ -0,0 +1,7 @@
+import { Schema, ValidationResult, Validator, ValidatorContext } from '../validation.js';
+export declare class NullableSchema<V> extends Schema<V | null> {
+    readonly schema: Validator<V>;
+    constructor(schema: Validator<V>);
+    validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<V | null>;
+}
+//# sourceMappingURL=nullable.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"nullable.d.ts","sourceRoot":"","sources":["../../src/schema/nullable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EACjB,MAAM,kBAAkB,CAAA;AAEzB,qBAAa,cAAc,CAAC,CAAC,CAAE,SAAQ,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC;IACzC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;gBAApB,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;IAIzC,iBAAiB,CACf,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,CAAC,GAAG,IAAI,CAAC;CAO9B"}

package/dist/schema/nullable.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NullableSchema = void 0;
+const validation_js_1 = require("../validation.js");
+class NullableSchema extends validation_js_1.Schema {
+    schema;
+    constructor(schema) {
+        super();
+        this.schema = schema;
+    }
+    validateInContext(input, ctx) {
+        if (input === null) {
+            return ctx.success(null);
+        }
+        return ctx.validate(input, this.schema);
+    }
+}
+exports.NullableSchema = NullableSchema;
+//# sourceMappingURL=nullable.js.map

package/dist/schema/nullable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nullable.js","sourceRoot":"","sources":["../../src/schema/nullable.ts"],"names":[],"mappings":";;;AAAA,oDAKyB;AAEzB,MAAa,cAAkB,SAAQ,sBAAgB;IAChC;IAArB,YAAqB,MAAoB;QACvC,KAAK,EAAE,CAAA;QADY,WAAM,GAAN,MAAM,CAAc;IAEzC,CAAC;IAED,iBAAiB,CACf,KAAc,EACd,GAAqB;QAErB,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACnB,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAC1B,CAAC;QAED,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IACzC,CAAC;CACF;AAfD,wCAeC","sourcesContent":["import {\n  Schema,\n  ValidationResult,\n  Validator,\n  ValidatorContext,\n} from '../validation.js'\n\nexport class NullableSchema<V> extends Schema<V | null> {\n  constructor(readonly schema: Validator<V>) {\n    super()\n  }\n\n  validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<V | null> {\n    if (input === null) {\n      return ctx.success(null)\n    }\n\n    return ctx.validate(input, this.schema)\n  }\n}\n"]}

package/dist/schema/object.d.ts

@@ -1,47 +1,13 @@
-import { Simplify } from '../core.js';
-import { Infer, ValidationResult, Validator, ValidatorContext } from '../validation.js';
-import { DictSchema } from './dict.js';
-export type ObjectSchemaProperties = {
-    [_ in string]: Validator<any>;
-};
-export type ObjectSchemaOptions = {
-    required?: readonly string[];
-    nullable?: readonly string[];
-    unknownProperties?: 'strict' | DictSchema;
-};
-export type ObjectSchemaNullValue<O extends ObjectSchemaOptions, K extends string> = O extends {
-    nullable: readonly (infer N extends string)[];
-} ? K extends N ? null : never : never;
-export type ObjectSchemaPropertiesOutput<P extends ObjectSchemaProperties, O extends ObjectSchemaOptions> = O extends {
-    required: readonly (infer R extends string)[];
-} ? {
-    -readonly [K in string & keyof P & R]-?: Infer<P[K]> | ObjectSchemaNullValue<O, K>;
-} & {
-    -readonly [K in Exclude<string & keyof P, R>]?: Infer<P[K]> | ObjectSchemaNullValue<O, K>;
-} : {
-    -readonly [K in string & keyof P]?: Infer<P[K]> | ObjectSchemaNullValue<O, K>;
-};
-/**
- * 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}
- */
-type Intersect<A extends Record<string, unknown>, B extends Record<string, unknown>> = 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 ObjectSchemaOutput<P extends ObjectSchemaProperties, O extends ObjectSchemaOptions> = O extends {
-    unknownProperties: Validator<infer D extends Record<string, unknown>>;
-} ? Simplify<Intersect<ObjectSchemaPropertiesOutput<P, O>, D>> : Simplify<ObjectSchemaPropertiesOutput<P, O>>;
-export declare class ObjectSchema<const Validators extends ObjectSchemaProperties = any, const Options extends ObjectSchemaOptions = any, const Output extends ObjectSchemaOutput<Validators, Options> = ObjectSchemaOutput<Validators, Options>> extends Validator<Output> {
-    readonly validators: Validators;
-    readonly options: Options;
-    constructor(validators: Validators, options: Options);
+import { WithOptionalProperties } from '../core.js';
+import { Infer, Schema, ValidationResult, Validator, ValidatorContext } from '../validation.js';
+export type ObjectSchemaShape = Record<string, Validator>;
+export type ObjectSchemaOutput<Shape extends ObjectSchemaShape> = WithOptionalProperties<{
+    [K in keyof Shape]: Infer<Shape[K]>;
+}>;
+export declare class ObjectSchema<const Shape extends ObjectSchemaShape = any> extends Schema<ObjectSchemaOutput<Shape>> {
+    readonly shape: Shape;
+    constructor(shape: Shape);
     get validatorsMap(): Map<string, Validator>;
-    validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<Output>;
+    validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<ObjectSchemaOutput<Shape>>;
 }
-export {};
 //# sourceMappingURL=object.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../../src/schema/object.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../../src/schema/object.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAEnD,OAAO,EACL,KAAK,EACL,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EACjB,MAAM,kBAAkB,CAAA;AAEzB,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;AAEzD,MAAM,MAAM,kBAAkB,CAAC,KAAK,SAAS,iBAAiB,IAC5D,sBAAsB,CAAC;KACpB,CAAC,IAAI,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;CACpC,CAAC,CAAA;AAEJ,qBAAa,YAAY,CACvB,KAAK,CAAC,KAAK,SAAS,iBAAiB,GAAG,GAAG,CAC3C,SAAQ,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,KAAK;gBAAZ,KAAK,EAAE,KAAK;IAIjC,IAAI,aAAa,IAAI,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAI1C;IAED,iBAAiB,CACf,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;CAkC/C"}

package/dist/schema/object.js

@@ -2,57 +2,35 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObjectSchema = void 0;
 const lex_data_1 = require("@atproto/lex-data");
+const lazy_property_js_1 = require("../util/lazy-property.js");
 const validation_js_1 = require("../validation.js");
-class ObjectSchema extends validation_js_1.Validator {
-    validators;
-    options;
-    constructor(validators, options) {
+class ObjectSchema extends validation_js_1.Schema {
+    shape;
+    constructor(shape) {
         super();
-        this.validators = validators;
-        this.options = options;
+        this.shape = shape;
     }
     get validatorsMap() {
-        const map = new Map(Object.entries(this.validators));
-        // Cache the map on the instance (to avoid re-creating it)
-        Object.defineProperty(this, 'validatorsMap', {
-            value: map,
-            writable: false,
-            enumerable: false,
-            configurable: true,
-        });
-        return map;
+        const map = new Map(Object.entries(this.shape));
+        return (0, lazy_property_js_1.lazyProperty)(this, 'validatorsMap', map);
     }
     validateInContext(input, ctx) {
         if (!(0, lex_data_1.isPlainObject)(input)) {
-            return ctx.issueInvalidType(input, ['object']);
+            return ctx.issueInvalidType(input, 'object');
         }
         // Lazily copy value
         let copy;
         for (const [key, propDef] of this.validatorsMap) {
-            if (input[key] === null && this.options.nullable?.includes(key)) {
-                continue;
-            }
             const result = ctx.validateChild(input, key, propDef);
             if (!result.success) {
-                // Because default values are provided by child validators, we need to
-                // run the validator to get the default value and, in case of failure,
-                // ignore validation error that were caused by missing keys.
                 if (!(key in input)) {
-                    if (this.options.required?.includes(key)) {
-                        // Transform into "required key" issue
-                        return ctx.issueRequiredKey(input, key);
-                    }
-                    // Ignore missing non-required key
-                    continue;
+                    // Transform into "required key" issue
+                    return ctx.issueRequiredKey(input, key);
                 }
                 return result;
             }
             // Skip copying if key is not present in input (and value is undefined)
             if (result.value === undefined && !(key in input)) {
-                // Except if the key is required
-                if (this.options.required?.includes(key)) {
-                    return ctx.issueRequiredKey(input, key);
-                }
                 continue;
             }
             if (result.value !== input[key]) {
@@ -60,20 +38,6 @@ class ObjectSchema extends validation_js_1.Validator {
                 copy[key] = result.value;
             }
         }
-        if (this.options.unknownProperties === 'strict') {
-            for (const key of Object.keys(input)) {
-                if (!this.validatorsMap.has(key)) {
-                    return ctx.issueInvalidPropertyType(input, key, 'undefined');
-                }
-            }
-        }
-        else if (this.options.unknownProperties) {
-            const result = this.options.unknownProperties.validateInContext(copy ?? input, ctx, { ignoredKeys: this.validatorsMap });
-            if (!result.success)
-                return result;
-            if (result.value !== input)
-                copy = result.value;
-        }
         const output = (copy ?? input);
         return ctx.success(output);
     }

package/dist/schema/object.js.map

@@ -1 +1 @@
-{"version":3,"file":"object.js","sourceRoot":"","sources":["../../src/schema/object.ts"],"names":[],"mappings":"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","sourcesContent":["import { isPlainObject } from '@atproto/lex-data'\nimport { Simplify } from '../core.js'\nimport {\n  Infer,\n  ValidationResult,\n  Validator,\n  ValidatorContext,\n} from '../validation.js'\nimport { DictSchema } from './dict.js'\n\nexport type ObjectSchemaProperties = { [_ in string]: Validator<any> }\nexport type ObjectSchemaOptions = {\n  required?: readonly string[]\n  nullable?: readonly string[]\n  unknownProperties?: 'strict' | DictSchema\n}\n\nexport type ObjectSchemaNullValue<\n  O extends ObjectSchemaOptions,\n  K extends string,\n> = O extends { nullable: readonly (infer N extends string)[] }\n  ? K extends N\n    ? null\n    : never\n  : never\n\nexport type ObjectSchemaPropertiesOutput<\n  P extends ObjectSchemaProperties,\n  O extends ObjectSchemaOptions,\n> = O extends { required: readonly (infer R extends string)[] }\n  ? {\n      -readonly [K in string & keyof P & R]-?:\n        | Infer<P[K]>\n        | ObjectSchemaNullValue<O, K>\n    } & {\n      -readonly [K in Exclude<string & keyof P, R>]?:\n        | Infer<P[K]>\n        | ObjectSchemaNullValue<O, K>\n    }\n  : {\n      -readonly [K in string & keyof P]?:\n        | Infer<P[K]>\n        | ObjectSchemaNullValue<O, K>\n    }\n\n/**\n * Allows to more accurately represent the intersection of two object types\n * where both types may share some keys, and one of them uses an index\n * signature.\n *\n * @see {@link https://www.typescriptlang.org/play/?#code/C4TwDgpgBAglC8UDeUBmB7dAuKByARgIYBOuUAvlAGTJQDaA+lAJYB2UAzsMWwOYC6OVgFcAtvgjEKAKGkATCAGMANiWiL0rLlEI4YsjVuBQA1hBA4uPVrwRQARBnT2Dm7QDdCy4dESE6ZiD8UAD0IVAi4pJQABQcABbowspyUBIORMT2AJSyEAAeYOjExqCQUACSrMCSHErAzJoAPNJQsFAFNaxyHFAASkrFck1WfAA0UMKsJqzoAO6sAHxjrVAAQh35XT39g8TDozYTUzPzSyuLdqtwVKttMYHoqO00j88bnRDdvawQ7pJ3NpQAD860BbRwSHBQLadAA0ix2G91oJ1vDggAfWABcxPF5QOH8aFtci5aRlaAwVDMfIQVKIKo1Yh1RQNZq0Jw4AgkMjkCYoRiIzjcPioyISKTkRayBQqNRQQzaQgAMRpdL01NpclcRignm8EFVWrsKrVchxQVC4XF0SxmSAA Playground link}\n */\ntype Intersect<\n  A extends Record<string, unknown>,\n  B extends Record<string, unknown>,\n> = B[keyof B] extends never\n  ? A\n  : keyof A & keyof B extends never\n    ? // If A and B don't overlap, just return A & B\n      A & B\n    : // Otherwise, properly represent the fact that accessing using an\n      // index signature could return a value from either A or B\n      A & { [K in keyof B]: B[K] | A[keyof A & K] }\n\nexport type ObjectSchemaOutput<\n  P extends ObjectSchemaProperties,\n  O extends ObjectSchemaOptions,\n> = O extends {\n  unknownProperties: Validator<infer D extends Record<string, unknown>>\n}\n  ? Simplify<Intersect<ObjectSchemaPropertiesOutput<P, O>, D>>\n  : Simplify<ObjectSchemaPropertiesOutput<P, O>>\n\nexport class ObjectSchema<\n  const Validators extends ObjectSchemaProperties = any,\n  const Options extends ObjectSchemaOptions = any,\n  const Output extends ObjectSchemaOutput<\n    Validators,\n    Options\n  > = ObjectSchemaOutput<Validators, Options>,\n> extends Validator<Output> {\n  constructor(\n    readonly validators: Validators,\n    readonly options: Options,\n  ) {\n    super()\n  }\n\n  get validatorsMap(): Map<string, Validator> {\n    const map = new Map(Object.entries(this.validators))\n\n    // Cache the map on the instance (to avoid re-creating it)\n    Object.defineProperty(this, 'validatorsMap', {\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<Output> {\n    if (!isPlainObject(input)) {\n      return ctx.issueInvalidType(input, ['object'])\n    }\n\n    // Lazily copy value\n    let copy: undefined | Record<string, unknown>\n\n    for (const [key, propDef] of this.validatorsMap) {\n      if (input[key] === null && this.options.nullable?.includes(key)) {\n        continue\n      }\n\n      const result = ctx.validateChild(input, key, propDef)\n      if (!result.success) {\n        // Because default values are provided by child validators, we need to\n        // run the validator to get the default value and, in case of failure,\n        // ignore validation error that were caused by missing keys.\n        if (!(key in input)) {\n          if (this.options.required?.includes(key)) {\n            // Transform into \"required key\" issue\n            return ctx.issueRequiredKey(input, key)\n          }\n\n          // Ignore missing non-required key\n          continue\n        }\n\n        return result\n      }\n\n      // Skip copying if key is not present in input (and value is undefined)\n      if (result.value === undefined && !(key in input)) {\n        // Except if the key is required\n        if (this.options.required?.includes(key)) {\n          return ctx.issueRequiredKey(input, key)\n        }\n\n        continue\n      }\n\n      if (result.value !== input[key]) {\n        copy ??= { ...input }\n        copy[key] = result.value\n      }\n    }\n\n    if (this.options.unknownProperties === 'strict') {\n      for (const key of Object.keys(input)) {\n        if (!this.validatorsMap.has(key)) {\n          return ctx.issueInvalidPropertyType(input, key, 'undefined')\n        }\n      }\n    } else if (this.options.unknownProperties) {\n      const result = this.options.unknownProperties.validateInContext(\n        copy ?? input,\n        ctx,\n        { ignoredKeys: this.validatorsMap },\n      )\n      if (!result.success) return result\n      if (result.value !== input) copy = result.value\n    }\n\n    const output = (copy ?? input) as Output\n\n    return ctx.success(output)\n  }\n}\n"]}
+{"version":3,"file":"object.js","sourceRoot":"","sources":["../../src/schema/object.ts"],"names":[],"mappings":";;;AAAA,gDAAiD;AAEjD,+DAAuD;AACvD,oDAMyB;AASzB,MAAa,YAEX,SAAQ,sBAAiC;IACpB;IAArB,YAAqB,KAAY;QAC/B,KAAK,EAAE,CAAA;QADY,UAAK,GAAL,KAAK,CAAO;IAEjC,CAAC;IAED,IAAI,aAAa;QACf,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;QAE/C,OAAO,IAAA,+BAAY,EAAC,IAAI,EAAE,eAAe,EAAE,GAAG,CAAC,CAAA;IACjD,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,oBAAoB;QACpB,IAAI,IAAyC,CAAA;QAE7C,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YAChD,MAAM,MAAM,GAAG,GAAG,CAAC,aAAa,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,CAAA;YACrD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBACpB,IAAI,CAAC,CAAC,GAAG,IAAI,KAAK,CAAC,EAAE,CAAC;oBACpB,sCAAsC;oBACtC,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;gBACzC,CAAC;gBAED,OAAO,MAAM,CAAA;YACf,CAAC;YAED,uEAAuE;YACvE,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,CAAC,GAAG,IAAI,KAAK,CAAC,EAAE,CAAC;gBAClD,SAAQ;YACV,CAAC;YAED,IAAI,MAAM,CAAC,KAAK,KAAK,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;gBAChC,IAAI,KAAK,EAAE,GAAG,KAAK,EAAE,CAAA;gBACrB,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,KAAK,CAAA;YAC1B,CAAC;QACH,CAAC;QAED,MAAM,MAAM,GAAG,CAAC,IAAI,IAAI,KAAK,CAA8B,CAAA;QAE3D,OAAO,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAC5B,CAAC;CACF;AAlDD,oCAkDC","sourcesContent":["import { isPlainObject } from '@atproto/lex-data'\nimport { WithOptionalProperties } from '../core.js'\nimport { lazyProperty } from '../util/lazy-property.js'\nimport {\n  Infer,\n  Schema,\n  ValidationResult,\n  Validator,\n  ValidatorContext,\n} from '../validation.js'\n\nexport type ObjectSchemaShape = Record<string, Validator>\n\nexport type ObjectSchemaOutput<Shape extends ObjectSchemaShape> =\n  WithOptionalProperties<{\n    [K in keyof Shape]: Infer<Shape[K]>\n  }>\n\nexport class ObjectSchema<\n  const Shape extends ObjectSchemaShape = any,\n> extends Schema<ObjectSchemaOutput<Shape>> {\n  constructor(readonly shape: Shape) {\n    super()\n  }\n\n  get validatorsMap(): Map<string, Validator> {\n    const map = new Map(Object.entries(this.shape))\n\n    return lazyProperty(this, 'validatorsMap', map)\n  }\n\n  validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<ObjectSchemaOutput<Shape>> {\n    if (!isPlainObject(input)) {\n      return ctx.issueInvalidType(input, 'object')\n    }\n\n    // Lazily copy value\n    let copy: undefined | Record<string, unknown>\n\n    for (const [key, propDef] of this.validatorsMap) {\n      const result = ctx.validateChild(input, key, propDef)\n      if (!result.success) {\n        if (!(key in input)) {\n          // Transform into \"required key\" issue\n          return ctx.issueRequiredKey(input, key)\n        }\n\n        return result\n      }\n\n      // Skip copying if key is not present in input (and value is undefined)\n      if (result.value === undefined && !(key in input)) {\n        continue\n      }\n\n      if (result.value !== input[key]) {\n        copy ??= { ...input }\n        copy[key] = result.value\n      }\n    }\n\n    const output = (copy ?? input) as ObjectSchemaOutput<Shape>\n\n    return ctx.success(output)\n  }\n}\n"]}

package/dist/schema/optional.d.ts

@@ -0,0 +1,7 @@
+import { Schema, ValidationResult, Validator, ValidatorContext } from '../validation.js';
+export declare class OptionalSchema<V> extends Schema<V | undefined> {
+    readonly schema: Validator<V>;
+    constructor(schema: Validator<V>);
+    validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<V | undefined>;
+}
+//# sourceMappingURL=optional.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"optional.d.ts","sourceRoot":"","sources":["../../src/schema/optional.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EACjB,MAAM,kBAAkB,CAAA;AAEzB,qBAAa,cAAc,CAAC,CAAC,CAAE,SAAQ,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC;IAC9C,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;gBAApB,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;IAIzC,iBAAiB,CACf,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,CAAC,GAAG,SAAS,CAAC;CAenC"}

package/dist/schema/optional.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OptionalSchema = void 0;
+const validation_js_1 = require("../validation.js");
+class OptionalSchema extends validation_js_1.Schema {
+    schema;
+    constructor(schema) {
+        super();
+        this.schema = schema;
+    }
+    validateInContext(input, ctx) {
+        // @NOTE The inner schema might apply a default value so we need to run it
+        // first, even if input is undefined.
+        const result = ctx.validate(input, this.schema);
+        if (result.success) {
+            return result;
+        }
+        if (input === undefined) {
+            return ctx.success(input);
+        }
+        return result;
+    }
+}
+exports.OptionalSchema = OptionalSchema;
+//# sourceMappingURL=optional.js.map

package/dist/schema/optional.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"optional.js","sourceRoot":"","sources":["../../src/schema/optional.ts"],"names":[],"mappings":";;;AAAA,oDAKyB;AAEzB,MAAa,cAAkB,SAAQ,sBAAqB;IACrC;IAArB,YAAqB,MAAoB;QACvC,KAAK,EAAE,CAAA;QADY,WAAM,GAAN,MAAM,CAAc;IAEzC,CAAC;IAED,iBAAiB,CACf,KAAc,EACd,GAAqB;QAErB,0EAA0E;QAC1E,qCAAqC;QACrC,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAE/C,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,MAAM,CAAA;QACf,CAAC;QAED,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAC3B,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;CACF;AAvBD,wCAuBC","sourcesContent":["import {\n  Schema,\n  ValidationResult,\n  Validator,\n  ValidatorContext,\n} from '../validation.js'\n\nexport class OptionalSchema<V> extends Schema<V | undefined> {\n  constructor(readonly schema: Validator<V>) {\n    super()\n  }\n\n  validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<V | undefined> {\n    // @NOTE The inner schema might apply a default value so we need to run it\n    // first, even if input is undefined.\n    const result = ctx.validate(input, this.schema)\n\n    if (result.success) {\n      return result\n    }\n\n    if (input === undefined) {\n      return ctx.success(input)\n    }\n\n    return result\n  }\n}\n"]}

package/dist/schema/params.d.ts

@@ -1,22 +1,17 @@
-import { ValidationResult, Validator, ValidatorContext } from '../validation.js';
+import { WithOptionalProperties } from '../core.js';
+import { Infer, Schema, ValidationResult, Validator, ValidatorContext } from '../validation.js';
 import { Param } from './_parameters.js';
-import { ObjectSchemaPropertiesOutput } from './object.js';
-export type ParamsSchemaProperties = {
-    [_ in string]: Validator<Param>;
-};
-export type ParamsSchemaOptions = {
-    required?: readonly string[];
-};
-export type ParamsSchemaOutput<P extends ParamsSchemaProperties, O extends ParamsSchemaOptions> = ObjectSchemaPropertiesOutput<P, O>;
-export type InferParamsSchema<T> = T extends ParamsSchema<infer P, infer O> ? NonNullable<unknown> extends ParamsSchemaOutput<P, O> ? ParamsSchemaOutput<P, O> | undefined : ParamsSchemaOutput<P, O> : never;
-export declare class ParamsSchema<const Validators extends ParamsSchemaProperties = ParamsSchemaProperties, const Options extends ParamsSchemaOptions = ParamsSchemaOptions, Output extends ParamsSchemaOutput<Validators, Options> = ParamsSchemaOutput<Validators, Options>> extends Validator<Output> {
-    readonly validators: Validators;
-    readonly options: Options;
-    readonly lexiconType: "params";
-    constructor(validators: Validators, options: Options);
-    get validatorsMap(): Map<string, Validator<Param>>;
-    validateInContext(input: unknown | undefined, ctx: ValidatorContext): ValidationResult<Output>;
-    fromURLSearchParams(urlSearchParams: URLSearchParams): Output;
-    toURLSearchParams(input: Output): URLSearchParams;
+export type ParamsSchemaShape = Record<string, Validator<Param | undefined>>;
+export type ParamsSchemaOutput<Shape extends ParamsSchemaShape> = WithOptionalProperties<{
+    [K in keyof Shape]: Infer<Shape[K]>;
+}>;
+export type InferParamsSchema<T> = T extends ParamsSchema<infer P> ? NonNullable<unknown> extends ParamsSchemaOutput<P> ? ParamsSchemaOutput<P> | undefined : ParamsSchemaOutput<P> : never;
+export declare class ParamsSchema<const Shape extends ParamsSchemaShape = ParamsSchemaShape> extends Schema<ParamsSchemaOutput<Shape>> {
+    readonly validators: Shape;
+    constructor(validators: Shape);
+    get validatorsMap(): Map<string, Validator<Param | undefined>>;
+    validateInContext(input: unknown | undefined, ctx: ValidatorContext): ValidationResult<ParamsSchemaOutput<Shape>>;
+    fromURLSearchParams(urlSearchParams: URLSearchParams): ParamsSchemaOutput<Shape>;
+    toURLSearchParams(input: ParamsSchemaOutput<Shape>): URLSearchParams;
 }
 //# sourceMappingURL=params.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"params.d.ts","sourceRoot":"","sources":["../../src/schema/params.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAChF,OAAO,EAAE,KAAK,EAA4B,MAAM,kBAAkB,CAAA;AAClE,OAAO,EAAE,4BAA4B,EAAE,MAAM,aAAa,CAAA;AAG1D,MAAM,MAAM,sBAAsB,GAAG;KAClC,CAAC,IAAI,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC;CAChC,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAC7B,CAAA;AAED,MAAM,MAAM,kBAAkB,CAC5B,CAAC,SAAS,sBAAsB,EAChC,CAAC,SAAS,mBAAmB,IAC3B,4BAA4B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;AAEtC,MAAM,MAAM,iBAAiB,CAAC,CAAC,IAC7B,CAAC,SAAS,YAAY,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GACpC,WAAW,CAAC,OAAO,CAAC,SAAS,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,GACnD,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,GACpC,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,GAC1B,KAAK,CAAA;AAEX,qBAAa,YAAY,CACvB,KAAK,CAAC,UAAU,SAAS,sBAAsB,GAAG,sBAAsB,EACxE,KAAK,CAAC,OAAO,SAAS,mBAAmB,GAAG,mBAAmB,EAC/D,MAAM,SAAS,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,GAAG,kBAAkB,CACzE,UAAU,EACV,OAAO,CACR,CACD,SAAQ,SAAS,CAAC,MAAM,CAAC;IAIvB,QAAQ,CAAC,UAAU,EAAE,UAAU;IAC/B,QAAQ,CAAC,OAAO,EAAE,OAAO;IAJ3B,QAAQ,CAAC,WAAW,EAAG,QAAQ,CAAS;gBAG7B,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO;IAK3B,IAAI,aAAa,IAAI,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAYjD;IAEQ,iBAAiB,CACxB,KAAK,EAAE,OAAO,YAAK,EACnB,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,MAAM,CAAC;IAkD3B,mBAAmB,CAAC,eAAe,EAAE,eAAe,GAAG,MAAM;IA6B7D,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe;CAiBlD"}
+{"version":3,"file":"params.d.ts","sourceRoot":"","sources":["../../src/schema/params.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAEnD,OAAO,EACL,KAAK,EACL,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EACjB,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,KAAK,EAA4B,MAAM,kBAAkB,CAAA;AAGlE,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC,CAAA;AAE5E,MAAM,MAAM,kBAAkB,CAAC,KAAK,SAAS,iBAAiB,IAC5D,sBAAsB,CAAC;KACpB,CAAC,IAAI,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;CACpC,CAAC,CAAA;AAEJ,MAAM,MAAM,iBAAiB,CAAC,CAAC,IAC7B,CAAC,SAAS,YAAY,CAAC,MAAM,CAAC,CAAC,GAC3B,WAAW,CAAC,OAAO,CAAC,SAAS,kBAAkB,CAAC,CAAC,CAAC,GAChD,kBAAkB,CAAC,CAAC,CAAC,GAAG,SAAS,GACjC,kBAAkB,CAAC,CAAC,CAAC,GACvB,KAAK,CAAA;AAEX,qBAAa,YAAY,CACvB,KAAK,CAAC,KAAK,SAAS,iBAAiB,GAAG,iBAAiB,CACzD,SAAQ,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE,KAAK;gBAAjB,UAAU,EAAE,KAAK;IAItC,IAAI,aAAa,IAAI,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC,CAI7D;IAED,iBAAiB,CACf,KAAK,EAAE,OAAO,YAAK,EACnB,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;IA+C9C,mBAAmB,CACjB,eAAe,EAAE,eAAe,GAC/B,kBAAkB,CAAC,KAAK,CAAC;IA6B5B,iBAAiB,CAAC,KAAK,EAAE,kBAAkB,CAAC,KAAK,CAAC,GAAG,eAAe;CAiBrE"}

package/dist/schema/params.js

@@ -2,28 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ParamsSchema = void 0;
 const lex_data_1 = require("@atproto/lex-data");
+const lazy_property_js_1 = require("../util/lazy-property.js");
 const validation_js_1 = require("../validation.js");
 const _parameters_js_1 = require("./_parameters.js");
 const string_js_1 = require("./string.js");
-class ParamsSchema extends validation_js_1.Validator {
+class ParamsSchema extends validation_js_1.Schema {
     validators;
-    options;
-    lexiconType = 'params';
-    constructor(validators, options) {
+    constructor(validators) {
         super();
         this.validators = validators;
-        this.options = options;
     }
     get validatorsMap() {
         const map = new Map(Object.entries(this.validators));
-        // Cache the map on the instance (to avoid re-creating it)
-        Object.defineProperty(this, 'validatorsMap', {
-            value: map,
-            writable: false,
-            enumerable: false,
-            configurable: true,
-        });
-        return map;
+        return (0, lazy_property_js_1.lazyProperty)(this, 'validatorsMap', map);
     }
     validateInContext(input = {}, ctx) {
         if (!(0, lex_data_1.isPlainObject)(input)) {
@@ -46,21 +37,16 @@ class ParamsSchema extends validation_js_1.Validator {
         for (const [key, propDef] of this.validatorsMap) {
             const result = ctx.validateChild(input, key, propDef);
             if (!result.success) {
-                // Because default values are provided by child validators, we need to
-                // run the validator to get the default value and, in case of failure,
-                // ignore validation error that were caused by missing keys.
                 if (!(key in input)) {
-                    if (!this.options.required?.includes(key)) {
-                        // Ignore missing non-required key
-                        continue;
-                    }
-                    else {
-                        // Transform into "required key" issue
-                        return ctx.issueRequiredKey(input, key);
-                    }
+                    // Transform into "required key" issue
+                    return ctx.issueRequiredKey(input, key);
                 }
                 return result;
             }
+            // Skip copying if key is not present in input (and value is undefined)
+            if (result.value === undefined && !(key in input)) {
+                continue;
+            }
             if (result.value !== input[key]) {
                 // Copy on write
                 copy ??= { ...input };