@atproto/lex-schema 0.0.5 → 0.0.7

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

@@ -1,11 +1,10 @@
-import { Restricted, UnknownString } from '../core.js';
-import { Infer, Schema, ValidationResult, ValidatorContext } from '../validation.js';
+import { Infer, Restricted, Schema, ValidationResult, ValidatorContext } from '../core.js';
 import { TypedRefSchema, TypedRefSchemaOutput } from './typed-ref.js';
 export type TypedRef<T extends {
     $type?: string;
 }> = TypedRefSchemaOutput<T>;
 export type TypedObject = {
-    $type: UnknownString;
+    $type: string;
 } & {
     [K in string]: Restricted<'Unknown property'>;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"typed-union.d.ts","sourceRoot":"","sources":["../../src/schema/typed-union.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAEtD,OAAO,EACL,KAAK,EACL,MAAM,EACN,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAErE,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,IAAI,oBAAoB,CAAC,CAAC,CAAC,CAAA;AAE5E,MAAM,MAAM,WAAW,GAAG;IAAE,KAAK,EAAE,aAAa,CAAA;CAAE,GAAG;KAgBlD,CAAC,IAAI,MAAM,GAAG,UAAU,CAAC,kBAAkB,CAAC;CAC9C,CAAA;AAED,KAAK,sBAAsB,CAAC,CAAC,SAAS,SAAS,cAAc,EAAE,IAAI;KAChE,CAAC,IAAI,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC5B,CAAC,MAAM,CAAC,CAAA;AAET,MAAM,MAAM,sBAAsB,CAChC,SAAS,SAAS,SAAS,cAAc,EAAE,EAC3C,MAAM,SAAS,OAAO,IACpB,MAAM,SAAS,IAAI,GACnB,sBAAsB,CAAC,SAAS,CAAC,GACjC,sBAAsB,CAAC,SAAS,CAAC,GAAG,WAAW,CAAA;AAEnD,qBAAa,gBAAgB,CAC3B,SAAS,SAAS,SAAS,cAAc,EAAE,GAAG,GAAG,EACjD,MAAM,SAAS,OAAO,GAAG,GAAG,CAC5B,SAAQ,MAAM,CAAC,sBAAsB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAEvD,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS;aAClB,MAAM,EAAE,MAAM;gBADX,IAAI,EAAE,SAAS,EAClB,MAAM,EAAE,MAAM;IAShC,IAAI,OAAO,IAAI,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,CAK7C;IAED,IAAI,MAAM,cAET;IAED,iBAAiB,CACf,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,sBAAsB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;CAwB/D"}
+{"version":3,"file":"typed-union.d.ts","sourceRoot":"","sources":["../../src/schema/typed-union.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,EACL,UAAU,EACV,MAAM,EACN,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,YAAY,CAAA;AAEnB,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAErE,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,IAAI,oBAAoB,CAAC,CAAC,CAAC,CAAA;AAE5E,MAAM,MAAM,WAAW,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG;KAgB3C,CAAC,IAAI,MAAM,GAAG,UAAU,CAAC,kBAAkB,CAAC;CAC9C,CAAA;AAED,KAAK,sBAAsB,CAAC,CAAC,SAAS,SAAS,cAAc,EAAE,IAAI;KAChE,CAAC,IAAI,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC5B,CAAC,MAAM,CAAC,CAAA;AAET,MAAM,MAAM,sBAAsB,CAChC,SAAS,SAAS,SAAS,cAAc,EAAE,EAC3C,MAAM,SAAS,OAAO,IACpB,MAAM,SAAS,IAAI,GACnB,sBAAsB,CAAC,SAAS,CAAC,GACjC,sBAAsB,CAAC,SAAS,CAAC,GAAG,WAAW,CAAA;AAEnD,qBAAa,gBAAgB,CAC3B,SAAS,SAAS,SAAS,cAAc,EAAE,GAAG,GAAG,EACjD,MAAM,SAAS,OAAO,GAAG,GAAG,CAC5B,SAAQ,MAAM,CAAC,sBAAsB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAEvD,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS;aAClB,MAAM,EAAE,MAAM;gBADX,IAAI,EAAE,SAAS,EAClB,MAAM,EAAE,MAAM;IAShC,IAAI,OAAO,IAAI,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,CAK7C;IAED,IAAI,MAAM,cAET;IAED,iBAAiB,CACf,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,sBAAsB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;CAwB/D"}

package/dist/schema/typed-union.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypedUnionSchema = 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 validation_js_1 = require("../validation.js");
-class TypedUnionSchema extends validation_js_1.Schema {
+class TypedUnionSchema extends core_js_1.Schema {
     refs;
     closed;
     constructor(refs, closed) {

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

@@ -1 +1 @@
-{"version":3,"file":"typed-union.js","sourceRoot":"","sources":["../../src/schema/typed-union.ts"],"names":[],"mappings":";;;AAAA,gDAAiD;AAEjD,+DAAuD;AACvD,oDAKyB;AAmCzB,MAAa,gBAGX,SAAQ,sBAAiD;IAEpC;IACH;IAFlB,YACqB,IAAe,EAClB,MAAc;QAE9B,0EAA0E;QAC1E,2EAA2E;QAC3E,UAAU;QAEV,KAAK,EAAE,CAAA;QAPY,SAAI,GAAJ,IAAI,CAAW;QAClB,WAAM,GAAN,MAAM,CAAQ;IAOhC,CAAC;IAED,IAAI,OAAO;QACT,MAAM,GAAG,GAAG,IAAI,GAAG,EAA8B,CAAA;QACjD,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI;YAAE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;QAEpD,OAAO,IAAA,+BAAY,EAAC,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,CAAA;IAC3C,CAAC;IAED,IAAI,MAAM;QACR,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;IACxC,CAAC;IAED,iBAAiB,CACf,KAAc,EACd,GAAqB;QAErB,IAAI,CAAC,IAAA,wBAAa,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,KAAK,CAAC,EAAE,CAAC;YACjD,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QAC9C,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAA;QAEvB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QACnC,IAAI,GAAG,EAAE,CAAC;YACR,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;YACvC,OAAO,MAEN,CAAA;QACH,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,OAAO,GAAG,CAAC,yBAAyB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QACnE,CAAC;QACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,GAAG,CAAC,wBAAwB,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;QAC/D,CAAC;QAED,OAAO,GAAG,CAAC,OAAO,CAAC,KAAkD,CAAC,CAAA;IACxE,CAAC;CACF;AArDD,4CAqDC","sourcesContent":["import { isPlainObject } from '@atproto/lex-data'\nimport { Restricted, UnknownString } from '../core.js'\nimport { lazyProperty } from '../util/lazy-property.js'\nimport {\n  Infer,\n  Schema,\n  ValidationResult,\n  ValidatorContext,\n} from '../validation.js'\nimport { TypedRefSchema, TypedRefSchemaOutput } from './typed-ref.js'\n\nexport type TypedRef<T extends { $type?: string }> = TypedRefSchemaOutput<T>\n\nexport type TypedObject = { $type: UnknownString } & {\n  // In order to prevent places that expect an open union from accepting an\n  // invalid version of the known typed objects, we need to prevent any other\n  // properties from being present.\n  //\n  // For example, if an open union expects:\n  // ```ts\n  // TypedObject | { $type: 'A'; a: number }\n  // ```\n  // we don't want it to accept:\n  // ```ts\n  // { $type: 'A' }\n  // ```\n  // Which would be the case as `{ $type: 'A' }` is a valid\n  // `TypedObject`. By adding an index signature that forbids any\n  // property, we ensure that only valid known typed objects can be used.\n  [K in string]: Restricted<'Unknown property'>\n}\n\ntype TypedRefSchemasToUnion<T extends readonly TypedRefSchema[]> = {\n  [K in keyof T]: Infer<T[K]>\n}[number]\n\nexport type TypedUnionSchemaOutput<\n  TypedRefs extends readonly TypedRefSchema[],\n  Closed extends boolean,\n> = Closed extends true\n  ? TypedRefSchemasToUnion<TypedRefs>\n  : TypedRefSchemasToUnion<TypedRefs> | TypedObject\n\nexport class TypedUnionSchema<\n  TypedRefs extends readonly TypedRefSchema[] = any,\n  Closed extends boolean = any,\n> extends Schema<TypedUnionSchemaOutput<TypedRefs, Closed>> {\n  constructor(\n    protected readonly refs: TypedRefs,\n    public readonly closed: Closed,\n  ) {\n    // @NOTE In order to avoid circular dependency issues, we don't access the\n    // refs's schema (or $type) here. Instead, we access them lazily when first\n    // needed.\n\n    super()\n  }\n\n  get refsMap(): Map<unknown, TypedRefs[number]> {\n    const map = new Map<unknown, TypedRefs[number]>()\n    for (const ref of this.refs) map.set(ref.$type, ref)\n\n    return lazyProperty(this, 'refsMap', map)\n  }\n\n  get $types() {\n    return Array.from(this.refsMap.keys())\n  }\n\n  validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<TypedUnionSchemaOutput<TypedRefs, Closed>> {\n    if (!isPlainObject(input) || !('$type' in input)) {\n      return ctx.issueInvalidType(input, '$typed')\n    }\n\n    const { $type } = input\n\n    const def = this.refsMap.get($type)\n    if (def) {\n      const result = ctx.validate(input, def)\n      return result as ValidationResult<\n        TypedUnionSchemaOutput<TypedRefs, Closed>\n      >\n    }\n\n    if (this.closed) {\n      return ctx.issueInvalidPropertyValue(input, '$type', this.$types)\n    }\n    if (typeof $type !== 'string') {\n      return ctx.issueInvalidPropertyType(input, '$type', 'string')\n    }\n\n    return ctx.success(input as TypedUnionSchemaOutput<TypedRefs, Closed>)\n  }\n}\n"]}
+{"version":3,"file":"typed-union.js","sourceRoot":"","sources":["../../src/schema/typed-union.ts"],"names":[],"mappings":";;;AAAA,gDAAiD;AACjD,wCAMmB;AACnB,+DAAuD;AAmCvD,MAAa,gBAGX,SAAQ,gBAAiD;IAEpC;IACH;IAFlB,YACqB,IAAe,EAClB,MAAc;QAE9B,0EAA0E;QAC1E,2EAA2E;QAC3E,UAAU;QAEV,KAAK,EAAE,CAAA;QAPY,SAAI,GAAJ,IAAI,CAAW;QAClB,WAAM,GAAN,MAAM,CAAQ;IAOhC,CAAC;IAED,IAAI,OAAO;QACT,MAAM,GAAG,GAAG,IAAI,GAAG,EAA8B,CAAA;QACjD,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI;YAAE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;QAEpD,OAAO,IAAA,+BAAY,EAAC,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,CAAA;IAC3C,CAAC;IAED,IAAI,MAAM;QACR,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;IACxC,CAAC;IAED,iBAAiB,CACf,KAAc,EACd,GAAqB;QAErB,IAAI,CAAC,IAAA,wBAAa,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,KAAK,CAAC,EAAE,CAAC;YACjD,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QAC9C,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAA;QAEvB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QACnC,IAAI,GAAG,EAAE,CAAC;YACR,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;YACvC,OAAO,MAEN,CAAA;QACH,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,OAAO,GAAG,CAAC,yBAAyB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QACnE,CAAC;QACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,GAAG,CAAC,wBAAwB,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;QAC/D,CAAC;QAED,OAAO,GAAG,CAAC,OAAO,CAAC,KAAkD,CAAC,CAAA;IACxE,CAAC;CACF;AArDD,4CAqDC","sourcesContent":["import { isPlainObject } from '@atproto/lex-data'\nimport {\n  Infer,\n  Restricted,\n  Schema,\n  ValidationResult,\n  ValidatorContext,\n} from '../core.js'\nimport { lazyProperty } from '../util/lazy-property.js'\nimport { TypedRefSchema, TypedRefSchemaOutput } from './typed-ref.js'\n\nexport type TypedRef<T extends { $type?: string }> = TypedRefSchemaOutput<T>\n\nexport type TypedObject = { $type: string } & {\n  // In order to prevent places that expect an open union from accepting an\n  // invalid version of the known typed objects, we need to prevent any other\n  // properties from being present.\n  //\n  // For example, if an open union expects:\n  // ```ts\n  // TypedObject | { $type: 'A'; a: number }\n  // ```\n  // we don't want it to accept:\n  // ```ts\n  // { $type: 'A' }\n  // ```\n  // Which would be the case as `{ $type: 'A' }` is a valid\n  // `TypedObject`. By adding an index signature that forbids any\n  // property, we ensure that only valid known typed objects can be used.\n  [K in string]: Restricted<'Unknown property'>\n}\n\ntype TypedRefSchemasToUnion<T extends readonly TypedRefSchema[]> = {\n  [K in keyof T]: Infer<T[K]>\n}[number]\n\nexport type TypedUnionSchemaOutput<\n  TypedRefs extends readonly TypedRefSchema[],\n  Closed extends boolean,\n> = Closed extends true\n  ? TypedRefSchemasToUnion<TypedRefs>\n  : TypedRefSchemasToUnion<TypedRefs> | TypedObject\n\nexport class TypedUnionSchema<\n  TypedRefs extends readonly TypedRefSchema[] = any,\n  Closed extends boolean = any,\n> extends Schema<TypedUnionSchemaOutput<TypedRefs, Closed>> {\n  constructor(\n    protected readonly refs: TypedRefs,\n    public readonly closed: Closed,\n  ) {\n    // @NOTE In order to avoid circular dependency issues, we don't access the\n    // refs's schema (or $type) here. Instead, we access them lazily when first\n    // needed.\n\n    super()\n  }\n\n  get refsMap(): Map<unknown, TypedRefs[number]> {\n    const map = new Map<unknown, TypedRefs[number]>()\n    for (const ref of this.refs) map.set(ref.$type, ref)\n\n    return lazyProperty(this, 'refsMap', map)\n  }\n\n  get $types() {\n    return Array.from(this.refsMap.keys())\n  }\n\n  validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<TypedUnionSchemaOutput<TypedRefs, Closed>> {\n    if (!isPlainObject(input) || !('$type' in input)) {\n      return ctx.issueInvalidType(input, '$typed')\n    }\n\n    const { $type } = input\n\n    const def = this.refsMap.get($type)\n    if (def) {\n      const result = ctx.validate(input, def)\n      return result as ValidationResult<\n        TypedUnionSchemaOutput<TypedRefs, Closed>\n      >\n    }\n\n    if (this.closed) {\n      return ctx.issueInvalidPropertyValue(input, '$type', this.$types)\n    }\n    if (typeof $type !== 'string') {\n      return ctx.issueInvalidPropertyType(input, '$type', 'string')\n    }\n\n    return ctx.success(input as TypedUnionSchemaOutput<TypedRefs, Closed>)\n  }\n}\n"]}

package/dist/schema/union.d.ts

@@ -1,4 +1,4 @@
-import { Infer, Schema, ValidationResult, Validator, ValidatorContext } from '../validation.js';
+import { Infer, Schema, ValidationResult, Validator, ValidatorContext } from '../core.js';
 export type UnionSchemaValidators = readonly [Validator, ...Validator[]];
 export type UnionSchemaOutput<V extends readonly Validator[]> = Infer<V[number]>;
 export declare class UnionSchema<V extends UnionSchemaValidators = any> extends Schema<UnionSchemaOutput<V>> {

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

@@ -1 +1 @@
-{"version":3,"file":"union.d.ts","sourceRoot":"","sources":["../../src/schema/union.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,MAAM,EAGN,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EACjB,MAAM,kBAAkB,CAAA;AAEzB,MAAM,MAAM,qBAAqB,GAAG,SAAS,CAAC,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC,CAAA;AACxE,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,SAAS,SAAS,EAAE,IAAI,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;AAEhF,qBAAa,WAAW,CAAC,CAAC,SAAS,qBAAqB,GAAG,GAAG,CAAE,SAAQ,MAAM,CAC5E,iBAAiB,CAAC,CAAC,CAAC,CACrB;IACa,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;gBAAb,UAAU,EAAE,CAAC;IAI5C,iBAAiB,CACf,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;CAc1C"}
+{"version":3,"file":"union.d.ts","sourceRoot":"","sources":["../../src/schema/union.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,MAAM,EAGN,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EACjB,MAAM,YAAY,CAAA;AAEnB,MAAM,MAAM,qBAAqB,GAAG,SAAS,CAAC,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC,CAAA;AACxE,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,SAAS,SAAS,EAAE,IAAI,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;AAEhF,qBAAa,WAAW,CAAC,CAAC,SAAS,qBAAqB,GAAG,GAAG,CAAE,SAAQ,MAAM,CAC5E,iBAAiB,CAAC,CAAC,CAAC,CACrB;IACa,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;gBAAb,UAAU,EAAE,CAAC;IAI5C,iBAAiB,CACf,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;CAc1C"}

package/dist/schema/union.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnionSchema = void 0;
-const validation_js_1 = require("../validation.js");
-class UnionSchema extends validation_js_1.Schema {
+const core_js_1 = require("../core.js");
+class UnionSchema extends core_js_1.Schema {
     validators;
     constructor(validators) {
         super();
@@ -19,7 +19,7 @@ class UnionSchema extends validation_js_1.Schema {
                 failures.push(result);
             }
         }
-        return ctx.failure(validation_js_1.ValidationError.fromFailures(failures));
+        return ctx.failure(core_js_1.ValidationError.fromFailures(failures));
     }
 }
 exports.UnionSchema = UnionSchema;

package/dist/schema/union.js.map

@@ -1 +1 @@
-{"version":3,"file":"union.js","sourceRoot":"","sources":["../../src/schema/union.ts"],"names":[],"mappings":";;;AAAA,oDAQyB;AAKzB,MAAa,WAAmD,SAAQ,sBAEvE;IACgC;IAA/B,YAA+B,UAAa;QAC1C,KAAK,EAAE,CAAA;QADsB,eAAU,GAAV,UAAU,CAAG;IAE5C,CAAC;IAED,iBAAiB,CACf,KAAc,EACd,GAAqB;QAErB,MAAM,QAAQ,GAAwB,EAAE,CAAA;QAExC,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACxC,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;YAC7C,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,OAAO,MAAgD,CAAA;YACzD,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACvB,CAAC;QACH,CAAC;QAED,OAAO,GAAG,CAAC,OAAO,CAAC,+BAAe,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC5D,CAAC;CACF;AAxBD,kCAwBC","sourcesContent":["import {\n  Infer,\n  Schema,\n  ValidationError,\n  ValidationFailure,\n  ValidationResult,\n  Validator,\n  ValidatorContext,\n} from '../validation.js'\n\nexport type UnionSchemaValidators = readonly [Validator, ...Validator[]]\nexport type UnionSchemaOutput<V extends readonly Validator[]> = Infer<V[number]>\n\nexport class UnionSchema<V extends UnionSchemaValidators = any> extends Schema<\n  UnionSchemaOutput<V>\n> {\n  constructor(protected readonly validators: V) {\n    super()\n  }\n\n  validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<UnionSchemaOutput<V>> {\n    const failures: ValidationFailure[] = []\n\n    for (const validator of this.validators) {\n      const result = ctx.validate(input, validator)\n      if (result.success) {\n        return result as ValidationResult<UnionSchemaOutput<V>>\n      } else {\n        failures.push(result)\n      }\n    }\n\n    return ctx.failure(ValidationError.fromFailures(failures))\n  }\n}\n"]}
+{"version":3,"file":"union.js","sourceRoot":"","sources":["../../src/schema/union.ts"],"names":[],"mappings":";;;AAAA,wCAQmB;AAKnB,MAAa,WAAmD,SAAQ,gBAEvE;IACgC;IAA/B,YAA+B,UAAa;QAC1C,KAAK,EAAE,CAAA;QADsB,eAAU,GAAV,UAAU,CAAG;IAE5C,CAAC;IAED,iBAAiB,CACf,KAAc,EACd,GAAqB;QAErB,MAAM,QAAQ,GAAwB,EAAE,CAAA;QAExC,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACxC,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;YAC7C,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,OAAO,MAAgD,CAAA;YACzD,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACvB,CAAC;QACH,CAAC;QAED,OAAO,GAAG,CAAC,OAAO,CAAC,yBAAe,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC5D,CAAC;CACF;AAxBD,kCAwBC","sourcesContent":["import {\n  Infer,\n  Schema,\n  ValidationError,\n  ValidationFailure,\n  ValidationResult,\n  Validator,\n  ValidatorContext,\n} from '../core.js'\n\nexport type UnionSchemaValidators = readonly [Validator, ...Validator[]]\nexport type UnionSchemaOutput<V extends readonly Validator[]> = Infer<V[number]>\n\nexport class UnionSchema<V extends UnionSchemaValidators = any> extends Schema<\n  UnionSchemaOutput<V>\n> {\n  constructor(protected readonly validators: V) {\n    super()\n  }\n\n  validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<UnionSchemaOutput<V>> {\n    const failures: ValidationFailure[] = []\n\n    for (const validator of this.validators) {\n      const result = ctx.validate(input, validator)\n      if (result.success) {\n        return result as ValidationResult<UnionSchemaOutput<V>>\n      } else {\n        failures.push(result)\n      }\n    }\n\n    return ctx.failure(ValidationError.fromFailures(failures))\n  }\n}\n"]}

package/dist/schema/unknown-object.d.ts

@@ -1,6 +1,5 @@
 import { LexMap } from '@atproto/lex-data';
-import { Schema, ValidationResult, ValidatorContext } from '../validation';
-export type { LexMap };
+import { Schema, ValidationResult, ValidatorContext } from '../core.js';
 export type UnknownObjectOutput = LexMap;
 export declare class UnknownObjectSchema extends Schema<UnknownObjectOutput> {
     validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<UnknownObjectOutput>;

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

@@ -1 +1 @@
-{"version":3,"file":"unknown-object.d.ts","sourceRoot":"","sources":["../../src/schema/unknown-object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAY,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAE1E,YAAY,EAAE,MAAM,EAAE,CAAA;AACtB,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAA;AAExC,qBAAa,mBAAoB,SAAQ,MAAM,CAAC,mBAAmB,CAAC;IAClE,iBAAiB,CACf,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,mBAAmB,CAAC;CAOzC"}
+{"version":3,"file":"unknown-object.d.ts","sourceRoot":"","sources":["../../src/schema/unknown-object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAY,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAEvE,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAA;AAExC,qBAAa,mBAAoB,SAAQ,MAAM,CAAC,mBAAmB,CAAC;IAClE,iBAAiB,CACf,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,mBAAmB,CAAC;CAOzC"}

package/dist/schema/unknown-object.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnknownObjectSchema = void 0;
 const lex_data_1 = require("@atproto/lex-data");
-const validation_1 = require("../validation");
-class UnknownObjectSchema extends validation_1.Schema {
+const core_js_1 = require("../core.js");
+class UnknownObjectSchema extends core_js_1.Schema {
     validateInContext(input, ctx) {
         if ((0, lex_data_1.isLexMap)(input)) {
             return ctx.success(input);

package/dist/schema/unknown-object.js.map

@@ -1 +1 @@
-{"version":3,"file":"unknown-object.js","sourceRoot":"","sources":["../../src/schema/unknown-object.ts"],"names":[],"mappings":";;;AAAA,gDAAoD;AACpD,8CAA0E;AAK1E,MAAa,mBAAoB,SAAQ,mBAA2B;IAClE,iBAAiB,CACf,KAAc,EACd,GAAqB;QAErB,IAAI,IAAA,mBAAQ,EAAC,KAAK,CAAC,EAAE,CAAC;YACpB,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAC3B,CAAC;QAED,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;IAC/C,CAAC;CACF;AAXD,kDAWC","sourcesContent":["import { LexMap, isLexMap } from '@atproto/lex-data'\nimport { Schema, ValidationResult, ValidatorContext } from '../validation'\n\nexport type { LexMap }\nexport type UnknownObjectOutput = LexMap\n\nexport class UnknownObjectSchema extends Schema<UnknownObjectOutput> {\n  validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<UnknownObjectOutput> {\n    if (isLexMap(input)) {\n      return ctx.success(input)\n    }\n\n    return ctx.issueInvalidType(input, 'unknown')\n  }\n}\n"]}
+{"version":3,"file":"unknown-object.js","sourceRoot":"","sources":["../../src/schema/unknown-object.ts"],"names":[],"mappings":";;;AAAA,gDAAoD;AACpD,wCAAuE;AAIvE,MAAa,mBAAoB,SAAQ,gBAA2B;IAClE,iBAAiB,CACf,KAAc,EACd,GAAqB;QAErB,IAAI,IAAA,mBAAQ,EAAC,KAAK,CAAC,EAAE,CAAC;YACpB,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAC3B,CAAC;QAED,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;IAC/C,CAAC;CACF;AAXD,kDAWC","sourcesContent":["import { LexMap, isLexMap } from '@atproto/lex-data'\nimport { Schema, ValidationResult, ValidatorContext } from '../core.js'\n\nexport type UnknownObjectOutput = LexMap\n\nexport class UnknownObjectSchema extends Schema<UnknownObjectOutput> {\n  validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<UnknownObjectOutput> {\n    if (isLexMap(input)) {\n      return ctx.success(input)\n    }\n\n    return ctx.issueInvalidType(input, 'unknown')\n  }\n}\n"]}

package/dist/schema/unknown.d.ts

@@ -1,4 +1,4 @@
-import { Schema, ValidationResult, ValidatorContext } from '../validation';
+import { Schema, ValidationResult, ValidatorContext } from '../core.js';
 export declare class UnknownSchema extends Schema<unknown> {
     validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<unknown>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"unknown.d.ts","sourceRoot":"","sources":["../../src/schema/unknown.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAE1E,qBAAa,aAAc,SAAQ,MAAM,CAAC,OAAO,CAAC;IAChD,iBAAiB,CACf,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,OAAO,CAAC;CAG7B"}
+{"version":3,"file":"unknown.d.ts","sourceRoot":"","sources":["../../src/schema/unknown.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAEvE,qBAAa,aAAc,SAAQ,MAAM,CAAC,OAAO,CAAC;IAChD,iBAAiB,CACf,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,OAAO,CAAC;CAG7B"}

package/dist/schema/unknown.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnknownSchema = void 0;
-const validation_1 = require("../validation");
-class UnknownSchema extends validation_1.Schema {
+const core_js_1 = require("../core.js");
+class UnknownSchema extends core_js_1.Schema {
     validateInContext(input, ctx) {
         return ctx.success(input);
     }

package/dist/schema/unknown.js.map

@@ -1 +1 @@
-{"version":3,"file":"unknown.js","sourceRoot":"","sources":["../../src/schema/unknown.ts"],"names":[],"mappings":";;;AAAA,8CAA0E;AAE1E,MAAa,aAAc,SAAQ,mBAAe;IAChD,iBAAiB,CACf,KAAc,EACd,GAAqB;QAErB,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC3B,CAAC;CACF;AAPD,sCAOC","sourcesContent":["import { Schema, ValidationResult, ValidatorContext } from '../validation'\n\nexport class UnknownSchema extends Schema<unknown> {\n  validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<unknown> {\n    return ctx.success(input)\n  }\n}\n"]}
+{"version":3,"file":"unknown.js","sourceRoot":"","sources":["../../src/schema/unknown.ts"],"names":[],"mappings":";;;AAAA,wCAAuE;AAEvE,MAAa,aAAc,SAAQ,gBAAe;IAChD,iBAAiB,CACf,KAAc,EACd,GAAqB;QAErB,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC3B,CAAC;CACF;AAPD,sCAOC","sourcesContent":["import { Schema, ValidationResult, ValidatorContext } from '../core.js'\n\nexport class UnknownSchema extends Schema<unknown> {\n  validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<unknown> {\n    return ctx.success(input)\n  }\n}\n"]}

package/dist/util/memoize.d.ts

@@ -0,0 +1,3 @@
+export declare function memoizedOptions<F extends (options?: NonNullable<unknown>) => any>(fn: F, keyFn?: (options: NonNullable<Parameters<F>[0]>) => string | number | boolean | null | void): F;
+export declare function memoizedTransformer<F extends (arg: any) => any>(fn: F): F;
+//# sourceMappingURL=memoize.d.ts.map

package/dist/util/memoize.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"memoize.d.ts","sourceRoot":"","sources":["../../src/util/memoize.ts"],"names":[],"mappings":"AACA,wBAAgB,eAAe,CAC7B,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,KAAK,GAAG,EAEjD,EAAE,EAAE,CAAC,EACL,KAAK,CAAC,EAAE,CACN,OAAO,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KACnC,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,IAAI,GAC3C,CAAC,CAoCH;AAGD,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,CASzE"}

package/dist/util/memoize.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.memoizedOptions = memoizedOptions;
+exports.memoizedTransformer = memoizedTransformer;
+/*@__NO_SIDE_EFFECTS__*/
+function memoizedOptions(fn, keyFn) {
+    let emptyOptionsValue;
+    if (keyFn) {
+        const cache = new Map();
+        const fromCache = (options) => {
+            const key = keyFn(options);
+            if (key !== undefined) {
+                const cached = cache.get(key);
+                if (cached)
+                    return cached;
+                const result = fn(options);
+                cache.set(key, result);
+                return result;
+            }
+            return fn(options);
+        };
+        return ((options) => {
+            // Non-empty options case
+            if (options)
+                for (const _ in options)
+                    return fromCache(options);
+            // Empty or missing options case
+            return (emptyOptionsValue ??= fn(options));
+        });
+    }
+    return ((options) => {
+        // Non-empty options case
+        if (options)
+            for (const _ in options)
+                return fn(options);
+        // Empty or missing options case
+        return (emptyOptionsValue ??= fn(options));
+    });
+}
+/*@__NO_SIDE_EFFECTS__*/
+function memoizedTransformer(fn) {
+    const cache = new WeakMap();
+    return ((arg) => {
+        const cached = cache.get(arg);
+        if (cached)
+            return cached;
+        const result = fn(arg);
+        cache.set(arg, result);
+        return result;
+    });
+}
+//# sourceMappingURL=memoize.js.map

package/dist/util/memoize.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"memoize.js","sourceRoot":"","sources":["../../src/util/memoize.ts"],"names":[],"mappings":";;AACA,0CA2CC;AAGD,kDASC;AAxDD,wBAAwB;AACxB,SAAgB,eAAe,CAG7B,EAAK,EACL,KAE4C;IAE5C,IAAI,iBAA4C,CAAA;IAEhD,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,KAAK,GAAG,IAAI,GAAG,EAAmD,CAAA;QACxE,MAAM,SAAS,GAAG,CAChB,OAAsC,EACvB,EAAE;YACjB,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,CAAA;YAC1B,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;gBACtB,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;gBAC7B,IAAI,MAAM;oBAAE,OAAO,MAAM,CAAA;gBACzB,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,CAAkB,CAAA;gBAC3C,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;gBACtB,OAAO,MAAM,CAAA;YACf,CAAC;YAED,OAAO,EAAE,CAAC,OAAO,CAAC,CAAA;QACpB,CAAC,CAAA;QAED,OAAO,CAAC,CAAC,OAAyB,EAAiB,EAAE;YACnD,yBAAyB;YACzB,IAAI,OAAO;gBAAE,KAAK,MAAM,CAAC,IAAI,OAAO;oBAAE,OAAO,SAAS,CAAC,OAAO,CAAC,CAAA;YAE/D,gCAAgC;YAChC,OAAO,CAAC,iBAAiB,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,CAAA;QAC5C,CAAC,CAAM,CAAA;IACT,CAAC;IAED,OAAO,CAAC,CAAC,OAAyB,EAAiB,EAAE;QACnD,yBAAyB;QACzB,IAAI,OAAO;YAAE,KAAK,MAAM,CAAC,IAAI,OAAO;gBAAE,OAAO,EAAE,CAAC,OAAO,CAAC,CAAA;QAExD,gCAAgC;QAChC,OAAO,CAAC,iBAAiB,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,CAAA;IAC5C,CAAC,CAAM,CAAA;AACT,CAAC;AAED,wBAAwB;AACxB,SAAgB,mBAAmB,CAA8B,EAAK;IACpE,MAAM,KAAK,GAAG,IAAI,OAAO,EAAyB,CAAA;IAClD,OAAO,CAAC,CAAC,GAAqB,EAAiB,EAAE;QAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC7B,IAAI,MAAM;YAAE,OAAO,MAAM,CAAA;QACzB,MAAM,MAAM,GAAG,EAAE,CAAC,GAAG,CAAkB,CAAA;QACvC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;QACtB,OAAO,MAAM,CAAA;IACf,CAAC,CAAM,CAAA;AACT,CAAC","sourcesContent":["/*@__NO_SIDE_EFFECTS__*/\nexport function memoizedOptions<\n  F extends (options?: NonNullable<unknown>) => any,\n>(\n  fn: F,\n  keyFn?: (\n    options: NonNullable<Parameters<F>[0]>,\n  ) => string | number | boolean | null | void,\n): F {\n  let emptyOptionsValue: ReturnType<F> | undefined\n\n  if (keyFn) {\n    const cache = new Map<string | number | boolean | null, ReturnType<F>>()\n    const fromCache = (\n      options: NonNullable<Parameters<F>[0]>,\n    ): ReturnType<F> => {\n      const key = keyFn(options)\n      if (key !== undefined) {\n        const cached = cache.get(key)\n        if (cached) return cached\n        const result = fn(options) as ReturnType<F>\n        cache.set(key, result)\n        return result\n      }\n\n      return fn(options)\n    }\n\n    return ((options: Parameters<F>[0]): ReturnType<F> => {\n      // Non-empty options case\n      if (options) for (const _ in options) return fromCache(options)\n\n      // Empty or missing options case\n      return (emptyOptionsValue ??= fn(options))\n    }) as F\n  }\n\n  return ((options: Parameters<F>[0]): ReturnType<F> => {\n    // Non-empty options case\n    if (options) for (const _ in options) return fn(options)\n\n    // Empty or missing options case\n    return (emptyOptionsValue ??= fn(options))\n  }) as F\n}\n\n/*@__NO_SIDE_EFFECTS__*/\nexport function memoizedTransformer<F extends (arg: any) => any>(fn: F): F {\n  const cache = new WeakMap<object, ReturnType<F>>()\n  return ((arg: Parameters<F>[0]): ReturnType<F> => {\n    const cached = cache.get(arg)\n    if (cached) return cached\n    const result = fn(arg) as ReturnType<F>\n    cache.set(arg, result)\n    return result\n  }) as F\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/lex-schema",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "license": "MIT",
   "description": "Lexicon schema system for AT Lexicons",
   "keywords": [
@@ -28,22 +28,22 @@
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "browser": "./dist/index.js",
       "import": "./dist/index.js",
-      "require": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "require": "./dist/index.js"
     }
   },
   "dependencies": {
     "tslib": "^2.8.1",
     "@atproto/syntax": "0.4.2",
-    "@atproto/lex-data": "0.0.4"
+    "@atproto/lex-data": "0.0.6"
   },
   "devDependencies": {
-    "jest": "^28.1.2"
+    "vitest": "^4.0.16"
   },
   "scripts": {
     "build": "tsc --build tsconfig.build.json",
-    "test": "jest"
+    "test": "vitest run"
   }
 }

package/src/core/$type.ts

@@ -1,5 +1,5 @@
 import { NsidString } from './string-format.js'
-import { OmitKey } from './types.js'
+import { OmitKey, Simplify } from './types.js'
 
 export type $Type<
   N extends NsidString = NsidString,
@@ -22,5 +22,16 @@ export function $type<N extends NsidString, H extends string>(
   return (hash === 'main' ? nsid : `${nsid}#${hash}`) as $Type<N, H>
 }
 
-export type $Typed<V, T extends string = string> = V & { $type: T }
+export type $Typed<V, T extends string = string> = Simplify<
+  V & {
+    $type: T
+  }
+>
+
+export type $TypedMaybe<V, T extends string = string> = Simplify<
+  V & {
+    $type?: T
+  }
+>
+
 export type Un$Typed<V extends { $type?: string }> = OmitKey<V, '$type'>

package/src/{validation → core}/validation-error.ts

@@ -1,22 +1,30 @@
-import { ResultFailure, failureReason } from '../core.js'
+import { LexError } from '@atproto/lex-data'
 import { arrayAgg } from '../util/array-agg.js'
+import { ResultFailure, failureReason } from './result.js'
 import {
   Issue,
   IssueInvalidType,
   IssueInvalidValue,
 } from './validation-issue.js'
 
-export class ValidationError extends Error {
+export class ValidationError extends LexError {
   name = 'ValidationError'
 
   readonly issues: Issue[]
 
   constructor(issues: Issue[], options?: ErrorOptions) {
     const issuesAgg = aggregateIssues(issues)
-    super(issuesAgg.join(', '), options)
+    super('InvalidRequest', issuesAgg.join(', '), options)
     this.issues = issuesAgg
   }
 
+  toJSON() {
+    return {
+      ...super.toJSON(),
+      issues: this.issues.map((issue) => issue.toJSON()),
+    }
+  }
+
   static fromFailures(
     failures: ResultFailure<ValidationError>[],
   ): ValidationError {

package/src/{validation → core}/validation-issue.ts

@@ -9,6 +9,14 @@ export abstract class Issue {
   ) {}
 
   abstract toString(): string
+
+  toJSON() {
+    return {
+      code: this.code,
+      path: this.path,
+      message: this.toString(),
+    }
+  }
 }
 
 export class IssueCustom extends Issue {
@@ -39,6 +47,13 @@ export class IssueInvalidFormat extends Issue {
     return `Invalid ${this.formatDescription} format${this.message ? ` (${this.message})` : ''}${stringifyPath(this.path)} (got ${stringifyValue(this.input)})`
   }
 
+  toJSON() {
+    return {
+      ...super.toJSON(),
+      format: this.format,
+    }
+  }
+
   get formatDescription(): string {
     switch (this.format) {
       case 'at-identifier':
@@ -71,6 +86,13 @@ export class IssueInvalidType extends Issue {
   toString() {
     return `Expected ${oneOf(this.expected.map(stringifyExpectedType))} value type${stringifyPath(this.path)} (got ${stringifyType(this.input)})`
   }
+
+  toJSON() {
+    return {
+      ...super.toJSON(),
+      expected: this.expected,
+    }
+  }
 }
 
 export class IssueInvalidValue extends Issue {
@@ -85,6 +107,13 @@ export class IssueInvalidValue extends Issue {
   toString() {
     return `Expected ${oneOf(this.values.map(stringifyValue))}${stringifyPath(this.path)} (got ${stringifyValue(this.input)})`
   }
+
+  toJSON() {
+    return {
+      ...super.toJSON(),
+      values: this.values,
+    }
+  }
 }
 
 export class IssueRequiredKey extends Issue {
@@ -99,6 +128,13 @@ export class IssueRequiredKey extends Issue {
   toString() {
     return `Missing required key "${String(this.key)}"${stringifyPath(this.path)}`
   }
+
+  toJSON() {
+    return {
+      ...super.toJSON(),
+      key: this.key,
+    }
+  }
 }
 
 export type MeasurableType =
@@ -123,6 +159,14 @@ export class IssueTooBig extends Issue {
   toString() {
     return `${this.type} too big (maximum ${this.maximum})${stringifyPath(this.path)} (got ${this.actual})`
   }
+
+  toJSON() {
+    return {
+      ...super.toJSON(),
+      type: this.type,
+      maximum: this.maximum,
+    }
+  }
 }
 
 export class IssueTooSmall extends Issue {
@@ -139,6 +183,14 @@ export class IssueTooSmall extends Issue {
   toString() {
     return `${this.type} too small (minimum ${this.minimum})${stringifyPath(this.path)} (got ${this.actual})`
   }
+
+  toJSON() {
+    return {
+      ...super.toJSON(),
+      type: this.type,
+      minimum: this.minimum,
+    }
+  }
 }
 
 function stringifyExpectedType(expected: string): string {

package/src/{validation → core}/validator.ts

@@ -1,5 +1,5 @@
-import { ResultFailure, ResultSuccess, failure, success } from '../core.js'
 import { PropertyKey } from './property-key.js'
+import { ResultFailure, ResultSuccess, failure, success } from './result.js'
 import { ValidationError } from './validation-error.js'
 import {
   Issue,

package/src/core.ts

@@ -1,5 +1,10 @@
 export * from './core/$type.js'
+export * from './core/property-key.js'
 export * from './core/record-key.js'
 export * from './core/result.js'
+export * from './core/schema.js'
 export * from './core/string-format.js'
 export * from './core/types.js'
+export * from './core/validation-error.js'
+export * from './core/validation-issue.js'
+export * from './core/validator.js'

package/src/external.ts

@@ -1,4 +1,14 @@
-import { $Type, $TypeOf, $type, LexiconRecordKey, NsidString } from './core.js'
+import {
+  $Type,
+  $TypeOf,
+  $type,
+  Infer,
+  LexiconRecordKey,
+  NsidString,
+  PropertyKey,
+  Schema,
+  Validator,
+} from './core.js'
 import {
   ArraySchema,
   ArraySchemaOptions,
@@ -57,29 +67,25 @@ import {
   UnknownSchema,
   refine,
 } from './schema.js'
-import { Infer, PropertyKey, Schema, Validator } from './validation.js'
+import { memoizedOptions, memoizedTransformer } from './util/memoize.js'
 
 export * from './core.js'
 export * from './helpers.js'
 export * from './schema.js'
-export * from './validation.js'
 
-/*@__NO_SIDE_EFFECTS__*/
-export function never() {
+export { _null as null }
+
+export const never = /*#__PURE__*/ memoizedOptions(function () {
   return new NeverSchema()
-}
+})
 
-/*@__NO_SIDE_EFFECTS__*/
-export function unknown() {
+export const unknown = /*#__PURE__*/ memoizedOptions(function () {
   return new UnknownSchema()
-}
+})
 
-/*@__NO_SIDE_EFFECTS__*/
-export function _null() {
+const _null = /*#__PURE__*/ memoizedOptions(function () {
   return new NullSchema()
-}
-
-export { _null as null }
+})
 
 /*@__NO_SIDE_EFFECTS__*/
 export function literal<const V extends null | string | number | boolean>(
@@ -100,39 +106,45 @@ export function _enum<const V extends null | string | number | boolean>(
 // @NOTE "enum" is a reserved keyword in JS/TS
 export { _enum as enum }
 
-/*@__NO_SIDE_EFFECTS__*/
-export function boolean(options?: BooleanSchemaOptions) {
-  return new BooleanSchema(options)
-}
-
-/*@__NO_SIDE_EFFECTS__*/
-export function integer(options?: IntegerSchemaOptions) {
+export const boolean = /*#__PURE__*/ memoizedOptions(
+  function (options?: BooleanSchemaOptions) {
+    return new BooleanSchema(options)
+  },
+  (options) => {
+    const keys = Object.keys(options)
+    if (keys.length === 1 && keys[0] === 'default') return options.default!
+  },
+)
+
+export const integer = /*#__PURE__*/ memoizedOptions(function (
+  options?: IntegerSchemaOptions,
+) {
   return new IntegerSchema(options)
-}
+})
 
-/*@__NO_SIDE_EFFECTS__*/
-export function cidLink(options?: CidSchemaOptions) {
+export const cidLink = /*#__PURE__*/ memoizedOptions(function (
+  options?: CidSchemaOptions,
+) {
   return new CidSchema(options)
-}
+})
 
-/*@__NO_SIDE_EFFECTS__*/
-export function bytes(options?: BytesSchemaOptions) {
+export const bytes = /*#__PURE__*/ memoizedOptions(function (
+  options?: BytesSchemaOptions,
+) {
   return new BytesSchema(options)
-}
+})
 
-/*@__NO_SIDE_EFFECTS__*/
-export function blob<O extends BlobSchemaOptions = NonNullable<unknown>>(
-  options: O = {} as O,
-) {
+export const blob = /*#__PURE__*/ memoizedOptions(function <
+  O extends BlobSchemaOptions = NonNullable<unknown>,
+>(options: O = {} as O) {
   return new BlobSchema(options)
-}
+})
 
-/*@__NO_SIDE_EFFECTS__*/
-export function string<
+export const string = /*#__PURE__*/ memoizedOptions(function <
   const O extends StringSchemaOptions = NonNullable<unknown>,
 >(options: StringSchemaOptions & O = {} as O) {
   return new StringSchema<O>(options)
-}
+})
 
 /*@__NO_SIDE_EFFECTS__*/
 export function regexp<T extends string = string>(pattern: RegExp) {
@@ -171,10 +183,9 @@ export function dict<
 // Utility
 export type { UnknownObjectOutput as UnknownObject }
 
-/*@__NO_SIDE_EFFECTS__*/
-export function unknownObject() {
+export const unknownObject = /*#__PURE__*/ memoizedOptions(function () {
   return new UnknownObjectSchema()
-}
+})
 
 /*@__NO_SIDE_EFFECTS__*/
 export function ref<T>(get: RefSchemaGetter<T>) {
@@ -190,15 +201,17 @@ export function custom<T>(
   return new CustomSchema<T>(assertion, message, path)
 }
 
-/*@__NO_SIDE_EFFECTS__*/
-export function nullable<const S extends Validator>(schema: S) {
+export const nullable = /*#__PURE__*/ memoizedTransformer(function <
+  const S extends Validator,
+>(schema: S) {
   return new NullableSchema<Infer<S>>(schema)
-}
+})
 
-/*@__NO_SIDE_EFFECTS__*/
-export function optional<const S extends Validator>(schema: S) {
+export const optional = /*#__PURE__*/ memoizedTransformer(function <
+  const S extends Validator,
+>(schema: S) {
   return new OptionalSchema<Infer<S>>(schema)
-}
+})
 
 /*@__NO_SIDE_EFFECTS__*/
 export function union<const V extends UnionSchemaValidators>(validators: V) {
@@ -325,12 +338,11 @@ export function record<
   return new RecordSchema<K, T, S>(key, type, schema)
 }
 
-/*@__NO_SIDE_EFFECTS__*/
-export function params<
+export const params = /*#__PURE__*/ memoizedOptions(function <
   const P extends ParamsSchemaShape = NonNullable<unknown>,
 >(properties: P = {} as P) {
   return new ParamsSchema<P>(properties)
-}
+})
 
 /*@__NO_SIDE_EFFECTS__*/
 export function payload<
@@ -340,6 +352,13 @@ export function payload<
   return new Payload<E, S>(encoding, schema)
 }
 
+/*@__NO_SIDE_EFFECTS__*/
+export function jsonPayload<const P extends ObjectSchemaShape>(
+  properties: P,
+): Payload<'application/json', ObjectSchema<P>> {
+  return payload('application/json', object(properties))
+}
+
 /*@__NO_SIDE_EFFECTS__*/
 export function query<
   const N extends NsidString,