@atproto/lex-schema 0.0.1 → 0.0.3

package/dist/schema/string.d.ts

@@ -1,8 +1,7 @@
-import { InferStringFormat, StringFormat, UnknownString } from '../core.js';
-import { ValidationResult, Validator, ValidatorContext } from '../validation.js';
+import { InferStringFormat, StringFormat } from '../core.js';
+import { Schema, ValidationResult, ValidatorContext } from '../validation.js';
 export type StringSchemaOptions = {
     default?: string;
-    knownValues?: readonly string[];
     format?: StringFormat;
     minLength?: number;
     maxLength?: number;
@@ -11,12 +10,9 @@ export type StringSchemaOptions = {
 };
 export type StringSchemaOutput<Options> = Options extends {
     format: infer F extends StringFormat;
-} ? InferStringFormat<F> : Options extends {
-    knownValues: readonly (infer K extends string)[];
-} ? K | UnknownString : string;
-export declare class StringSchema<const Options extends StringSchemaOptions = any> extends Validator<StringSchemaOutput<Options>> {
+} ? InferStringFormat<F> : string;
+export declare class StringSchema<const Options extends StringSchemaOptions = any> extends Schema<StringSchemaOutput<Options>> {
     readonly options: Options;
-    readonly lexiconType: "string";
     constructor(options: Options);
     validateInContext(input: unknown | undefined, ctx: ValidatorContext): ValidationResult<StringSchemaOutput<Options>>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"string.d.ts","sourceRoot":"","sources":["../../src/schema/string.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EACjB,YAAY,EACZ,aAAa,EAEd,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAGhF,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC/B,MAAM,CAAC,EAAE,YAAY,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAA;AAED,MAAM,MAAM,kBAAkB,CAAC,OAAO,IAEpC,OAAO,SAAS;IAAE,MAAM,EAAE,MAAM,CAAC,SAAS,YAAY,CAAA;CAAE,GACpD,iBAAiB,CAAC,CAAC,CAAC,GACpB,OAAO,SAAS;IAAE,WAAW,EAAE,SAAS,CAAC,MAAM,CAAC,SAAS,MAAM,CAAC,EAAE,CAAA;CAAE,GAClE,CAAC,GAAG,aAAa,GACjB,MAAM,CAAA;AAEd,qBAAa,YAAY,CACvB,KAAK,CAAC,OAAO,SAAS,mBAAmB,GAAG,GAAG,CAC/C,SAAQ,SAAS,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAGlC,QAAQ,CAAC,OAAO,EAAE,OAAO;IAFrC,QAAQ,CAAC,WAAW,EAAG,QAAQ,CAAS;gBAEnB,OAAO,EAAE,OAAO;IAI5B,iBAAiB,CAExB,KAAK,EAAE,OAAO,YAAuB,EACrC,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;CA6DjD;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAkC5D"}
+{"version":3,"file":"string.d.ts","sourceRoot":"","sources":["../../src/schema/string.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAsB,MAAM,YAAY,CAAA;AAChF,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAG7E,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,YAAY,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAA;AAED,MAAM,MAAM,kBAAkB,CAAC,OAAO,IAEpC,OAAO,SAAS;IAAE,MAAM,EAAE,MAAM,CAAC,SAAS,YAAY,CAAA;CAAE,GACpD,iBAAiB,CAAC,CAAC,CAAC,GACpB,MAAM,CAAA;AAEZ,qBAAa,YAAY,CACvB,KAAK,CAAC,OAAO,SAAS,mBAAmB,GAAG,GAAG,CAC/C,SAAQ,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,OAAO;gBAAhB,OAAO,EAAE,OAAO;IAIrC,iBAAiB,CAEf,KAAK,EAAE,OAAO,YAAuB,EACrC,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;CA6DjD;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAsC5D"}

package/dist/schema/string.js

@@ -6,9 +6,8 @@ const lex_data_1 = require("@atproto/lex-data");
 const core_js_1 = require("../core.js");
 const validation_js_1 = require("../validation.js");
 const token_js_1 = require("./token.js");
-class StringSchema extends validation_js_1.Validator {
+class StringSchema extends validation_js_1.Schema {
     options;
-    lexiconType = 'string';
     constructor(options) {
         super();
         this.options = options;
@@ -74,6 +73,10 @@ class StringSchema extends validation_js_1.Validator {
 exports.StringSchema = StringSchema;
 function coerceToString(input) {
     switch (typeof input) {
+        // @NOTE We do *not* coerce numbers/booleans to strings because that can
+        // lead to them being accepted as string instead of being coerced to
+        // number/boolean when the input is a string and the expected result is
+        // number/boolean (e.g. in params).
         case 'string':
             return input;
         case 'object': {
@@ -92,7 +95,7 @@ function coerceToString(input) {
             if (input instanceof URL) {
                 return input.toString();
             }
-            const cid = lex_data_1.CID.asCID(input);
+            const cid = (0, lex_data_1.asCid)(input);
             if (cid)
                 return cid.toString();
             if (input instanceof String) {

package/dist/schema/string.js.map

@@ -1 +1 @@
-{"version":3,"file":"string.js","sourceRoot":"","sources":["../../src/schema/string.ts"],"names":[],"mappings":"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","sourcesContent":["import { CID, graphemeLen, utf8Len } from '@atproto/lex-data'\nimport {\n  InferStringFormat,\n  StringFormat,\n  UnknownString,\n  assertStringFormat,\n} from '../core.js'\nimport { ValidationResult, Validator, ValidatorContext } from '../validation.js'\nimport { TokenSchema } from './token.js'\n\nexport type StringSchemaOptions = {\n  default?: string\n  knownValues?: readonly string[]\n  format?: StringFormat\n  minLength?: number\n  maxLength?: number\n  minGraphemes?: number\n  maxGraphemes?: number\n}\n\nexport type StringSchemaOutput<Options> =\n  //\n  Options extends { format: infer F extends StringFormat }\n    ? InferStringFormat<F>\n    : Options extends { knownValues: readonly (infer K extends string)[] }\n      ? K | UnknownString\n      : string\n\nexport class StringSchema<\n  const Options extends StringSchemaOptions = any,\n> extends Validator<StringSchemaOutput<Options>> {\n  readonly lexiconType = 'string' as const\n\n  constructor(readonly options: Options) {\n    super()\n  }\n\n  override validateInContext(\n    // @NOTE validation will be applied on the default value as well\n    input: unknown = this.options.default,\n    ctx: ValidatorContext,\n  ): ValidationResult<StringSchemaOutput<Options>> {\n    const { options } = this\n\n    const str = coerceToString(input)\n    if (str == null) {\n      return ctx.issueInvalidType(input, 'string')\n    }\n\n    let lazyUtf8Len: number\n\n    const { minLength } = options\n    if (minLength != null) {\n      if ((lazyUtf8Len ??= utf8Len(str)) < minLength) {\n        return ctx.issueTooSmall(str, 'string', minLength, lazyUtf8Len)\n      }\n    }\n\n    const { maxLength } = options\n    if (maxLength != null) {\n      // Optimization: we can avoid computing the UTF-8 length if the maximum\n      // possible length, in bytes, of the input JS string is smaller than the\n      // maxLength (in UTF-8 string bytes).\n      if (str.length * 3 <= maxLength) {\n        // Input string so small it can't possibly exceed maxLength\n      } else if ((lazyUtf8Len ??= utf8Len(str)) > maxLength) {\n        return ctx.issueTooBig(str, 'string', maxLength, lazyUtf8Len)\n      }\n    }\n\n    let lazyGraphLen: number\n\n    const { minGraphemes } = options\n    if (minGraphemes != null) {\n      // Optimization: avoid counting graphemes if the length check already fails\n      if (str.length < minGraphemes) {\n        return ctx.issueTooSmall(str, 'grapheme', minGraphemes, str.length)\n      } else if ((lazyGraphLen ??= graphemeLen(str)) < minGraphemes) {\n        return ctx.issueTooSmall(str, 'grapheme', minGraphemes, lazyGraphLen)\n      }\n    }\n\n    const { maxGraphemes } = options\n    if (maxGraphemes != null) {\n      if ((lazyGraphLen ??= graphemeLen(str)) > maxGraphemes) {\n        return ctx.issueTooBig(str, 'grapheme', maxGraphemes, lazyGraphLen)\n      }\n    }\n\n    if (options.format !== undefined) {\n      try {\n        // @TODO optimize to avoid throw cost (requires re-writing utilities\n        // from @atproto/syntax)\n        assertStringFormat(str, options.format)\n      } catch (err) {\n        const message = err instanceof Error ? err.message : undefined\n        return ctx.issueInvalidFormat(str, options.format, message)\n      }\n    }\n\n    return ctx.success(str as StringSchemaOutput<Options>)\n  }\n}\n\nexport function coerceToString(input: unknown): string | null {\n  switch (typeof input) {\n    case 'string':\n      return input\n    case 'object': {\n      if (input == null) return null\n\n      // @NOTE Allow using TokenSchema instances in places expecting strings,\n      // converting them to their string value.\n      if (input instanceof TokenSchema) {\n        return input.toString()\n      }\n\n      if (input instanceof Date) {\n        if (Number.isNaN(input.getTime())) return null\n        return input.toISOString()\n      }\n\n      if (input instanceof URL) {\n        return input.toString()\n      }\n\n      const cid = CID.asCID(input)\n      if (cid) return cid.toString()\n\n      if (input instanceof String) {\n        return input.valueOf()\n      }\n    }\n\n    // falls through\n    default:\n      return null\n  }\n}\n"]}
+{"version":3,"file":"string.js","sourceRoot":"","sources":["../../src/schema/string.ts"],"names":[],"mappings":"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","sourcesContent":["import { asCid, graphemeLen, utf8Len } from '@atproto/lex-data'\nimport { InferStringFormat, StringFormat, assertStringFormat } from '../core.js'\nimport { Schema, ValidationResult, ValidatorContext } from '../validation.js'\nimport { TokenSchema } from './token.js'\n\nexport type StringSchemaOptions = {\n  default?: string\n  format?: StringFormat\n  minLength?: number\n  maxLength?: number\n  minGraphemes?: number\n  maxGraphemes?: number\n}\n\nexport type StringSchemaOutput<Options> =\n  //\n  Options extends { format: infer F extends StringFormat }\n    ? InferStringFormat<F>\n    : string\n\nexport class StringSchema<\n  const Options extends StringSchemaOptions = any,\n> extends Schema<StringSchemaOutput<Options>> {\n  constructor(readonly options: Options) {\n    super()\n  }\n\n  validateInContext(\n    // @NOTE validation will be applied on the default value as well\n    input: unknown = this.options.default,\n    ctx: ValidatorContext,\n  ): ValidationResult<StringSchemaOutput<Options>> {\n    const { options } = this\n\n    const str = coerceToString(input)\n    if (str == null) {\n      return ctx.issueInvalidType(input, 'string')\n    }\n\n    let lazyUtf8Len: number\n\n    const { minLength } = options\n    if (minLength != null) {\n      if ((lazyUtf8Len ??= utf8Len(str)) < minLength) {\n        return ctx.issueTooSmall(str, 'string', minLength, lazyUtf8Len)\n      }\n    }\n\n    const { maxLength } = options\n    if (maxLength != null) {\n      // Optimization: we can avoid computing the UTF-8 length if the maximum\n      // possible length, in bytes, of the input JS string is smaller than the\n      // maxLength (in UTF-8 string bytes).\n      if (str.length * 3 <= maxLength) {\n        // Input string so small it can't possibly exceed maxLength\n      } else if ((lazyUtf8Len ??= utf8Len(str)) > maxLength) {\n        return ctx.issueTooBig(str, 'string', maxLength, lazyUtf8Len)\n      }\n    }\n\n    let lazyGraphLen: number\n\n    const { minGraphemes } = options\n    if (minGraphemes != null) {\n      // Optimization: avoid counting graphemes if the length check already fails\n      if (str.length < minGraphemes) {\n        return ctx.issueTooSmall(str, 'grapheme', minGraphemes, str.length)\n      } else if ((lazyGraphLen ??= graphemeLen(str)) < minGraphemes) {\n        return ctx.issueTooSmall(str, 'grapheme', minGraphemes, lazyGraphLen)\n      }\n    }\n\n    const { maxGraphemes } = options\n    if (maxGraphemes != null) {\n      if ((lazyGraphLen ??= graphemeLen(str)) > maxGraphemes) {\n        return ctx.issueTooBig(str, 'grapheme', maxGraphemes, lazyGraphLen)\n      }\n    }\n\n    if (options.format !== undefined) {\n      try {\n        // @TODO optimize to avoid throw cost (requires re-writing utilities\n        // from @atproto/syntax)\n        assertStringFormat(str, options.format)\n      } catch (err) {\n        const message = err instanceof Error ? err.message : undefined\n        return ctx.issueInvalidFormat(str, options.format, message)\n      }\n    }\n\n    return ctx.success(str as StringSchemaOutput<Options>)\n  }\n}\n\nexport function coerceToString(input: unknown): string | null {\n  switch (typeof input) {\n    // @NOTE We do *not* coerce numbers/booleans to strings because that can\n    // lead to them being accepted as string instead of being coerced to\n    // number/boolean when the input is a string and the expected result is\n    // number/boolean (e.g. in params).\n    case 'string':\n      return input\n    case 'object': {\n      if (input == null) return null\n\n      // @NOTE Allow using TokenSchema instances in places expecting strings,\n      // converting them to their string value.\n      if (input instanceof TokenSchema) {\n        return input.toString()\n      }\n\n      if (input instanceof Date) {\n        if (Number.isNaN(input.getTime())) return null\n        return input.toISOString()\n      }\n\n      if (input instanceof URL) {\n        return input.toString()\n      }\n\n      const cid = asCid(input)\n      if (cid) return cid.toString()\n\n      if (input instanceof String) {\n        return input.valueOf()\n      }\n    }\n\n    // falls through\n    default:\n      return null\n  }\n}\n"]}

package/dist/schema/subscription.d.ts

@@ -1,3 +1,4 @@
+import { NsidString } from '../core.js';
 import { Infer } from '../validation.js';
 import { ObjectSchema } from './object.js';
 import { ParamsSchema } from './params.js';
@@ -5,12 +6,12 @@ import { RefSchema } from './ref.js';
 import { TypedUnionSchema } from './typed-union.js';
 export type InferSubscriptionParameters<S extends Subscription> = S extends Subscription<any, infer P extends ParamsSchema, any> ? Infer<P> : never;
 export type InferSubscriptionMessage<S extends Subscription> = S extends Subscription<any, any, infer M extends RefSchema | TypedUnionSchema | ObjectSchema> ? Infer<M> : unknown;
-export declare class Subscription<N extends string = any, P extends ParamsSchema = any, M extends undefined | RefSchema | TypedUnionSchema | ObjectSchema = any, E extends undefined | readonly string[] = any> {
-    readonly nsid: N;
-    readonly parameters: P;
-    readonly message: M;
-    readonly errors: E;
+export declare class Subscription<TNsid extends NsidString = any, TParameters extends ParamsSchema = any, TMessage extends undefined | RefSchema | TypedUnionSchema | ObjectSchema = any, TErrors extends undefined | readonly string[] = any> {
+    readonly nsid: TNsid;
+    readonly parameters: TParameters;
+    readonly message: TMessage;
+    readonly errors: TErrors;
     readonly type: "subscription";
-    constructor(nsid: N, parameters: P, message: M, errors: E);
+    constructor(nsid: TNsid, parameters: TParameters, message: TMessage, errors: TErrors);
 }
 //# sourceMappingURL=subscription.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"subscription.d.ts","sourceRoot":"","sources":["../../src/schema/subscription.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAEnD,MAAM,MAAM,2BAA2B,CAAC,CAAC,SAAS,YAAY,IAC5D,CAAC,SAAS,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,SAAS,YAAY,EAAE,GAAG,CAAC,GAC1D,KAAK,CAAC,CAAC,CAAC,GACR,KAAK,CAAA;AAEX,MAAM,MAAM,wBAAwB,CAAC,CAAC,SAAS,YAAY,IACzD,CAAC,SAAS,YAAY,CACpB,GAAG,EACH,GAAG,EACH,MAAM,CAAC,SAAS,SAAS,GAAG,gBAAgB,GAAG,YAAY,CAC5D,GACG,KAAK,CAAC,CAAC,CAAC,GACR,OAAO,CAAA;AAEb,qBAAa,YAAY,CACvB,CAAC,SAAS,MAAM,GAAG,GAAG,EACtB,CAAC,SAAS,YAAY,GAAG,GAAG,EAC5B,CAAC,SAAS,SAAS,GAAG,SAAS,GAAG,gBAAgB,GAAG,YAAY,GAAG,GAAG,EACvE,CAAC,SAAS,SAAS,GAAG,SAAS,MAAM,EAAE,GAAG,GAAG;IAK3C,QAAQ,CAAC,IAAI,EAAE,CAAC;IAChB,QAAQ,CAAC,UAAU,EAAE,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,CAAC;IACnB,QAAQ,CAAC,MAAM,EAAE,CAAC;IANpB,QAAQ,CAAC,IAAI,EAAG,cAAc,CAAS;gBAG5B,IAAI,EAAE,CAAC,EACP,UAAU,EAAE,CAAC,EACb,OAAO,EAAE,CAAC,EACV,MAAM,EAAE,CAAC;CAErB"}
+{"version":3,"file":"subscription.d.ts","sourceRoot":"","sources":["../../src/schema/subscription.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAEnD,MAAM,MAAM,2BAA2B,CAAC,CAAC,SAAS,YAAY,IAC5D,CAAC,SAAS,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,SAAS,YAAY,EAAE,GAAG,CAAC,GAC1D,KAAK,CAAC,CAAC,CAAC,GACR,KAAK,CAAA;AAEX,MAAM,MAAM,wBAAwB,CAAC,CAAC,SAAS,YAAY,IACzD,CAAC,SAAS,YAAY,CACpB,GAAG,EACH,GAAG,EACH,MAAM,CAAC,SAAS,SAAS,GAAG,gBAAgB,GAAG,YAAY,CAC5D,GACG,KAAK,CAAC,CAAC,CAAC,GACR,OAAO,CAAA;AAEb,qBAAa,YAAY,CACvB,KAAK,SAAS,UAAU,GAAG,GAAG,EAC9B,WAAW,SAAS,YAAY,GAAG,GAAG,EACtC,QAAQ,SACJ,SAAS,GACT,SAAS,GACT,gBAAgB,GAChB,YAAY,GAAG,GAAG,EACtB,OAAO,SAAS,SAAS,GAAG,SAAS,MAAM,EAAE,GAAG,GAAG;IAKjD,QAAQ,CAAC,IAAI,EAAE,KAAK;IACpB,QAAQ,CAAC,UAAU,EAAE,WAAW;IAChC,QAAQ,CAAC,OAAO,EAAE,QAAQ;IAC1B,QAAQ,CAAC,MAAM,EAAE,OAAO;IAN1B,QAAQ,CAAC,IAAI,EAAG,cAAc,CAAS;gBAG5B,IAAI,EAAE,KAAK,EACX,UAAU,EAAE,WAAW,EACvB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO;CAE3B"}

package/dist/schema/subscription.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscription.js","sourceRoot":"","sources":["../../src/schema/subscription.ts"],"names":[],"mappings":";;;AAoBA,MAAa,YAAY;IASZ;IACA;IACA;IACA;IANF,IAAI,GAAG,cAAuB,CAAA;IAEvC,YACW,IAAO,EACP,UAAa,EACb,OAAU,EACV,MAAS;QAHT,SAAI,GAAJ,IAAI,CAAG;QACP,eAAU,GAAV,UAAU,CAAG;QACb,YAAO,GAAP,OAAO,CAAG;QACV,WAAM,GAAN,MAAM,CAAG;IACjB,CAAC;CACL;AAdD,oCAcC","sourcesContent":["import { Infer } from '../validation.js'\nimport { ObjectSchema } from './object.js'\nimport { ParamsSchema } from './params.js'\nimport { RefSchema } from './ref.js'\nimport { TypedUnionSchema } from './typed-union.js'\n\nexport type InferSubscriptionParameters<S extends Subscription> =\n  S extends Subscription<any, infer P extends ParamsSchema, any>\n    ? Infer<P>\n    : never\n\nexport type InferSubscriptionMessage<S extends Subscription> =\n  S extends Subscription<\n    any,\n    any,\n    infer M extends RefSchema | TypedUnionSchema | ObjectSchema\n  >\n    ? Infer<M>\n    : unknown\n\nexport class Subscription<\n  N extends string = any,\n  P extends ParamsSchema = any,\n  M extends undefined | RefSchema | TypedUnionSchema | ObjectSchema = any,\n  E extends undefined | readonly string[] = any,\n> {\n  readonly type = 'subscription' as const\n\n  constructor(\n    readonly nsid: N,\n    readonly parameters: P,\n    readonly message: M,\n    readonly errors: E,\n  ) {}\n}\n"]}
+{"version":3,"file":"subscription.js","sourceRoot":"","sources":["../../src/schema/subscription.ts"],"names":[],"mappings":";;;AAqBA,MAAa,YAAY;IAaZ;IACA;IACA;IACA;IANF,IAAI,GAAG,cAAuB,CAAA;IAEvC,YACW,IAAW,EACX,UAAuB,EACvB,OAAiB,EACjB,MAAe;QAHf,SAAI,GAAJ,IAAI,CAAO;QACX,eAAU,GAAV,UAAU,CAAa;QACvB,YAAO,GAAP,OAAO,CAAU;QACjB,WAAM,GAAN,MAAM,CAAS;IACvB,CAAC;CACL;AAlBD,oCAkBC","sourcesContent":["import { NsidString } from '../core.js'\nimport { Infer } from '../validation.js'\nimport { ObjectSchema } from './object.js'\nimport { ParamsSchema } from './params.js'\nimport { RefSchema } from './ref.js'\nimport { TypedUnionSchema } from './typed-union.js'\n\nexport type InferSubscriptionParameters<S extends Subscription> =\n  S extends Subscription<any, infer P extends ParamsSchema, any>\n    ? Infer<P>\n    : never\n\nexport type InferSubscriptionMessage<S extends Subscription> =\n  S extends Subscription<\n    any,\n    any,\n    infer M extends RefSchema | TypedUnionSchema | ObjectSchema\n  >\n    ? Infer<M>\n    : unknown\n\nexport class Subscription<\n  TNsid extends NsidString = any,\n  TParameters extends ParamsSchema = any,\n  TMessage extends\n    | undefined\n    | RefSchema\n    | TypedUnionSchema\n    | ObjectSchema = any,\n  TErrors extends undefined | readonly string[] = any,\n> {\n  readonly type = 'subscription' as const\n\n  constructor(\n    readonly nsid: TNsid,\n    readonly parameters: TParameters,\n    readonly message: TMessage,\n    readonly errors: TErrors,\n  ) {}\n}\n"]}

package/dist/schema/token.d.ts

@@ -1,7 +1,6 @@
-import { ValidationResult, Validator, ValidatorContext } from '../validation.js';
-export declare class TokenSchema<V extends string = any> extends Validator<V> {
+import { Schema, ValidationResult, ValidatorContext } from '../validation.js';
+export declare class TokenSchema<V extends string = any> extends Schema<V> {
     protected readonly value: V;
-    readonly lexiconType: "token";
     constructor(value: V);
     validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<V>;
     toJSON(): string;

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

@@ -1 +1 @@
-{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../src/schema/token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAEhF,qBAAa,WAAW,CAAC,CAAC,SAAS,MAAM,GAAG,GAAG,CAAE,SAAQ,SAAS,CAAC,CAAC,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IAFvC,QAAQ,CAAC,WAAW,EAAG,OAAO,CAAS;gBAER,KAAK,EAAE,CAAC;IAI9B,iBAAiB,CACxB,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,CAAC,CAAC;IAqBtB,MAAM,IAAI,MAAM;IAIhB,QAAQ,IAAI,MAAM;CAGnB"}
+{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../src/schema/token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAE7E,qBAAa,WAAW,CAAC,CAAC,SAAS,MAAM,GAAG,GAAG,CAAE,SAAQ,MAAM,CAAC,CAAC,CAAC;IACpD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;gBAAR,KAAK,EAAE,CAAC;IAIvC,iBAAiB,CACf,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,CAAC,CAAC;IAqBtB,MAAM,IAAI,MAAM;IAIhB,QAAQ,IAAI,MAAM;CAGnB"}

package/dist/schema/token.js

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

package/dist/schema/token.js.map

@@ -1 +1 @@
-{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/schema/token.ts"],"names":[],"mappings":";;;AAAA,oDAAgF;AAEhF,MAAa,WAAoC,SAAQ,yBAAY;IAGpC;IAFtB,WAAW,GAAG,OAAgB,CAAA;IAEvC,YAA+B,KAAQ;QACrC,KAAK,EAAE,CAAA;QADsB,UAAK,GAAL,KAAK,CAAG;IAEvC,CAAC;IAEQ,iBAAiB,CACxB,KAAc,EACd,GAAqB;QAErB,IAAI,KAAK,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;YACzB,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAChC,CAAC;QAED,0EAA0E;QAC1E,eAAe;QACf,IAAI,KAAK,YAAY,WAAW,IAAI,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;YAC/D,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAChC,CAAC;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QAC7C,CAAC;QAED,OAAO,GAAG,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;IACnD,CAAC;IAED,yEAAyE;IACzE,cAAc;IAEd,MAAM;QACJ,OAAO,IAAI,CAAC,KAAK,CAAA;IACnB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,KAAK,CAAA;IACnB,CAAC;CACF;AAtCD,kCAsCC","sourcesContent":["import { ValidationResult, Validator, ValidatorContext } from '../validation.js'\n\nexport class TokenSchema<V extends string = any> extends Validator<V> {\n  readonly lexiconType = 'token' as const\n\n  constructor(protected readonly value: V) {\n    super()\n  }\n\n  override validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<V> {\n    if (input === this.value) {\n      return ctx.success(this.value)\n    }\n\n    // @NOTE: allow using the token instance itself (but convert to the actual\n    // token value)\n    if (input instanceof TokenSchema && input.value === this.value) {\n      return ctx.success(this.value)\n    }\n\n    if (typeof input !== 'string') {\n      return ctx.issueInvalidType(input, 'token')\n    }\n\n    return ctx.issueInvalidValue(input, [this.value])\n  }\n\n  // When using the TokenSchema instance as data, let's serialize it to the\n  // token value\n\n  toJSON(): string {\n    return this.value\n  }\n\n  toString(): string {\n    return this.value\n  }\n}\n"]}
+{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/schema/token.ts"],"names":[],"mappings":";;;AAAA,oDAA6E;AAE7E,MAAa,WAAoC,SAAQ,sBAAS;IACjC;IAA/B,YAA+B,KAAQ;QACrC,KAAK,EAAE,CAAA;QADsB,UAAK,GAAL,KAAK,CAAG;IAEvC,CAAC;IAED,iBAAiB,CACf,KAAc,EACd,GAAqB;QAErB,IAAI,KAAK,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;YACzB,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAChC,CAAC;QAED,0EAA0E;QAC1E,eAAe;QACf,IAAI,KAAK,YAAY,WAAW,IAAI,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;YAC/D,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAChC,CAAC;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QAC7C,CAAC;QAED,OAAO,GAAG,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;IACnD,CAAC;IAED,yEAAyE;IACzE,cAAc;IAEd,MAAM;QACJ,OAAO,IAAI,CAAC,KAAK,CAAA;IACnB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,KAAK,CAAA;IACnB,CAAC;CACF;AApCD,kCAoCC","sourcesContent":["import { Schema, ValidationResult, ValidatorContext } from '../validation.js'\n\nexport class TokenSchema<V extends string = any> extends Schema<V> {\n  constructor(protected readonly value: V) {\n    super()\n  }\n\n  validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<V> {\n    if (input === this.value) {\n      return ctx.success(this.value)\n    }\n\n    // @NOTE: allow using the token instance itself (but convert to the actual\n    // token value)\n    if (input instanceof TokenSchema && input.value === this.value) {\n      return ctx.success(this.value)\n    }\n\n    if (typeof input !== 'string') {\n      return ctx.issueInvalidType(input, 'token')\n    }\n\n    return ctx.issueInvalidValue(input, [this.value])\n  }\n\n  // When using the TokenSchema instance as data, let's serialize it to the\n  // token value\n\n  toJSON(): string {\n    return this.value\n  }\n\n  toString(): string {\n    return this.value\n  }\n}\n"]}

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

@@ -1,32 +1,34 @@
 import { $Type, Simplify } from '../core.js';
-import { Infer, ValidationResult, Validator, ValidatorContext } from '../validation.js';
-export declare class TypedObjectSchema<Type extends $Type = any, Schema extends Validator<Record<string, unknown>> = any, Output extends Infer<Schema> & {
-    $type?: Type;
-} = Infer<Schema> & {
-    $type?: Type;
-}> extends Validator<Output> {
-    readonly $type: Type;
-    readonly schema: Schema;
-    readonly lexiconType: "object";
-    constructor($type: Type, schema: Schema);
-    isTypeOf<X extends {
-        $type?: unknown;
-    }>(value: X): value is X extends {
-        $type?: Type;
-    } ? X : never;
-    build<X extends Omit<Output, '$type'>>(input: X): Simplify<Omit<X, '$type'> & {
-        $type: Type;
+import { Infer, Schema, ValidationResult, Validator, ValidatorContext } from '../validation.js';
+export type TypedObjectSchemaOutput<T extends $Type, S extends Validator<{
+    [_ in string]?: unknown;
+}>> = Simplify<Infer<S> & {
+    $type?: T;
+}>;
+export declare class TypedObjectSchema<const T extends $Type = any, const S extends Validator<{
+    [_ in string]?: unknown;
+}> = any> extends Schema<TypedObjectSchemaOutput<T, S>> {
+    readonly $type: T;
+    readonly schema: S;
+    constructor($type: T, schema: S);
+    isTypeOf<X extends Record<string, unknown>>(value: X): value is X extends {
+        $type?: T;
+    } ? X : X & {
+        $type?: T;
+    };
+    build<X extends Omit<Infer<S>, '$type'>>(input: X): Simplify<Omit<X, '$type'> & {
+        $type: T;
     }>;
-    $isTypeOf<X extends {
-        $type?: unknown;
-    }>(value: X): value is X extends {
-        $type?: Type;
-    } ? X : never;
-    $build<X extends Omit<Output, '$type'>>(input: X): Omit<X, "$type"> & {
-        $type: Type;
-    } extends infer T ? { [K in keyof T]: (Omit<X, "$type"> & {
-        $type: Type;
+    $isTypeOf<X extends Record<string, unknown>>(value: X): value is X extends {
+        $type?: T;
+    } ? X : X & {
+        $type?: T;
+    };
+    $build<X extends Omit<Infer<S>, '$type'>>(input: X): Omit<X, "$type"> & {
+        $type: T;
+    } extends infer T_1 ? { [K in keyof T_1]: (Omit<X, "$type"> & {
+        $type: T;
     })[K]; } : never;
-    validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<Output>;
+    validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<TypedObjectSchemaOutput<T, S>>;
 }
 //# sourceMappingURL=typed-object.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"typed-object.d.ts","sourceRoot":"","sources":["../../src/schema/typed-object.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,EACL,KAAK,EACL,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EACjB,MAAM,kBAAkB,CAAA;AAEzB,qBAAa,iBAAiB,CAC5B,IAAI,SAAS,KAAK,GAAG,GAAG,EACxB,MAAM,SAAS,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,GAAG,EACvD,MAAM,SAAS,KAAK,CAAC,MAAM,CAAC,GAAG;IAAE,KAAK,CAAC,EAAE,IAAI,CAAA;CAAE,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG;IAChE,KAAK,CAAC,EAAE,IAAI,CAAA;CACb,CACD,SAAQ,SAAS,CAAC,MAAM,CAAC;IAIvB,QAAQ,CAAC,KAAK,EAAE,IAAI;IACpB,QAAQ,CAAC,MAAM,EAAE,MAAM;IAJzB,QAAQ,CAAC,WAAW,EAAG,QAAQ,CAAS;gBAG7B,KAAK,EAAE,IAAI,EACX,MAAM,EAAE,MAAM;IAKzB,QAAQ,CAAC,CAAC,SAAS;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,EACpC,KAAK,EAAE,CAAC,GACP,KAAK,IAAI,CAAC,SAAS;QAAE,KAAK,CAAC,EAAE,IAAI,CAAA;KAAE,GAAG,CAAC,GAAG,KAAK;IAIlD,KAAK,CAAC,CAAC,SAAS,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,EACnC,KAAK,EAAE,CAAC,GACP,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG;QAAE,KAAK,EAAE,IAAI,CAAA;KAAE,CAAC;IAI/C,SAAS,CAAC,CAAC,SAAS;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,EAAE,KAAK,EAAE,CAAC;gBAVjB,IAAI;;IAcpC,MAAM,CAAC,CAAC,SAAS,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC;eARR,IAAI;;eAAJ,IAAI;;IAYnC,iBAAiB,CACxB,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,MAAM,CAAC;CAe5B"}
+{"version":3,"file":"typed-object.d.ts","sourceRoot":"","sources":["../../src/schema/typed-object.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,EACL,KAAK,EACL,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EACjB,MAAM,kBAAkB,CAAA;AAEzB,MAAM,MAAM,uBAAuB,CACjC,CAAC,SAAS,KAAK,EACf,CAAC,SAAS,SAAS,CAAC;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,EAAE,OAAO;CAAE,CAAC,IAC9C,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG;IAAE,KAAK,CAAC,EAAE,CAAC,CAAA;CAAE,CAAC,CAAA;AAEtC,qBAAa,iBAAiB,CAC5B,KAAK,CAAC,CAAC,SAAS,KAAK,GAAG,GAAG,EAC3B,KAAK,CAAC,CAAC,SAAS,SAAS,CAAC;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,EAAE,OAAO;CAAE,CAAC,GAAG,GAAG,CAC5D,SAAQ,MAAM,CAAC,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAE3C,QAAQ,CAAC,KAAK,EAAE,CAAC;IACjB,QAAQ,CAAC,MAAM,EAAE,CAAC;gBADT,KAAK,EAAE,CAAC,EACR,MAAM,EAAE,CAAC;IAKpB,QAAQ,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACxC,KAAK,EAAE,CAAC,GACP,KAAK,IAAI,CAAC,SAAS;QAAE,KAAK,CAAC,EAAE,CAAC,CAAA;KAAE,GAAG,CAAC,GAAG,CAAC,GAAG;QAAE,KAAK,CAAC,EAAE,CAAC,CAAA;KAAE;IAI3D,KAAK,CAAC,CAAC,SAAS,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EACrC,KAAK,EAAE,CAAC,GACP,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG;QAAE,KAAK,EAAE,CAAC,CAAA;KAAE,CAAC;IAI5C,SAAS,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC;gBAVrB,CAAC;;gBAAuB,CAAC;;IAczD,MAAM,CAAC,CAAC,SAAS,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC;eARV,CAAC;;eAAD,CAAC;;IAYzC,iBAAiB,CACf,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CAiBnD"}

package/dist/schema/typed-object.js

@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypedObjectSchema = void 0;
 const lex_data_1 = require("@atproto/lex-data");
 const validation_js_1 = require("../validation.js");
-class TypedObjectSchema extends validation_js_1.Validator {
+class TypedObjectSchema extends validation_js_1.Schema {
     $type;
     schema;
-    lexiconType = 'object';
     constructor($type, schema) {
         super();
         this.$type = $type;

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

@@ -1 +1 @@
-{"version":3,"file":"typed-object.js","sourceRoot":"","sources":["../../src/schema/typed-object.ts"],"names":[],"mappings":";;;AAAA,gDAAiD;AAEjD,oDAKyB;AAEzB,MAAa,iBAMX,SAAQ,yBAAiB;IAId;IACA;IAJF,WAAW,GAAG,QAAiB,CAAA;IAExC,YACW,KAAW,EACX,MAAc;QAEvB,KAAK,EAAE,CAAA;QAHE,UAAK,GAAL,KAAK,CAAM;QACX,WAAM,GAAN,MAAM,CAAQ;IAGzB,CAAC;IAED,QAAQ,CACN,KAAQ;QAER,OAAO,KAAK,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,CAAA;IAChE,CAAC;IAED,KAAK,CACH,KAAQ;QAER,OAAO,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAA;IACxC,CAAC;IAED,SAAS,CAAgC,KAAQ;QAC/C,OAAO,IAAI,CAAC,QAAQ,CAAI,KAAK,CAAC,CAAA;IAChC,CAAC;IAED,MAAM,CAAkC,KAAQ;QAC9C,OAAO,IAAI,CAAC,KAAK,CAAI,KAAK,CAAC,CAAA;IAC7B,CAAC;IAEQ,iBAAiB,CACxB,KAAc,EACd,GAAqB;QAErB,IAAI,CAAC,IAAA,wBAAa,EAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QAC9C,CAAC;QAED,IACE,OAAO,IAAI,KAAK;YAChB,KAAK,CAAC,KAAK,KAAK,SAAS;YACzB,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,EAC1B,CAAC;YACD,OAAO,GAAG,CAAC,yBAAyB,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;QACpE,CAAC;QAED,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,MAA2B,CAAC,CAAA;IAC9D,CAAC;CACF;AAtDD,8CAsDC","sourcesContent":["import { isPlainObject } from '@atproto/lex-data'\nimport { $Type, Simplify } from '../core.js'\nimport {\n  Infer,\n  ValidationResult,\n  Validator,\n  ValidatorContext,\n} from '../validation.js'\n\nexport class TypedObjectSchema<\n  Type extends $Type = any,\n  Schema extends Validator<Record<string, unknown>> = any,\n  Output extends Infer<Schema> & { $type?: Type } = Infer<Schema> & {\n    $type?: Type\n  },\n> extends Validator<Output> {\n  readonly lexiconType = 'object' as const\n\n  constructor(\n    readonly $type: Type,\n    readonly schema: Schema,\n  ) {\n    super()\n  }\n\n  isTypeOf<X extends { $type?: unknown }>(\n    value: X,\n  ): value is X extends { $type?: Type } ? X : never {\n    return value.$type === undefined || value.$type === this.$type\n  }\n\n  build<X extends Omit<Output, '$type'>>(\n    input: X,\n  ): Simplify<Omit<X, '$type'> & { $type: Type }> {\n    return { ...input, $type: this.$type }\n  }\n\n  $isTypeOf<X extends { $type?: unknown }>(value: X) {\n    return this.isTypeOf<X>(value)\n  }\n\n  $build<X extends Omit<Output, '$type'>>(input: X) {\n    return this.build<X>(input)\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    if (\n      '$type' in input &&\n      input.$type !== undefined &&\n      input.$type !== this.$type\n    ) {\n      return ctx.issueInvalidPropertyValue(input, '$type', [this.$type])\n    }\n\n    return ctx.validate(input, this.schema as Validator<Output>)\n  }\n}\n"]}
+{"version":3,"file":"typed-object.js","sourceRoot":"","sources":["../../src/schema/typed-object.ts"],"names":[],"mappings":";;;AAAA,gDAAiD;AAEjD,oDAMyB;AAOzB,MAAa,iBAGX,SAAQ,sBAAqC;IAElC;IACA;IAFX,YACW,KAAQ,EACR,MAAS;QAElB,KAAK,EAAE,CAAA;QAHE,UAAK,GAAL,KAAK,CAAG;QACR,WAAM,GAAN,MAAM,CAAG;IAGpB,CAAC;IAED,QAAQ,CACN,KAAQ;QAER,OAAO,KAAK,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,CAAA;IAChE,CAAC;IAED,KAAK,CACH,KAAQ;QAER,OAAO,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAA;IACxC,CAAC;IAED,SAAS,CAAoC,KAAQ;QACnD,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAC7B,CAAC;IAED,MAAM,CAAoC,KAAQ;QAChD,OAAO,IAAI,CAAC,KAAK,CAAI,KAAK,CAAC,CAAA;IAC7B,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,IACE,OAAO,IAAI,KAAK;YAChB,KAAK,CAAC,KAAK,KAAK,SAAS;YACzB,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,EAC1B,CAAC;YACD,OAAO,GAAG,CAAC,yBAAyB,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;QACpE,CAAC;QAED,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAErC,CAAA;IACH,CAAC;CACF;AAnDD,8CAmDC","sourcesContent":["import { isPlainObject } from '@atproto/lex-data'\nimport { $Type, Simplify } from '../core.js'\nimport {\n  Infer,\n  Schema,\n  ValidationResult,\n  Validator,\n  ValidatorContext,\n} from '../validation.js'\n\nexport type TypedObjectSchemaOutput<\n  T extends $Type,\n  S extends Validator<{ [_ in string]?: unknown }>,\n> = Simplify<Infer<S> & { $type?: T }>\n\nexport class TypedObjectSchema<\n  const T extends $Type = any,\n  const S extends Validator<{ [_ in string]?: unknown }> = any,\n> extends Schema<TypedObjectSchemaOutput<T, S>> {\n  constructor(\n    readonly $type: T,\n    readonly schema: S,\n  ) {\n    super()\n  }\n\n  isTypeOf<X extends Record<string, unknown>>(\n    value: X,\n  ): value is X extends { $type?: T } ? X : X & { $type?: T } {\n    return value.$type === undefined || value.$type === this.$type\n  }\n\n  build<X extends Omit<Infer<S>, '$type'>>(\n    input: X,\n  ): Simplify<Omit<X, '$type'> & { $type: T }> {\n    return { ...input, $type: this.$type }\n  }\n\n  $isTypeOf<X extends Record<string, unknown>>(value: X) {\n    return this.isTypeOf(value)\n  }\n\n  $build<X extends Omit<Infer<S>, '$type'>>(input: X) {\n    return this.build<X>(input)\n  }\n\n  validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<TypedObjectSchemaOutput<T, S>> {\n    if (!isPlainObject(input)) {\n      return ctx.issueInvalidType(input, 'object')\n    }\n\n    if (\n      '$type' in input &&\n      input.$type !== undefined &&\n      input.$type !== this.$type\n    ) {\n      return ctx.issueInvalidPropertyValue(input, '$type', [this.$type])\n    }\n\n    return ctx.validate(input, this.schema) as ValidationResult<\n      TypedObjectSchemaOutput<T, S>\n    >\n  }\n}\n"]}

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

@@ -1,4 +1,4 @@
-import { ValidationResult, Validator, ValidatorContext } from '../validation.js';
+import { Schema, ValidationResult, Validator, ValidatorContext } from '../validation.js';
 export type TypedRefSchemaValidator<V extends {
     $type?: string;
 } = any> = V extends {
@@ -20,7 +20,7 @@ export type TypedRefSchemaOutput<V extends {
 } : never;
 export declare class TypedRefSchema<V extends {
     $type?: string;
-} = any> extends Validator<TypedRefSchemaOutput<V>> {
+} = any> extends Schema<TypedRefSchemaOutput<V>> {
     #private;
     constructor(getter: TypedRefGetter<V>);
     get schema(): TypedRefSchemaValidator<V>;

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

@@ -1 +1 @@
-{"version":3,"file":"typed-ref.d.ts","sourceRoot":"","sources":["../../src/schema/typed-ref.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAGhF,MAAM,MAAM,uBAAuB,CAAC,CAAC,SAAS;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,GAAG,IACpE,CAAC,SAAS;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC,SAAS,MAAM,CAAA;CAAE,GACxC;IAAE,KAAK,EAAE,CAAC,CAAA;CAAE,GAAG,SAAS,CAAC,CAAC,GAAG;IAAE,KAAK,CAAC,EAAE,CAAC,CAAA;CAAE,CAAC,GAC3C,KAAK,CAAA;AAEX,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,GAAG,IAC3D,MAAM,uBAAuB,CAAC,CAAC,CAAC,CAAA;AAElC,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,GAAG,IACjE,CAAC,SAAS;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC,SAAS,MAAM,CAAA;CAAE,GAAG,CAAC,GAAG;IAAE,KAAK,EAAE,CAAC,CAAA;CAAE,GAAG,KAAK,CAAA;AAEzE,qBAAa,cAAc,CACzB,CAAC,SAAS;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,GAAG,CAClC,SAAQ,SAAS,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;;gBAG9B,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;IASrC,IAAI,MAAM,IAAI,uBAAuB,CAAC,CAAC,CAAC,CAgBvC;IAED,IAAI,KAAK,IAAI,oBAAoB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAE5C;IAEQ,iBAAiB,CACxB,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;CAU7C"}
+{"version":3,"file":"typed-ref.d.ts","sourceRoot":"","sources":["../../src/schema/typed-ref.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EACjB,MAAM,kBAAkB,CAAA;AAGzB,MAAM,MAAM,uBAAuB,CAAC,CAAC,SAAS;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,GAAG,IACpE,CAAC,SAAS;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC,SAAS,MAAM,CAAA;CAAE,GACxC;IAAE,KAAK,EAAE,CAAC,CAAA;CAAE,GAAG,SAAS,CAAC,CAAC,GAAG;IAAE,KAAK,CAAC,EAAE,CAAC,CAAA;CAAE,CAAC,GAC3C,KAAK,CAAA;AAEX,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,GAAG,IAC3D,MAAM,uBAAuB,CAAC,CAAC,CAAC,CAAA;AAElC,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,GAAG,IACjE,CAAC,SAAS;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC,SAAS,MAAM,CAAA;CAAE,GAAG,CAAC,GAAG;IAAE,KAAK,EAAE,CAAC,CAAA;CAAE,GAAG,KAAK,CAAA;AAEzE,qBAAa,cAAc,CAAC,CAAC,SAAS;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,GAAG,CAAE,SAAQ,MAAM,CAC5E,oBAAoB,CAAC,CAAC,CAAC,CACxB;;gBAGa,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;IASrC,IAAI,MAAM,IAAI,uBAAuB,CAAC,CAAC,CAAC,CAgBvC;IAED,IAAI,KAAK,IAAI,oBAAoB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAE5C;IAED,iBAAiB,CACf,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;CAU7C"}

package/dist/schema/typed-ref.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypedRefSchema = void 0;
 const validation_js_1 = require("../validation.js");
-class TypedRefSchema extends validation_js_1.Validator {
+class TypedRefSchema extends validation_js_1.Schema {
     #getter;
     constructor(getter) {
         // @NOTE In order to avoid circular dependency issues, we don't resolve

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

@@ -1 +1 @@
-{"version":3,"file":"typed-ref.js","sourceRoot":"","sources":["../../src/schema/typed-ref.ts"],"names":[],"mappings":";;;AAAA,oDAAgF;AAchF,MAAa,cAEX,SAAQ,yBAAkC;IAC1C,OAAO,CAAmB;IAE1B,YAAY,MAAyB;QACnC,uEAAuE;QACvE,sEAAsE;QAEtE,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;IACvB,CAAC;IAED,IAAI,MAAM;QACR,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAErC,4EAA4E;QAC5E,gCAAgC;QAChC,IAAI,CAAC,OAAO,GAAG,kBAAkB,CAAA;QAEjC,4CAA4C;QAC5C,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE;YACpC,KAAK;YACL,QAAQ,EAAE,KAAK;YACf,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,IAAI;SACnB,CAAC,CAAA;QAEF,OAAO,KAAK,CAAA;IACd,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAA;IAC1B,CAAC;IAEQ,iBAAiB,CACxB,KAAc,EACd,GAAqB;QAErB,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAC/C,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO,MAAM,CAAA;QAElC,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;YACtC,OAAO,GAAG,CAAC,yBAAyB,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;QAC3E,CAAC;QAED,OAAO,MAAmD,CAAA;IAC5D,CAAC;CACF;AAjDD,wCAiDC;AAED,SAAS,kBAAkB;IACzB,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;AAChE,CAAC","sourcesContent":["import { ValidationResult, Validator, ValidatorContext } from '../validation.js'\n\n// Basically a RecordSchema or TypedObjectSchema\nexport type TypedRefSchemaValidator<V extends { $type?: string } = any> =\n  V extends { $type?: infer T extends string }\n    ? { $type: T } & Validator<V & { $type?: T }>\n    : never\n\nexport type TypedRefGetter<V extends { $type?: string } = any> =\n  () => TypedRefSchemaValidator<V>\n\nexport type TypedRefSchemaOutput<V extends { $type?: string } = any> =\n  V extends { $type?: infer T extends string } ? V & { $type: T } : never\n\nexport class TypedRefSchema<\n  V extends { $type?: string } = any,\n> extends Validator<TypedRefSchemaOutput<V>> {\n  #getter: TypedRefGetter<V>\n\n  constructor(getter: TypedRefGetter<V>) {\n    // @NOTE In order to avoid circular dependency issues, we don't resolve\n    // the schema here. Instead, we resolve it lazily when first accessed.\n\n    super()\n\n    this.#getter = getter\n  }\n\n  get schema(): TypedRefSchemaValidator<V> {\n    const value = this.#getter.call(null)\n\n    // Prevents a getter from depending on itself recursively, also allows GC to\n    // clean up the getter function.\n    this.#getter = throwAlreadyCalled\n\n    // Cache the resolved schema on the instance\n    Object.defineProperty(this, 'schema', {\n      value,\n      writable: false,\n      enumerable: false,\n      configurable: true,\n    })\n\n    return value\n  }\n\n  get $type(): TypedRefSchemaOutput<V>['$type'] {\n    return this.schema.$type\n  }\n\n  override validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<TypedRefSchemaOutput<V>> {\n    const result = ctx.validate(input, this.schema)\n    if (!result.success) return result\n\n    if (result.value.$type !== this.$type) {\n      return ctx.issueInvalidPropertyValue(result.value, '$type', [this.$type])\n    }\n\n    return result as ValidationResult<TypedRefSchemaOutput<V>>\n  }\n}\n\nfunction throwAlreadyCalled(): never {\n  throw new Error('TypedRefSchema getter called multiple times')\n}\n"]}
+{"version":3,"file":"typed-ref.js","sourceRoot":"","sources":["../../src/schema/typed-ref.ts"],"names":[],"mappings":";;;AAAA,oDAKyB;AAczB,MAAa,cAAmD,SAAQ,sBAEvE;IACC,OAAO,CAAmB;IAE1B,YAAY,MAAyB;QACnC,uEAAuE;QACvE,sEAAsE;QAEtE,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;IACvB,CAAC;IAED,IAAI,MAAM;QACR,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAErC,4EAA4E;QAC5E,gCAAgC;QAChC,IAAI,CAAC,OAAO,GAAG,kBAAkB,CAAA;QAEjC,4CAA4C;QAC5C,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE;YACpC,KAAK;YACL,QAAQ,EAAE,KAAK;YACf,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,IAAI;SACnB,CAAC,CAAA;QAEF,OAAO,KAAK,CAAA;IACd,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAA;IAC1B,CAAC;IAED,iBAAiB,CACf,KAAc,EACd,GAAqB;QAErB,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAC/C,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO,MAAM,CAAA;QAElC,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;YACtC,OAAO,GAAG,CAAC,yBAAyB,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;QAC3E,CAAC;QAED,OAAO,MAAmD,CAAA;IAC5D,CAAC;CACF;AAjDD,wCAiDC;AAED,SAAS,kBAAkB;IACzB,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;AAChE,CAAC","sourcesContent":["import {\n  Schema,\n  ValidationResult,\n  Validator,\n  ValidatorContext,\n} from '../validation.js'\n\n// Basically a RecordSchema or TypedObjectSchema\nexport type TypedRefSchemaValidator<V extends { $type?: string } = any> =\n  V extends { $type?: infer T extends string }\n    ? { $type: T } & Validator<V & { $type?: T }>\n    : never\n\nexport type TypedRefGetter<V extends { $type?: string } = any> =\n  () => TypedRefSchemaValidator<V>\n\nexport type TypedRefSchemaOutput<V extends { $type?: string } = any> =\n  V extends { $type?: infer T extends string } ? V & { $type: T } : never\n\nexport class TypedRefSchema<V extends { $type?: string } = any> extends Schema<\n  TypedRefSchemaOutput<V>\n> {\n  #getter: TypedRefGetter<V>\n\n  constructor(getter: TypedRefGetter<V>) {\n    // @NOTE In order to avoid circular dependency issues, we don't resolve\n    // the schema here. Instead, we resolve it lazily when first accessed.\n\n    super()\n\n    this.#getter = getter\n  }\n\n  get schema(): TypedRefSchemaValidator<V> {\n    const value = this.#getter.call(null)\n\n    // Prevents a getter from depending on itself recursively, also allows GC to\n    // clean up the getter function.\n    this.#getter = throwAlreadyCalled\n\n    // Cache the resolved schema on the instance\n    Object.defineProperty(this, 'schema', {\n      value,\n      writable: false,\n      enumerable: false,\n      configurable: true,\n    })\n\n    return value\n  }\n\n  get $type(): TypedRefSchemaOutput<V>['$type'] {\n    return this.schema.$type\n  }\n\n  validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<TypedRefSchemaOutput<V>> {\n    const result = ctx.validate(input, this.schema)\n    if (!result.success) return result\n\n    if (result.value.$type !== this.$type) {\n      return ctx.issueInvalidPropertyValue(result.value, '$type', [this.$type])\n    }\n\n    return result as ValidationResult<TypedRefSchemaOutput<V>>\n  }\n}\n\nfunction throwAlreadyCalled(): never {\n  throw new Error('TypedRefSchema getter called multiple times')\n}\n"]}

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

@@ -1,5 +1,5 @@
 import { Restricted, UnknownString } from '../core.js';
-import { Infer, ValidationResult, Validator, ValidatorContext } from '../validation.js';
+import { Infer, Schema, ValidationResult, ValidatorContext } from '../validation.js';
 import { TypedRefSchema, TypedRefSchemaOutput } from './typed-ref.js';
 export type TypedRef<T extends {
     $type?: string;
@@ -13,12 +13,11 @@ type TypedRefSchemasToUnion<T extends readonly TypedRefSchema[]> = {
     [K in keyof T]: Infer<T[K]>;
 }[number];
 export type TypedUnionSchemaOutput<TypedRefs extends readonly TypedRefSchema[], Closed extends boolean> = Closed extends true ? TypedRefSchemasToUnion<TypedRefs> : TypedRefSchemasToUnion<TypedRefs> | TypedObject;
-export declare class TypedUnionSchema<TypedRefs extends readonly TypedRefSchema[] = any, Closed extends boolean = any> extends Validator<TypedUnionSchemaOutput<TypedRefs, Closed>> {
+export declare class TypedUnionSchema<TypedRefs extends readonly TypedRefSchema[] = any, Closed extends boolean = any> extends Schema<TypedUnionSchemaOutput<TypedRefs, Closed>> {
     protected readonly refs: TypedRefs;
     readonly closed: Closed;
-    readonly lexiconType: "union";
     constructor(refs: TypedRefs, closed: Closed);
-    protected get refsMap(): Map<unknown, TypedRefs[number]>;
+    get refsMap(): Map<unknown, TypedRefs[number]>;
     get $types(): unknown[];
     validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<TypedUnionSchemaOutput<TypedRefs, Closed>>;
 }

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;AACtD,OAAO,EACL,KAAK,EACL,gBAAgB,EAChB,SAAS,EACT,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,SAAS,CAAC,sBAAsB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAI1D,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS;aAClB,MAAM,EAAE,MAAM;IAJhC,QAAQ,CAAC,WAAW,EAAG,OAAO,CAAS;gBAGlB,IAAI,EAAE,SAAS,EAClB,MAAM,EAAE,MAAM;IAShC,SAAS,KAAK,OAAO,oCAapB;IAED,IAAI,MAAM,cAET;IAEQ,iBAAiB,CACxB,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,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"}

package/dist/schema/typed-union.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypedUnionSchema = 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 TypedUnionSchema extends validation_js_1.Validator {
+class TypedUnionSchema extends validation_js_1.Schema {
     refs;
     closed;
-    lexiconType = 'union';
     constructor(refs, closed) {
         // @NOTE In order to avoid circular dependency issues, we don't access the
         // refs's schema (or $type) here. Instead, we access them lazily when first
@@ -19,14 +19,7 @@ class TypedUnionSchema extends validation_js_1.Validator {
         const map = new Map();
         for (const ref of this.refs)
             map.set(ref.$type, ref);
-        // Cache the map on the instance
-        Object.defineProperty(this, 'refsMap', {
-            value: map,
-            writable: false,
-            enumerable: false,
-            configurable: true,
-        });
-        return map;
+        return (0, lazy_property_js_1.lazyProperty)(this, 'refsMap', map);
     }
     get $types() {
         return Array.from(this.refsMap.keys());

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,oDAKyB;AAmCzB,MAAa,gBAGX,SAAQ,yBAAoD;IAIvC;IACH;IAJT,WAAW,GAAG,OAAgB,CAAA;IAEvC,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,IAAc,OAAO;QACnB,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,gCAAgC;QAChC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE;YACrC,KAAK,EAAE,GAAG;YACV,QAAQ,EAAE,KAAK;YACf,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,IAAI;SACnB,CAAC,CAAA;QAEF,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,IAAI,MAAM;QACR,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;IACxC,CAAC;IAEQ,iBAAiB,CACxB,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;AA/DD,4CA+DC","sourcesContent":["import { isPlainObject } from '@atproto/lex-data'\nimport { Restricted, UnknownString } from '../core.js'\nimport {\n  Infer,\n  ValidationResult,\n  Validator,\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 Validator<TypedUnionSchemaOutput<TypedRefs, Closed>> {\n  readonly lexiconType = 'union' as const\n\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  protected get refsMap() {\n    const map = new Map<unknown, TypedRefs[number]>()\n    for (const ref of this.refs) map.set(ref.$type, ref)\n\n    // Cache the map on the instance\n    Object.defineProperty(this, 'refsMap', {\n      value: map,\n      writable: false,\n      enumerable: false,\n      configurable: true,\n    })\n\n    return map\n  }\n\n  get $types() {\n    return Array.from(this.refsMap.keys())\n  }\n\n  override 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;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"]}

package/dist/schema/union.d.ts

@@ -1,7 +1,7 @@
-import { Infer, ValidationResult, Validator, ValidatorContext } from '../validation.js';
+import { Infer, Schema, ValidationResult, Validator, ValidatorContext } from '../validation.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 Validator<UnionSchemaOutput<V>> {
+export declare class UnionSchema<V extends UnionSchemaValidators = any> extends Schema<UnionSchemaOutput<V>> {
     protected readonly validators: V;
     constructor(validators: V);
     validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<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,EAGL,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,CACtB,CAAC,SAAS,qBAAqB,GAAG,GAAG,CACrC,SAAQ,SAAS,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;IAC3B,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;gBAAb,UAAU,EAAE,CAAC;IAInC,iBAAiB,CACxB,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;CAiB1C"}
+{"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;CAiB1C"}

package/dist/schema/union.js

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

package/dist/schema/union.js.map

@@ -1 +1 @@
-{"version":3,"file":"union.js","sourceRoot":"","sources":["../../src/schema/union.ts"],"names":[],"mappings":";;;AAAA,oDAOyB;AAKzB,MAAa,WAEX,SAAQ,yBAA+B;IACR;IAA/B,YAA+B,UAAa;QAC1C,KAAK,EAAE,CAAA;QADsB,eAAU,GAAV,UAAU,CAAG;IAE5C,CAAC;IAEQ,iBAAiB,CACxB,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;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,+BAAe,CAAC,YAAY,CAAC,QAAQ,CAAC;SAC9C,CAAA;IACH,CAAC;CACF;AA3BD,kCA2BC","sourcesContent":["import {\n  Infer,\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<\n  V extends UnionSchemaValidators = any,\n> extends Validator<UnionSchemaOutput<V>> {\n  constructor(protected readonly validators: V) {\n    super()\n  }\n\n  override 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 {\n      success: false,\n      error: ValidationError.fromFailures(failures),\n    }\n  }\n}\n"]}
+{"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;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,+BAAe,CAAC,YAAY,CAAC,QAAQ,CAAC;SAC9C,CAAA;IACH,CAAC;CACF;AA3BD,kCA2BC","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 {\n      success: false,\n      error: ValidationError.fromFailures(failures),\n    }\n  }\n}\n"]}

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

@@ -1,9 +1,8 @@
 import { LexMap } from '@atproto/lex-data';
-import { ValidationResult, Validator, ValidatorContext } from '../validation';
+import { Schema, ValidationResult, ValidatorContext } from '../validation';
 export type { LexMap };
 export type UnknownObjectOutput = LexMap;
-export declare class UnknownObjectSchema extends Validator<UnknownObjectOutput> {
-    readonly lexiconType: "unknown";
+export declare class UnknownObjectSchema extends Schema<UnknownObjectOutput> {
     validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<UnknownObjectOutput>;
 }
 //# sourceMappingURL=unknown-object.d.ts.map

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,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAE7E,YAAY,EAAE,MAAM,EAAE,CAAA;AACtB,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAA;AAExC,qBAAa,mBAAoB,SAAQ,SAAS,CAAC,mBAAmB,CAAC;IACrE,QAAQ,CAAC,WAAW,EAAG,SAAS,CAAS;IAEhC,iBAAiB,CACxB,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,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"}

package/dist/schema/unknown-object.js

@@ -3,8 +3,7 @@ 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.Validator {
-    lexiconType = 'unknown';
+class UnknownObjectSchema extends validation_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,8CAA6E;AAK7E,MAAa,mBAAoB,SAAQ,sBAA8B;IAC5D,WAAW,GAAG,SAAkB,CAAA;IAEhC,iBAAiB,CACxB,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;AAbD,kDAaC","sourcesContent":["import { LexMap, isLexMap } from '@atproto/lex-data'\nimport { ValidationResult, Validator, ValidatorContext } from '../validation'\n\nexport type { LexMap }\nexport type UnknownObjectOutput = LexMap\n\nexport class UnknownObjectSchema extends Validator<UnknownObjectOutput> {\n  readonly lexiconType = 'unknown' as const\n\n  override 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,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"]}

package/dist/schema/unknown.d.ts

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

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,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAE7E,qBAAa,aAAc,SAAQ,SAAS,CAAC,OAAO,CAAC;IAC1C,iBAAiB,CACxB,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,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"}

package/dist/schema/unknown.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnknownSchema = void 0;
 const validation_1 = require("../validation");
-class UnknownSchema extends validation_1.Validator {
+class UnknownSchema extends validation_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,8CAA6E;AAE7E,MAAa,aAAc,SAAQ,sBAAkB;IAC1C,iBAAiB,CACxB,KAAc,EACd,GAAqB;QAErB,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC3B,CAAC;CACF;AAPD,sCAOC","sourcesContent":["import { ValidationResult, Validator, ValidatorContext } from '../validation'\n\nexport class UnknownSchema extends Validator<unknown> {\n  override 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,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"]}

package/dist/schema.d.ts

@@ -1,4 +1,5 @@
 export * from './schema/_parameters.js';
+export * from './schema/refine.js';
 export * from './schema/array.js';
 export * from './schema/blob.js';
 export * from './schema/boolean.js';
@@ -11,12 +12,15 @@ export * from './schema/literal.js';
 export * from './schema/never.js';
 export * from './schema/null.js';
 export * from './schema/object.js';
+export * from './schema/regexp.js';
 export * from './schema/string.js';
 export * from './schema/unknown-object.js';
 export * from './schema/unknown.js';
 export * from './schema/custom.js';
 export * from './schema/discriminated-union.js';
 export * from './schema/intersection.js';
+export * from './schema/nullable.js';
+export * from './schema/optional.js';
 export * from './schema/ref.js';
 export * from './schema/union.js';
 export * from './schema/params.js';