@amazon/vinyl-validation 1.2.0 → 2.0.4

package/dist/types/current/validation/NumberSchema.js

@@ -23,7 +23,7 @@ export const numberValidators = {
      * @param min The minimum (inclusive) the value may be.
      */
     gte(min) {
-        return createValidator(substitute(locale.gte, { value: min }), (input) => input >= min);
+        return createValidator(substitute(locale.gte, { value: min }), (input) => input >= min, undefined, { minimum: min });
     },
     /**
      * Creates a validator that asserts that the input number is greater than the provided minimum
@@ -32,7 +32,7 @@ export const numberValidators = {
      * @param min The minimum (exclusive) the value may be.
      */
     gt(min) {
-        return createValidator(substitute(locale.gt, { value: min }), (input) => input > min);
+        return createValidator(substitute(locale.gt, { value: min }), (input) => input > min, undefined, { exclusiveMinimum: min });
     },
     /**
      * Creates a validator that asserts that the input number is at most the provided maximum
@@ -41,7 +41,7 @@ export const numberValidators = {
      * @param max The maximum (inclusive) the value may be.
      */
     lte(max) {
-        return createValidator(substitute(locale.lte, { value: max }), (input) => input <= max);
+        return createValidator(substitute(locale.lte, { value: max }), (input) => input <= max, undefined, { maximum: max });
     },
     /**
      * Creates a validator that asserts that the input number is less than the provided maximum
@@ -50,7 +50,7 @@ export const numberValidators = {
      * @param max The maximum (exclusive) the value may be.
      */
     lt(max) {
-        return createValidator(substitute(locale.lt, { value: max }), (input) => input < max);
+        return createValidator(substitute(locale.lt, { value: max }), (input) => input < max, undefined, { exclusiveMaximum: max });
     },
     /**
      * Creates a validator that asserts that the input number is at least the provided minimum
@@ -60,7 +60,7 @@ export const numberValidators = {
      * @param max The maximum (inclusive) value the input may be.
      */
     within(min, max) {
-        return createValidator(substitute(locale.within, { min, max }), (input) => input >= min && input <= max);
+        return createValidator(substitute(locale.within, { min, max }), (input) => input >= min && input <= max, undefined, { minimum: min, maximum: max });
     },
     /**
      * Creates a validator that asserts that the input number is finite.
@@ -72,7 +72,7 @@ export const numberValidators = {
      * Creates a validator that asserts that the input number is a safe integer.
      */
     safeInteger() {
-        return createValidator(locale.safeInteger, (input) => Number.isSafeInteger(input));
+        return createValidator(locale.safeInteger, (input) => Number.isSafeInteger(input), undefined, { type: 'integer' });
     },
 };
 export class NumberSchema extends ValueSchema {

package/dist/types/current/validation/ObjectSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ObjectSchema.d.ts","sourceRoot":"","sources":["../../../../src/validation/ObjectSchema.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACR,SAAS,EACT,kBAAkB,EAClB,WAAW,EACd,MAAM,oBAAoB,CAAA;AAE3B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAElE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAI3C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAC5D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAa/C,eAAO,MAAM,gBAAgB;IACzB;;;;;OAKG;0BACQ,CAAC,SAAS,MAAM,sBAAsB,EAC7C,QAAQ,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,iBAAiB,CACxC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EACd;QAAE,QAAQ,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;KAAE,CACzC,GACJ,KAAG,oBAAoB,CAAC,CAAC,EAAE,MAAM,CAAC;CAyE7B,CAAA;AAEV;;GAEG;AACH,qBAAa,YAAY,CAAC,CAAC,SAAS,MAAM,CACtC,SAAQ,WAAW,CAAC,CAAC,CACrB,YAAW,oBAAoB,CAAC,CAAC,EAAE,OAAO,CAAC;IAE3C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAuC;IAE3D;;OAEG;IACH,MAAM,KAAK,IAAI,IAAI,YAAY,CAAC,SAAS,CAAC,CAIzC;IAED;;;;;OAKG;IACH,MAAM,CAAC,CAAC,SAAS,MAAM,EACnB,kBAAkB,EAAE,OAAO,CAAC,0BAA0B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAC9D,YAAY,CAAC,CAAC,CAAC;IAIlB;;OAEG;IACH,OAAO,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAInC;;OAEG;IACH,WAAW,IAAI,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAI3C;;OAEG;IACH,IAAI,CAAC,CAAC,SAAS,MAAM,KAAK,YAAY,CAAC,CAAC,CAAC;CAG5C;AAED,MAAM,MAAM,0BAA0B,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,IAAI;KAIxE,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,GAC5B,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,GAC1B,KAAK,GACL,CAAC,GACL,CAAC,CAAC,CAAC,GAAG,yBAAyB,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;CAClD,GAAG;KAGC,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,GAC5B,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,GAC1B,CAAC,GACD,KAAK,GACT,KAAK,CAAC,CAAC,EAAE,yBAAyB,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;CACrD,CAAA;AAED,MAAM,MAAM,yBAAyB,CACjC,CAAC,SAAS,MAAM,EAChB,CAAC,SAAS,MAAM,CAAC,IACjB,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;IAAE,QAAQ,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;CAAE,CAAC,CAAA"}
+{"version":3,"file":"ObjectSchema.d.ts","sourceRoot":"","sources":["../../../../src/validation/ObjectSchema.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACR,SAAS,EACT,kBAAkB,EAClB,WAAW,EACd,MAAM,oBAAoB,CAAA;AAE3B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAElE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAI3C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAC5D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAe/C,eAAO,MAAM,gBAAgB;IACzB;;;;;OAKG;0BACQ,CAAC,SAAS,MAAM,sBAAsB,EAC7C,QAAQ,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,iBAAiB,CACxC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EACd;QAAE,QAAQ,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;KAAE,CACzC,GACJ,KAAG,oBAAoB,CAAC,CAAC,EAAE,MAAM,CAAC;CAmF7B,CAAA;AAEV;;GAEG;AACH,qBAAa,YAAY,CAAC,CAAC,SAAS,MAAM,CACtC,SAAQ,WAAW,CAAC,CAAC,CACrB,YAAW,oBAAoB,CAAC,CAAC,EAAE,OAAO,CAAC;IAE3C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAuC;IAE3D;;OAEG;IACH,MAAM,KAAK,IAAI,IAAI,YAAY,CAAC,SAAS,CAAC,CAIzC;IAED;;;;;OAKG;IACH,MAAM,CAAC,CAAC,SAAS,MAAM,EACnB,kBAAkB,EAAE,OAAO,CAAC,0BAA0B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAC9D,YAAY,CAAC,CAAC,CAAC;IAIlB;;OAEG;IACH,OAAO,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAInC;;OAEG;IACH,WAAW,IAAI,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAI3C;;OAEG;IACH,IAAI,CAAC,CAAC,SAAS,MAAM,KAAK,YAAY,CAAC,CAAC,CAAC;CAG5C;AAED,MAAM,MAAM,0BAA0B,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,IAAI;KAIxE,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,GAC5B,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,GAC1B,KAAK,GACL,CAAC,GACL,CAAC,CAAC,CAAC,GAAG,yBAAyB,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;CAClD,GAAG;KAGC,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,GAC5B,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,GAC1B,CAAC,GACD,KAAK,GACT,KAAK,CAAC,CAAC,EAAE,yBAAyB,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;CACrD,CAAA;AAED,MAAM,MAAM,yBAAyB,CACjC,CAAC,SAAS,MAAM,EAChB,CAAC,SAAS,MAAM,CAAC,IACjB,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;IAAE,QAAQ,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;CAAE,CAAC,CAAA"}

package/dist/types/current/validation/ObjectSchema.js

@@ -7,6 +7,7 @@ import { maybeToDeepPartial, maybeToPartial } from './ValidatorWithPartial';
 import { ValueSchema } from './ValueSchema';
 import { typeOfValidators } from './typeOfValidators';
 import { createDeepValidator } from './Validator';
+import { toJsonSchema } from './JsonSchema';
 /**
  * @private
  */
@@ -27,12 +28,17 @@ export const objectValidators = {
     properties(propertyValidators) {
         const propertiesDescriptions = [];
         const keys = ownKeys(propertyValidators);
+        const jsonProperties = {};
+        const requiredKeys = [];
         for (const key of keys) {
             const validator = propertyValidators[key];
             propertiesDescriptions.push(substitute(locale.prop, {
                 key: String(key) + (validator.options.optional ? '?' : ''),
                 value: validator.description,
             }));
+            jsonProperties[String(key)] = toJsonSchema(validator);
+            if (!validator.options.optional)
+                requiredKeys.push(String(key));
         }
         const description = substitute(locale.extend, {
             body: propertiesDescriptions
@@ -41,6 +47,11 @@ export const objectValidators = {
                 .map((line) => locale.indent + line)
                 .join('\n'),
         });
+        const jsonSchema = {
+            type: 'object',
+            properties: jsonProperties,
+            ...(requiredKeys.length ? { required: requiredKeys } : {}),
+        };
         const validator = createDeepValidator(description, (input, options, path) => {
             const errors = [];
             for (const key of keys) {
@@ -62,7 +73,7 @@ export const objectValidators = {
                     return errors;
             }
             return errors;
-        });
+        }, jsonSchema);
         return merge(validator, {
             partial() {
                 const optionalPropertyValidators = {};

package/dist/types/current/validation/RecordSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RecordSchema.d.ts","sourceRoot":"","sources":["../../../../src/validation/RecordSchema.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAG3C,OAAO,KAAK,EAA0B,SAAS,EAAE,MAAM,aAAa,CAAA;AAUpE,eAAO,MAAM,gBAAgB;IACzB;;;;;;;;;;OAUG;sBACI,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,CAAC,gBACjB,SAAS,CAAC,CAAC,CAAC,kBACV,SAAS,CAAC,CAAC,CAAC,KAC7B,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC;CAgC5B,CAAA;AAEV;;GAEG;AACH,qBAAa,YAAY,CACrB,CAAC,SAAS,cAAc,CAAC,MAAM,GAAG,EAAE,GAAG,CAAC,CAC1C,SAAQ,WAAW,CAAC,CAAC,CAAC;IACpB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAwD;IAE5E;;OAEG;IACH,MAAM,KAAK,IAAI,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,EAAE,OAAO,CAAC,CAAC,CAI1D;IAED,OAAO,CAAC,MAAM,KAAK,mBAAmB,GAErC;IAED;;;;;;;;;;OAUG;IACH,MAAM,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,CAAC,EAC/B,YAAY,EAAE,SAAS,CAAC,CAAC,CAAC,EAC1B,cAAc,EAAE,SAAS,CAAC,CAAC,CAAC,GAC7B,YAAY,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAIrC;;;;;;;OAOG;IACH,YAAY,CAAC,CAAC,EACV,cAAc,EAAE,SAAS,CAAC,CAAC,CAAC,GAC7B,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAIlC;;OAEG;IACH,QAAQ,IAAI,YAAY,CACpB,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,KAAK,CACpE;IAID;;OAEG;IACH,IAAI,CAAC,CAAC,SAAS,cAAc,CAAC,MAAM,GAAG,EAAE,OAAO,CAAC,KAAK,YAAY,CAAC,CAAC,CAAC;CAGxE"}
+{"version":3,"file":"RecordSchema.d.ts","sourceRoot":"","sources":["../../../../src/validation/RecordSchema.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAG3C,OAAO,KAAK,EAA0B,SAAS,EAAE,MAAM,aAAa,CAAA;AAWpE,eAAO,MAAM,gBAAgB;IACzB;;;;;;;;;;OAUG;sBACI,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,CAAC,gBACjB,SAAS,CAAC,CAAC,CAAC,kBACV,SAAS,CAAC,CAAC,CAAC,KAC7B,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC;CAoC5B,CAAA;AAEV;;GAEG;AACH,qBAAa,YAAY,CACrB,CAAC,SAAS,cAAc,CAAC,MAAM,GAAG,EAAE,GAAG,CAAC,CAC1C,SAAQ,WAAW,CAAC,CAAC,CAAC;IACpB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAwD;IAE5E;;OAEG;IACH,MAAM,KAAK,IAAI,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,EAAE,OAAO,CAAC,CAAC,CAI1D;IAED,OAAO,CAAC,MAAM,KAAK,mBAAmB,GAErC;IAED;;;;;;;;;;OAUG;IACH,MAAM,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,CAAC,EAC/B,YAAY,EAAE,SAAS,CAAC,CAAC,CAAC,EAC1B,cAAc,EAAE,SAAS,CAAC,CAAC,CAAC,GAC7B,YAAY,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAIrC;;;;;;;OAOG;IACH,YAAY,CAAC,CAAC,EACV,cAAc,EAAE,SAAS,CAAC,CAAC,CAAC,GAC7B,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAIlC;;OAEG;IACH,QAAQ,IAAI,YAAY,CACpB,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,KAAK,CACpE;IAID;;OAEG;IACH,IAAI,CAAC,CAAC,SAAS,cAAc,CAAC,MAAM,GAAG,EAAE,OAAO,CAAC,KAAK,YAAY,CAAC,CAAC,CAAC;CAGxE"}

package/dist/types/current/validation/RecordSchema.js

@@ -7,6 +7,7 @@ import { ValueSchema } from './ValueSchema';
 import { StringSchema } from './StringSchema';
 import { typeOfValidators } from './typeOfValidators';
 import { createDeepValidator } from './Validator';
+import { toJsonSchema } from './JsonSchema';
 /**
  * @private
  */
@@ -42,6 +43,9 @@ export const recordValidators = {
                     return errors;
             }
             return errors;
+        }, {
+            type: 'object',
+            additionalProperties: toJsonSchema(valueValidator),
         });
     },
 };

package/dist/types/current/validation/SchemaBase.d.ts

@@ -1,5 +1,6 @@
 import type { ValidationErrorMessage, ValidationOptions, Validator } from './Validator';
 import type { PropertyValidator, PropertyValidatorWithOptions } from './PropertyValidator';
+import type { JsonSchema, JsonSchemaProvider } from './JsonSchema';
 /**
  * A base class for validation state.
  * Provides methods for chaining.
@@ -8,13 +9,14 @@ import type { PropertyValidator, PropertyValidatorWithOptions } from './Property
  */
 export declare abstract class SchemaBase<T> implements PropertyValidator<T, {
     readonly optional: false;
-}> {
+}>, JsonSchemaProvider {
     private readonly currentValidator;
     private readonly previousSchema?;
     private readonly operation?;
     __type: import("@amazon/vinyl-util").Invariant<T>;
     private readonly validator;
     private _options;
+    private _jsonSchemaDescription?;
     get options(): {
         readonly optional: false;
     };
@@ -33,6 +35,26 @@ export declare abstract class SchemaBase<T> implements PropertyValidator<T, {
      */
     constructor(currentValidator: Validator<any, any>, previousSchema: SchemaBase<any>, operation: (validatorA: Validator<any>, validatorB: Validator<any, any>) => Validator<T>);
     get description(): string;
+    /**
+     * The composed JSON Schema fragment for this schema, including any {@link describe} description.
+     * Composes through chaining the same way {@link description} does; serialize a complete
+     * definition with {@link toJsonSchema}.
+     */
+    get jsonSchema(): JsonSchema | undefined;
+    /**
+     * Attaches a human-readable description to this schema, akin to zod's `describe`.
+     * The description is metadata only; it does not affect validation, and surfaces in the output
+     * of {@link toJsonSchema}.
+     *
+     * @param description The description to attach.
+     * @return A clone of this schema carrying the description.
+     */
+    describe(description: string): this;
+    /**
+     * Serializes this schema to a JSON Schema definition, suitable for describing the shape to an
+     * LLM or other consumer. Works similarly to zod-to-json-schema.
+     */
+    toJsonSchema(): JsonSchema;
     readonly assert: (input: unknown, origin?: string, path?: readonly string[]) => asserts input is T;
     readonly isValid: (input: unknown) => input is T;
     readonly validate: (input: unknown, options?: ValidationOptions, path?: readonly string[]) => readonly ValidationErrorMessage[];

package/dist/types/current/validation/SchemaBase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaBase.d.ts","sourceRoot":"","sources":["../../../../src/validation/SchemaBase.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACR,sBAAsB,EACtB,iBAAiB,EACjB,SAAS,EACZ,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,EACR,iBAAiB,EAEjB,4BAA4B,EAC/B,MAAM,qBAAqB,CAAA;AAM5B;;;;;GAKG;AACH,8BAAsB,UAAU,CAAC,CAAC,CAAE,YAAW,iBAAiB,CAC5D,CAAC,EACD;IAAE,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAA;CAAE,CAC/B;IAkCO,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAChC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;IAnC/B,MAAM,4CAAiB;IAEvB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAc;IACxC,OAAO,CAAC,QAAQ,CAA4B;IAE5C,IAAI,OAAO;;MAEV;IAED;;;;OAIG;gBACS,gBAAgB,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEjD;;;;;;OAMG;gBAEC,gBAAgB,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,EACrC,cAAc,EAAE,UAAU,CAAC,GAAG,CAAC,EAC/B,SAAS,EAAE,CACP,UAAU,EAAE,SAAS,CAAC,GAAG,CAAC,EAC1B,UAAU,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,KAC9B,SAAS,CAAC,CAAC,CAAC;IAmBrB,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,QAAQ,CAAC,MAAM,EAAE,CACb,KAAK,EAAE,OAAO,EACd,MAAM,CAAC,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,KACvB,OAAO,CAAC,KAAK,IAAI,CAAC,CAEtB;IAED,QAAQ,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,KAAK,IAAI,CAAC,CAEF;IAE9C,QAAQ,CAAC,QAAQ,GACb,OAAO,OAAO,EACd,UAAU,iBAAiB,EAC3B,OAAO,SAAS,MAAM,EAAE,KACzB,SAAS,sBAAsB,EAAE,CACa;IAEjD;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,CACX,SAAS,GAAE,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC,GAAG,CAAY,GACpE,GAAG;IAYN,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,GAAG;IAEjD,SAAS,CAAC,IAAI,CACV,gBAAgB,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,EACrC,cAAc,EAAE,UAAU,CAAC,GAAG,CAAC,GAAG,SAAS,EAC3C,SAAS,EACH,CAAC,CACG,UAAU,EAAE,SAAS,CAAC,GAAG,CAAC,EAC1B,UAAU,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,KAC9B,SAAS,CAAC,CAAC,CAAC,CAAC,GAClB,SAAS,GAChB,GAAG;IAkBN;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,CAAC,aAAa,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,GAAG;IAIxD,QAAQ,IAAI,4BAA4B,CACpC,IAAI,EACJ,CAAC,EACD;QAAE,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAA;KAAE,CAC9B;IASD,QAAQ,IAAI,4BAA4B,CACpC,IAAI,EACJ,CAAC,EACD;QAAE,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAA;KAAE,CAC/B;CAQJ"}
+{"version":3,"file":"SchemaBase.d.ts","sourceRoot":"","sources":["../../../../src/validation/SchemaBase.ts"],"names":[],"mappings":"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"}

package/dist/types/current/validation/SchemaBase.js

@@ -4,6 +4,7 @@
  */
 import { IllegalArgumentError, invariant } from '@amazon/vinyl-util';
 import { andValidators } from './andValidators';
+import { mergeJsonSchema } from './JsonSchema';
 const requiredValidationOptions = {
     optional: false,
 };
@@ -20,6 +21,7 @@ export class SchemaBase {
     __type = invariant();
     validator;
     _options = requiredValidationOptions;
+    _jsonSchemaDescription;
     get options() {
         return this._options;
     }
@@ -35,6 +37,39 @@ export class SchemaBase {
     get description() {
         return this.validator.description;
     }
+    /**
+     * The composed JSON Schema fragment for this schema, including any {@link describe} description.
+     * Composes through chaining the same way {@link description} does; serialize a complete
+     * definition with {@link toJsonSchema}.
+     */
+    get jsonSchema() {
+        const base = this.validator.jsonSchema;
+        if (this._jsonSchemaDescription == null)
+            return base;
+        return mergeJsonSchema(base, {
+            description: this._jsonSchemaDescription,
+        });
+    }
+    /**
+     * Attaches a human-readable description to this schema, akin to zod's `describe`.
+     * The description is metadata only; it does not affect validation, and surfaces in the output
+     * of {@link toJsonSchema}.
+     *
+     * @param description The description to attach.
+     * @return A clone of this schema carrying the description.
+     */
+    describe(description) {
+        const cloned = this.clone();
+        cloned._jsonSchemaDescription = description;
+        return cloned;
+    }
+    /**
+     * Serializes this schema to a JSON Schema definition, suitable for describing the shape to an
+     * LLM or other consumer. Works similarly to zod-to-json-schema.
+     */
+    toJsonSchema() {
+        return this.jsonSchema ?? {};
+    }
     assert = (input, origin, path) => {
         this.validator.assert(input, origin, path);
     };
@@ -52,6 +87,7 @@ export class SchemaBase {
             ? this.self(transform(this.currentValidator), this.previousSchema.clone(transform), this.operation)
             : this.self(transform(this.currentValidator));
         cloned._options = this._options;
+        cloned._jsonSchemaDescription = this._jsonSchemaDescription;
         return cloned;
     }
     self(current, previous, operation) {

package/dist/types/current/validation/SetSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SetSchema.d.ts","sourceRoot":"","sources":["../../../../src/validation/SetSchema.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAExD,OAAO,KAAK,EAA0B,SAAS,EAAE,MAAM,aAAa,CAAA;AAEpE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAU3C,eAAO,MAAM,aAAa;IACtB;;OAEG;0BACM,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAOhC;;;;OAIG;4BACU,CAAC,oBACQ,SAAS,CAAC,CAAC,CAAC,KAC/B,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;CAuBpC,CAAA;AAEV,qBAAa,SAAS,CAAC,CAAC,SAAS,WAAW,CAAC,OAAO,CAAC,CAAE,SAAQ,WAAW,CAAC,CAAC,CAAC;IACzE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAuC;IAE3D;;OAEG;IACH,MAAM,KAAK,IAAI,IAAI,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAIzC;IAED;;;;OAIG;IACH,YAAY,CAAC,CAAC,EACV,gBAAgB,EAAE,SAAS,CAAC,CAAC,CAAC,GAC/B,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAIxC;;;OAGG;IACH,QAAQ,IAAI,SAAS,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;IAIrD;;OAEG;IACH,IAAI,CAAC,CAAC,SAAS,WAAW,CAAC,OAAO,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC;CAGvD"}
+{"version":3,"file":"SetSchema.d.ts","sourceRoot":"","sources":["../../../../src/validation/SetSchema.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAExD,OAAO,KAAK,EAA0B,SAAS,EAAE,MAAM,aAAa,CAAA;AAEpE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAW3C,eAAO,MAAM,aAAa;IACtB;;OAEG;0BACM,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAShC;;;;OAIG;4BACU,CAAC,oBACQ,SAAS,CAAC,CAAC,CAAC,KAC/B,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;CA4BpC,CAAA;AAEV,qBAAa,SAAS,CAAC,CAAC,SAAS,WAAW,CAAC,OAAO,CAAC,CAAE,SAAQ,WAAW,CAAC,CAAC,CAAC;IACzE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAuC;IAE3D;;OAEG;IACH,MAAM,KAAK,IAAI,IAAI,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAIzC;IAED;;;;OAIG;IACH,YAAY,CAAC,CAAC,EACV,gBAAgB,EAAE,SAAS,CAAC,CAAC,CAAC,GAC/B,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAIxC;;;OAGG;IACH,QAAQ,IAAI,SAAS,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;IAIrD;;OAEG;IACH,IAAI,CAAC,CAAC,SAAS,WAAW,CAAC,OAAO,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC;CAGvD"}

package/dist/types/current/validation/SetSchema.js

@@ -5,6 +5,7 @@
 import { substitute } from '@amazon/vinyl-util';
 import { createDeepValidator, createValidator } from './Validator';
 import { ValueSchema } from './ValueSchema';
+import { toJsonSchema } from './JsonSchema';
 /**
  * @private
  */
@@ -17,7 +18,7 @@ export const setValidators = {
      * Creates a validator that asserts that the input is a set.
      */
     isSet() {
-        return createValidator(locale.set, (input) => input instanceof Set);
+        return createValidator(locale.set, (input) => input instanceof Set, undefined, { type: 'array', uniqueItems: true });
     },
     /**
      * Creates a validator that asserts that every element passes the given validator.
@@ -37,6 +38,10 @@ export const setValidators = {
                 i++;
             }
             return errors;
+        }, {
+            type: 'array',
+            uniqueItems: true,
+            items: toJsonSchema(elementValidator),
         });
     },
 };

package/dist/types/current/validation/StringSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StringSchema.d.ts","sourceRoot":"","sources":["../../../../src/validation/StringSchema.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAc5C,eAAO,MAAM,gBAAgB;IACzB;;OAEG;6BACS,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAIrC;;;;;OAKG;8BACY,MAAM,KAAG,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAOjD;;;;;OAKG;8BACY,MAAM,KAAG,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAOjD;;;OAGG;iCACa,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAOzC;;;OAGG;8BACY,MAAM,KAAG,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;CAQ3C,CAAA;AAEV,qBAAa,YAAa,SAAQ,WAAW,CAAC,MAAM,CAAC;IACjD,OAAO,CAAC,MAAM,CAAC,KAAK,CAA4B;IAEhD;;OAEG;IACH,MAAM,KAAK,IAAI,IAAI,YAAY,CAI9B;IAED;;OAEG;IACH,QAAQ,IAAI,YAAY;IAIxB;;;;;OAKG;IACH,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY;IAIpC;;;;;OAKG;IACH,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY;IAIpC;;;OAGG;IACH,YAAY,IAAI,YAAY;IAI5B;;;OAGG;IACH,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY;CAGvC"}
+{"version":3,"file":"StringSchema.d.ts","sourceRoot":"","sources":["../../../../src/validation/StringSchema.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAc5C,eAAO,MAAM,gBAAgB;IACzB;;OAEG;6BACS,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IASrC;;;;;OAKG;8BACY,MAAM,KAAG,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IASjD;;;;;OAKG;8BACY,MAAM,KAAG,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IASjD;;;OAGG;iCACa,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAOzC;;;OAGG;8BACY,MAAM,KAAG,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;CAU3C,CAAA;AAEV,qBAAa,YAAa,SAAQ,WAAW,CAAC,MAAM,CAAC;IACjD,OAAO,CAAC,MAAM,CAAC,KAAK,CAA4B;IAEhD;;OAEG;IACH,MAAM,KAAK,IAAI,IAAI,YAAY,CAI9B;IAED;;OAEG;IACH,QAAQ,IAAI,YAAY;IAIxB;;;;;OAKG;IACH,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY;IAIpC;;;;;OAKG;IACH,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY;IAIpC;;;OAGG;IACH,YAAY,IAAI,YAAY;IAI5B;;;OAGG;IACH,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY;CAGvC"}

package/dist/types/current/validation/StringSchema.js

@@ -21,7 +21,7 @@ export const stringValidators = {
      * Creates a validator that asserts that the input is not empty.
      */
     notEmpty() {
-        return createValidator(locale.notEmpty, (input) => input !== '');
+        return createValidator(locale.notEmpty, (input) => input !== '', undefined, { minLength: 1 });
     },
     /**
      * Creates a validator that asserts that the input string has at least the given minimum
@@ -30,7 +30,7 @@ export const stringValidators = {
      * @param min The string must be at least this length.
      */
     minLength(min) {
-        return createValidator(substitute(locale.minLength, { value: min }), (input) => input.length >= min);
+        return createValidator(substitute(locale.minLength, { value: min }), (input) => input.length >= min, undefined, { minLength: min });
     },
     /**
      * Creates a validator that asserts that the input string has at most the given maximum
@@ -39,7 +39,7 @@ export const stringValidators = {
      * @param max The string must be at most this length.
      */
     maxLength(max) {
-        return createValidator(substitute(locale.maxLength, { value: max }), (input) => input.length <= max);
+        return createValidator(substitute(locale.maxLength, { value: max }), (input) => input.length <= max, undefined, { maxLength: max });
     },
     /**
      * Creates a validator that asserts that the input string has no whitespace characters.
@@ -55,7 +55,7 @@ export const stringValidators = {
     matches(regex) {
         return createValidator(substitute(locale.matches, { value: regex.toString() }), (input) => {
             return regex.test(input);
-        });
+        }, undefined, { pattern: regex.source });
     },
 };
 export class StringSchema extends ValueSchema {

package/dist/types/current/validation/Validator.d.ts

@@ -1,4 +1,5 @@
 import { type Invariant } from '@amazon/vinyl-util';
+import type { JsonSchema } from './JsonSchema';
 /**
  * Represents a validation failure.
  */
@@ -27,6 +28,15 @@ export interface Validator<Output extends Input, in Input = unknown> {
      * A short description of the validator.
      */
     readonly description: string;
+    /**
+     * The JSON Schema fragment this validator contributes, if any.
+     *
+     * Fragments compose the same way the {@link description} does: chaining validators with `and`
+     * merges their fragments, and `or` unions them into an `anyOf`. Serialize a full schema with
+     * {@link toJsonSchema}. A validator with no meaningful shape (for example a bare type check)
+     * may omit this.
+     */
+    readonly jsonSchema?: JsonSchema | undefined;
     /**
      * Returns true if the input is valid according to this validator.
      *
@@ -74,8 +84,9 @@ export declare function createValidationExpectationMessage<Input>(expectationMes
  * @param isValid Returns true if the given input is valid.
  * @param inputStringify Stringifies the input for use as the actual `{actual}` token in the validation
  * expectation template. Default is `stringifyForPrint` with a 500 character max length.
+ * @param jsonSchema The JSON Schema fragment this validator contributes, if any.
  */
-export declare function createValidator<Output extends Input, Input = unknown>(expectationMessage: string, isValid: (input: Input) => boolean, inputStringify?: (input: Input) => string): Validator<Output, Input>;
+export declare function createValidator<Output extends Input, Input = unknown>(expectationMessage: string, isValid: (input: Input) => boolean, inputStringify?: (input: Input) => string, jsonSchema?: JsonSchema): Validator<Output, Input>;
 /**
  * Creates a new deep validator.
  *
@@ -83,6 +94,7 @@ export declare function createValidator<Output extends Input, Input = unknown>(e
  *
  * @param description Describes the validator.
  * @param validate Returns an array of validation failures.
+ * @param jsonSchema The JSON Schema fragment this validator contributes, if any.
  */
-export declare function createDeepValidator<Output extends Input, Input = unknown>(description: string, validate: (input: Input, options: ValidationOptions, path: readonly string[]) => readonly ValidationErrorMessage[]): Validator<Output, Input>;
+export declare function createDeepValidator<Output extends Input, Input = unknown>(description: string, validate: (input: Input, options: ValidationOptions, path: readonly string[]) => readonly ValidationErrorMessage[], jsonSchema?: JsonSchema): Validator<Output, Input>;
 //# sourceMappingURL=Validator.d.ts.map

package/dist/types/current/validation/Validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../../../src/validation/Validator.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,SAAS,EAAmB,MAAM,oBAAoB,CAAA;AAGpE;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACnC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;CACnC;AAED,MAAM,WAAW,iBAAiB;IAC9B;;;OAGG;IACH,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,CAAA;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,SAAS,CAAC,MAAM,SAAS,KAAK,EAAE,EAAE,CAAC,KAAK,GAAG,OAAO;IAC/D;;;;OAIG;IACH,MAAM,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,CAAA;IAE1B;;OAEG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAE5B;;;;OAIG;IACH,QAAQ,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,KAAK,IAAI,MAAM,CAAA;IAEnD;;;;;;;;;OASG;IACH,QAAQ,CAAC,QAAQ,EAAE,CACf,KAAK,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,iBAAiB,EAC3B,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,KACvB,SAAS,sBAAsB,EAAE,CAAA;IAEtC;;;;;;;;OAQG;IACH,QAAQ,CAAC,MAAM,EAAE,CACb,KAAK,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,KACvB,OAAO,CAAC,KAAK,IAAI,MAAM,CAAA;CAC/B;AAgBD;;;;;;;GAOG;AACH,wBAAgB,kCAAkC,CAAC,KAAK,EACpD,kBAAkB,EAAE,MAAM,EAC1B,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,cAAc,GAAE,CAAC,KAAK,EAAE,KAAK,KAAK,MACD,GAClC,MAAM,CAMR;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,MAAM,SAAS,KAAK,EAAE,KAAK,GAAG,OAAO,EACjE,kBAAkB,EAAE,MAAM,EAC1B,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,EAClC,cAAc,GAAE,CAAC,KAAK,EAAE,KAAK,KAAK,MACD,GAClC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAgD1B;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,SAAS,KAAK,EAAE,KAAK,GAAG,OAAO,EACrE,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,CACN,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,iBAAiB,EAC1B,IAAI,EAAE,SAAS,MAAM,EAAE,KACtB,SAAS,sBAAsB,EAAE,GACvC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CA4B1B"}
+{"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../../../src/validation/Validator.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,SAAS,EAAmB,MAAM,oBAAoB,CAAA;AAEpE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAE9C;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACnC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;CACnC;AAED,MAAM,WAAW,iBAAiB;IAC9B;;;OAGG;IACH,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,CAAA;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,SAAS,CAAC,MAAM,SAAS,KAAK,EAAE,EAAE,CAAC,KAAK,GAAG,OAAO;IAC/D;;;;OAIG;IACH,MAAM,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,CAAA;IAE1B;;OAEG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAE5B;;;;;;;OAOG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,UAAU,GAAG,SAAS,CAAA;IAE5C;;;;OAIG;IACH,QAAQ,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,KAAK,IAAI,MAAM,CAAA;IAEnD;;;;;;;;;OASG;IACH,QAAQ,CAAC,QAAQ,EAAE,CACf,KAAK,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,iBAAiB,EAC3B,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,KACvB,SAAS,sBAAsB,EAAE,CAAA;IAEtC;;;;;;;;OAQG;IACH,QAAQ,CAAC,MAAM,EAAE,CACb,KAAK,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,KACvB,OAAO,CAAC,KAAK,IAAI,MAAM,CAAA;CAC/B;AAgBD;;;;;;;GAOG;AACH,wBAAgB,kCAAkC,CAAC,KAAK,EACpD,kBAAkB,EAAE,MAAM,EAC1B,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,cAAc,GAAE,CAAC,KAAK,EAAE,KAAK,KAAK,MACD,GAClC,MAAM,CAMR;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAAC,MAAM,SAAS,KAAK,EAAE,KAAK,GAAG,OAAO,EACjE,kBAAkB,EAAE,MAAM,EAC1B,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,EAClC,cAAc,GAAE,CAAC,KAAK,EAAE,KAAK,KAAK,MACD,EACjC,UAAU,CAAC,EAAE,UAAU,GACxB,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAiD1B;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,SAAS,KAAK,EAAE,KAAK,GAAG,OAAO,EACrE,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,CACN,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,iBAAiB,EAC1B,IAAI,EAAE,SAAS,MAAM,EAAE,KACtB,SAAS,sBAAsB,EAAE,EACtC,UAAU,CAAC,EAAE,UAAU,GACxB,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CA6B1B"}

package/dist/types/current/validation/Validator.js

@@ -42,10 +42,12 @@ export function createValidationExpectationMessage(expectationMessage, input, pa
  * @param isValid Returns true if the given input is valid.
  * @param inputStringify Stringifies the input for use as the actual `{actual}` token in the validation
  * expectation template. Default is `stringifyForPrint` with a 500 character max length.
+ * @param jsonSchema The JSON Schema fragment this validator contributes, if any.
  */
-export function createValidator(expectationMessage, isValid, inputStringify = (input) => stringifyForPrint(input, 500)) {
+export function createValidator(expectationMessage, isValid, inputStringify = (input) => stringifyForPrint(input, 500), jsonSchema) {
     return {
         description: expectationMessage,
+        jsonSchema,
         isValid(input) {
             return isValid(input);
         },
@@ -74,10 +76,12 @@ export function createValidator(expectationMessage, isValid, inputStringify = (i
  *
  * @param description Describes the validator.
  * @param validate Returns an array of validation failures.
+ * @param jsonSchema The JSON Schema fragment this validator contributes, if any.
  */
-export function createDeepValidator(description, validate) {
+export function createDeepValidator(description, validate, jsonSchema) {
     return {
         description,
+        jsonSchema,
         isValid(input) {
             return validate(input, { all: false }, []).length === 0;
         },

package/dist/types/current/validation/ValueSchema.d.ts

@@ -4,6 +4,7 @@ export declare const valueValidators: {
     readonly any: () => Validator<any>;
     /**
      * Creates a validator that asserts that the input is nullish.
+     * JSON Schema has no representation for `undefined`, so only `null` is expressed.
      */
     readonly nullish: () => Validator<null | undefined>;
     /**

package/dist/types/current/validation/ValueSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ValueSchema.d.ts","sourceRoot":"","sources":["../../../../src/validation/ValueSchema.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAS5C,eAAO,MAAM,eAAe;wBACjB,SAAS,CAAC,GAAG,CAAC;IAKrB;;OAEG;4BACQ,SAAS,CAAC,IAAI,GAAG,SAAS,CAAC;IAItC;;OAEG;yBACK,SAAS,CAAC,IAAI,CAAC;IAIvB;;OAEG;8BACU,SAAS,CAAC,SAAS,CAAC;CAG3B,CAAA;AAEV,qBAAa,WAAW,CAAC,CAAC,CAAE,SAAQ,UAAU,CAAC,CAAC,CAAC;IAC7C;;OAEG;IACH,KAAK,IAAI,WAAW,CAAC,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;IAI1C;;OAEG;IACH,MAAM,IAAI,WAAW,CAAC,CAAC,GAAG,IAAI,CAAC;IAI/B;;OAEG;IACH,WAAW,IAAI,WAAW,CAAC,CAAC,GAAG,SAAS,CAAC;IAIzC;;;;;;;OAOG;IACH,GAAG,CAAC,CAAC,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC;IAIvD;;;;;;;;;OASG;IACH,EAAE,CAAC,CAAC,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC;CAG9D"}
+{"version":3,"file":"ValueSchema.d.ts","sourceRoot":"","sources":["../../../../src/validation/ValueSchema.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAS5C,eAAO,MAAM,eAAe;wBACjB,SAAS,CAAC,GAAG,CAAC;IAKrB;;;OAGG;4BACQ,SAAS,CAAC,IAAI,GAAG,SAAS,CAAC;IAWtC;;OAEG;yBACK,SAAS,CAAC,IAAI,CAAC;IAWvB;;OAEG;8BACU,SAAS,CAAC,SAAS,CAAC;CAG3B,CAAA;AAEV,qBAAa,WAAW,CAAC,CAAC,CAAE,SAAQ,UAAU,CAAC,CAAC,CAAC;IAC7C;;OAEG;IACH,KAAK,IAAI,WAAW,CAAC,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;IAI1C;;OAEG;IACH,MAAM,IAAI,WAAW,CAAC,CAAC,GAAG,IAAI,CAAC;IAI/B;;OAEG;IACH,WAAW,IAAI,WAAW,CAAC,CAAC,GAAG,SAAS,CAAC;IAIzC;;;;;;;OAOG;IACH,GAAG,CAAC,CAAC,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC;IAIvD;;;;;;;;;OASG;IACH,EAAE,CAAC,CAAC,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC;CAG9D"}

package/dist/types/current/validation/ValueSchema.js

@@ -18,15 +18,20 @@ export const valueValidators = {
     },
     /**
      * Creates a validator that asserts that the input is nullish.
+     * JSON Schema has no representation for `undefined`, so only `null` is expressed.
      */
     nullish() {
-        return createValidator(locale.nullish, (input) => input == null);
+        return createValidator(locale.nullish, (input) => input == null, undefined, {
+            type: 'null',
+        });
     },
     /**
      * Creates a validator that asserts that the input is strictly null.
      */
     null() {
-        return createValidator(locale.null, (input) => input === null);
+        return createValidator(locale.null, (input) => input === null, undefined, {
+            type: 'null',
+        });
     },
     /**
      * Creates a validator that asserts that the input is strictly undefined.

package/dist/types/current/validation/andValidators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"andValidators.d.ts","sourceRoot":"","sources":["../../../../src/validation/andValidators.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAoC5C;;GAEG;AACH,wBAAgB,aAAa,CAAC,CAAC,SAAS,KAAK,EAAE,CAAC,EAAE,KAAK,EACnD,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,EAC/B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAC9B,SAAS,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAA;AAE1B;;GAEG;AACH,wBAAgB,aAAa,CAAC,CAAC,SAAS,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EACtD,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,EAC/B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAC9B,SAAS,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAA;AAE9B;;GAEG;AACH,wBAAgB,aAAa,CAAC,CAAC,SAAS,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EACzD,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,EAC/B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAC9B,SAAS,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAA;AAEhC;;GAEG;AACH,wBAAgB,aAAa,CAAC,CAAC,SAAS,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAC5D,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,EAC/B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAC9B,SAAS,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAA;AAEpC,wBAAgB,aAAa,CACzB,GAAG,UAAU,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GACrC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA"}
+{"version":3,"file":"andValidators.d.ts","sourceRoot":"","sources":["../../../../src/validation/andValidators.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAqC5C;;GAEG;AACH,wBAAgB,aAAa,CAAC,CAAC,SAAS,KAAK,EAAE,CAAC,EAAE,KAAK,EACnD,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,EAC/B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAC9B,SAAS,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAA;AAE1B;;GAEG;AACH,wBAAgB,aAAa,CAAC,CAAC,SAAS,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EACtD,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,EAC/B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAC9B,SAAS,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAA;AAE9B;;GAEG;AACH,wBAAgB,aAAa,CAAC,CAAC,SAAS,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EACzD,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,EAC/B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAC9B,SAAS,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAA;AAEhC;;GAEG;AACH,wBAAgB,aAAa,CAAC,CAAC,SAAS,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAC5D,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,EAC/B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAC9B,SAAS,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAA;AAEpC,wBAAgB,aAAa,CACzB,GAAG,UAAU,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GACrC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA"}

package/dist/types/current/validation/andValidators.js

@@ -4,6 +4,7 @@
  */
 import { substitute } from '@amazon/vinyl-util';
 import { createDeepValidator } from './Validator';
+import { mergeJsonSchema } from './JsonSchema';
 /*
  * @brief
  * andValidators will intersect an arbitrary number of validators.
@@ -44,5 +45,5 @@ export function andValidators(...validators) {
                 return errors;
         }
         return [];
-    });
+    }, mergeJsonSchema(...validators.map((v) => v.jsonSchema)));
 }

package/dist/types/current/validation/orValidators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orValidators.d.ts","sourceRoot":"","sources":["../../../../src/validation/orValidators.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAA0B,SAAS,EAAE,MAAM,aAAa,CAAA;AA+BpE;;GAEG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAC9B,SAAS,CAAC,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAA;AAExB;;GAEG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAChC,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAC9B,SAAS,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAA;AAE5B;;GAEG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EACnC,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAC9B,SAAS,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAA;AAEhC;;GAEG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EACtC,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAC9B,SAAS,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAA;AAEpC,wBAAgB,YAAY,CACxB,GAAG,UAAU,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GACrC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA"}
+{"version":3,"file":"orValidators.d.ts","sourceRoot":"","sources":["../../../../src/validation/orValidators.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAA0B,SAAS,EAAE,MAAM,aAAa,CAAA;AAkDpE;;GAEG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAC9B,SAAS,CAAC,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAA;AAExB;;GAEG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAChC,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAC9B,SAAS,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAA;AAE5B;;GAEG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EACnC,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAC9B,SAAS,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAA;AAEhC;;GAEG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EACtC,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7B,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAC9B,SAAS,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAA;AAEpC,wBAAgB,YAAY,CACxB,GAAG,UAAU,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GACrC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA"}

package/dist/types/current/validation/orValidators.js

@@ -26,6 +26,23 @@ const locale = {
      */
     separator: ' | ',
 };
+/**
+ * Composes the child validators' JSON Schema fragments into a union.
+ *
+ * Branches with no fragment are skipped: JSON Schema has no representation for `undefined`, and a
+ * value's optionality is instead conveyed by an object's `required` list. A single remaining branch
+ * collapses to that branch rather than a redundant `anyOf`.
+ */
+function unionJsonSchema(validators) {
+    const branches = validators
+        .map((v) => v.jsonSchema)
+        .filter((fragment) => fragment != null);
+    if (branches.length === 0)
+        return undefined;
+    if (branches.length === 1)
+        return branches[0];
+    return { anyOf: branches };
+}
 /**
  * Validates that one of the given validators pass.
  *
@@ -70,5 +87,5 @@ export function orValidators(...validators) {
                     path,
                 },
             ];
-    });
+    }, unionJsonSchema(validators));
 }

package/dist/types/current/validation/typeOfValidators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typeOfValidators.d.ts","sourceRoot":"","sources":["../../../../src/validation/typeOfValidators.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAyC5C;;;;GAIG;AACH,eAAO,MAAM,gBAAgB;;;;;;;CAmBnB,CAAA"}
+{"version":3,"file":"typeOfValidators.d.ts","sourceRoot":"","sources":["../../../../src/validation/typeOfValidators.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AA0D5C;;;;GAIG;AACH,eAAO,MAAM,gBAAgB;;;;;;;CAmBnB,CAAA"}

package/dist/types/current/validation/typeOfValidators.js

@@ -10,6 +10,16 @@ import { createValidator } from './Validator';
 const locale = {
     template: 'type {value}',
 };
+/**
+ * The JSON Schema `type` for each JavaScript `typeof` value that has a JSON representation.
+ * Types with no JSON equivalent (`function`, `symbol`) are absent and contribute no fragment.
+ */
+const jsonSchemaTypeByTypeof = {
+    string: 'string',
+    number: 'number',
+    boolean: 'boolean',
+    object: 'object',
+};
 /**
  * Creates a validator that validates that the input is not nullish and its `typeof` matches the
  * expected value.
@@ -20,9 +30,11 @@ const locale = {
  * @param expected
  */
 function typeOfValidator(expected) {
+    const jsonType = jsonSchemaTypeByTypeof[expected];
+    const jsonSchema = jsonType == null ? undefined : { type: jsonType };
     return createValidator(substitute(locale.template, { value: expected }), (input) => {
         return input != null && typeof input === expected;
-    });
+    }, undefined, jsonSchema);
 }
 const typeOfValidatorCache = {};
 function cachedTypeOfValidator(type) {

package/dist/types/current/validation/validators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validators.d.ts","sourceRoot":"","sources":["../../../../src/validation/validators.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validators.d.ts","sourceRoot":"","sources":["../../../../src/validation/validators.ts"],"names":[],"mappings":"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"}

package/dist/types/current/validation/validators.js

@@ -60,7 +60,7 @@ export function instanceOf(clazz) {
 export function isOneOf(...possibleValues) {
     return new ValueSchema(createValidator(substitute(locale.isOneOf, {
         value: possibleValues.join(locale.oneOfSeparator),
-    }), (input) => possibleValues.includes(input)));
+    }), (input) => possibleValues.includes(input), undefined, { enum: [...possibleValues] }));
 }
 /**
  * Creates a validator that asserts that the input is one of the values of the given enum.

package/dist/types/ts3.7/index.d.ts

@@ -1,18 +1,19 @@
 /** Auto-generated from build scripts */
-export * from './validation/validators';
-export * from './validation/typeOfValidators';
-export * from './validation/orValidators';
 export * from './validation/andValidators';
-export * from './validation/ValueSchema';
-export * from './validation/ValidatorWithPartial';
-export * from './validation/Validator';
-export * from './validation/StringSchema';
-export * from './validation/SetSchema';
-export * from './validation/SchemaBase';
-export * from './validation/RecordSchema';
-export * from './validation/PropertyValidator';
-export * from './validation/ObjectSchema';
-export * from './validation/NumberSchema';
-export * from './validation/FunctionSchema';
 export * from './validation/ArraySchema';
+export * from './validation/FunctionSchema';
+export * from './validation/JsonSchema';
+export * from './validation/NumberSchema';
+export * from './validation/ObjectSchema';
+export * from './validation/orValidators';
+export * from './validation/PropertyValidator';
+export * from './validation/RecordSchema';
+export * from './validation/SchemaBase';
+export * from './validation/SetSchema';
+export * from './validation/StringSchema';
+export * from './validation/typeOfValidators';
+export * from './validation/Validator';
+export * from './validation/validators';
+export * from './validation/ValidatorWithPartial';
+export * from './validation/ValueSchema';
 //# sourceMappingURL=index.d.ts.map