@atproto/lex-schema 0.0.2 → 0.0.3

package/dist/schema/params.js.map

@@ -1 +1 @@
-{"version":3,"file":"params.js","sourceRoot":"","sources":["../../src/schema/params.ts"],"names":[],"mappings":"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","sourcesContent":["import { isPlainObject } from '@atproto/lex-data'\nimport { ValidationResult, Validator, ValidatorContext } from '../validation.js'\nimport { Param, ParamScalar, paramSchema } from './_parameters.js'\nimport { ObjectSchemaPropertiesOutput } from './object.js'\nimport { StringSchema } from './string.js'\n\nexport type ParamsSchemaProperties = {\n  [_ in string]: Validator<Param>\n}\n\nexport type ParamsSchemaOptions = {\n  required?: readonly string[]\n}\n\nexport type ParamsSchemaOutput<\n  P extends ParamsSchemaProperties,\n  O extends ParamsSchemaOptions,\n> = ObjectSchemaPropertiesOutput<P, O>\n\nexport type InferParamsSchema<T> =\n  T extends ParamsSchema<infer P, infer O>\n    ? NonNullable<unknown> extends ParamsSchemaOutput<P, O>\n      ? ParamsSchemaOutput<P, O> | undefined\n      : ParamsSchemaOutput<P, O>\n    : never\n\nexport class ParamsSchema<\n  const Validators extends ParamsSchemaProperties = ParamsSchemaProperties,\n  const Options extends ParamsSchemaOptions = ParamsSchemaOptions,\n  Output extends ParamsSchemaOutput<Validators, Options> = ParamsSchemaOutput<\n    Validators,\n    Options\n  >,\n> extends Validator<Output> {\n  readonly lexiconType = 'params' as const\n\n  constructor(\n    readonly validators: Validators,\n    readonly options: Options,\n  ) {\n    super()\n  }\n\n  get validatorsMap(): Map<string, Validator<Param>> {\n    const map = new Map(Object.entries(this.validators))\n\n    // Cache the map on the instance (to avoid re-creating it)\n    Object.defineProperty(this, 'validatorsMap', {\n      value: map,\n      writable: false,\n      enumerable: false,\n      configurable: true,\n    })\n\n    return map\n  }\n\n  override validateInContext(\n    input: unknown = {},\n    ctx: ValidatorContext,\n  ): ValidationResult<Output> {\n    if (!isPlainObject(input)) {\n      return ctx.issueInvalidType(input, 'object')\n    }\n\n    // Lazily copy value\n    let copy: undefined | Record<string, unknown>\n\n    // Ensure that non-specified params conform to param schema\n    for (const key in input) {\n      if (this.validatorsMap.has(key)) continue\n\n      const result = ctx.validateChild(input, key, paramSchema)\n      if (!result.success) return result\n\n      if (result.value !== input[key]) {\n        copy ??= { ...input }\n        copy[key] = result.value\n      }\n    }\n\n    for (const [key, propDef] of this.validatorsMap) {\n      const result = ctx.validateChild(input, key, propDef)\n      if (!result.success) {\n        // Because default values are provided by child validators, we need to\n        // run the validator to get the default value and, in case of failure,\n        // ignore validation error that were caused by missing keys.\n        if (!(key in input)) {\n          if (!this.options.required?.includes(key)) {\n            // Ignore missing non-required key\n            continue\n          } else {\n            // Transform into \"required key\" issue\n            return ctx.issueRequiredKey(input, key)\n          }\n        }\n\n        return result\n      }\n\n      if (result.value !== input[key]) {\n        // Copy on write\n        copy ??= { ...input }\n        copy[key] = result.value\n      }\n    }\n\n    return ctx.success((copy ?? input) as Output)\n  }\n\n  fromURLSearchParams(urlSearchParams: URLSearchParams): Output {\n    const params: Record<string, Param> = {}\n\n    for (const [key, value] of urlSearchParams.entries()) {\n      const validator = this.validatorsMap.get(key)\n\n      const coerced: ParamScalar =\n        validator != null && validator instanceof StringSchema\n          ? value\n          : value === 'true'\n            ? true\n            : value === 'false'\n              ? false\n              : /^-?\\d+$/.test(value)\n                ? Number(value)\n                : value\n\n      if (params[key] === undefined) {\n        params[key] = coerced\n      } else if (Array.isArray(params[key])) {\n        params[key].push(coerced)\n      } else {\n        params[key] = [params[key] as ParamScalar, coerced]\n      }\n    }\n\n    return this.parse(params)\n  }\n\n  toURLSearchParams(input: Output): URLSearchParams {\n    const urlSearchParams = new URLSearchParams()\n\n    if (input !== undefined) {\n      for (const [key, value] of Object.entries(input)) {\n        if (Array.isArray(value)) {\n          for (const v of value) {\n            urlSearchParams.append(key, String(v))\n          }\n        } else if (value !== undefined) {\n          urlSearchParams.append(key, String(value))\n        }\n      }\n    }\n\n    return urlSearchParams\n  }\n}\n"]}
+{"version":3,"file":"params.js","sourceRoot":"","sources":["../../src/schema/params.ts"],"names":[],"mappings":"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","sourcesContent":["import { isPlainObject } from '@atproto/lex-data'\nimport { WithOptionalProperties } from '../core.js'\nimport { lazyProperty } from '../util/lazy-property.js'\nimport {\n  Infer,\n  Schema,\n  ValidationResult,\n  Validator,\n  ValidatorContext,\n} from '../validation.js'\nimport { Param, ParamScalar, paramSchema } from './_parameters.js'\nimport { StringSchema } from './string.js'\n\nexport type ParamsSchemaShape = Record<string, Validator<Param | undefined>>\n\nexport type ParamsSchemaOutput<Shape extends ParamsSchemaShape> =\n  WithOptionalProperties<{\n    [K in keyof Shape]: Infer<Shape[K]>\n  }>\n\nexport type InferParamsSchema<T> =\n  T extends ParamsSchema<infer P>\n    ? NonNullable<unknown> extends ParamsSchemaOutput<P>\n      ? ParamsSchemaOutput<P> | undefined // Allow undefined if all params are optional\n      : ParamsSchemaOutput<P>\n    : never\n\nexport class ParamsSchema<\n  const Shape extends ParamsSchemaShape = ParamsSchemaShape,\n> extends Schema<ParamsSchemaOutput<Shape>> {\n  constructor(readonly validators: Shape) {\n    super()\n  }\n\n  get validatorsMap(): Map<string, Validator<Param | undefined>> {\n    const map = new Map(Object.entries(this.validators))\n\n    return lazyProperty(this, 'validatorsMap', map)\n  }\n\n  validateInContext(\n    input: unknown = {},\n    ctx: ValidatorContext,\n  ): ValidationResult<ParamsSchemaOutput<Shape>> {\n    if (!isPlainObject(input)) {\n      return ctx.issueInvalidType(input, 'object')\n    }\n\n    // Lazily copy value\n    let copy: undefined | Record<string, unknown>\n\n    // Ensure that non-specified params conform to param schema\n    for (const key in input) {\n      if (this.validatorsMap.has(key)) continue\n\n      const result = ctx.validateChild(input, key, paramSchema)\n      if (!result.success) return result\n\n      if (result.value !== input[key]) {\n        copy ??= { ...input }\n        copy[key] = result.value\n      }\n    }\n\n    for (const [key, propDef] of this.validatorsMap) {\n      const result = ctx.validateChild(input, key, propDef)\n      if (!result.success) {\n        if (!(key in input)) {\n          // Transform into \"required key\" issue\n          return ctx.issueRequiredKey(input, key)\n        }\n\n        return result\n      }\n\n      // Skip copying if key is not present in input (and value is undefined)\n      if (result.value === undefined && !(key in input)) {\n        continue\n      }\n\n      if (result.value !== input[key]) {\n        // Copy on write\n        copy ??= { ...input }\n        copy[key] = result.value\n      }\n    }\n\n    return ctx.success((copy ?? input) as ParamsSchemaOutput<Shape>)\n  }\n\n  fromURLSearchParams(\n    urlSearchParams: URLSearchParams,\n  ): ParamsSchemaOutput<Shape> {\n    const params: Record<string, Param> = {}\n\n    for (const [key, value] of urlSearchParams.entries()) {\n      const validator = this.validatorsMap.get(key)\n\n      const coerced: ParamScalar =\n        validator != null && validator instanceof StringSchema\n          ? value\n          : value === 'true'\n            ? true\n            : value === 'false'\n              ? false\n              : /^-?\\d+$/.test(value)\n                ? Number(value)\n                : value\n\n      if (params[key] === undefined) {\n        params[key] = coerced\n      } else if (Array.isArray(params[key])) {\n        params[key].push(coerced)\n      } else {\n        params[key] = [params[key] as ParamScalar, coerced]\n      }\n    }\n\n    return this.parse(params)\n  }\n\n  toURLSearchParams(input: ParamsSchemaOutput<Shape>): URLSearchParams {\n    const urlSearchParams = new URLSearchParams()\n\n    if (input !== undefined) {\n      for (const [key, value] of Object.entries(input)) {\n        if (Array.isArray(value)) {\n          for (const v of value) {\n            urlSearchParams.append(key, String(v))\n          }\n        } else if (value !== undefined) {\n          urlSearchParams.append(key, String(value))\n        }\n      }\n    }\n\n    return urlSearchParams\n  }\n}\n"]}

package/dist/schema/payload.d.ts

@@ -1,11 +1,11 @@
 import { LexValue } from '@atproto/lex-data';
-import { Validator } from '../validation.js';
+import { Infer, Validator } from '../validation.js';
 export type LexBody<E extends string = any> = E extends `text/${string}` ? string : E extends 'application/json' ? LexValue : Uint8Array;
 export type InferPayloadEncoding<P extends Payload> = P extends Payload<infer E, any> ? E : undefined;
-export type InferPayloadBody<P extends Payload> = P extends Payload<any, infer S> ? S extends Validator<infer V> ? V : P extends Payload<infer E extends string> ? LexBody<E> : undefined : undefined;
-export type PayloadOutput<E extends string | undefined = any, S extends Validator | undefined = any> = E extends string ? S extends Validator<infer V> ? {
+export type InferPayloadBody<P extends Payload> = P extends Payload<any, infer S> ? S extends Validator ? Infer<S> : P extends Payload<infer E extends string> ? LexBody<E> : undefined : undefined;
+export type PayloadOutput<E extends string | undefined = any, S extends Validator | undefined = any> = E extends string ? S extends Validator ? {
     encoding: E;
-    body: V;
+    body: Infer<S>;
 } : {
     encoding: E;
     body: LexBody<E>;

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

@@ -1 +1 @@
-{"version":3,"file":"payload.d.ts","sourceRoot":"","sources":["../../src/schema/payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAE5C,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,QAAQ,MAAM,EAAE,GACpE,MAAM,GACN,CAAC,SAAS,kBAAkB,GAC1B,QAAQ,GACR,UAAU,CAAA;AAEhB,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,OAAO,IAChD,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,CAAA;AAEjD,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,OAAO,IAC5C,CAAC,SAAS,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,GAC3B,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,CAAC,GAC1B,CAAC,GACD,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,SAAS,MAAM,CAAC,GACvC,OAAO,CAAC,CAAC,CAAC,GACV,SAAS,GACb,SAAS,CAAA;AAEf,MAAM,MAAM,aAAa,CACvB,CAAC,SAAS,MAAM,GAAG,SAAS,GAAG,GAAG,EAClC,CAAC,SAAS,SAAS,GAAG,SAAS,GAAG,GAAG,IACnC,CAAC,SAAS,MAAM,GAChB,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,CAAC,GAC1B;IACE,QAAQ,EAAE,CAAC,CAAA;IACX,IAAI,EAAE,CAAC,CAAA;CACR,GACD;IACE,QAAQ,EAAE,CAAC,CAAA;IACX,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;CACjB,GACH,IAAI,CAAA;AAER,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,MAAM,GAAG,SAAS,IAAI,CAAC,SAAS,SAAS,GACvE,SAAS,GACT,SAAS,GAAG,SAAS,CAAA;AAEzB,qBAAa,OAAO,CAClB,KAAK,CAAC,QAAQ,SAAS,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,EAC9D,KAAK,CAAC,IAAI,SAAS,WAAW,CAAC,QAAQ,CAAC,GAAG,WAAW,CAAC,QAAQ,CAAC;IAG9D,QAAQ,CAAC,QAAQ,EAAE,QAAQ;IAC3B,QAAQ,CAAC,MAAM,EAAE,IAAI;gBADZ,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,IAAI;CAMxB"}
+{"version":3,"file":"payload.d.ts","sourceRoot":"","sources":["../../src/schema/payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAEnD,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,QAAQ,MAAM,EAAE,GACpE,MAAM,GACN,CAAC,SAAS,kBAAkB,GAC1B,QAAQ,GACR,UAAU,CAAA;AAEhB,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,OAAO,IAChD,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,CAAA;AAEjD,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,OAAO,IAC5C,CAAC,SAAS,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,GAC3B,CAAC,SAAS,SAAS,GACjB,KAAK,CAAC,CAAC,CAAC,GACR,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,SAAS,MAAM,CAAC,GACvC,OAAO,CAAC,CAAC,CAAC,GACV,SAAS,GACb,SAAS,CAAA;AAEf,MAAM,MAAM,aAAa,CACvB,CAAC,SAAS,MAAM,GAAG,SAAS,GAAG,GAAG,EAClC,CAAC,SAAS,SAAS,GAAG,SAAS,GAAG,GAAG,IACnC,CAAC,SAAS,MAAM,GAChB,CAAC,SAAS,SAAS,GACjB;IACE,QAAQ,EAAE,CAAC,CAAA;IACX,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAA;CACf,GACD;IACE,QAAQ,EAAE,CAAC,CAAA;IACX,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;CACjB,GACH,IAAI,CAAA;AAER,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,MAAM,GAAG,SAAS,IAAI,CAAC,SAAS,SAAS,GACvE,SAAS,GACT,SAAS,GAAG,SAAS,CAAA;AAEzB,qBAAa,OAAO,CAClB,KAAK,CAAC,QAAQ,SAAS,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,EAC9D,KAAK,CAAC,IAAI,SAAS,WAAW,CAAC,QAAQ,CAAC,GAAG,WAAW,CAAC,QAAQ,CAAC;IAG9D,QAAQ,CAAC,QAAQ,EAAE,QAAQ;IAC3B,QAAQ,CAAC,MAAM,EAAE,IAAI;gBADZ,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,IAAI;CAMxB"}

package/dist/schema/payload.js.map

@@ -1 +1 @@
-{"version":3,"file":"payload.js","sourceRoot":"","sources":["../../src/schema/payload.ts"],"names":[],"mappings":";;;AAwCA,MAAa,OAAO;IAKP;IACA;IAFX,YACW,QAAkB,EAClB,MAAY;QADZ,aAAQ,GAAR,QAAQ,CAAU;QAClB,WAAM,GAAN,MAAM,CAAM;QAErB,IAAI,QAAQ,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACnD,MAAM,IAAI,SAAS,CAAC,qDAAqD,CAAC,CAAA;QAC5E,CAAC;IACH,CAAC;CACF;AAZD,0BAYC","sourcesContent":["import { LexValue } from '@atproto/lex-data'\nimport { Validator } from '../validation.js'\n\nexport type LexBody<E extends string = any> = E extends `text/${string}`\n  ? string // Text encodings always yield string bodies\n  : E extends 'application/json'\n    ? LexValue\n    : Uint8Array\n\nexport type InferPayloadEncoding<P extends Payload> =\n  P extends Payload<infer E, any> ? E : undefined\n\nexport type InferPayloadBody<P extends Payload> =\n  P extends Payload<any, infer S>\n    ? S extends Validator<infer V>\n      ? V\n      : P extends Payload<infer E extends string>\n        ? LexBody<E>\n        : undefined\n    : undefined\n\nexport type PayloadOutput<\n  E extends string | undefined = any,\n  S extends Validator | undefined = any,\n> = E extends string\n  ? S extends Validator<infer V>\n    ? {\n        encoding: E\n        body: V\n      }\n    : {\n        encoding: E\n        body: LexBody<E>\n      }\n  : void\n\nexport type PayloadBody<E extends string | undefined> = E extends undefined\n  ? undefined\n  : Validator | undefined\n\nexport class Payload<\n  const Encoding extends string | undefined = string | undefined,\n  const Body extends PayloadBody<Encoding> = PayloadBody<Encoding>,\n> {\n  constructor(\n    readonly encoding: Encoding,\n    readonly schema: Body,\n  ) {\n    if (encoding === undefined && schema !== undefined) {\n      throw new TypeError('schema cannot be defined when encoding is undefined')\n    }\n  }\n}\n"]}
+{"version":3,"file":"payload.js","sourceRoot":"","sources":["../../src/schema/payload.ts"],"names":[],"mappings":";;;AAwCA,MAAa,OAAO;IAKP;IACA;IAFX,YACW,QAAkB,EAClB,MAAY;QADZ,aAAQ,GAAR,QAAQ,CAAU;QAClB,WAAM,GAAN,MAAM,CAAM;QAErB,IAAI,QAAQ,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACnD,MAAM,IAAI,SAAS,CAAC,qDAAqD,CAAC,CAAA;QAC5E,CAAC;IACH,CAAC;CACF;AAZD,0BAYC","sourcesContent":["import { LexValue } from '@atproto/lex-data'\nimport { Infer, Validator } from '../validation.js'\n\nexport type LexBody<E extends string = any> = E extends `text/${string}`\n  ? string // Text encodings always yield string bodies\n  : E extends 'application/json'\n    ? LexValue\n    : Uint8Array\n\nexport type InferPayloadEncoding<P extends Payload> =\n  P extends Payload<infer E, any> ? E : undefined\n\nexport type InferPayloadBody<P extends Payload> =\n  P extends Payload<any, infer S>\n    ? S extends Validator\n      ? Infer<S>\n      : P extends Payload<infer E extends string>\n        ? LexBody<E>\n        : undefined\n    : undefined\n\nexport type PayloadOutput<\n  E extends string | undefined = any,\n  S extends Validator | undefined = any,\n> = E extends string\n  ? S extends Validator\n    ? {\n        encoding: E\n        body: Infer<S>\n      }\n    : {\n        encoding: E\n        body: LexBody<E>\n      }\n  : void\n\nexport type PayloadBody<E extends string | undefined> = E extends undefined\n  ? undefined\n  : Validator | undefined\n\nexport class Payload<\n  const Encoding extends string | undefined = string | undefined,\n  const Body extends PayloadBody<Encoding> = PayloadBody<Encoding>,\n> {\n  constructor(\n    readonly encoding: Encoding,\n    readonly schema: Body,\n  ) {\n    if (encoding === undefined && schema !== undefined) {\n      throw new TypeError('schema cannot be defined when encoding is undefined')\n    }\n  }\n}\n"]}

package/dist/schema/permission-set.d.ts

@@ -1,3 +1,4 @@
+import { NsidString } from '../core.js';
 import { Permission } from './permission.js';
 export type PermissionSetOptions = {
     title?: string;
@@ -5,11 +6,10 @@ export type PermissionSetOptions = {
     detail?: string;
     'detail:lang'?: Record<string, undefined | string>;
 };
-export declare class PermissionSet<const Nsid extends string = any, const Permissions extends readonly Permission[] = any, const Options extends PermissionSetOptions = any> {
-    readonly nsid: Nsid;
-    readonly permissions: Permissions;
-    readonly options: Options;
-    readonly lexiconType: "permission-set";
-    constructor(nsid: Nsid, permissions: Permissions, options: Options);
+export declare class PermissionSet<const TNsid extends NsidString = any, const TPermissions extends readonly Permission[] = any> {
+    readonly nsid: TNsid;
+    readonly permissions: TPermissions;
+    readonly options: PermissionSetOptions;
+    constructor(nsid: TNsid, permissions: TPermissions, options?: PermissionSetOptions);
 }
 //# sourceMappingURL=permission-set.d.ts.map

package/dist/schema/permission-set.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"permission-set.d.ts","sourceRoot":"","sources":["../../src/schema/permission-set.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,CAAA;IACjD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,CAAA;CACnD,CAAA;AAED,qBAAa,aAAa,CACxB,KAAK,CAAC,IAAI,SAAS,MAAM,GAAG,GAAG,EAC/B,KAAK,CAAC,WAAW,SAAS,SAAS,UAAU,EAAE,GAAG,GAAG,EACrD,KAAK,CAAC,OAAO,SAAS,oBAAoB,GAAG,GAAG;IAK9C,QAAQ,CAAC,IAAI,EAAE,IAAI;IACnB,QAAQ,CAAC,WAAW,EAAE,WAAW;IACjC,QAAQ,CAAC,OAAO,EAAE,OAAO;IAL3B,QAAQ,CAAC,WAAW,EAAG,gBAAgB,CAAS;gBAGrC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,OAAO;CAE5B"}
+{"version":3,"file":"permission-set.d.ts","sourceRoot":"","sources":["../../src/schema/permission-set.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,CAAA;IACjD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,CAAA;CACnD,CAAA;AAED,qBAAa,aAAa,CACxB,KAAK,CAAC,KAAK,SAAS,UAAU,GAAG,GAAG,EACpC,KAAK,CAAC,YAAY,SAAS,SAAS,UAAU,EAAE,GAAG,GAAG;IAGpD,QAAQ,CAAC,IAAI,EAAE,KAAK;IACpB,QAAQ,CAAC,WAAW,EAAE,YAAY;IAClC,QAAQ,CAAC,OAAO,EAAE,oBAAoB;gBAF7B,IAAI,EAAE,KAAK,EACX,WAAW,EAAE,YAAY,EACzB,OAAO,GAAE,oBAAyB;CAE9C"}

package/dist/schema/permission-set.js

@@ -5,8 +5,7 @@ class PermissionSet {
     nsid;
     permissions;
     options;
-    lexiconType = 'permission-set';
-    constructor(nsid, permissions, options) {
+    constructor(nsid, permissions, options = {}) {
         this.nsid = nsid;
         this.permissions = permissions;
         this.options = options;

package/dist/schema/permission-set.js.map

@@ -1 +1 @@
-{"version":3,"file":"permission-set.js","sourceRoot":"","sources":["../../src/schema/permission-set.ts"],"names":[],"mappings":";;;AASA,MAAa,aAAa;IAQb;IACA;IACA;IALF,WAAW,GAAG,gBAAyB,CAAA;IAEhD,YACW,IAAU,EACV,WAAwB,EACxB,OAAgB;QAFhB,SAAI,GAAJ,IAAI,CAAM;QACV,gBAAW,GAAX,WAAW,CAAa;QACxB,YAAO,GAAP,OAAO,CAAS;IACxB,CAAC;CACL;AAZD,sCAYC","sourcesContent":["import { Permission } from './permission.js'\n\nexport type PermissionSetOptions = {\n  title?: string\n  'title:lang'?: Record<string, undefined | string>\n  detail?: string\n  'detail:lang'?: Record<string, undefined | string>\n}\n\nexport class PermissionSet<\n  const Nsid extends string = any,\n  const Permissions extends readonly Permission[] = any,\n  const Options extends PermissionSetOptions = any,\n> {\n  readonly lexiconType = 'permission-set' as const\n\n  constructor(\n    readonly nsid: Nsid,\n    readonly permissions: Permissions,\n    readonly options: Options,\n  ) {}\n}\n"]}
+{"version":3,"file":"permission-set.js","sourceRoot":"","sources":["../../src/schema/permission-set.ts"],"names":[],"mappings":";;;AAUA,MAAa,aAAa;IAKb;IACA;IACA;IAHX,YACW,IAAW,EACX,WAAyB,EACzB,UAAgC,EAAE;QAFlC,SAAI,GAAJ,IAAI,CAAO;QACX,gBAAW,GAAX,WAAW,CAAc;QACzB,YAAO,GAAP,OAAO,CAA2B;IAC1C,CAAC;CACL;AATD,sCASC","sourcesContent":["import { NsidString } from '../core.js'\nimport { Permission } from './permission.js'\n\nexport type PermissionSetOptions = {\n  title?: string\n  'title:lang'?: Record<string, undefined | string>\n  detail?: string\n  'detail:lang'?: Record<string, undefined | string>\n}\n\nexport class PermissionSet<\n  const TNsid extends NsidString = any,\n  const TPermissions extends readonly Permission[] = any,\n> {\n  constructor(\n    readonly nsid: TNsid,\n    readonly permissions: TPermissions,\n    readonly options: PermissionSetOptions = {},\n  ) {}\n}\n"]}

package/dist/schema/permission.d.ts

@@ -3,7 +3,6 @@ export type PermissionOptions = Params;
 export declare class Permission<const Resource extends string = any, const Options extends PermissionOptions = any> {
     readonly resource: Resource;
     readonly options: Options;
-    readonly lexiconType: "permission";
     constructor(resource: Resource, options: Options);
 }
 //# sourceMappingURL=permission.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"permission.d.ts","sourceRoot":"","sources":["../../src/schema/permission.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAEzC,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAA;AAEtC,qBAAa,UAAU,CACrB,KAAK,CAAC,QAAQ,SAAS,MAAM,GAAG,GAAG,EACnC,KAAK,CAAC,OAAO,SAAS,iBAAiB,GAAG,GAAG;IAK3C,QAAQ,CAAC,QAAQ,EAAE,QAAQ;IAC3B,QAAQ,CAAC,OAAO,EAAE,OAAO;IAJ3B,QAAQ,CAAC,WAAW,EAAG,YAAY,CAAS;gBAGjC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO;CAE5B"}
+{"version":3,"file":"permission.d.ts","sourceRoot":"","sources":["../../src/schema/permission.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAEzC,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAA;AAEtC,qBAAa,UAAU,CACrB,KAAK,CAAC,QAAQ,SAAS,MAAM,GAAG,GAAG,EACnC,KAAK,CAAC,OAAO,SAAS,iBAAiB,GAAG,GAAG;IAG3C,QAAQ,CAAC,QAAQ,EAAE,QAAQ;IAC3B,QAAQ,CAAC,OAAO,EAAE,OAAO;gBADhB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO;CAE5B"}

package/dist/schema/permission.js

@@ -4,7 +4,6 @@ exports.Permission = void 0;
 class Permission {
     resource;
     options;
-    lexiconType = 'permission';
     constructor(resource, options) {
         this.resource = resource;
         this.options = options;

package/dist/schema/permission.js.map

@@ -1 +1 @@
-{"version":3,"file":"permission.js","sourceRoot":"","sources":["../../src/schema/permission.ts"],"names":[],"mappings":";;;AAIA,MAAa,UAAU;IAOV;IACA;IAJF,WAAW,GAAG,YAAqB,CAAA;IAE5C,YACW,QAAkB,EAClB,OAAgB;QADhB,aAAQ,GAAR,QAAQ,CAAU;QAClB,YAAO,GAAP,OAAO,CAAS;IACxB,CAAC;CACL;AAVD,gCAUC","sourcesContent":["import { Params } from './_parameters.js'\n\nexport type PermissionOptions = Params\n\nexport class Permission<\n  const Resource extends string = any,\n  const Options extends PermissionOptions = any,\n> {\n  readonly lexiconType = 'permission' as const\n\n  constructor(\n    readonly resource: Resource,\n    readonly options: Options,\n  ) {}\n}\n"]}
+{"version":3,"file":"permission.js","sourceRoot":"","sources":["../../src/schema/permission.ts"],"names":[],"mappings":";;;AAIA,MAAa,UAAU;IAKV;IACA;IAFX,YACW,QAAkB,EAClB,OAAgB;QADhB,aAAQ,GAAR,QAAQ,CAAU;QAClB,YAAO,GAAP,OAAO,CAAS;IACxB,CAAC;CACL;AARD,gCAQC","sourcesContent":["import { Params } from './_parameters.js'\n\nexport type PermissionOptions = Params\n\nexport class Permission<\n  const Resource extends string = any,\n  const Options extends PermissionOptions = any,\n> {\n  constructor(\n    readonly resource: Resource,\n    readonly options: Options,\n  ) {}\n}\n"]}

package/dist/schema/procedure.d.ts

@@ -1,17 +1,16 @@
-import { Nsid } from '../core.js';
+import { NsidString } from '../core.js';
 import { Infer } from '../validation.js';
 import { ParamsSchema } from './params.js';
 import { InferPayloadBody, Payload } from './payload.js';
 export type InferProcedureParameters<Q extends Procedure> = Q extends Procedure<any, infer P extends ParamsSchema, any> ? Infer<P> : never;
 export type InferProcedureInputBody<Q extends Procedure> = Q extends Procedure<any, any, infer I extends Payload, any> ? InferPayloadBody<I> : never;
 export type InferProcedureOutputBody<Q extends Procedure> = Q extends Procedure<any, any, any, infer O extends Payload> ? InferPayloadBody<O> : never;
-export declare class Procedure<N extends Nsid = any, P extends ParamsSchema = any, I extends Payload = any, O extends Payload = any, E extends undefined | readonly string[] = any> {
-    readonly nsid: N;
-    readonly parameters: P;
-    readonly input: I;
-    readonly output: O;
-    readonly errors: E;
-    readonly lexiconType: "procedure";
-    constructor(nsid: N, parameters: P, input: I, output: O, errors: E);
+export declare class Procedure<TNsid extends NsidString = any, TParameters extends ParamsSchema = any, TInputPayload extends Payload = any, TOutputPayload extends Payload = any, TErrors extends undefined | readonly string[] = any> {
+    readonly nsid: TNsid;
+    readonly parameters: TParameters;
+    readonly input: TInputPayload;
+    readonly output: TOutputPayload;
+    readonly errors: TErrors;
+    constructor(nsid: TNsid, parameters: TParameters, input: TInputPayload, output: TOutputPayload, errors: TErrors);
 }
 //# sourceMappingURL=procedure.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"procedure.d.ts","sourceRoot":"","sources":["../../src/schema/procedure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAExD,MAAM,MAAM,wBAAwB,CAAC,CAAC,SAAS,SAAS,IACtD,CAAC,SAAS,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,SAAS,YAAY,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAA;AAEhF,MAAM,MAAM,uBAAuB,CAAC,CAAC,SAAS,SAAS,IACrD,CAAC,SAAS,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,SAAS,OAAO,EAAE,GAAG,CAAC,GACvD,gBAAgB,CAAC,CAAC,CAAC,GACnB,KAAK,CAAA;AAEX,MAAM,MAAM,wBAAwB,CAAC,CAAC,SAAS,SAAS,IACtD,CAAC,SAAS,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,SAAS,OAAO,CAAC,GACvD,gBAAgB,CAAC,CAAC,CAAC,GACnB,KAAK,CAAA;AAEX,qBAAa,SAAS,CACpB,CAAC,SAAS,IAAI,GAAG,GAAG,EACpB,CAAC,SAAS,YAAY,GAAG,GAAG,EAC5B,CAAC,SAAS,OAAO,GAAG,GAAG,EACvB,CAAC,SAAS,OAAO,GAAG,GAAG,EACvB,CAAC,SAAS,SAAS,GAAG,SAAS,MAAM,EAAE,GAAG,GAAG;IAK3C,QAAQ,CAAC,IAAI,EAAE,CAAC;IAChB,QAAQ,CAAC,UAAU,EAAE,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,CAAC;IACjB,QAAQ,CAAC,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,MAAM,EAAE,CAAC;IAPpB,QAAQ,CAAC,WAAW,EAAG,WAAW,CAAS;gBAGhC,IAAI,EAAE,CAAC,EACP,UAAU,EAAE,CAAC,EACb,KAAK,EAAE,CAAC,EACR,MAAM,EAAE,CAAC,EACT,MAAM,EAAE,CAAC;CAErB"}
+{"version":3,"file":"procedure.d.ts","sourceRoot":"","sources":["../../src/schema/procedure.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,gBAAgB,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAExD,MAAM,MAAM,wBAAwB,CAAC,CAAC,SAAS,SAAS,IACtD,CAAC,SAAS,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,SAAS,YAAY,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAA;AAEhF,MAAM,MAAM,uBAAuB,CAAC,CAAC,SAAS,SAAS,IACrD,CAAC,SAAS,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,SAAS,OAAO,EAAE,GAAG,CAAC,GACvD,gBAAgB,CAAC,CAAC,CAAC,GACnB,KAAK,CAAA;AAEX,MAAM,MAAM,wBAAwB,CAAC,CAAC,SAAS,SAAS,IACtD,CAAC,SAAS,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,SAAS,OAAO,CAAC,GACvD,gBAAgB,CAAC,CAAC,CAAC,GACnB,KAAK,CAAA;AAEX,qBAAa,SAAS,CACpB,KAAK,SAAS,UAAU,GAAG,GAAG,EAC9B,WAAW,SAAS,YAAY,GAAG,GAAG,EACtC,aAAa,SAAS,OAAO,GAAG,GAAG,EACnC,cAAc,SAAS,OAAO,GAAG,GAAG,EACpC,OAAO,SAAS,SAAS,GAAG,SAAS,MAAM,EAAE,GAAG,GAAG;IAGjD,QAAQ,CAAC,IAAI,EAAE,KAAK;IACpB,QAAQ,CAAC,UAAU,EAAE,WAAW;IAChC,QAAQ,CAAC,KAAK,EAAE,aAAa;IAC7B,QAAQ,CAAC,MAAM,EAAE,cAAc;IAC/B,QAAQ,CAAC,MAAM,EAAE,OAAO;gBAJf,IAAI,EAAE,KAAK,EACX,UAAU,EAAE,WAAW,EACvB,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,OAAO;CAE3B"}

package/dist/schema/procedure.js

@@ -7,7 +7,6 @@ class Procedure {
     input;
     output;
     errors;
-    lexiconType = 'procedure';
     constructor(nsid, parameters, input, output, errors) {
         this.nsid = nsid;
         this.parameters = parameters;

package/dist/schema/procedure.js.map

@@ -1 +1 @@
-{"version":3,"file":"procedure.js","sourceRoot":"","sources":["../../src/schema/procedure.ts"],"names":[],"mappings":";;;AAkBA,MAAa,SAAS;IAUT;IACA;IACA;IACA;IACA;IAPF,WAAW,GAAG,WAAoB,CAAA;IAE3C,YACW,IAAO,EACP,UAAa,EACb,KAAQ,EACR,MAAS,EACT,MAAS;QAJT,SAAI,GAAJ,IAAI,CAAG;QACP,eAAU,GAAV,UAAU,CAAG;QACb,UAAK,GAAL,KAAK,CAAG;QACR,WAAM,GAAN,MAAM,CAAG;QACT,WAAM,GAAN,MAAM,CAAG;IACjB,CAAC;CACL;AAhBD,8BAgBC","sourcesContent":["import { Nsid } from '../core.js'\nimport { Infer } from '../validation.js'\nimport { ParamsSchema } from './params.js'\nimport { InferPayloadBody, Payload } from './payload.js'\n\nexport type InferProcedureParameters<Q extends Procedure> =\n  Q extends Procedure<any, infer P extends ParamsSchema, any> ? Infer<P> : never\n\nexport type InferProcedureInputBody<Q extends Procedure> =\n  Q extends Procedure<any, any, infer I extends Payload, any>\n    ? InferPayloadBody<I>\n    : never\n\nexport type InferProcedureOutputBody<Q extends Procedure> =\n  Q extends Procedure<any, any, any, infer O extends Payload>\n    ? InferPayloadBody<O>\n    : never\n\nexport class Procedure<\n  N extends Nsid = any,\n  P extends ParamsSchema = any,\n  I extends Payload = any,\n  O extends Payload = any,\n  E extends undefined | readonly string[] = any,\n> {\n  readonly lexiconType = 'procedure' as const\n\n  constructor(\n    readonly nsid: N,\n    readonly parameters: P,\n    readonly input: I,\n    readonly output: O,\n    readonly errors: E,\n  ) {}\n}\n"]}
+{"version":3,"file":"procedure.js","sourceRoot":"","sources":["../../src/schema/procedure.ts"],"names":[],"mappings":";;;AAkBA,MAAa,SAAS;IAQT;IACA;IACA;IACA;IACA;IALX,YACW,IAAW,EACX,UAAuB,EACvB,KAAoB,EACpB,MAAsB,EACtB,MAAe;QAJf,SAAI,GAAJ,IAAI,CAAO;QACX,eAAU,GAAV,UAAU,CAAa;QACvB,UAAK,GAAL,KAAK,CAAe;QACpB,WAAM,GAAN,MAAM,CAAgB;QACtB,WAAM,GAAN,MAAM,CAAS;IACvB,CAAC;CACL;AAdD,8BAcC","sourcesContent":["import { NsidString } from '../core.js'\nimport { Infer } from '../validation.js'\nimport { ParamsSchema } from './params.js'\nimport { InferPayloadBody, Payload } from './payload.js'\n\nexport type InferProcedureParameters<Q extends Procedure> =\n  Q extends Procedure<any, infer P extends ParamsSchema, any> ? Infer<P> : never\n\nexport type InferProcedureInputBody<Q extends Procedure> =\n  Q extends Procedure<any, any, infer I extends Payload, any>\n    ? InferPayloadBody<I>\n    : never\n\nexport type InferProcedureOutputBody<Q extends Procedure> =\n  Q extends Procedure<any, any, any, infer O extends Payload>\n    ? InferPayloadBody<O>\n    : never\n\nexport class Procedure<\n  TNsid extends NsidString = any,\n  TParameters extends ParamsSchema = any,\n  TInputPayload extends Payload = any,\n  TOutputPayload extends Payload = any,\n  TErrors extends undefined | readonly string[] = any,\n> {\n  constructor(\n    readonly nsid: TNsid,\n    readonly parameters: TParameters,\n    readonly input: TInputPayload,\n    readonly output: TOutputPayload,\n    readonly errors: TErrors,\n  ) {}\n}\n"]}

package/dist/schema/query.d.ts

@@ -1,15 +1,14 @@
-import { Nsid } from '../core.js';
+import { NsidString } from '../core.js';
 import { Infer } from '../validation.js';
 import { ParamsSchema } from './params.js';
 import { InferPayloadBody, Payload } from './payload.js';
 export type InferQueryParameters<Q extends Query> = Q extends Query<any, infer P extends ParamsSchema, any> ? Infer<P> : never;
 export type InferQueryOutputBody<Q extends Query> = Q extends Query<any, any, infer O extends Payload> ? InferPayloadBody<O> : never;
-export declare class Query<N extends Nsid = any, P extends ParamsSchema = any, O extends Payload = any, E extends undefined | readonly string[] = any> {
-    readonly nsid: N;
-    readonly parameters: P;
-    readonly output: O;
-    readonly errors: E;
-    readonly lexiconType: "query";
-    constructor(nsid: N, parameters: P, output: O, errors: E);
+export declare class Query<TNsid extends NsidString = any, TParameters extends ParamsSchema = any, TOutputPayload extends Payload = any, TErrors extends undefined | readonly string[] = any> {
+    readonly nsid: TNsid;
+    readonly parameters: TParameters;
+    readonly output: TOutputPayload;
+    readonly errors: TErrors;
+    constructor(nsid: TNsid, parameters: TParameters, output: TOutputPayload, errors: TErrors);
 }
 //# sourceMappingURL=query.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/schema/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAExD,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,KAAK,IAC9C,CAAC,SAAS,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,SAAS,YAAY,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAA;AAE5E,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,KAAK,IAC9C,CAAC,SAAS,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,SAAS,OAAO,CAAC,GAC9C,gBAAgB,CAAC,CAAC,CAAC,GACnB,KAAK,CAAA;AAEX,qBAAa,KAAK,CAChB,CAAC,SAAS,IAAI,GAAG,GAAG,EACpB,CAAC,SAAS,YAAY,GAAG,GAAG,EAC5B,CAAC,SAAS,OAAO,GAAG,GAAG,EACvB,CAAC,SAAS,SAAS,GAAG,SAAS,MAAM,EAAE,GAAG,GAAG;IAK3C,QAAQ,CAAC,IAAI,EAAE,CAAC;IAChB,QAAQ,CAAC,UAAU,EAAE,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,MAAM,EAAE,CAAC;IANpB,QAAQ,CAAC,WAAW,EAAG,OAAO,CAAS;gBAG5B,IAAI,EAAE,CAAC,EACP,UAAU,EAAE,CAAC,EACb,MAAM,EAAE,CAAC,EACT,MAAM,EAAE,CAAC;CAErB"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/schema/query.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,gBAAgB,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAExD,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,KAAK,IAC9C,CAAC,SAAS,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,SAAS,YAAY,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAA;AAE5E,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,KAAK,IAC9C,CAAC,SAAS,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,SAAS,OAAO,CAAC,GAC9C,gBAAgB,CAAC,CAAC,CAAC,GACnB,KAAK,CAAA;AAEX,qBAAa,KAAK,CAChB,KAAK,SAAS,UAAU,GAAG,GAAG,EAC9B,WAAW,SAAS,YAAY,GAAG,GAAG,EACtC,cAAc,SAAS,OAAO,GAAG,GAAG,EACpC,OAAO,SAAS,SAAS,GAAG,SAAS,MAAM,EAAE,GAAG,GAAG;IAGjD,QAAQ,CAAC,IAAI,EAAE,KAAK;IACpB,QAAQ,CAAC,UAAU,EAAE,WAAW;IAChC,QAAQ,CAAC,MAAM,EAAE,cAAc;IAC/B,QAAQ,CAAC,MAAM,EAAE,OAAO;gBAHf,IAAI,EAAE,KAAK,EACX,UAAU,EAAE,WAAW,EACvB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,OAAO;CAE3B"}

package/dist/schema/query.js

@@ -6,7 +6,6 @@ class Query {
     parameters;
     output;
     errors;
-    lexiconType = 'query';
     constructor(nsid, parameters, output, errors) {
         this.nsid = nsid;
         this.parameters = parameters;

package/dist/schema/query.js.map

@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/schema/query.ts"],"names":[],"mappings":";;;AAaA,MAAa,KAAK;IASL;IACA;IACA;IACA;IANF,WAAW,GAAG,OAAgB,CAAA;IAEvC,YACW,IAAO,EACP,UAAa,EACb,MAAS,EACT,MAAS;QAHT,SAAI,GAAJ,IAAI,CAAG;QACP,eAAU,GAAV,UAAU,CAAG;QACb,WAAM,GAAN,MAAM,CAAG;QACT,WAAM,GAAN,MAAM,CAAG;IACjB,CAAC;CACL;AAdD,sBAcC","sourcesContent":["import { Nsid } from '../core.js'\nimport { Infer } from '../validation.js'\nimport { ParamsSchema } from './params.js'\nimport { InferPayloadBody, Payload } from './payload.js'\n\nexport type InferQueryParameters<Q extends Query> =\n  Q extends Query<any, infer P extends ParamsSchema, any> ? Infer<P> : never\n\nexport type InferQueryOutputBody<Q extends Query> =\n  Q extends Query<any, any, infer O extends Payload>\n    ? InferPayloadBody<O>\n    : never\n\nexport class Query<\n  N extends Nsid = any,\n  P extends ParamsSchema = any,\n  O extends Payload = any,\n  E extends undefined | readonly string[] = any,\n> {\n  readonly lexiconType = 'query' as const\n\n  constructor(\n    readonly nsid: N,\n    readonly parameters: P,\n    readonly output: O,\n    readonly errors: E,\n  ) {}\n}\n"]}
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/schema/query.ts"],"names":[],"mappings":";;;AAaA,MAAa,KAAK;IAOL;IACA;IACA;IACA;IAJX,YACW,IAAW,EACX,UAAuB,EACvB,MAAsB,EACtB,MAAe;QAHf,SAAI,GAAJ,IAAI,CAAO;QACX,eAAU,GAAV,UAAU,CAAa;QACvB,WAAM,GAAN,MAAM,CAAgB;QACtB,WAAM,GAAN,MAAM,CAAS;IACvB,CAAC;CACL;AAZD,sBAYC","sourcesContent":["import { NsidString } from '../core.js'\nimport { Infer } from '../validation.js'\nimport { ParamsSchema } from './params.js'\nimport { InferPayloadBody, Payload } from './payload.js'\n\nexport type InferQueryParameters<Q extends Query> =\n  Q extends Query<any, infer P extends ParamsSchema, any> ? Infer<P> : never\n\nexport type InferQueryOutputBody<Q extends Query> =\n  Q extends Query<any, any, infer O extends Payload>\n    ? InferPayloadBody<O>\n    : never\n\nexport class Query<\n  TNsid extends NsidString = any,\n  TParameters extends ParamsSchema = any,\n  TOutputPayload extends Payload = any,\n  TErrors extends undefined | readonly string[] = any,\n> {\n  constructor(\n    readonly nsid: TNsid,\n    readonly parameters: TParameters,\n    readonly output: TOutputPayload,\n    readonly errors: TErrors,\n  ) {}\n}\n"]}

package/dist/schema/record.d.ts

@@ -1,37 +1,43 @@
-import { Nsid, RecordKey, Simplify } from '../core.js';
-import { Infer, ValidationResult, Validator, ValidatorContext } from '../validation.js';
-export type InferRecordKey<R extends RecordSchema> = R extends RecordSchema<infer K, any, any, any> ? RecordKeySchemaOutput<K> : never;
-export declare class RecordSchema<Key extends RecordKey = any, Type extends Nsid = any, Schema extends Validator<object> = any, Output extends Infer<Schema> & {
-    $type: Type;
-} = Infer<Schema> & {
-    $type: Type;
-}> extends Validator<Output> {
-    readonly key: Key;
-    readonly $type: Type;
-    readonly schema: Schema;
-    readonly lexiconType: "record";
-    keySchema: RecordKeySchema<Key>;
-    constructor(key: Key, $type: Type, schema: Schema);
+import { LexiconRecordKey, NsidString, Simplify, TidString } from '../core.js';
+import { Infer, Schema, ValidationResult, Validator, ValidatorContext } from '../validation.js';
+export type InferRecordKey<R extends RecordSchema> = R extends RecordSchema<infer K> ? RecordKeySchemaOutput<K> : never;
+export type RecordSchemaOutput<T extends NsidString, S extends Validator<{
+    [_ in string]?: unknown;
+}>> = Simplify<Omit<Infer<S>, '$type'> & {
+    $type: T;
+}>;
+export declare class RecordSchema<K extends LexiconRecordKey = any, T extends NsidString = any, S extends Validator<{
+    [_ in string]?: unknown;
+}> = any> extends Schema<RecordSchemaOutput<T, S>> {
+    readonly key: K;
+    readonly $type: T;
+    readonly schema: S;
+    keySchema: RecordKeySchema<K>;
+    constructor(key: K, $type: T, schema: S);
     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;
+        $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;
-    })[K]; } : never;
-    validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<Output>;
+        $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_1 in keyof T_1]: (Omit<X, "$type"> & {
+        $type: T;
+    })[K_1]; } : never;
+    validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<RecordSchemaOutput<T, S>>;
 }
-export type RecordKeySchemaOutput<Key extends RecordKey> = Key extends 'any' ? string : Key extends 'tid' ? string : Key extends 'nsid' ? Nsid : Key extends `literal:${infer L extends string}` ? L : never;
-export type RecordKeySchema<Key extends RecordKey> = Validator<RecordKeySchemaOutput<Key>>;
+export type RecordKeySchemaOutput<Key extends LexiconRecordKey> = Key extends 'any' ? string : Key extends 'tid' ? TidString : Key extends 'nsid' ? NsidString : Key extends `literal:${infer L extends string}` ? L : never;
+export type RecordKeySchema<Key extends LexiconRecordKey> = Schema<RecordKeySchemaOutput<Key>>;
 //# sourceMappingURL=record.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"record.d.ts","sourceRoot":"","sources":["../../src/schema/record.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACtD,OAAO,EACL,KAAK,EACL,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EACjB,MAAM,kBAAkB,CAAA;AAIzB,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,YAAY,IAC/C,CAAC,SAAS,YAAY,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAC1C,qBAAqB,CAAC,CAAC,CAAC,GACxB,KAAK,CAAA;AAEX,qBAAa,YAAY,CACvB,GAAG,SAAS,SAAS,GAAG,GAAG,EAC3B,IAAI,SAAS,IAAI,GAAG,GAAG,EACvB,MAAM,SAAS,SAAS,CAAC,MAAM,CAAC,GAAG,GAAG,EACtC,MAAM,SAAS,KAAK,CAAC,MAAM,CAAC,GAAG;IAAE,KAAK,EAAE,IAAI,CAAA;CAAE,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG;IAC/D,KAAK,EAAE,IAAI,CAAA;CACZ,CACD,SAAQ,SAAS,CAAC,MAAM,CAAC;IAMvB,QAAQ,CAAC,GAAG,EAAE,GAAG;IACjB,QAAQ,CAAC,KAAK,EAAE,IAAI;IACpB,QAAQ,CAAC,MAAM,EAAE,MAAM;IAPzB,QAAQ,CAAC,WAAW,EAAG,QAAQ,CAAS;IAExC,SAAS,EAAE,eAAe,CAAC,GAAG,CAAC,CAAA;gBAGpB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,IAAI,EACX,MAAM,EAAE,MAAM;IAMzB,QAAQ,CAAC,CAAC,SAAS;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,EACpC,KAAK,EAAE,CAAC,GACP,KAAK,IAAI,CAAC,SAAS;QAAE,KAAK,EAAE,IAAI,CAAA;KAAE,GAAG,CAAC,GAAG,KAAK;IAIjD,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;eAVlB,IAAI;;IAcnC,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;CAa5B;AAED,MAAM,MAAM,qBAAqB,CAAC,GAAG,SAAS,SAAS,IAAI,GAAG,SAAS,KAAK,GACxE,MAAM,GACN,GAAG,SAAS,KAAK,GACf,MAAM,GACN,GAAG,SAAS,MAAM,GAChB,IAAI,GACJ,GAAG,SAAS,WAAW,MAAM,CAAC,SAAS,MAAM,EAAE,GAC7C,CAAC,GACD,KAAK,CAAA;AAEf,MAAM,MAAM,eAAe,CAAC,GAAG,SAAS,SAAS,IAAI,SAAS,CAC5D,qBAAqB,CAAC,GAAG,CAAC,CAC3B,CAAA"}
+{"version":3,"file":"record.d.ts","sourceRoot":"","sources":["../../src/schema/record.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAC9E,OAAO,EACL,KAAK,EACL,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EACjB,MAAM,kBAAkB,CAAA;AAIzB,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,YAAY,IAC/C,CAAC,SAAS,YAAY,CAAC,MAAM,CAAC,CAAC,GAAG,qBAAqB,CAAC,CAAC,CAAC,GAAG,KAAK,CAAA;AAEpE,MAAM,MAAM,kBAAkB,CAC5B,CAAC,SAAS,UAAU,EACpB,CAAC,SAAS,SAAS,CAAC;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,EAAE,OAAO;CAAE,CAAC,IAC9C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG;IAAE,KAAK,EAAE,CAAC,CAAA;CAAE,CAAC,CAAA;AAEpD,qBAAa,YAAY,CACvB,CAAC,SAAS,gBAAgB,GAAG,GAAG,EAChC,CAAC,SAAS,UAAU,GAAG,GAAG,EAC1B,CAAC,SAAS,SAAS,CAAC;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,EAAE,OAAO;CAAE,CAAC,GAAG,GAAG,CACtD,SAAQ,MAAM,CAAC,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAItC,QAAQ,CAAC,GAAG,EAAE,CAAC;IACf,QAAQ,CAAC,KAAK,EAAE,CAAC;IACjB,QAAQ,CAAC,MAAM,EAAE,CAAC;IALpB,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC,CAAA;gBAGlB,GAAG,EAAE,CAAC,EACN,KAAK,EAAE,CAAC,EACR,MAAM,EAAE,CAAC;IAMpB,QAAQ,CAAC,CAAC,SAAS;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,EACpC,KAAK,EAAE,CAAC,GACP,KAAK,IAAI,CAAC,SAAS;QAAE,KAAK,EAAE,CAAC,CAAA;KAAE,GAAG,CAAC,GAAG,CAAC,GAAG;QAAE,KAAK,EAAE,CAAC,CAAA;KAAE;IAIzD,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;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,EAAE,KAAK,EAAE,CAAC;eAVlB,CAAC;;eAAsB,CAAC;;IAcvD,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,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CAa9C;AAED,MAAM,MAAM,qBAAqB,CAAC,GAAG,SAAS,gBAAgB,IAC5D,GAAG,SAAS,KAAK,GACb,MAAM,GACN,GAAG,SAAS,KAAK,GACf,SAAS,GACT,GAAG,SAAS,MAAM,GAChB,UAAU,GACV,GAAG,SAAS,WAAW,MAAM,CAAC,SAAS,MAAM,EAAE,GAC7C,CAAC,GACD,KAAK,CAAA;AAEjB,MAAM,MAAM,eAAe,CAAC,GAAG,SAAS,gBAAgB,IAAI,MAAM,CAChE,qBAAqB,CAAC,GAAG,CAAC,CAC3B,CAAA"}

package/dist/schema/record.js

@@ -4,11 +4,10 @@ exports.RecordSchema = void 0;
 const validation_js_1 = require("../validation.js");
 const literal_js_1 = require("./literal.js");
 const string_js_1 = require("./string.js");
-class RecordSchema extends validation_js_1.Validator {
+class RecordSchema extends validation_js_1.Schema {
     key;
     $type;
     schema;
-    lexiconType = 'record';
     keySchema;
     constructor(key, $type, schema) {
         super();

package/dist/schema/record.js.map

@@ -1 +1 @@
-{"version":3,"file":"record.js","sourceRoot":"","sources":["../../src/schema/record.ts"],"names":[],"mappings":";;;AACA,oDAKyB;AACzB,6CAA4C;AAC5C,2CAA0C;AAO1C,MAAa,YAOX,SAAQ,yBAAiB;IAMd;IACA;IACA;IAPF,WAAW,GAAG,QAAiB,CAAA;IAExC,SAAS,CAAsB;IAE/B,YACW,GAAQ,EACR,KAAW,EACX,MAAc;QAEvB,KAAK,EAAE,CAAA;QAJE,QAAG,GAAH,GAAG,CAAK;QACR,UAAK,GAAL,KAAK,CAAM;QACX,WAAM,GAAN,MAAM,CAAQ;QAGvB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,CAAA;IACjC,CAAC;IAED,QAAQ,CACN,KAAQ;QAER,OAAO,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,CAAA;IACnC,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,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAA6B,CAAA;QAE3E,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,OAAO,MAAM,CAAA;QACf,CAAC;QAED,IAAI,IAAI,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,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,MAAM,CAAA;IACf,CAAC;CACF;AAzDD,oCAyDC;AAgBD,MAAM,SAAS,GAAG,IAAI,wBAAY,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAA;AACpD,MAAM,SAAS,GAAG,IAAI,wBAAY,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAA;AACrD,MAAM,UAAU,GAAG,IAAI,wBAAY,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;AACvD,MAAM,iBAAiB,GAAG,IAAI,0BAAa,CAAC,MAAM,CAAC,CAAA;AAEnD,SAAS,SAAS,CAAwB,GAAQ;IAChD,gDAAgD;IAChD,IAAI,GAAG,KAAK,KAAK;QAAE,OAAO,SAAgB,CAAA;IAC1C,IAAI,GAAG,KAAK,KAAK;QAAE,OAAO,SAAgB,CAAA;IAC1C,IAAI,GAAG,KAAK,MAAM;QAAE,OAAO,UAAiB,CAAA;IAC5C,IAAI,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAA+B,CAAA;QACxD,IAAI,KAAK,KAAK,MAAM;YAAE,OAAO,iBAAwB,CAAA;QACrD,OAAO,IAAI,0BAAa,CAAC,KAAK,CAAC,CAAA;IACjC,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,gCAAgC,GAAG,EAAE,CAAC,CAAA;AACxD,CAAC","sourcesContent":["import { Nsid, RecordKey, Simplify } from '../core.js'\nimport {\n  Infer,\n  ValidationResult,\n  Validator,\n  ValidatorContext,\n} from '../validation.js'\nimport { LiteralSchema } from './literal.js'\nimport { StringSchema } from './string.js'\n\nexport type InferRecordKey<R extends RecordSchema> =\n  R extends RecordSchema<infer K, any, any, any>\n    ? RecordKeySchemaOutput<K>\n    : never\n\nexport class RecordSchema<\n  Key extends RecordKey = any,\n  Type extends Nsid = any,\n  Schema extends Validator<object> = any,\n  Output extends Infer<Schema> & { $type: Type } = Infer<Schema> & {\n    $type: Type\n  },\n> extends Validator<Output> {\n  readonly lexiconType = 'record' as const\n\n  keySchema: RecordKeySchema<Key>\n\n  constructor(\n    readonly key: Key,\n    readonly $type: Type,\n    readonly schema: Schema,\n  ) {\n    super()\n    this.keySchema = recordKey(key)\n  }\n\n  isTypeOf<X extends { $type?: unknown }>(\n    value: X,\n  ): value is X extends { $type: Type } ? X : never {\n    return 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    const result = ctx.validate(input, this.schema) as ValidationResult<Output>\n\n    if (!result.success) {\n      return result\n    }\n\n    if (this.$type !== result.value.$type) {\n      return ctx.issueInvalidPropertyValue(result.value, '$type', [this.$type])\n    }\n\n    return result\n  }\n}\n\nexport type RecordKeySchemaOutput<Key extends RecordKey> = Key extends 'any'\n  ? string\n  : Key extends 'tid'\n    ? string\n    : Key extends 'nsid'\n      ? Nsid\n      : Key extends `literal:${infer L extends string}`\n        ? L\n        : never\n\nexport type RecordKeySchema<Key extends RecordKey> = Validator<\n  RecordKeySchemaOutput<Key>\n>\n\nconst keySchema = new StringSchema({ minLength: 1 })\nconst tidSchema = new StringSchema({ format: 'tid' })\nconst nsidSchema = new StringSchema({ format: 'nsid' })\nconst selfLiteralSchema = new LiteralSchema('self')\n\nfunction recordKey<Key extends RecordKey>(key: Key): RecordKeySchema<Key> {\n  // @NOTE Use cached instances for common schemas\n  if (key === 'any') return keySchema as any\n  if (key === 'tid') return tidSchema as any\n  if (key === 'nsid') return nsidSchema as any\n  if (key.startsWith('literal:')) {\n    const value = key.slice(8) as RecordKeySchemaOutput<Key>\n    if (value === 'self') return selfLiteralSchema as any\n    return new LiteralSchema(value)\n  }\n\n  throw new Error(`Unsupported record key type: ${key}`)\n}\n"]}
+{"version":3,"file":"record.js","sourceRoot":"","sources":["../../src/schema/record.ts"],"names":[],"mappings":";;;AACA,oDAMyB;AACzB,6CAA4C;AAC5C,2CAA0C;AAU1C,MAAa,YAIX,SAAQ,sBAAgC;IAI7B;IACA;IACA;IALX,SAAS,CAAoB;IAE7B,YACW,GAAM,EACN,KAAQ,EACR,MAAS;QAElB,KAAK,EAAE,CAAA;QAJE,QAAG,GAAH,GAAG,CAAG;QACN,UAAK,GAAL,KAAK,CAAG;QACR,WAAM,GAAN,MAAM,CAAG;QAGlB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,CAAA;IACjC,CAAC;IAED,QAAQ,CACN,KAAQ;QAER,OAAO,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,CAAA;IACnC,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,CAAoC,KAAQ;QAChD,OAAO,IAAI,CAAC,KAAK,CAAI,KAAK,CAAC,CAAA;IAC7B,CAAC;IAED,iBAAiB,CACf,KAAc,EACd,GAAqB;QAErB,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAE/C,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,OAAO,MAAM,CAAA;QACf,CAAC;QAED,IAAI,IAAI,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,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,MAAoD,CAAA;IAC7D,CAAC;CACF;AApDD,oCAoDC;AAiBD,MAAM,SAAS,GAAG,IAAI,wBAAY,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAA;AACpD,MAAM,SAAS,GAAG,IAAI,wBAAY,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAA;AACrD,MAAM,UAAU,GAAG,IAAI,wBAAY,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;AACvD,MAAM,iBAAiB,GAAG,IAAI,0BAAa,CAAC,MAAM,CAAC,CAAA;AAEnD,SAAS,SAAS,CAChB,GAAQ;IAER,gDAAgD;IAChD,IAAI,GAAG,KAAK,KAAK;QAAE,OAAO,SAAgB,CAAA;IAC1C,IAAI,GAAG,KAAK,KAAK;QAAE,OAAO,SAAgB,CAAA;IAC1C,IAAI,GAAG,KAAK,MAAM;QAAE,OAAO,UAAiB,CAAA;IAC5C,IAAI,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAA+B,CAAA;QACxD,IAAI,KAAK,KAAK,MAAM;YAAE,OAAO,iBAAwB,CAAA;QACrD,OAAO,IAAI,0BAAa,CAAC,KAAK,CAAC,CAAA;IACjC,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,gCAAgC,GAAG,EAAE,CAAC,CAAA;AACxD,CAAC","sourcesContent":["import { LexiconRecordKey, NsidString, Simplify, TidString } from '../core.js'\nimport {\n  Infer,\n  Schema,\n  ValidationResult,\n  Validator,\n  ValidatorContext,\n} from '../validation.js'\nimport { LiteralSchema } from './literal.js'\nimport { StringSchema } from './string.js'\n\nexport type InferRecordKey<R extends RecordSchema> =\n  R extends RecordSchema<infer K> ? RecordKeySchemaOutput<K> : never\n\nexport type RecordSchemaOutput<\n  T extends NsidString,\n  S extends Validator<{ [_ in string]?: unknown }>,\n> = Simplify<Omit<Infer<S>, '$type'> & { $type: T }>\n\nexport class RecordSchema<\n  K extends LexiconRecordKey = any,\n  T extends NsidString = any,\n  S extends Validator<{ [_ in string]?: unknown }> = any,\n> extends Schema<RecordSchemaOutput<T, S>> {\n  keySchema: RecordKeySchema<K>\n\n  constructor(\n    readonly key: K,\n    readonly $type: T,\n    readonly schema: S,\n  ) {\n    super()\n    this.keySchema = recordKey(key)\n  }\n\n  isTypeOf<X extends { $type?: unknown }>(\n    value: X,\n  ): value is X extends { $type: T } ? X : X & { $type: T } {\n    return 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 { $type?: unknown }>(value: X) {\n    return this.isTypeOf<X>(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<RecordSchemaOutput<T, S>> {\n    const result = ctx.validate(input, this.schema)\n\n    if (!result.success) {\n      return result\n    }\n\n    if (this.$type !== result.value.$type) {\n      return ctx.issueInvalidPropertyValue(result.value, '$type', [this.$type])\n    }\n\n    return result as ValidationResult<RecordSchemaOutput<T, S>>\n  }\n}\n\nexport type RecordKeySchemaOutput<Key extends LexiconRecordKey> =\n  Key extends 'any'\n    ? string\n    : Key extends 'tid'\n      ? TidString\n      : Key extends 'nsid'\n        ? NsidString\n        : Key extends `literal:${infer L extends string}`\n          ? L\n          : never\n\nexport type RecordKeySchema<Key extends LexiconRecordKey> = Schema<\n  RecordKeySchemaOutput<Key>\n>\n\nconst keySchema = new StringSchema({ minLength: 1 })\nconst tidSchema = new StringSchema({ format: 'tid' })\nconst nsidSchema = new StringSchema({ format: 'nsid' })\nconst selfLiteralSchema = new LiteralSchema('self')\n\nfunction recordKey<Key extends LexiconRecordKey>(\n  key: Key,\n): RecordKeySchema<Key> {\n  // @NOTE Use cached instances for common schemas\n  if (key === 'any') return keySchema as any\n  if (key === 'tid') return tidSchema as any\n  if (key === 'nsid') return nsidSchema as any\n  if (key.startsWith('literal:')) {\n    const value = key.slice(8) as RecordKeySchemaOutput<Key>\n    if (value === 'self') return selfLiteralSchema as any\n    return new LiteralSchema(value)\n  }\n\n  throw new Error(`Unsupported record key type: ${key}`)\n}\n"]}

package/dist/schema/ref.d.ts

@@ -1,8 +1,7 @@
-import { ValidationResult, Validator, ValidatorContext } from '../validation.js';
+import { Schema, ValidationResult, Validator, ValidatorContext } from '../validation.js';
 export type RefSchemaGetter<V> = () => Validator<V>;
-export declare class RefSchema<V = any> extends Validator<V> {
+export declare class RefSchema<V = any> extends Schema<V> {
     #private;
-    readonly lexiconType: "ref";
     constructor(getter: RefSchemaGetter<V>);
     get schema(): Validator<V>;
     validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<V>;

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

@@ -1 +1 @@
-{"version":3,"file":"ref.d.ts","sourceRoot":"","sources":["../../src/schema/ref.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAEhF,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,MAAM,SAAS,CAAC,CAAC,CAAC,CAAA;AAEnD,qBAAa,SAAS,CAAC,CAAC,GAAG,GAAG,CAAE,SAAQ,SAAS,CAAC,CAAC,CAAC;;IAClD,QAAQ,CAAC,WAAW,EAAG,KAAK,CAAS;gBAIzB,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC;IAStC,IAAI,MAAM,IAAI,SAAS,CAAC,CAAC,CAAC,CAgBzB;IAEQ,iBAAiB,CACxB,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,CAAC,CAAC;CAGvB"}
+{"version":3,"file":"ref.d.ts","sourceRoot":"","sources":["../../src/schema/ref.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EACjB,MAAM,kBAAkB,CAAA;AAEzB,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,MAAM,SAAS,CAAC,CAAC,CAAC,CAAA;AAEnD,qBAAa,SAAS,CAAC,CAAC,GAAG,GAAG,CAAE,SAAQ,MAAM,CAAC,CAAC,CAAC;;gBAGnC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC;IAStC,IAAI,MAAM,IAAI,SAAS,CAAC,CAAC,CAAC,CAgBzB;IAED,iBAAiB,CACf,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,CAAC,CAAC;CAGvB"}

package/dist/schema/ref.js

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

package/dist/schema/ref.js.map

@@ -1 +1 @@
-{"version":3,"file":"ref.js","sourceRoot":"","sources":["../../src/schema/ref.ts"],"names":[],"mappings":";;;AAAA,oDAAgF;AAIhF,MAAa,SAAmB,SAAQ,yBAAY;IACzC,WAAW,GAAG,KAAc,CAAA;IAErC,OAAO,CAAoB;IAE3B,YAAY,MAA0B;QACpC,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,mEAAmE;QACnE,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;IAEQ,iBAAiB,CACxB,KAAc,EACd,GAAqB;QAErB,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IACzC,CAAC;CACF;AAtCD,8BAsCC;AAED,SAAS,kBAAkB;IACzB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;AAC3D,CAAC","sourcesContent":["import { ValidationResult, Validator, ValidatorContext } from '../validation.js'\n\nexport type RefSchemaGetter<V> = () => Validator<V>\n\nexport class RefSchema<V = any> extends Validator<V> {\n  readonly lexiconType = 'ref' as const\n\n  #getter: RefSchemaGetter<V>\n\n  constructor(getter: RefSchemaGetter<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(): Validator<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    // Disable the getter and 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  override validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<V> {\n    return ctx.validate(input, this.schema)\n  }\n}\n\nfunction throwAlreadyCalled(): never {\n  throw new Error('RefSchema getter called multiple times')\n}\n"]}
+{"version":3,"file":"ref.js","sourceRoot":"","sources":["../../src/schema/ref.ts"],"names":[],"mappings":";;;AAAA,oDAKyB;AAIzB,MAAa,SAAmB,SAAQ,sBAAS;IAC/C,OAAO,CAAoB;IAE3B,YAAY,MAA0B;QACpC,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,mEAAmE;QACnE,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,iBAAiB,CACf,KAAc,EACd,GAAqB;QAErB,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IACzC,CAAC;CACF;AApCD,8BAoCC;AAED,SAAS,kBAAkB;IACzB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;AAC3D,CAAC","sourcesContent":["import {\n  Schema,\n  ValidationResult,\n  Validator,\n  ValidatorContext,\n} from '../validation.js'\n\nexport type RefSchemaGetter<V> = () => Validator<V>\n\nexport class RefSchema<V = any> extends Schema<V> {\n  #getter: RefSchemaGetter<V>\n\n  constructor(getter: RefSchemaGetter<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(): Validator<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    // Disable the getter and 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  validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<V> {\n    return ctx.validate(input, this.schema)\n  }\n}\n\nfunction throwAlreadyCalled(): never {\n  throw new Error('RefSchema getter called multiple times')\n}\n"]}

package/dist/schema/refine.d.ts

@@ -0,0 +1,18 @@
+import { Infer, PropertyKey, Validator } from '../validation.js';
+import { CustomAssertionContext } from './custom.js';
+export type RefinementCheck<T> = {
+    check: (value: T, ctx: CustomAssertionContext) => boolean;
+    message: string;
+    path?: PropertyKey | readonly PropertyKey[];
+};
+export type RefinementAssertion<T, Out extends T> = {
+    check: (this: null, value: T, ctx: CustomAssertionContext) => value is Out;
+    message: string;
+    path?: PropertyKey | readonly PropertyKey[];
+};
+export type InferRefinement<R> = R extends RefinementCheck<infer T> ? T : R extends RefinementAssertion<infer T, any> ? T : never;
+export type Refinement<T = any, Out extends T = T> = RefinementCheck<T> | RefinementAssertion<T, Out>;
+export declare function refine<S extends Validator, Out extends Infer<S>>(schema: S, refinement: RefinementAssertion<Infer<S>, Out>): S & Validator<Out>;
+export declare function refine<S extends Validator>(schema: S, refinement: RefinementCheck<Infer<S>>): S;
+export declare function refine<R extends Refinement, S extends Validator<InferRefinement<R>>>(schema: S, refinement: R): S;
+//# sourceMappingURL=refine.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"refine.d.ts","sourceRoot":"","sources":["../../src/schema/refine.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAEL,WAAW,EAEX,SAAS,EAEV,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAA;AAEpD,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI;IAC/B,KAAK,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,sBAAsB,KAAK,OAAO,CAAA;IACzD,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS,WAAW,EAAE,CAAA;CAC5C,CAAA;AAED,MAAM,MAAM,mBAAmB,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC,IAAI;IAClD,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,sBAAsB,KAAK,KAAK,IAAI,GAAG,CAAA;IAC1E,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS,WAAW,EAAE,CAAA;CAC5C,CAAA;AAED,MAAM,MAAM,eAAe,CAAC,CAAC,IAC3B,CAAC,SAAS,eAAe,CAAC,MAAM,CAAC,CAAC,GAC9B,CAAC,GACD,CAAC,SAAS,mBAAmB,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,GACzC,CAAC,GACD,KAAK,CAAA;AAEb,MAAM,MAAM,UAAU,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,SAAS,CAAC,GAAG,CAAC,IAC7C,eAAe,CAAC,CAAC,CAAC,GAClB,mBAAmB,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;AAE/B,wBAAgB,MAAM,CAAC,CAAC,SAAS,SAAS,EAAE,GAAG,SAAS,KAAK,CAAC,CAAC,CAAC,EAC9D,MAAM,EAAE,CAAC,EACT,UAAU,EAAE,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,GAC7C,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,CAAA;AACrB,wBAAgB,MAAM,CAAC,CAAC,SAAS,SAAS,EACxC,MAAM,EAAE,CAAC,EACT,UAAU,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GACpC,CAAC,CAAA;AACJ,wBAAgB,MAAM,CACpB,CAAC,SAAS,UAAU,EACpB,CAAC,SAAS,SAAS,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EACvC,MAAM,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,GAAG,CAAC,CAAA"}

package/dist/schema/refine.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.refine = refine;
+const validation_js_1 = require("../validation.js");
+/*@__NO_SIDE_EFFECTS__*/
+function refine(schema, refinement) {
+    // This is basically the same as monkey patching the "validateInContext"
+    // method to the schema, but done in a way that does not mutate the original
+    // schema. This is safe to do because Validators don't update their internal
+    // state over their lifetime.
+    return Object.create(schema, {
+        validateInContext: {
+            // We do not use an arrow function to avoid creating a closure
+            value: validateInContextUnbound.bind({ schema, refinement }),
+            enumerable: false,
+            writable: false,
+            configurable: true,
+        },
+    });
+}
+/*@__NO_SIDE_EFFECTS__*/
+function validateInContextUnbound(input, ctx) {
+    const result = ctx.validate(input, this.schema);
+    if (!result.success)
+        return result;
+    const checkResult = this.refinement.check.call(null, result.value, ctx);
+    if (!checkResult) {
+        const path = ctx.concatPath(this.refinement.path);
+        return ctx.failure(new validation_js_1.IssueCustom(path, input, this.refinement.message));
+    }
+    return result;
+}
+//# sourceMappingURL=refine.js.map

package/dist/schema/refine.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"refine.js","sourceRoot":"","sources":["../../src/schema/refine.ts"],"names":[],"mappings":";;AA8CA,wBAiBC;AA/DD,oDAOyB;AAsCzB,wBAAwB;AACxB,SAAgB,MAAM,CACpB,MAAS,EACT,UAAgC;IAEhC,wEAAwE;IACxE,4EAA4E;IAC5E,4EAA4E;IAC5E,6BAA6B;IAC7B,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE;QAC3B,iBAAiB,EAAE;YACjB,8DAA8D;YAC9D,KAAK,EAAE,wBAAwB,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;YAC5D,UAAU,EAAE,KAAK;YACjB,QAAQ,EAAE,KAAK;YACf,YAAY,EAAE,IAAI;SACnB;KACF,CAAC,CAAA;AACJ,CAAC;AAED,wBAAwB;AACxB,SAAS,wBAAwB,CAK/B,KAAc,EACd,GAAqB;IAErB,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IAC/C,IAAI,CAAC,MAAM,CAAC,OAAO;QAAE,OAAO,MAAM,CAAA;IAElC,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;IACvE,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,IAAI,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QACjD,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,2BAAW,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAA;IAC3E,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC","sourcesContent":["import {\n  Infer,\n  IssueCustom,\n  PropertyKey,\n  ValidationResult,\n  Validator,\n  ValidatorContext,\n} from '../validation.js'\nimport { CustomAssertionContext } from './custom.js'\n\nexport type RefinementCheck<T> = {\n  check: (value: T, ctx: CustomAssertionContext) => boolean\n  message: string\n  path?: PropertyKey | readonly PropertyKey[]\n}\n\nexport type RefinementAssertion<T, Out extends T> = {\n  check: (this: null, value: T, ctx: CustomAssertionContext) => value is Out\n  message: string\n  path?: PropertyKey | readonly PropertyKey[]\n}\n\nexport type InferRefinement<R> =\n  R extends RefinementCheck<infer T>\n    ? T\n    : R extends RefinementAssertion<infer T, any>\n      ? T\n      : never\n\nexport type Refinement<T = any, Out extends T = T> =\n  | RefinementCheck<T>\n  | RefinementAssertion<T, Out>\n\nexport function refine<S extends Validator, Out extends Infer<S>>(\n  schema: S,\n  refinement: RefinementAssertion<Infer<S>, Out>,\n): S & Validator<Out>\nexport function refine<S extends Validator>(\n  schema: S,\n  refinement: RefinementCheck<Infer<S>>,\n): S\nexport function refine<\n  R extends Refinement,\n  S extends Validator<InferRefinement<R>>,\n>(schema: S, refinement: R): S\n/*@__NO_SIDE_EFFECTS__*/\nexport function refine<S extends Validator>(\n  schema: S,\n  refinement: Refinement<Infer<S>>,\n): S {\n  // This is basically the same as monkey patching the \"validateInContext\"\n  // method to the schema, but done in a way that does not mutate the original\n  // schema. This is safe to do because Validators don't update their internal\n  // state over their lifetime.\n  return Object.create(schema, {\n    validateInContext: {\n      // We do not use an arrow function to avoid creating a closure\n      value: validateInContextUnbound.bind({ schema, refinement }),\n      enumerable: false,\n      writable: false,\n      configurable: true,\n    },\n  })\n}\n\n/*@__NO_SIDE_EFFECTS__*/\nfunction validateInContextUnbound<S extends Validator>(\n  this: {\n    schema: S\n    refinement: Refinement<Infer<S>>\n  },\n  input: unknown,\n  ctx: ValidatorContext,\n): ValidationResult<Infer<S>> {\n  const result = ctx.validate(input, this.schema)\n  if (!result.success) return result\n\n  const checkResult = this.refinement.check.call(null, result.value, ctx)\n  if (!checkResult) {\n    const path = ctx.concatPath(this.refinement.path)\n    return ctx.failure(new IssueCustom(path, input, this.refinement.message))\n  }\n\n  return result\n}\n"]}

package/dist/schema/regexp.d.ts

@@ -0,0 +1,7 @@
+import { Schema, ValidationResult, ValidatorContext } from '../validation';
+export declare class RegexpSchema<T extends string> extends Schema<T> {
+    readonly pattern: RegExp;
+    constructor(pattern: RegExp);
+    validateInContext(input: unknown, ctx: ValidatorContext): ValidationResult<T>;
+}
+//# sourceMappingURL=regexp.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"regexp.d.ts","sourceRoot":"","sources":["../../src/schema/regexp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAE1E,qBAAa,YAAY,CAAC,CAAC,SAAS,MAAM,CAAE,SAAQ,MAAM,CAAC,CAAC,CAAC;aAC/B,OAAO,EAAE,MAAM;gBAAf,OAAO,EAAE,MAAM;IAI3C,iBAAiB,CACf,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,gBAAgB,GACpB,gBAAgB,CAAC,CAAC,CAAC;CAWvB"}

package/dist/schema/regexp.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RegexpSchema = void 0;
+const validation_1 = require("../validation");
+class RegexpSchema extends validation_1.Schema {
+    pattern;
+    constructor(pattern) {
+        super();
+        this.pattern = pattern;
+    }
+    validateInContext(input, ctx) {
+        if (typeof input !== 'string') {
+            return ctx.issueInvalidType(input, 'string');
+        }
+        if (!this.pattern.test(input)) {
+            return ctx.issueInvalidFormat(input, this.pattern.toString());
+        }
+        return ctx.success(input);
+    }
+}
+exports.RegexpSchema = RegexpSchema;
+//# sourceMappingURL=regexp.js.map

package/dist/schema/regexp.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"regexp.js","sourceRoot":"","sources":["../../src/schema/regexp.ts"],"names":[],"mappings":";;;AAAA,8CAA0E;AAE1E,MAAa,YAA+B,SAAQ,mBAAS;IAC/B;IAA5B,YAA4B,OAAe;QACzC,KAAK,EAAE,CAAA;QADmB,YAAO,GAAP,OAAO,CAAQ;IAE3C,CAAC;IAED,iBAAiB,CACf,KAAc,EACd,GAAqB;QAErB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QAC9C,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9B,OAAO,GAAG,CAAC,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC/D,CAAC;QAED,OAAO,GAAG,CAAC,OAAO,CAAC,KAAU,CAAC,CAAA;IAChC,CAAC;CACF;AAnBD,oCAmBC","sourcesContent":["import { Schema, ValidationResult, ValidatorContext } from '../validation'\n\nexport class RegexpSchema<T extends string> extends Schema<T> {\n  constructor(public readonly pattern: RegExp) {\n    super()\n  }\n\n  validateInContext(\n    input: unknown,\n    ctx: ValidatorContext,\n  ): ValidationResult<T> {\n    if (typeof input !== 'string') {\n      return ctx.issueInvalidType(input, 'string')\n    }\n\n    if (!this.pattern.test(input)) {\n      return ctx.issueInvalidFormat(input, this.pattern.toString())\n    }\n\n    return ctx.success(input as T)\n  }\n}\n"]}