@atproto/lex-schema 0.0.9 → 0.0.11

package/dist/schema/literal.d.ts

@@ -1,11 +1,8 @@
-import { Schema, ValidationResult, ValidatorContext } from '../core.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;
-    readonly options?: LiteralSchemaOptions<Output> | undefined;
-    constructor(value: Output, options?: LiteralSchemaOptions<Output> | undefined);
-    validateInContext(input: unknown | undefined, ctx: ValidatorContext): ValidationResult<Output>;
+import { Schema, ValidationContext } from '../core.js';
+export declare class LiteralSchema<const TValue extends null | string | number | boolean> extends Schema<TValue> {
+    readonly value: TValue;
+    constructor(value: TValue);
+    validateInContext(input: unknown, ctx: ValidationContext): import("../core.js").ValidationResult<TValue>;
 }
+export declare function literal<const V extends null | string | number | boolean>(value: V): LiteralSchema<V>;
 //# 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,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAEvE,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"}
+{"version":3,"file":"literal.d.ts","sourceRoot":"","sources":["../../src/schema/literal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEtD,qBAAa,aAAa,CACxB,KAAK,CAAC,MAAM,SAAS,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CACrD,SAAQ,MAAM,CAAC,MAAM,CAAC;IACV,QAAQ,CAAC,KAAK,EAAE,MAAM;gBAAb,KAAK,EAAE,MAAM;IAIlC,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,iBAAiB;CAOzD;AAGD,wBAAgB,OAAO,CAAC,KAAK,CAAC,CAAC,SAAS,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,EACtE,KAAK,EAAE,CAAC,oBAGT"}

package/dist/schema/literal.js

@@ -1,16 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LiteralSchema = void 0;
+exports.literal = literal;
 const core_js_1 = require("../core.js");
 class LiteralSchema extends core_js_1.Schema {
     value;
-    options;
-    constructor(value, options) {
+    constructor(value) {
         super();
         this.value = value;
-        this.options = options;
     }
-    validateInContext(input = this.options?.default, ctx) {
+    validateInContext(input, ctx) {
         if (input !== this.value) {
             return ctx.issueInvalidValue(input, [this.value]);
         }
@@ -18,4 +17,8 @@ class LiteralSchema extends core_js_1.Schema {
     }
 }
 exports.LiteralSchema = LiteralSchema;
+/*@__NO_SIDE_EFFECTS__*/
+function literal(value) {
+    return new LiteralSchema(value);
+}
 //# sourceMappingURL=literal.js.map

package/dist/schema/literal.js.map

@@ -1 +1 @@
-{"version":3,"file":"literal.js","sourceRoot":"","sources":["../../src/schema/literal.ts"],"names":[],"mappings":";;;AAAA,wCAAuE;AAMvE,MAAa,aAEX,SAAQ,gBAAc;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 '../core.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"]}
+{"version":3,"file":"literal.js","sourceRoot":"","sources":["../../src/schema/literal.ts"],"names":[],"mappings":";;;AAmBA,0BAIC;AAvBD,wCAAsD;AAEtD,MAAa,aAEX,SAAQ,gBAAc;IACD;IAArB,YAAqB,KAAa;QAChC,KAAK,EAAE,CAAA;QADY,UAAK,GAAL,KAAK,CAAQ;IAElC,CAAC;IAED,iBAAiB,CAAC,KAAc,EAAE,GAAsB;QACtD,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;AAdD,sCAcC;AAED,wBAAwB;AACxB,SAAgB,OAAO,CACrB,KAAQ;IAER,OAAO,IAAI,aAAa,CAAI,KAAK,CAAC,CAAA;AACpC,CAAC","sourcesContent":["import { Schema, ValidationContext } from '../core.js'\n\nexport class LiteralSchema<\n  const TValue extends null | string | number | boolean,\n> extends Schema<TValue> {\n  constructor(readonly value: TValue) {\n    super()\n  }\n\n  validateInContext(input: unknown, ctx: ValidationContext) {\n    if (input !== this.value) {\n      return ctx.issueInvalidValue(input, [this.value])\n    }\n\n    return ctx.success(this.value)\n  }\n}\n\n/*@__NO_SIDE_EFFECTS__*/\nexport function literal<const V extends null | string | number | boolean>(\n  value: V,\n) {\n  return new LiteralSchema<V>(value)\n}\n"]}

package/dist/schema/never.d.ts

@@ -1,5 +1,6 @@
-import { Schema, ValidationFailure, ValidatorContext } from '../core.js';
+import { Schema, ValidationContext } from '../core.js';
 export declare class NeverSchema extends Schema<never> {
-    validateInContext(input: unknown, ctx: ValidatorContext): ValidationFailure;
+    validateInContext(input: unknown, ctx: ValidationContext): import("../core.js").ValidationFailure;
 }
+export declare const never: () => NeverSchema;
 //# 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,EAAE,MAAM,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAExE,qBAAa,WAAY,SAAQ,MAAM,CAAC,KAAK,CAAC;IAC5C,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,gBAAgB,GAAG,iBAAiB;CAG5E"}
+{"version":3,"file":"never.d.ts","sourceRoot":"","sources":["../../src/schema/never.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAGtD,qBAAa,WAAY,SAAQ,MAAM,CAAC,KAAK,CAAC;IAC5C,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,iBAAiB;CAGzD;AAED,eAAO,MAAM,KAAK,mBAEhB,CAAA"}

package/dist/schema/never.js

@@ -1,11 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NeverSchema = void 0;
+exports.never = exports.NeverSchema = void 0;
 const core_js_1 = require("../core.js");
+const memoize_js_1 = require("../util/memoize.js");
 class NeverSchema extends core_js_1.Schema {
     validateInContext(input, ctx) {
         return ctx.issueInvalidType(input, 'never');
     }
 }
 exports.NeverSchema = NeverSchema;
+exports.never = (0, memoize_js_1.memoizedOptions)(function () {
+    return new NeverSchema();
+});
 //# sourceMappingURL=never.js.map

package/dist/schema/never.js.map

@@ -1 +1 @@
-{"version":3,"file":"never.js","sourceRoot":"","sources":["../../src/schema/never.ts"],"names":[],"mappings":";;;AAAA,wCAAwE;AAExE,MAAa,WAAY,SAAQ,gBAAa;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 '../core.js'\n\nexport class NeverSchema extends Schema<never> {\n  validateInContext(input: unknown, ctx: ValidatorContext): ValidationFailure {\n    return ctx.issueInvalidType(input, 'never')\n  }\n}\n"]}
+{"version":3,"file":"never.js","sourceRoot":"","sources":["../../src/schema/never.ts"],"names":[],"mappings":";;;AAAA,wCAAsD;AACtD,mDAAoD;AAEpD,MAAa,WAAY,SAAQ,gBAAa;IAC5C,iBAAiB,CAAC,KAAc,EAAE,GAAsB;QACtD,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;IAC7C,CAAC;CACF;AAJD,kCAIC;AAEY,QAAA,KAAK,GAAiB,IAAA,4BAAe,EAAC;IACjD,OAAO,IAAI,WAAW,EAAE,CAAA;AAC1B,CAAC,CAAC,CAAA","sourcesContent":["import { Schema, ValidationContext } from '../core.js'\nimport { memoizedOptions } from '../util/memoize.js'\n\nexport class NeverSchema extends Schema<never> {\n  validateInContext(input: unknown, ctx: ValidationContext) {\n    return ctx.issueInvalidType(input, 'never')\n  }\n}\n\nexport const never = /*#__PURE__*/ memoizedOptions(function () {\n  return new NeverSchema()\n})\n"]}

package/dist/schema/null.d.ts

@@ -1,6 +1,7 @@
-import { Schema, ValidationResult, ValidatorContext } from '../core.js';
+import { Schema, ValidationContext } from '../core.js';
 export declare class NullSchema extends Schema<null> {
-    constructor();
-    validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<null>;
+    validateInContext(input: unknown, ctx: ValidationContext): import("../core.js").ValidationResult<null>;
 }
+export declare const nullSchema: () => NullSchema;
+export { nullSchema as null };
 //# sourceMappingURL=null.d.ts.map

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,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAEvE,qBAAa,UAAW,SAAQ,MAAM,CAAC,IAAI,CAAC;;IAK1C,iBAAiB,CACf,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,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAGtD,qBAAa,UAAW,SAAQ,MAAM,CAAC,IAAI,CAAC;IAC1C,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,iBAAiB;CAOzD;AAED,eAAO,MAAM,UAAU,kBAErB,CAAA;AAEF,OAAO,EAAE,UAAU,IAAI,IAAI,EAAE,CAAA"}

package/dist/schema/null.js

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NullSchema = void 0;
+exports.null = exports.nullSchema = exports.NullSchema = void 0;
 const core_js_1 = require("../core.js");
+const memoize_js_1 = require("../util/memoize.js");
 class NullSchema extends core_js_1.Schema {
-    constructor() {
-        super();
-    }
     validateInContext(input, ctx) {
         if (input !== null) {
             return ctx.issueInvalidType(input, 'null');
@@ -14,4 +12,8 @@ class NullSchema extends core_js_1.Schema {
     }
 }
 exports.NullSchema = NullSchema;
+exports.nullSchema = (0, memoize_js_1.memoizedOptions)(function () {
+    return new NullSchema();
+});
+exports.null = exports.nullSchema;
 //# sourceMappingURL=null.js.map

package/dist/schema/null.js.map

@@ -1 +1 @@
-{"version":3,"file":"null.js","sourceRoot":"","sources":["../../src/schema/null.ts"],"names":[],"mappings":";;;AAAA,wCAAuE;AAEvE,MAAa,UAAW,SAAQ,gBAAY;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 '../core.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"]}
+{"version":3,"file":"null.js","sourceRoot":"","sources":["../../src/schema/null.ts"],"names":[],"mappings":";;;AAAA,wCAAsD;AACtD,mDAAoD;AAEpD,MAAa,UAAW,SAAQ,gBAAY;IAC1C,iBAAiB,CAAC,KAAc,EAAE,GAAsB;QACtD,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;AARD,gCAQC;AAEY,QAAA,UAAU,GAAiB,IAAA,4BAAe,EAAC;IACtD,OAAO,IAAI,UAAU,EAAE,CAAA;AACzB,CAAC,CAAC,CAAA;AAEqB,eAJV,kBAAU,CAII","sourcesContent":["import { Schema, ValidationContext } from '../core.js'\nimport { memoizedOptions } from '../util/memoize.js'\n\nexport class NullSchema extends Schema<null> {\n  validateInContext(input: unknown, ctx: ValidationContext) {\n    if (input !== null) {\n      return ctx.issueInvalidType(input, 'null')\n    }\n\n    return ctx.success(null)\n  }\n}\n\nexport const nullSchema = /*#__PURE__*/ memoizedOptions(function () {\n  return new NullSchema()\n})\n\nexport { nullSchema as null }\n"]}

package/dist/schema/nullable.d.ts

@@ -1,7 +1,8 @@
-import { Schema, ValidationResult, Validator, ValidatorContext } from '../core.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>;
+import { InferInput, InferOutput, Schema, ValidationContext, Validator } from '../core.js';
+export declare class NullableSchema<const TValidator extends Validator> extends Schema<InferInput<TValidator> | null, InferOutput<TValidator> | null> {
+    readonly validator: TValidator;
+    constructor(validator: TValidator);
+    validateInContext(input: unknown, ctx: ValidationContext): import("../core.js").ValidationFailure | import("../core.js").ValidationSuccess<null> | import("../core.js").ValidationSuccess<InferInput<TValidator>>;
 }
+export declare const nullable: <const TValidator extends Validator>(validator: TValidator) => NullableSchema<TValidator>;
 //# sourceMappingURL=nullable.d.ts.map

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

@@ -1 +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,YAAY,CAAA;AAEnB,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"}
+{"version":3,"file":"nullable.d.ts","sourceRoot":"","sources":["../../src/schema/nullable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,WAAW,EACX,MAAM,EACN,iBAAiB,EACjB,SAAS,EACV,MAAM,YAAY,CAAA;AAGnB,qBAAa,cAAc,CAAC,KAAK,CAAC,UAAU,SAAS,SAAS,CAAE,SAAQ,MAAM,CAC5E,UAAU,CAAC,UAAU,CAAC,GAAG,IAAI,EAC7B,WAAW,CAAC,UAAU,CAAC,GAAG,IAAI,CAC/B;IACa,QAAQ,CAAC,SAAS,EAAE,UAAU;gBAArB,SAAS,EAAE,UAAU;IAI1C,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,iBAAiB;CAOzD;AAED,eAAO,MAAM,QAAQ,SACb,UAAU,SAAS,SAAS,aACvB,UAAU,+BAErB,CAAA"}

package/dist/schema/nullable.js

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

package/dist/schema/nullable.js.map

@@ -1 +1 @@
-{"version":3,"file":"nullable.js","sourceRoot":"","sources":["../../src/schema/nullable.ts"],"names":[],"mappings":";;;AAAA,wCAKmB;AAEnB,MAAa,cAAkB,SAAQ,gBAAgB;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 '../core.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"]}
+{"version":3,"file":"nullable.js","sourceRoot":"","sources":["../../src/schema/nullable.ts"],"names":[],"mappings":";;;AAAA,wCAMmB;AACnB,mDAAwD;AAExD,MAAa,cAAmD,SAAQ,gBAGvE;IACsB;IAArB,YAAqB,SAAqB;QACxC,KAAK,EAAE,CAAA;QADY,cAAS,GAAT,SAAS,CAAY;IAE1C,CAAC;IAED,iBAAiB,CAAC,KAAc,EAAE,GAAsB;QACtD,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,SAAS,CAAC,CAAA;IAC5C,CAAC;CACF;AAfD,wCAeC;AAEY,QAAA,QAAQ,GAAiB,IAAA,gCAAmB,EAAC,UAExD,SAAqB;IACrB,OAAO,IAAI,cAAc,CAAa,SAAS,CAAC,CAAA;AAClD,CAAC,CAAC,CAAA","sourcesContent":["import {\n  InferInput,\n  InferOutput,\n  Schema,\n  ValidationContext,\n  Validator,\n} from '../core.js'\nimport { memoizedTransformer } from '../util/memoize.js'\n\nexport class NullableSchema<const TValidator extends Validator> extends Schema<\n  InferInput<TValidator> | null,\n  InferOutput<TValidator> | null\n> {\n  constructor(readonly validator: TValidator) {\n    super()\n  }\n\n  validateInContext(input: unknown, ctx: ValidationContext) {\n    if (input === null) {\n      return ctx.success(null)\n    }\n\n    return ctx.validate(input, this.validator)\n  }\n}\n\nexport const nullable = /*#__PURE__*/ memoizedTransformer(function <\n  const TValidator extends Validator,\n>(validator: TValidator) {\n  return new NullableSchema<TValidator>(validator)\n})\n"]}

package/dist/schema/object.d.ts

@@ -1,12 +1,14 @@
-import { Infer, Schema, ValidationResult, Validator, ValidatorContext, WithOptionalProperties } from '../core.js';
+import { InferInput, InferOutput, Schema, ValidationContext, Validator, WithOptionalProperties } from '../core.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);
+export declare class ObjectSchema<const TShape extends ObjectSchemaShape = any> extends Schema<WithOptionalProperties<{
+    [K in keyof TShape]: InferInput<TShape[K]>;
+}>, WithOptionalProperties<{
+    [K in keyof TShape]: InferOutput<TShape[K]>;
+}>> {
+    readonly shape: TShape;
+    constructor(shape: TShape);
     get validatorsMap(): Map<string, Validator>;
-    validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<ObjectSchemaOutput<Shape>>;
+    validateInContext(input: unknown, ctx: ValidationContext): import("../core.js").ValidationResult<Record<string, unknown>>;
 }
+export declare function object<const TShape extends ObjectSchemaShape>(properties: TShape): ObjectSchema<TShape>;
 //# 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":"AACA,OAAO,EACL,KAAK,EACL,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,YAAY,CAAA;AAGnB,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"}
+{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../../src/schema/object.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,WAAW,EACX,MAAM,EACN,iBAAiB,EACjB,SAAS,EACT,sBAAsB,EACvB,MAAM,YAAY,CAAA;AAGnB,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;AAEzD,qBAAa,YAAY,CACvB,KAAK,CAAC,MAAM,SAAS,iBAAiB,GAAG,GAAG,CAC5C,SAAQ,MAAM,CACd,sBAAsB,CAAC;KACpB,CAAC,IAAI,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;CAC3C,CAAC,EACF,sBAAsB,CAAC;KACpB,CAAC,IAAI,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;CAC5C,CAAC,CACH;IACa,QAAQ,CAAC,KAAK,EAAE,MAAM;gBAAb,KAAK,EAAE,MAAM;IAIlC,IAAI,aAAa,IAAI,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAI1C;IAED,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,iBAAiB;CAqCzD;AAGD,wBAAgB,MAAM,CAAC,KAAK,CAAC,MAAM,SAAS,iBAAiB,EAC3D,UAAU,EAAE,MAAM,wBAGnB"}

package/dist/schema/object.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObjectSchema = void 0;
+exports.object = object;
 const lex_data_1 = require("@atproto/lex-data");
 const core_js_1 = require("../core.js");
 const lazy_property_js_1 = require("../util/lazy-property.js");
@@ -33,14 +34,21 @@ class ObjectSchema extends core_js_1.Schema {
             if (result.value === undefined && !(key in input)) {
                 continue;
             }
-            if (result.value !== input[key]) {
+            if (!Object.is(result.value, input[key])) {
+                if (ctx.options.mode === 'validate') {
+                    // In "validate" mode, we can't modify the input, so we issue an error
+                    return ctx.issueInvalidPropertyValue(input, key, [result.value]);
+                }
                 copy ??= { ...input };
                 copy[key] = result.value;
             }
         }
-        const output = (copy ?? input);
-        return ctx.success(output);
+        return ctx.success(copy ?? input);
     }
 }
 exports.ObjectSchema = ObjectSchema;
+/*@__NO_SIDE_EFFECTS__*/
+function object(properties) {
+    return new ObjectSchema(properties);
+}
 //# sourceMappingURL=object.js.map

package/dist/schema/object.js.map

@@ -1 +1 @@
-{"version":3,"file":"object.js","sourceRoot":"","sources":["../../src/schema/object.ts"],"names":[],"mappings":";;;AAAA,gDAAiD;AACjD,wCAOmB;AACnB,+DAAuD;AASvD,MAAa,YAEX,SAAQ,gBAAiC;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 {\n  Infer,\n  Schema,\n  ValidationResult,\n  Validator,\n  ValidatorContext,\n  WithOptionalProperties,\n} from '../core.js'\nimport { lazyProperty } from '../util/lazy-property.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"]}
+{"version":3,"file":"object.js","sourceRoot":"","sources":["../../src/schema/object.ts"],"names":[],"mappings":";;;AAyEA,wBAIC;AA7ED,gDAAiD;AACjD,wCAOmB;AACnB,+DAAuD;AAIvD,MAAa,YAEX,SAAQ,gBAOT;IACsB;IAArB,YAAqB,KAAa;QAChC,KAAK,EAAE,CAAA;QADY,UAAK,GAAL,KAAK,CAAQ;IAElC,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,CAAC,KAAc,EAAE,GAAsB;QACtD,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,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;gBACzC,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;oBACpC,sEAAsE;oBACtE,OAAO,GAAG,CAAC,yBAAyB,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;gBAClE,CAAC;gBAED,IAAI,KAAK,EAAE,GAAG,KAAK,EAAE,CAAA;gBACrB,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,KAAK,CAAA;YAC1B,CAAC;QACH,CAAC;QAED,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,KAAK,CAAC,CAAA;IACnC,CAAC;CACF;AAzDD,oCAyDC;AAED,wBAAwB;AACxB,SAAgB,MAAM,CACpB,UAAkB;IAElB,OAAO,IAAI,YAAY,CAAS,UAAU,CAAC,CAAA;AAC7C,CAAC","sourcesContent":["import { isPlainObject } from '@atproto/lex-data'\nimport {\n  InferInput,\n  InferOutput,\n  Schema,\n  ValidationContext,\n  Validator,\n  WithOptionalProperties,\n} from '../core.js'\nimport { lazyProperty } from '../util/lazy-property.js'\n\nexport type ObjectSchemaShape = Record<string, Validator>\n\nexport class ObjectSchema<\n  const TShape extends ObjectSchemaShape = any,\n> extends Schema<\n  WithOptionalProperties<{\n    [K in keyof TShape]: InferInput<TShape[K]>\n  }>,\n  WithOptionalProperties<{\n    [K in keyof TShape]: InferOutput<TShape[K]>\n  }>\n> {\n  constructor(readonly shape: TShape) {\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(input: unknown, ctx: ValidationContext) {\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 (!Object.is(result.value, input[key])) {\n        if (ctx.options.mode === 'validate') {\n          // In \"validate\" mode, we can't modify the input, so we issue an error\n          return ctx.issueInvalidPropertyValue(input, key, [result.value])\n        }\n\n        copy ??= { ...input }\n        copy[key] = result.value\n      }\n    }\n\n    return ctx.success(copy ?? input)\n  }\n}\n\n/*@__NO_SIDE_EFFECTS__*/\nexport function object<const TShape extends ObjectSchemaShape>(\n  properties: TShape,\n) {\n  return new ObjectSchema<TShape>(properties)\n}\n"]}

package/dist/schema/optional.d.ts

@@ -1,7 +1,9 @@
-import { Schema, ValidationResult, Validator, ValidatorContext } from '../core.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>;
+import { InferInput, InferOutput, Schema, UnwrapValidator, ValidationContext, Validator } from '../core.js';
+import { WithDefaultSchema } from './with-default.js';
+export declare class OptionalSchema<TValidator extends Validator> extends Schema<InferInput<TValidator> | undefined, UnwrapValidator<TValidator> extends WithDefaultSchema<infer TValidator> ? InferOutput<TValidator> : InferOutput<TValidator> | undefined> {
+    readonly validator: TValidator;
+    constructor(validator: TValidator);
+    validateInContext(input: unknown, ctx: ValidationContext): import("../core.js").ValidationResult<undefined> | import("../core.js").ValidationSuccess<InferInput<TValidator>>;
 }
+export declare const optional: <const TValidator extends Validator>(validator: TValidator) => OptionalSchema<TValidator>;
 //# sourceMappingURL=optional.d.ts.map

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

@@ -1 +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,YAAY,CAAA;AAEnB,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"}
+{"version":3,"file":"optional.d.ts","sourceRoot":"","sources":["../../src/schema/optional.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,WAAW,EACX,MAAM,EACN,eAAe,EACf,iBAAiB,EACjB,SAAS,EACV,MAAM,YAAY,CAAA;AAEnB,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAErD,qBAAa,cAAc,CAAC,UAAU,SAAS,SAAS,CAAE,SAAQ,MAAM,CACtE,UAAU,CAAC,UAAU,CAAC,GAAG,SAAS,EAClC,eAAe,CAAC,UAAU,CAAC,SAAS,iBAAiB,CAAC,MAAM,UAAU,CAAC,GACnE,WAAW,CAAC,UAAU,CAAC,GACvB,WAAW,CAAC,UAAU,CAAC,GAAG,SAAS,CACxC;IACa,QAAQ,CAAC,SAAS,EAAE,UAAU;gBAArB,SAAS,EAAE,UAAU;IAI1C,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,iBAAiB;CAoBzD;AAED,eAAO,MAAM,QAAQ,SACb,UAAU,SAAS,SAAS,aACvB,UAAU,+BAErB,CAAA"}

package/dist/schema/optional.js

@@ -1,17 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OptionalSchema = void 0;
+exports.optional = exports.OptionalSchema = void 0;
 const core_js_1 = require("../core.js");
+const memoize_js_1 = require("../util/memoize.js");
 class OptionalSchema extends core_js_1.Schema {
-    schema;
-    constructor(schema) {
+    validator;
+    constructor(validator) {
         super();
-        this.schema = schema;
+        this.validator = validator;
     }
     validateInContext(input, ctx) {
+        // Optimization: No need to apply child schema defaults in validation mode
+        if (input === undefined && ctx.options.mode === 'validate') {
+            return ctx.success(input);
+        }
         // @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);
+        // even if input is undefined.
+        const result = ctx.validate(input, this.validator);
         if (result.success) {
             return result;
         }
@@ -22,4 +27,7 @@ class OptionalSchema extends core_js_1.Schema {
     }
 }
 exports.OptionalSchema = OptionalSchema;
+exports.optional = (0, memoize_js_1.memoizedTransformer)(function (validator) {
+    return new OptionalSchema(validator);
+});
 //# sourceMappingURL=optional.js.map

package/dist/schema/optional.js.map

@@ -1 +1 @@
-{"version":3,"file":"optional.js","sourceRoot":"","sources":["../../src/schema/optional.ts"],"names":[],"mappings":";;;AAAA,wCAKmB;AAEnB,MAAa,cAAkB,SAAQ,gBAAqB;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 '../core.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"]}
+{"version":3,"file":"optional.js","sourceRoot":"","sources":["../../src/schema/optional.ts"],"names":[],"mappings":";;;AAAA,wCAOmB;AACnB,mDAAwD;AAGxD,MAAa,cAA6C,SAAQ,gBAKjE;IACsB;IAArB,YAAqB,SAAqB;QACxC,KAAK,EAAE,CAAA;QADY,cAAS,GAAT,SAAS,CAAY;IAE1C,CAAC;IAED,iBAAiB,CAAC,KAAc,EAAE,GAAsB;QACtD,0EAA0E;QAC1E,IAAI,KAAK,KAAK,SAAS,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAC3D,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAC3B,CAAC;QAED,0EAA0E;QAC1E,8BAA8B;QAC9B,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QAElD,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;AA9BD,wCA8BC;AAEY,QAAA,QAAQ,GAAiB,IAAA,gCAAmB,EAAC,UAExD,SAAqB;IACrB,OAAO,IAAI,cAAc,CAAa,SAAS,CAAC,CAAA;AAClD,CAAC,CAAC,CAAA","sourcesContent":["import {\n  InferInput,\n  InferOutput,\n  Schema,\n  UnwrapValidator,\n  ValidationContext,\n  Validator,\n} from '../core.js'\nimport { memoizedTransformer } from '../util/memoize.js'\nimport { WithDefaultSchema } from './with-default.js'\n\nexport class OptionalSchema<TValidator extends Validator> extends Schema<\n  InferInput<TValidator> | undefined,\n  UnwrapValidator<TValidator> extends WithDefaultSchema<infer TValidator>\n    ? InferOutput<TValidator>\n    : InferOutput<TValidator> | undefined\n> {\n  constructor(readonly validator: TValidator) {\n    super()\n  }\n\n  validateInContext(input: unknown, ctx: ValidationContext) {\n    // Optimization: No need to apply child schema defaults in validation mode\n    if (input === undefined && ctx.options.mode === 'validate') {\n      return ctx.success(input)\n    }\n\n    // @NOTE The inner schema might apply a default value so we need to run it\n    // even if input is undefined.\n    const result = ctx.validate(input, this.validator)\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\nexport const optional = /*#__PURE__*/ memoizedTransformer(function <\n  const TValidator extends Validator,\n>(validator: TValidator) {\n  return new OptionalSchema<TValidator>(validator)\n})\n"]}

package/dist/schema/params.d.ts

@@ -1,15 +1,28 @@
-import { Infer, Schema, ValidationResult, Validator, ValidatorContext, WithOptionalProperties } from '../core.js';
-import { Param } from './_parameters.js';
-export type ParamsSchemaShape = Record<string, Validator<Param | undefined>>;
-export type ParamsSchemaOutput<Shape extends ParamsSchemaShape> = WithOptionalProperties<{
-    [K in keyof Shape]: Infer<Shape[K]>;
-}>;
-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;
+import { Infer, InferInput, InferOutput, Schema, ValidationContext, Validator, WithOptionalProperties } from '../core.js';
+import { StringSchema } from './string.js';
+export type ParamScalar = Infer<typeof paramScalarSchema>;
+declare const paramScalarSchema: import("./union.js").UnionSchema<readonly [import("./boolean.js").BooleanSchema, import("./integer.js").IntegerSchema, StringSchema<{}>]>;
+export type Param = Infer<typeof paramSchema>;
+export declare const paramSchema: import("./union.js").UnionSchema<readonly [import("./union.js").UnionSchema<readonly [import("./boolean.js").BooleanSchema, import("./integer.js").IntegerSchema, StringSchema<{}>]>, import("./array.js").ArraySchema<import("./union.js").UnionSchema<readonly [import("./boolean.js").BooleanSchema, import("./integer.js").IntegerSchema, StringSchema<{}>]>>]>;
+export type Params = Infer<typeof paramsSchema>;
+export declare const paramsSchema: import("./dict.js").DictSchema<StringSchema<{}>, import("./optional.js").OptionalSchema<import("./union.js").UnionSchema<readonly [import("./union.js").UnionSchema<readonly [import("./boolean.js").BooleanSchema, import("./integer.js").IntegerSchema, StringSchema<{}>]>, import("./array.js").ArraySchema<import("./union.js").UnionSchema<readonly [import("./boolean.js").BooleanSchema, import("./integer.js").IntegerSchema, StringSchema<{}>]>>]>>>;
+export type ParamsSchemaShape = {
+    [x: string]: Validator<Param | undefined>;
+};
+export declare class ParamsSchema<const TShape extends ParamsSchemaShape = {
+    [x: string]: Validator<Param | undefined>;
+}> extends Schema<WithOptionalProperties<{
+    [K in keyof TShape]: InferInput<TShape[K]>;
+}>, WithOptionalProperties<{
+    [K in keyof TShape]: InferOutput<TShape[K]>;
+}>> {
+    readonly shape: TShape;
+    constructor(shape: TShape);
+    get shapeValidators(): Map<string, Validator<Param | undefined>>;
+    validateInContext(input: unknown, ctx: ValidationContext): import("../core.js").ValidationResult<Record<string, unknown>>;
+    fromURLSearchParams(urlSearchParams: URLSearchParams): InferOutput<this>;
+    toURLSearchParams(input: InferInput<this>): URLSearchParams;
 }
+export declare const params: <const TShape extends ParamsSchemaShape = {}>(properties?: TShape) => ParamsSchema<TShape>;
+export {};
 //# 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,EACL,KAAK,EACL,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,YAAY,CAAA;AAEnB,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,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"}
+{"version":3,"file":"params.d.ts","sourceRoot":"","sources":["../../src/schema/params.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,EACL,UAAU,EACV,WAAW,EACX,MAAM,EACN,iBAAiB,EACjB,SAAS,EACT,sBAAsB,EACvB,MAAM,YAAY,CAAA;AAQnB,OAAO,EAAE,YAAY,EAAU,MAAM,aAAa,CAAA;AAGlD,MAAM,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAA;AACzD,QAAA,MAAM,iBAAiB,2IAA0C,CAAA;AAEjE,MAAM,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,WAAW,CAAC,CAAA;AAC7C,eAAO,MAAM,WAAW,qWAAuD,CAAA;AAE/E,MAAM,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,YAAY,CAAC,CAAA;AAC/C,eAAO,MAAM,YAAY,+bAAwC,CAAA;AAEjE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC,KAAK,GAAG,SAAS,CAAC,CAAA;CAC1C,CAAA;AAED,qBAAa,YAAY,CACvB,KAAK,CAAC,MAAM,SAAS,iBAAiB,GAAG;IACvC,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC,KAAK,GAAG,SAAS,CAAC,CAAA;CAC1C,CACD,SAAQ,MAAM,CACd,sBAAsB,CAAC;KACpB,CAAC,IAAI,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;CAC3C,CAAC,EACF,sBAAsB,CAAC;KACpB,CAAC,IAAI,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;CAC5C,CAAC,CACH;IACa,QAAQ,CAAC,KAAK,EAAE,MAAM;gBAAb,KAAK,EAAE,MAAM;IAIlC,IAAI,eAAe,IAAI,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC,CAI/D;IAED,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,iBAAiB;IA0DxD,mBAAmB,CAAC,eAAe,EAAE,eAAe,GAAG,WAAW,CAAC,IAAI,CAAC;IA6BxE,iBAAiB,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,GAAG,eAAe;CAmB5D;AAED,eAAO,MAAM,MAAM,SACX,MAAM,SAAS,iBAAiB,oBAC1B,MAAM,yBAElB,CAAA"}

package/dist/schema/params.js

@@ -1,22 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ParamsSchema = void 0;
+exports.params = exports.ParamsSchema = exports.paramsSchema = exports.paramSchema = void 0;
 const lex_data_1 = require("@atproto/lex-data");
 const core_js_1 = require("../core.js");
 const lazy_property_js_1 = require("../util/lazy-property.js");
-const _parameters_js_1 = require("./_parameters.js");
+const memoize_js_1 = require("../util/memoize.js");
+const array_js_1 = require("./array.js");
+const boolean_js_1 = require("./boolean.js");
+const dict_js_1 = require("./dict.js");
+const integer_js_1 = require("./integer.js");
+const optional_js_1 = require("./optional.js");
 const string_js_1 = require("./string.js");
+const union_js_1 = require("./union.js");
+const paramScalarSchema = (0, union_js_1.union)([(0, boolean_js_1.boolean)(), (0, integer_js_1.integer)(), (0, string_js_1.string)()]);
+exports.paramSchema = (0, union_js_1.union)([paramScalarSchema, (0, array_js_1.array)(paramScalarSchema)]);
+exports.paramsSchema = (0, dict_js_1.dict)((0, string_js_1.string)(), (0, optional_js_1.optional)(exports.paramSchema));
 class ParamsSchema extends core_js_1.Schema {
-    validators;
-    constructor(validators) {
+    shape;
+    constructor(shape) {
         super();
-        this.validators = validators;
+        this.shape = shape;
     }
-    get validatorsMap() {
-        const map = new Map(Object.entries(this.validators));
-        return (0, lazy_property_js_1.lazyProperty)(this, 'validatorsMap', map);
+    get shapeValidators() {
+        const map = new Map(Object.entries(this.shape));
+        return (0, lazy_property_js_1.lazyProperty)(this, 'shapeValidators', map);
     }
-    validateInContext(input = {}, ctx) {
+    validateInContext(input, ctx) {
+        // @TODO BETTER SUPPORT Input/Output
         if (!(0, lex_data_1.isPlainObject)(input)) {
             return ctx.issueInvalidType(input, 'object');
         }
@@ -24,17 +34,21 @@ class ParamsSchema extends core_js_1.Schema {
         let copy;
         // Ensure that non-specified params conform to param schema
         for (const key in input) {
-            if (this.validatorsMap.has(key))
+            if (this.shapeValidators.has(key))
                 continue;
-            const result = ctx.validateChild(input, key, _parameters_js_1.paramSchema);
+            const result = ctx.validateChild(input, key, exports.paramSchema);
             if (!result.success)
                 return result;
             if (result.value !== input[key]) {
+                if (ctx.options.mode === 'validate') {
+                    // In "validate" mode, we can't modify the input, so we issue an error
+                    return ctx.issueInvalidPropertyValue(input, key, [result.value]);
+                }
                 copy ??= { ...input };
                 copy[key] = result.value;
             }
         }
-        for (const [key, propDef] of this.validatorsMap) {
+        for (const [key, propDef] of this.shapeValidators) {
             const result = ctx.validateChild(input, key, propDef);
             if (!result.success) {
                 if (!(key in input)) {
@@ -47,19 +61,23 @@ class ParamsSchema extends core_js_1.Schema {
             if (result.value === undefined && !(key in input)) {
                 continue;
             }
-            if (result.value !== input[key]) {
+            if (!Object.is(result.value, input[key])) {
+                if (ctx.options.mode === 'validate') {
+                    // In "validate" mode, we can't modify the input, so we issue an error
+                    return ctx.issueInvalidPropertyValue(input, key, [result.value]);
+                }
                 // Copy on write
                 copy ??= { ...input };
                 copy[key] = result.value;
             }
         }
-        return ctx.success((copy ?? input));
+        return ctx.success(copy ?? input);
     }
     fromURLSearchParams(urlSearchParams) {
         const params = {};
         for (const [key, value] of urlSearchParams.entries()) {
-            const validator = this.validatorsMap.get(key);
-            const coerced = validator != null && validator instanceof string_js_1.StringSchema
+            const validator = this.shapeValidators.get(key);
+            const coerced = validator instanceof string_js_1.StringSchema
                 ? value
                 : value === 'true'
                     ? true
@@ -82,20 +100,24 @@ class ParamsSchema extends core_js_1.Schema {
     }
     toURLSearchParams(input) {
         const urlSearchParams = new URLSearchParams();
-        if (input !== undefined) {
-            for (const [key, value] of Object.entries(input)) {
-                if (Array.isArray(value)) {
-                    for (const v of value) {
-                        urlSearchParams.append(key, String(v));
-                    }
-                }
-                else if (value !== undefined) {
-                    urlSearchParams.append(key, String(value));
+        // @NOTE We apply defaults here to ensure that server with different
+        // defaults still receive all expected parameters.
+        const params = this.parse(input);
+        for (const [key, value] of Object.entries(params)) {
+            if (Array.isArray(value)) {
+                for (const v of value) {
+                    urlSearchParams.append(key, String(v));
                 }
             }
+            else if (value !== undefined) {
+                urlSearchParams.append(key, String(value));
+            }
         }
         return urlSearchParams;
     }
 }
 exports.ParamsSchema = ParamsSchema;
+exports.params = (0, memoize_js_1.memoizedOptions)(function params(properties = {}) {
+    return new ParamsSchema(properties);
+});
 //# sourceMappingURL=params.js.map