@naturalcycles/nodejs-lib 15.46.2 → 15.47.0

package/dist/validation/ajv/getAjv.js

@@ -233,17 +233,67 @@ export function createAjv(opt) {
         type: 'string',
         modifying: false,
         errors: true,
-        schemaType: 'boolean',
-        validate: function validate(_opt, data, _schema, ctx) {
+        schemaType: 'object',
+        validate: function validate(opt, data, _schema, ctx) {
+            const hasOptions = Object.keys(opt).length > 0;
             const isValid = isIsoDateValid(data);
-            if (isValid)
+            if (!isValid) {
+                ;
+                validate.errors = [
+                    {
+                        instancePath: ctx?.instancePath ?? '',
+                        message: `is an invalid IsoDate`,
+                    },
+                ];
+                return false;
+            }
+            if (!hasOptions)
                 return true;
-            validate.errors = [
-                {
-                    instancePath: ctx?.instancePath ?? '',
-                    message: `is an invalid IsoDate`,
-                },
-            ];
+            const { before, sameOrBefore, after, sameOrAfter } = opt;
+            const errors = [];
+            if (before) {
+                const isParamValid = isIsoDateValid(before);
+                const isRuleValid = isParamValid && before > data;
+                if (!isRuleValid) {
+                    errors.push({
+                        instancePath: ctx?.instancePath ?? '',
+                        message: `is not before ${before}`,
+                    });
+                }
+            }
+            if (sameOrBefore) {
+                const isParamValid = isIsoDateValid(sameOrBefore);
+                const isRuleValid = isParamValid && sameOrBefore >= data;
+                if (!isRuleValid) {
+                    errors.push({
+                        instancePath: ctx?.instancePath ?? '',
+                        message: `is not the same or before ${sameOrBefore}`,
+                    });
+                }
+            }
+            if (after) {
+                const isParamValid = isIsoDateValid(after);
+                const isRuleValid = isParamValid && after < data;
+                if (!isRuleValid) {
+                    errors.push({
+                        instancePath: ctx?.instancePath ?? '',
+                        message: `is not after ${after}`,
+                    });
+                }
+            }
+            if (sameOrAfter) {
+                const isParamValid = isIsoDateValid(sameOrAfter);
+                const isRuleValid = isParamValid && sameOrAfter <= data;
+                if (!isRuleValid) {
+                    errors.push({
+                        instancePath: ctx?.instancePath ?? '',
+                        message: `is not the same or after ${sameOrAfter}`,
+                    });
+                }
+            }
+            if (errors.length === 0)
+                return true;
+            validate.errors = errors;
             return false;
         },
     });

package/dist/validation/ajv/jsonSchemaBuilder.d.ts

@@ -75,7 +75,13 @@ export declare class JsonSchemaStringBuilder<IN extends string = string, OUT = I
     toUpperCase(): this;
     truncate(toLength: number): this;
     branded<B extends string>(): JsonSchemaStringBuilder<B, B, Opt>;
-    isoDate(): JsonSchemaStringBuilder<IsoDate | IN, IsoDate, Opt>;
+    /**
+     * Validates that the input is a fully-specified YYYY-MM-DD formatted valid IsoDate value.
+     *
+     * All previous expectations in the schema chain are dropped - including `.optional()` -
+     * because this call effectively starts a new schema chain.
+     */
+    isoDate(): JsonSchemaIsoDateBuilder;
     isoDateTime(): JsonSchemaStringBuilder<IsoDateTime | IN, IsoDateTime, Opt>;
     /**
      * Validates the string format to be JWT.
@@ -102,6 +108,20 @@ export declare class JsonSchemaStringBuilder<IN extends string = string, OUT = I
 export interface JsonSchemaStringEmailOptions {
     checkTLD: boolean;
 }
+export declare class JsonSchemaIsoDateBuilder<Opt extends boolean = false> extends JsonSchemaAnyBuilder<string | IsoDate, IsoDate, Opt> {
+    constructor();
+    before(date: string): this;
+    sameOrBefore(date: string): this;
+    after(date: string): this;
+    sameOrAfter(date: string): this;
+    between(fromDate: string, toDate: string, incl: Inclusiveness): this;
+}
+export interface JsonSchemaIsoDateOptions {
+    before?: string;
+    sameOrBefore?: string;
+    after?: string;
+    sameOrAfter?: string;
+}
 export declare class JsonSchemaNumberBuilder<IN extends number = number, OUT = IN, Opt extends boolean = false> extends JsonSchemaAnyBuilder<IN, OUT, Opt> {
     constructor();
     integer(): this;
@@ -177,7 +197,7 @@ export declare class JsonSchemaArrayBuilder<IN, OUT, Opt> extends JsonSchemaAnyB
     maxLength(maxItems: number): this;
     length(minItems: number, maxItems: number): this;
     exactLength(length: number): this;
-    unique(uniqueItems: number): this;
+    unique(): this;
 }
 export declare class JsonSchemaSet2Builder<IN, OUT, Opt> extends JsonSchemaAnyBuilder<Iterable<IN>, Set2<OUT>, Opt> {
     constructor(itemsSchema: JsonSchemaAnyBuilder<IN, OUT, Opt>);
@@ -194,7 +214,7 @@ export declare class JsonSchemaEnumBuilder<IN extends string | number | boolean
 export interface JsonSchema<IN = unknown, OUT = IN> {
     readonly in?: IN;
     readonly out?: OUT;
-    $schema?: AnyObject;
+    $schema?: string;
     $id?: string;
     title?: string;
     description?: string;
@@ -232,10 +252,14 @@ export interface JsonSchema<IN = unknown, OUT = IN> {
     exclusiveMinimum?: number;
     maximum?: number;
     exclusiveMaximum?: number;
+    minItems?: number;
+    maxItems?: number;
+    uniqueItems?: boolean;
     enum?: any;
+    email?: JsonSchemaStringEmailOptions;
     Set2?: JsonSchema;
     Buffer?: true;
-    IsoDate?: true;
+    IsoDate?: JsonSchemaIsoDateOptions;
     IsoDateTime?: true;
     instanceof?: string | string[];
     transform?: {
@@ -249,7 +273,7 @@ export interface JsonSchema<IN = unknown, OUT = IN> {
 }
 declare function object(props: AnyObject): never;
 declare function object<IN extends AnyObject>(props: {
-    [key in keyof IN]: JsonSchemaAnyBuilder<any, IN[key], any>;
+    [K in keyof Required<IN>]-?: JsonSchemaAnyBuilder<any, IN[K], any>;
 }): JsonSchemaObjectBuilder<IN, IN, false>;
 declare function objectInfer<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(props: P): JsonSchemaObjectInferringBuilder<P, false>;
 declare function objectDbEntity(props: AnyObject): never;

package/dist/validation/ajv/jsonSchemaBuilder.js

@@ -4,7 +4,7 @@ import { _isUndefined, _numberEnumValues, _stringEnumValues, getEnumType, } from
 import { _uniq } from '@naturalcycles/js-lib/array';
 import { _assert } from '@naturalcycles/js-lib/error';
 import { _deepCopy, _sortObject } from '@naturalcycles/js-lib/object';
-import { JWT_REGEX, } from '@naturalcycles/js-lib/types';
+import { _objectAssign, JWT_REGEX, } from '@naturalcycles/js-lib/types';
 import { TIMEZONES } from '../timezones.js';
 import { JSON_SCHEMA_ORDER, mergeJsonSchemaObjects } from './jsonSchemaBuilder.util.js';
 export const j = {
@@ -94,14 +94,14 @@ export class JsonSchemaAnyBuilder {
      * ```
      */
     isOfType() {
-        Object.assign(this.schema, { hasIsOfTypeCheck: true });
+        _objectAssign(this.schema, { hasIsOfTypeCheck: true });
         return this;
     }
     getSchema() {
         return this.schema;
     }
     $schema($schema) {
-        Object.assign(this.schema, { $schema });
+        _objectAssign(this.schema, { $schema });
         return this;
     }
     $schemaDraft7() {
@@ -109,31 +109,31 @@ export class JsonSchemaAnyBuilder {
         return this;
     }
     $id($id) {
-        Object.assign(this.schema, { $id });
+        _objectAssign(this.schema, { $id });
         return this;
     }
     title(title) {
-        Object.assign(this.schema, { title });
+        _objectAssign(this.schema, { title });
         return this;
     }
     description(description) {
-        Object.assign(this.schema, { description });
+        _objectAssign(this.schema, { description });
         return this;
     }
     deprecated(deprecated = true) {
-        Object.assign(this.schema, { deprecated });
+        _objectAssign(this.schema, { deprecated });
         return this;
     }
     type(type) {
-        Object.assign(this.schema, { type });
+        _objectAssign(this.schema, { type });
         return this;
     }
     default(v) {
-        Object.assign(this.schema, { default: v });
+        _objectAssign(this.schema, { default: v });
         return this;
     }
     instanceof(of) {
-        Object.assign(this.schema, { type: 'object', instanceof: of });
+        _objectAssign(this.schema, { type: 'object', instanceof: of });
         return this;
     }
     optional() {
@@ -182,53 +182,59 @@ export class JsonSchemaStringBuilder extends JsonSchemaAnyBuilder {
             this.setErrorMessage('pattern', `is not a valid ${opt.name}`);
         if (opt?.msg)
             this.setErrorMessage('pattern', opt.msg);
-        Object.assign(this.schema, { pattern });
+        _objectAssign(this.schema, { pattern });
         return this;
     }
     minLength(minLength) {
-        Object.assign(this.schema, { minLength });
+        _objectAssign(this.schema, { minLength });
         return this;
     }
     maxLength(maxLength) {
-        Object.assign(this.schema, { maxLength });
+        _objectAssign(this.schema, { maxLength });
         return this;
     }
     length(minLength, maxLength) {
-        Object.assign(this.schema, { minLength, maxLength });
+        _objectAssign(this.schema, { minLength, maxLength });
         return this;
     }
     email(opt) {
         const defaultOptions = { checkTLD: true };
-        Object.assign(this.schema, { email: { ...defaultOptions, ...opt } });
+        _objectAssign(this.schema, { email: { ...defaultOptions, ...opt } });
         // from `ajv-formats`
         const regex = /^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i;
         return this.regex(regex, { msg: 'is not a valid email address' }).trim().toLowerCase();
     }
     trim() {
-        Object.assign(this.schema, { transform: { ...this.schema.transform, trim: true } });
+        _objectAssign(this.schema, { transform: { ...this.schema.transform, trim: true } });
         return this;
     }
     toLowerCase() {
-        Object.assign(this.schema, { transform: { ...this.schema.transform, toLowerCase: true } });
+        _objectAssign(this.schema, { transform: { ...this.schema.transform, toLowerCase: true } });
         return this;
     }
     toUpperCase() {
-        Object.assign(this.schema, { transform: { ...this.schema.transform, toUpperCase: true } });
+        _objectAssign(this.schema, { transform: { ...this.schema.transform, toUpperCase: true } });
         return this;
     }
     truncate(toLength) {
-        Object.assign(this.schema, { transform: { ...this.schema.transform, truncate: toLength } });
+        _objectAssign(this.schema, { transform: { ...this.schema.transform, truncate: toLength } });
         return this;
     }
     branded() {
         return this;
     }
+    /**
+     * Validates that the input is a fully-specified YYYY-MM-DD formatted valid IsoDate value.
+     *
+     * All previous expectations in the schema chain are dropped - including `.optional()` -
+     * because this call effectively starts a new schema chain.
+     */
     isoDate() {
-        Object.assign(this.schema, { IsoDate: true });
-        return this.branded();
+        _objectAssign(this.schema, { IsoDate: {} });
+        return new JsonSchemaIsoDateBuilder();
     }
     isoDateTime() {
-        Object.assign(this.schema, { IsoDateTime: true });
+        _objectAssign(this.schema, { IsoDateTime: true });
         return this.branded();
     }
     /**
@@ -289,6 +295,39 @@ export class JsonSchemaStringBuilder extends JsonSchemaAnyBuilder {
         return j.enum(TIMEZONES, { msg: 'is an invalid IANA timezone' }).branded();
     }
 }
+export class JsonSchemaIsoDateBuilder extends JsonSchemaAnyBuilder {
+    constructor() {
+        super({
+            type: 'string',
+            IsoDate: {},
+        });
+    }
+    before(date) {
+        _objectAssign(this.schema.IsoDate, { before: date });
+        return this;
+    }
+    sameOrBefore(date) {
+        _objectAssign(this.schema.IsoDate, { sameOrBefore: date });
+        return this;
+    }
+    after(date) {
+        _objectAssign(this.schema.IsoDate, { after: date });
+        return this;
+    }
+    sameOrAfter(date) {
+        _objectAssign(this.schema.IsoDate, { sameOrAfter: date });
+        return this;
+    }
+    between(fromDate, toDate, incl) {
+        if (incl === '[)') {
+            _objectAssign(this.schema.IsoDate, { sameOrAfter: fromDate, before: toDate });
+        }
+        else if (incl === '[]') {
+            _objectAssign(this.schema.IsoDate, { sameOrAfter: fromDate, sameOrBefore: toDate });
+        }
+        return this;
+    }
+}
 export class JsonSchemaNumberBuilder extends JsonSchemaAnyBuilder {
     constructor() {
         super({
@@ -296,30 +335,30 @@ export class JsonSchemaNumberBuilder extends JsonSchemaAnyBuilder {
         });
     }
     integer() {
-        Object.assign(this.schema, { type: 'integer' });
+        _objectAssign(this.schema, { type: 'integer' });
         return this;
     }
     branded() {
         return this;
     }
     multipleOf(multipleOf) {
-        Object.assign(this.schema, { multipleOf });
+        _objectAssign(this.schema, { multipleOf });
         return this;
     }
     min(minimum) {
-        Object.assign(this.schema, { minimum });
+        _objectAssign(this.schema, { minimum });
         return this;
     }
     exclusiveMin(exclusiveMinimum) {
-        Object.assign(this.schema, { exclusiveMinimum });
+        _objectAssign(this.schema, { exclusiveMinimum });
         return this;
     }
     max(maximum) {
-        Object.assign(this.schema, { maximum });
+        _objectAssign(this.schema, { maximum });
         return this;
     }
     exclusiveMax(exclusiveMaximum) {
-        Object.assign(this.schema, { exclusiveMaximum });
+        _objectAssign(this.schema, { exclusiveMaximum });
         return this;
     }
     lessThan(value) {
@@ -427,12 +466,12 @@ export class JsonSchemaObjectBuilder extends JsonSchemaAnyBuilder {
      * When set, the validation will not strip away properties that are not specified explicitly in the schema.
      */
     allowAdditionalProperties() {
-        Object.assign(this.schema, { additionalProperties: true });
+        _objectAssign(this.schema, { additionalProperties: true });
         return this;
     }
     extend(props) {
         const newBuilder = new JsonSchemaObjectBuilder();
-        Object.assign(newBuilder.schema, _deepCopy(this.schema));
+        _objectAssign(newBuilder.schema, _deepCopy(this.schema));
         const incomingSchemaBuilder = new JsonSchemaObjectBuilder(props);
         mergeJsonSchemaObjects(newBuilder.schema, incomingSchemaBuilder.schema);
         return newBuilder;
@@ -481,12 +520,12 @@ export class JsonSchemaObjectInferringBuilder extends JsonSchemaAnyBuilder {
      * When set, the validation will not strip away properties that are not specified explicitly in the schema.
      */
     allowAdditionalProperties() {
-        Object.assign(this.schema, { additionalProperties: true });
+        _objectAssign(this.schema, { additionalProperties: true });
         return this;
     }
     extend(props) {
         const newBuilder = new JsonSchemaObjectInferringBuilder();
-        Object.assign(newBuilder.schema, _deepCopy(this.schema));
+        _objectAssign(newBuilder.schema, _deepCopy(this.schema));
         const incomingSchemaBuilder = new JsonSchemaObjectInferringBuilder(props);
         mergeJsonSchemaObjects(newBuilder.schema, incomingSchemaBuilder.schema);
         return newBuilder;
@@ -511,11 +550,11 @@ export class JsonSchemaArrayBuilder extends JsonSchemaAnyBuilder {
         });
     }
     minLength(minItems) {
-        Object.assign(this.schema, { minItems });
+        _objectAssign(this.schema, { minItems });
         return this;
     }
     maxLength(maxItems) {
-        Object.assign(this.schema, { maxItems });
+        _objectAssign(this.schema, { maxItems });
         return this;
     }
     length(minItems, maxItems) {
@@ -524,8 +563,8 @@ export class JsonSchemaArrayBuilder extends JsonSchemaAnyBuilder {
     exactLength(length) {
         return this.minLength(length).maxLength(length);
     }
-    unique(uniqueItems) {
-        Object.assign(this.schema, { uniqueItems });
+    unique() {
+        _objectAssign(this.schema, { uniqueItems: true });
         return this;
     }
 }
@@ -537,11 +576,11 @@ export class JsonSchemaSet2Builder extends JsonSchemaAnyBuilder {
         });
     }
     min(minItems) {
-        Object.assign(this.schema, { minItems });
+        _objectAssign(this.schema, { minItems });
         return this;
     }
     max(maxItems) {
-        Object.assign(this.schema, { maxItems });
+        _objectAssign(this.schema, { maxItems });
         return this;
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.46.2",
+  "version": "15.47.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@types/js-yaml": "^4",

package/src/security/id.util.ts

@@ -11,6 +11,7 @@ let mockedStringId: string | undefined
 export function mockStringId(id: string): void {
   mockedStringId = id
 }
+
 export function unmockStringId(): void {
   mockedStringId = undefined
 }

package/src/validation/ajv/getAjv.ts

@@ -3,7 +3,7 @@ import { Set2 } from '@naturalcycles/js-lib/object'
 import { _substringAfterLast } from '@naturalcycles/js-lib/string'
 import { _, Ajv, type Options, type ValidateFunction } from 'ajv'
 import { validTLDs } from '../tlds.js'
-import type { JsonSchemaStringEmailOptions } from './jsonSchemaBuilder.js'
+import type { JsonSchemaIsoDateOptions, JsonSchemaStringEmailOptions } from './jsonSchemaBuilder.js'
 
 /* eslint-disable @typescript-eslint/prefer-string-starts-ends-with */
 // oxlint-disable unicorn/prefer-code-point
@@ -255,16 +255,77 @@ export function createAjv(opt?: Options): Ajv {
     type: 'string',
     modifying: false,
     errors: true,
-    schemaType: 'boolean',
-    validate: function validate(_opt: true, data: string, _schema, ctx) {
+    schemaType: 'object',
+    validate: function validate(opt: JsonSchemaIsoDateOptions, data: string, _schema, ctx) {
+      const hasOptions = Object.keys(opt).length > 0
+
       const isValid = isIsoDateValid(data)
-      if (isValid) return true
-      ;(validate as any).errors = [
-        {
-          instancePath: ctx?.instancePath ?? '',
-          message: `is an invalid IsoDate`,
-        },
-      ]
+      if (!isValid) {
+        ;(validate as any).errors = [
+          {
+            instancePath: ctx?.instancePath ?? '',
+            message: `is an invalid IsoDate`,
+          },
+        ]
+
+        return false
+      }
+
+      if (!hasOptions) return true
+
+      const { before, sameOrBefore, after, sameOrAfter } = opt
+      const errors: any[] = []
+
+      if (before) {
+        const isParamValid = isIsoDateValid(before)
+        const isRuleValid = isParamValid && before > data
+
+        if (!isRuleValid) {
+          errors.push({
+            instancePath: ctx?.instancePath ?? '',
+            message: `is not before ${before}`,
+          })
+        }
+      }
+
+      if (sameOrBefore) {
+        const isParamValid = isIsoDateValid(sameOrBefore)
+        const isRuleValid = isParamValid && sameOrBefore >= data
+
+        if (!isRuleValid) {
+          errors.push({
+            instancePath: ctx?.instancePath ?? '',
+            message: `is not the same or before ${sameOrBefore}`,
+          })
+        }
+      }
+
+      if (after) {
+        const isParamValid = isIsoDateValid(after)
+        const isRuleValid = isParamValid && after < data
+
+        if (!isRuleValid) {
+          errors.push({
+            instancePath: ctx?.instancePath ?? '',
+            message: `is not after ${after}`,
+          })
+        }
+      }
+
+      if (sameOrAfter) {
+        const isParamValid = isIsoDateValid(sameOrAfter)
+        const isRuleValid = isParamValid && sameOrAfter <= data
+
+        if (!isRuleValid) {
+          errors.push({
+            instancePath: ctx?.instancePath ?? '',
+            message: `is not the same or after ${sameOrAfter}`,
+          })
+        }
+      }
+
+      if (errors.length === 0) return true
+      ;(validate as any).errors = errors
       return false
     },
   })

package/src/validation/ajv/jsonSchemaBuilder.ts

@@ -12,6 +12,7 @@ import { _assert } from '@naturalcycles/js-lib/error'
 import type { Set2 } from '@naturalcycles/js-lib/object'
 import { _deepCopy, _sortObject } from '@naturalcycles/js-lib/object'
 import {
+  _objectAssign,
   type AnyObject,
   type BaseDBEntity,
   type IANATimezone,
@@ -144,7 +145,7 @@ export class JsonSchemaAnyBuilder<IN, OUT, Opt> {
    * ```
    */
   isOfType<ExpectedType>(): ExactMatch<ExpectedType, OUT> extends true ? this : never {
-    Object.assign(this.schema, { hasIsOfTypeCheck: true })
+    _objectAssign(this.schema, { hasIsOfTypeCheck: true })
     return this as any
   }
 
@@ -153,7 +154,7 @@ export class JsonSchemaAnyBuilder<IN, OUT, Opt> {
   }
 
   $schema($schema: string): this {
-    Object.assign(this.schema, { $schema })
+    _objectAssign(this.schema, { $schema })
     return this
   }
 
@@ -163,37 +164,37 @@ export class JsonSchemaAnyBuilder<IN, OUT, Opt> {
   }
 
   $id($id: string): this {
-    Object.assign(this.schema, { $id })
+    _objectAssign(this.schema, { $id })
     return this
   }
 
   title(title: string): this {
-    Object.assign(this.schema, { title })
+    _objectAssign(this.schema, { title })
     return this
   }
 
   description(description: string): this {
-    Object.assign(this.schema, { description })
+    _objectAssign(this.schema, { description })
     return this
   }
 
   deprecated(deprecated = true): this {
-    Object.assign(this.schema, { deprecated })
+    _objectAssign(this.schema, { deprecated })
     return this
   }
 
   type(type: string): this {
-    Object.assign(this.schema, { type })
+    _objectAssign(this.schema, { type })
     return this
   }
 
   default(v: any): this {
-    Object.assign(this.schema, { default: v })
+    _objectAssign(this.schema, { default: v })
     return this
   }
 
   instanceof(of: string): this {
-    Object.assign(this.schema, { type: 'object', instanceof: of })
+    _objectAssign(this.schema, { type: 'object', instanceof: of })
     return this
   }
 
@@ -253,28 +254,28 @@ export class JsonSchemaStringBuilder<
   pattern(pattern: string, opt?: JsonBuilderRuleOpt): this {
     if (opt?.name) this.setErrorMessage('pattern', `is not a valid ${opt.name}`)
     if (opt?.msg) this.setErrorMessage('pattern', opt.msg)
-    Object.assign(this.schema, { pattern })
+    _objectAssign(this.schema, { pattern })
     return this
   }
 
   minLength(minLength: number): this {
-    Object.assign(this.schema, { minLength })
+    _objectAssign(this.schema, { minLength })
     return this
   }
 
   maxLength(maxLength: number): this {
-    Object.assign(this.schema, { maxLength })
+    _objectAssign(this.schema, { maxLength })
     return this
   }
 
   length(minLength: number, maxLength: number): this {
-    Object.assign(this.schema, { minLength, maxLength })
+    _objectAssign(this.schema, { minLength, maxLength })
     return this
   }
 
   email(opt?: Partial<JsonSchemaStringEmailOptions>): this {
     const defaultOptions: JsonSchemaStringEmailOptions = { checkTLD: true }
-    Object.assign(this.schema, { email: { ...defaultOptions, ...opt } })
+    _objectAssign(this.schema, { email: { ...defaultOptions, ...opt } })
 
     // from `ajv-formats`
     const regex =
@@ -283,22 +284,22 @@ export class JsonSchemaStringBuilder<
   }
 
   trim(): this {
-    Object.assign(this.schema, { transform: { ...this.schema.transform, trim: true } })
+    _objectAssign(this.schema, { transform: { ...this.schema.transform, trim: true } })
     return this
   }
 
   toLowerCase(): this {
-    Object.assign(this.schema, { transform: { ...this.schema.transform, toLowerCase: true } })
+    _objectAssign(this.schema, { transform: { ...this.schema.transform, toLowerCase: true } })
     return this
   }
 
   toUpperCase(): this {
-    Object.assign(this.schema, { transform: { ...this.schema.transform, toUpperCase: true } })
+    _objectAssign(this.schema, { transform: { ...this.schema.transform, toUpperCase: true } })
     return this
   }
 
   truncate(toLength: number): this {
-    Object.assign(this.schema, { transform: { ...this.schema.transform, truncate: toLength } })
+    _objectAssign(this.schema, { transform: { ...this.schema.transform, truncate: toLength } })
     return this
   }
 
@@ -306,13 +307,19 @@ export class JsonSchemaStringBuilder<
     return this as unknown as JsonSchemaStringBuilder<B, B, Opt>
   }
 
-  isoDate(): JsonSchemaStringBuilder<IsoDate | IN, IsoDate, Opt> {
-    Object.assign(this.schema, { IsoDate: true })
-    return this.branded<IsoDate>()
+  /**
+   * Validates that the input is a fully-specified YYYY-MM-DD formatted valid IsoDate value.
+   *
+   * All previous expectations in the schema chain are dropped - including `.optional()` -
+   * because this call effectively starts a new schema chain.
+   */
+  isoDate(): JsonSchemaIsoDateBuilder {
+    _objectAssign(this.schema, { IsoDate: {} })
+    return new JsonSchemaIsoDateBuilder()
   }
 
   isoDateTime(): JsonSchemaStringBuilder<IsoDateTime | IN, IsoDateTime, Opt> {
-    Object.assign(this.schema, { IsoDateTime: true })
+    _objectAssign(this.schema, { IsoDateTime: true })
     return this.branded<IsoDateTime>()
   }
 
@@ -392,6 +399,56 @@ export interface JsonSchemaStringEmailOptions {
   checkTLD: boolean
 }
 
+export class JsonSchemaIsoDateBuilder<Opt extends boolean = false> extends JsonSchemaAnyBuilder<
+  string | IsoDate,
+  IsoDate,
+  Opt
+> {
+  constructor() {
+    super({
+      type: 'string',
+      IsoDate: {},
+    })
+  }
+
+  before(date: string): this {
+    _objectAssign(this.schema.IsoDate!, { before: date })
+    return this
+  }
+
+  sameOrBefore(date: string): this {
+    _objectAssign(this.schema.IsoDate!, { sameOrBefore: date })
+    return this
+  }
+
+  after(date: string): this {
+    _objectAssign(this.schema.IsoDate!, { after: date })
+    return this
+  }
+
+  sameOrAfter(date: string): this {
+    _objectAssign(this.schema.IsoDate!, { sameOrAfter: date })
+    return this
+  }
+
+  between(fromDate: string, toDate: string, incl: Inclusiveness): this {
+    if (incl === '[)') {
+      _objectAssign(this.schema.IsoDate!, { sameOrAfter: fromDate, before: toDate })
+    } else if (incl === '[]') {
+      _objectAssign(this.schema.IsoDate!, { sameOrAfter: fromDate, sameOrBefore: toDate })
+    }
+
+    return this
+  }
+}
+
+export interface JsonSchemaIsoDateOptions {
+  before?: string
+  sameOrBefore?: string
+  after?: string
+  sameOrAfter?: string
+}
+
 export class JsonSchemaNumberBuilder<
   IN extends number = number,
   OUT = IN,
@@ -404,7 +461,7 @@ export class JsonSchemaNumberBuilder<
   }
 
   integer(): this {
-    Object.assign(this.schema, { type: 'integer' })
+    _objectAssign(this.schema, { type: 'integer' })
     return this
   }
 
@@ -413,27 +470,27 @@ export class JsonSchemaNumberBuilder<
   }
 
   multipleOf(multipleOf: number): this {
-    Object.assign(this.schema, { multipleOf })
+    _objectAssign(this.schema, { multipleOf })
     return this
   }
 
   min(minimum: number): this {
-    Object.assign(this.schema, { minimum })
+    _objectAssign(this.schema, { minimum })
     return this
   }
 
   exclusiveMin(exclusiveMinimum: number): this {
-    Object.assign(this.schema, { exclusiveMinimum })
+    _objectAssign(this.schema, { exclusiveMinimum })
     return this
   }
 
   max(maximum: number): this {
-    Object.assign(this.schema, { maximum })
+    _objectAssign(this.schema, { maximum })
     return this
   }
 
   exclusiveMax(exclusiveMaximum: number): this {
-    Object.assign(this.schema, { exclusiveMaximum })
+    _objectAssign(this.schema, { exclusiveMaximum })
     return this
   }
 
@@ -575,7 +632,7 @@ export class JsonSchemaObjectBuilder<
    * When set, the validation will not strip away properties that are not specified explicitly in the schema.
    */
   allowAdditionalProperties(): this {
-    Object.assign(this.schema, { additionalProperties: true })
+    _objectAssign(this.schema, { additionalProperties: true })
     return this
   }
 
@@ -583,7 +640,7 @@ export class JsonSchemaObjectBuilder<
     props: AnyObject,
   ): JsonSchemaObjectBuilder<IN & IN2, OUT & IN2, Opt> {
     const newBuilder = new JsonSchemaObjectBuilder<IN & IN2, OUT & IN2, Opt>()
-    Object.assign(newBuilder.schema, _deepCopy(this.schema))
+    _objectAssign(newBuilder.schema, _deepCopy(this.schema))
 
     const incomingSchemaBuilder = new JsonSchemaObjectBuilder<IN2, IN2, false>(props)
     mergeJsonSchemaObjects(newBuilder.schema as any, incomingSchemaBuilder.schema as any)
@@ -675,7 +732,7 @@ export class JsonSchemaObjectInferringBuilder<
    * When set, the validation will not strip away properties that are not specified explicitly in the schema.
    */
   allowAdditionalProperties(): this {
-    Object.assign(this.schema, { additionalProperties: true })
+    _objectAssign(this.schema, { additionalProperties: true })
     return this
   }
 
@@ -692,7 +749,7 @@ export class JsonSchemaObjectInferringBuilder<
     Opt
   > {
     const newBuilder = new JsonSchemaObjectInferringBuilder<PROPS, Opt>()
-    Object.assign(newBuilder.schema, _deepCopy(this.schema))
+    _objectAssign(newBuilder.schema, _deepCopy(this.schema))
 
     const incomingSchemaBuilder = new JsonSchemaObjectInferringBuilder<NEW_PROPS, false>(props)
     mergeJsonSchemaObjects(newBuilder.schema as any, incomingSchemaBuilder.schema as any)
@@ -731,12 +788,12 @@ export class JsonSchemaArrayBuilder<IN, OUT, Opt> extends JsonSchemaAnyBuilder<I
   }
 
   minLength(minItems: number): this {
-    Object.assign(this.schema, { minItems })
+    _objectAssign(this.schema, { minItems })
     return this
   }
 
   maxLength(maxItems: number): this {
-    Object.assign(this.schema, { maxItems })
+    _objectAssign(this.schema, { maxItems })
     return this
   }
 
@@ -748,8 +805,8 @@ export class JsonSchemaArrayBuilder<IN, OUT, Opt> extends JsonSchemaAnyBuilder<I
     return this.minLength(length).maxLength(length)
   }
 
-  unique(uniqueItems: number): this {
-    Object.assign(this.schema, { uniqueItems })
+  unique(): this {
+    _objectAssign(this.schema, { uniqueItems: true })
     return this
   }
 }
@@ -767,12 +824,12 @@ export class JsonSchemaSet2Builder<IN, OUT, Opt> extends JsonSchemaAnyBuilder<
   }
 
   min(minItems: number): this {
-    Object.assign(this.schema, { minItems })
+    _objectAssign(this.schema, { minItems })
     return this
   }
 
   max(maxItems: number): this {
-    Object.assign(this.schema, { maxItems })
+    _objectAssign(this.schema, { maxItems })
     return this
   }
 }
@@ -809,7 +866,7 @@ export interface JsonSchema<IN = unknown, OUT = IN> {
   readonly in?: IN
   readonly out?: OUT
 
-  $schema?: AnyObject
+  $schema?: string
   $id?: string
   title?: string
   description?: string
@@ -857,14 +914,18 @@ export interface JsonSchema<IN = unknown, OUT = IN> {
   exclusiveMinimum?: number
   maximum?: number
   exclusiveMaximum?: number
+  minItems?: number
+  maxItems?: number
+  uniqueItems?: boolean
 
   enum?: any
 
   // Below we add custom Ajv keywords
 
+  email?: JsonSchemaStringEmailOptions
   Set2?: JsonSchema
   Buffer?: true
-  IsoDate?: true
+  IsoDate?: JsonSchemaIsoDateOptions
   IsoDateTime?: true
   instanceof?: string | string[]
   transform?: { trim?: true; toLowerCase?: true; toUpperCase?: true; truncate?: number }
@@ -874,7 +935,7 @@ export interface JsonSchema<IN = unknown, OUT = IN> {
 
 function object(props: AnyObject): never
 function object<IN extends AnyObject>(props: {
-  [key in keyof IN]: JsonSchemaAnyBuilder<any, IN[key], any>
+  [K in keyof Required<IN>]-?: JsonSchemaAnyBuilder<any, IN[K], any>
 }): JsonSchemaObjectBuilder<IN, IN, false>
 
 function object<IN extends AnyObject>(props: {