@naturalcycles/js-lib 15.35.0 → 15.37.0

package/dist/json-schema/jsonSchema.model.d.ts

@@ -1,5 +1,5 @@
 import type { AnyObject, StringMap } from '../types.js';
-export type JsonSchema<T = unknown> = JsonSchemaAny<T> | JsonSchemaOneOf<T> | JsonSchemaAllOf<T> | JsonSchemaAnyOf<T> | JsonSchemaNot<T> | JsonSchemaRef<T> | JsonSchemaConst<T> | JsonSchemaEnum<T> | JsonSchemaString | JsonSchemaNumber | JsonSchemaBoolean | JsonSchemaNull | JsonSchemaObject | JsonSchemaArray<T> | JsonSchemaTuple<T>;
+export type JsonSchema<T = unknown> = JsonSchemaAny<T> | JsonSchemaOneOf<T> | JsonSchemaAllOf<T> | JsonSchemaAnyOf<T> | JsonSchemaNot<T> | JsonSchemaRef<T> | JsonSchemaConst<T> | JsonSchemaEnum<T> | JsonSchemaString | JsonSchemaNumber | JsonSchemaBoolean | JsonSchemaNull | JsonSchemaObject<T extends AnyObject ? T : AnyObject> | JsonSchemaArray<T> | JsonSchemaTuple<T>;
 export interface JsonSchemaAny<T = unknown> {
     $schema?: string;
     $id?: string;
@@ -8,7 +8,7 @@ export interface JsonSchemaAny<T = unknown> {
     deprecated?: boolean;
     readOnly?: boolean;
     writeOnly?: boolean;
-    type?: string;
+    type?: string | string[];
     default?: T;
     if?: JsonSchema;
     then?: JsonSchema;

package/dist/json-schema/jsonSchemaBuilder.d.ts

@@ -1,4 +1,4 @@
-import type { AnyObject, BaseDBEntity, IsoDate, IsoDateTime, UnixTimestamp } from '../types.js';
+import { type AnyObject, type BaseDBEntity, type IsoDate, type IsoDateTime, type UnixTimestamp } from '../types.js';
 import type { JsonSchema, JsonSchemaAllOf, JsonSchemaAny, JsonSchemaArray, JsonSchemaBoolean, JsonSchemaConst, JsonSchemaEnum, JsonSchemaNull, JsonSchemaNumber, JsonSchemaObject, JsonSchemaOneOf, JsonSchemaRef, JsonSchemaString, JsonSchemaTuple } from './jsonSchema.model.js';
 export interface JsonSchemaBuilder<T = unknown> {
     build: () => JsonSchema<T>;
@@ -8,36 +8,37 @@ export interface JsonSchemaBuilder<T = unknown> {
  * Inspired by Joi and Zod.
  */
 export declare const j: {
-    any<T = unknown>(): JsonSchemaAnyBuilder<T, JsonSchemaAny<T>>;
-    const<T = unknown>(value: T): JsonSchemaAnyBuilder<T, JsonSchemaConst<T>>;
-    null(): JsonSchemaAnyBuilder<null, JsonSchemaNull>;
-    ref<T = unknown>($ref: string): JsonSchemaAnyBuilder<T, JsonSchemaRef<T>>;
-    enum<T = unknown>(enumValues: T[]): JsonSchemaAnyBuilder<T, JsonSchemaEnum<T>>;
-    boolean(): JsonSchemaAnyBuilder<boolean, JsonSchemaBoolean>;
-    buffer(): JsonSchemaAnyBuilder<Buffer<ArrayBufferLike>, JsonSchemaAny<Buffer<ArrayBufferLike>>>;
-    number<T extends number = number>(): JsonSchemaNumberBuilder<T>;
-    integer<T extends number = number>(): JsonSchemaNumberBuilder<T>;
-    unixTimestamp(): JsonSchemaNumberBuilder<UnixTimestamp>;
-    unixTimestamp2000(): JsonSchemaNumberBuilder<UnixTimestamp>;
-    string<T extends string = string>(): JsonSchemaStringBuilder<T>;
+    any<T = unknown>(): JsonSchemaAnyBuilder<T, JsonSchemaAny<T>, false>;
+    const<T extends string | number | boolean | null>(value: T): JsonSchemaAnyBuilder<T, JsonSchemaConst<T>, false>;
+    null(): JsonSchemaAnyBuilder<null, JsonSchemaNull, false>;
+    ref<T = unknown>($ref: string): JsonSchemaAnyBuilder<T, JsonSchemaRef<T>, false>;
+    enum<T = unknown>(enumValues: T[]): JsonSchemaAnyBuilder<T, JsonSchemaEnum<T>, false>;
+    boolean(): JsonSchemaAnyBuilder<boolean, JsonSchemaBoolean, false>;
+    buffer(): JsonSchemaAnyBuilder<Buffer<ArrayBufferLike>, JsonSchemaAny<Buffer<ArrayBufferLike>>, false>;
+    number<T extends number = number>(): JsonSchemaNumberBuilder<T, false>;
+    integer<T extends number = number>(): JsonSchemaNumberBuilder<T, false>;
+    unixTimestamp(): JsonSchemaNumberBuilder<UnixTimestamp, false>;
+    unixTimestamp2000(): JsonSchemaNumberBuilder<UnixTimestamp, false>;
+    string<T extends string = string>(): JsonSchemaStringBuilder<T, false>;
+    jwt(): JsonSchemaStringBuilder<string, false>;
     /**
      * Accepts only the `YYYY-MM-DD` shape from all ISO 8601 variants.
      */
-    isoDate(): JsonSchemaStringBuilder<IsoDate>;
+    isoDate(): JsonSchemaStringBuilder<IsoDate, false>;
     /**
      * Accepts strings that start with the `YYYY-MM-DDTHH:MM:SS` shape
      * and optionally end with either a `Z` or a `+/-hh:mm` timezone part.
      */
-    isoDateTime(): JsonSchemaStringBuilder<IsoDateTime>;
+    isoDateTime(): JsonSchemaStringBuilder<IsoDateTime, false>;
     object: typeof object;
-    dbEntity<T extends AnyObject>(props: T): JsonSchemaObjectBuilder<BaseDBEntity & { [K in keyof T]: T[K] extends JsonSchemaAnyBuilder<infer U, any> ? U : never; }>;
-    rootObject<T extends AnyObject>(props: { [K in keyof T]: JsonSchemaAnyBuilder<T[K]>; }): JsonSchemaObjectBuilder<T>;
-    array<T extends JsonSchemaAnyBuilder<any>>(itemSchema: T): JsonSchemaArrayBuilder<T["infer"]>;
+    dbEntity<T extends AnyObject>(props: T): JsonSchemaObjectBuilder<BaseDBEntity & ({ [K in keyof T as T[K] extends JsonSchemaAnyBuilder<any, any, infer Opt extends boolean> ? Opt extends true ? never : K : never]: T[K] extends JsonSchemaAnyBuilder<infer U, any, any> ? U : never; } & { [K_1 in keyof T as T[K_1] extends JsonSchemaAnyBuilder<any, any, infer Opt extends boolean> ? Opt extends true ? K_1 : never : never]?: (T[K_1] extends JsonSchemaAnyBuilder<infer U, any, any> ? U : never) | undefined; } extends infer O ? { [K_2 in keyof O]: O[K_2]; } : never) extends infer O_1 ? { [K_3 in keyof O_1]: O_1[K_3]; } : never, false>;
+    rootObject<T extends AnyObject>(props: { [K in keyof T]: JsonSchemaAnyBuilder<T[K]>; }): JsonSchemaObjectBuilder<T, false>;
+    array<T extends JsonSchemaAnyBuilder<any>>(itemSchema: T): JsonSchemaArrayBuilder<T["infer"], false>;
     tuple<T extends any[] = unknown[]>(items: JsonSchemaAnyBuilder[]): JsonSchemaTupleBuilder<T>;
-    oneOf<T = unknown>(items: JsonSchemaAnyBuilder[]): JsonSchemaAnyBuilder<T, JsonSchemaOneOf<T>>;
-    allOf<T = unknown>(items: JsonSchemaAnyBuilder[]): JsonSchemaAnyBuilder<T, JsonSchemaAllOf<T>>;
+    oneOf<Builders extends JsonSchemaAnyBuilder<any, any, any>[]>(items: [...Builders]): JsonSchemaAnyBuilder<Builders[number] extends JsonSchemaAnyBuilder<infer U, any, any> ? U : never, JsonSchemaOneOf<Builders[number] extends JsonSchemaAnyBuilder<infer U, any, any> ? U : never>>;
+    allOf<T = unknown>(items: JsonSchemaAnyBuilder[]): JsonSchemaAnyBuilder<T, JsonSchemaAllOf<T>, false>;
 };
-export declare class JsonSchemaAnyBuilder<T = unknown, SCHEMA_TYPE extends JsonSchema<T> = JsonSchema<T>> implements JsonSchemaBuilder<T> {
+export declare class JsonSchemaAnyBuilder<T = unknown, SCHEMA_TYPE extends JsonSchema<T> = JsonSchema<T>, Opt extends boolean = false> implements JsonSchemaBuilder<T> {
     protected schema: SCHEMA_TYPE;
     constructor(schema: SCHEMA_TYPE);
     /**
@@ -52,24 +53,23 @@ export declare class JsonSchemaAnyBuilder<T = unknown, SCHEMA_TYPE extends JsonS
     deprecated(deprecated?: boolean): this;
     type(type: string): this;
     default(v: any): this;
-    oneOf(schemas: JsonSchema[]): this;
-    allOf(schemas: JsonSchema[]): this;
     instanceof(of: string): this;
-    optional(): JsonSchemaAnyBuilder<T | undefined, JsonSchema<T | undefined>>;
-    optional(optional: true): JsonSchemaAnyBuilder<T | undefined, JsonSchema<T | undefined>>;
-    optional(optional: false): JsonSchemaAnyBuilder<Exclude<T, undefined>, JsonSchema<Exclude<T, undefined>>>;
+    optional(): JsonSchemaAnyBuilder<T | undefined, JsonSchema<T | undefined>, true>;
+    optional(optional: true): JsonSchemaAnyBuilder<T | undefined, JsonSchema<T | undefined>, true>;
+    optional(optional: false): JsonSchemaAnyBuilder<Exclude<T, undefined>, JsonSchema<Exclude<T, undefined>>, false>;
+    nullable(): JsonSchemaAnyBuilder<T | null, JsonSchema<T | null>, Opt>;
     /**
      * Produces a "clean schema object" without methods.
      * Same as if it would be JSON.stringified.
      */
     build(): SCHEMA_TYPE;
-    clone(): JsonSchemaAnyBuilder<T, SCHEMA_TYPE>;
+    clone(): JsonSchemaAnyBuilder<T, SCHEMA_TYPE, Opt>;
     /**
      * @experimental
      */
     infer: T;
 }
-export declare class JsonSchemaNumberBuilder<T extends number = number> extends JsonSchemaAnyBuilder<T, JsonSchemaNumber<T>> {
+export declare class JsonSchemaNumberBuilder<T extends number = number, Opt extends boolean = false> extends JsonSchemaAnyBuilder<T, JsonSchemaNumber<T>, Opt> {
     constructor();
     integer(): this;
     multipleOf(multipleOf: number): this;
@@ -94,7 +94,7 @@ export declare class JsonSchemaNumberBuilder<T extends number = number> extends
     utcOffsetHours: () => this;
     branded<B extends number>(): JsonSchemaNumberBuilder<B>;
 }
-export declare class JsonSchemaStringBuilder<T extends string = string> extends JsonSchemaAnyBuilder<T, JsonSchemaString<T>> {
+export declare class JsonSchemaStringBuilder<T extends string = string, Opt extends boolean = false> extends JsonSchemaAnyBuilder<T, JsonSchemaString<T>, Opt> {
     constructor();
     regex(pattern: RegExp): this;
     pattern(pattern: string): this;
@@ -126,9 +126,10 @@ export declare class JsonSchemaStringBuilder<T extends string = string> extends
      * and optionally end with either a `Z` or a `+/-hh:mm` timezone part.
      */
     isoDateTime(): JsonSchemaStringBuilder<IsoDateTime>;
+    jwt(): this;
     private transformModify;
 }
-export declare class JsonSchemaObjectBuilder<T extends AnyObject> extends JsonSchemaAnyBuilder<T, JsonSchemaObject<T>> {
+export declare class JsonSchemaObjectBuilder<T extends AnyObject, Opt extends boolean = false> extends JsonSchemaAnyBuilder<T, JsonSchemaObject<T>, Opt> {
     constructor();
     addProperties(props: {
         [k in keyof T]: JsonSchemaBuilder<T[k]>;
@@ -142,9 +143,11 @@ export declare class JsonSchemaObjectBuilder<T extends AnyObject> extends JsonSc
     maxProps(maxProperties: number): this;
     additionalProps(additionalProperties: boolean): this;
     baseDBEntity(): JsonSchemaObjectBuilder<T & BaseDBEntity>;
-    extend<T2 extends AnyObject>(s2: JsonSchemaObjectBuilder<T2>): JsonSchemaObjectBuilder<T & T2>;
+    extend<T2 extends AnyObject>(s2: JsonSchemaObjectBuilder<T2>): JsonSchemaObjectBuilder<T & T2 extends infer O ? {
+        [K in keyof O]: O[K];
+    } : never>;
 }
-export declare class JsonSchemaArrayBuilder<ITEM> extends JsonSchemaAnyBuilder<ITEM[], JsonSchemaArray<ITEM>> {
+export declare class JsonSchemaArrayBuilder<ITEM, Opt extends boolean = false> extends JsonSchemaAnyBuilder<ITEM[], JsonSchemaArray<ITEM>, Opt> {
     constructor(itemsSchema: JsonSchemaBuilder<ITEM>);
     min(minItems: number): this;
     max(maxItems: number): this;
@@ -153,9 +156,13 @@ export declare class JsonSchemaArrayBuilder<ITEM> extends JsonSchemaAnyBuilder<I
 export declare class JsonSchemaTupleBuilder<T extends any[]> extends JsonSchemaAnyBuilder<T, JsonSchemaTuple<T>> {
     constructor(items: JsonSchemaBuilder[]);
 }
-declare function object<P extends Record<string, JsonSchemaAnyBuilder<any, any>>>(props: P): JsonSchemaObjectBuilder<{
-    [K in keyof P]: P[K] extends JsonSchemaAnyBuilder<infer U, any> ? U : never;
-}>;
+declare function object<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(props: P): JsonSchemaObjectBuilder<{
+    [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer Opt> ? Opt extends true ? never : K : never]: P[K] extends JsonSchemaAnyBuilder<infer U, any, any> ? U : never;
+} & {
+    [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer Opt> ? Opt extends true ? K : never : never]?: P[K] extends JsonSchemaAnyBuilder<infer U, any, any> ? U : never;
+} extends infer O ? {
+    [K in keyof O]: O[K];
+} : never>;
 declare function object<T extends AnyObject>(props: {
     [K in keyof T]: JsonSchemaAnyBuilder<T[K]>;
 }): JsonSchemaObjectBuilder<T>;

package/dist/json-schema/jsonSchemaBuilder.js

@@ -1,6 +1,7 @@
 import { _uniq } from '../array/array.util.js';
 import { _deepCopy } from '../object/object.util.js';
 import { _sortObject } from '../object/sortObject.js';
+import { JWT_REGEX, } from '../types.js';
 import { JSON_SCHEMA_ORDER } from './jsonSchema.cnst.js';
 import { mergeJsonSchemaObjects } from './jsonSchema.util.js';
 /**
@@ -56,6 +57,9 @@ export const j = {
     string() {
         return new JsonSchemaStringBuilder();
     },
+    jwt() {
+        return new JsonSchemaStringBuilder().jwt();
+    },
     /**
      * Accepts only the `YYYY-MM-DD` shape from all ISO 8601 variants.
      */
@@ -144,14 +148,6 @@ export class JsonSchemaAnyBuilder {
         Object.assign(this.schema, { default: v });
         return this;
     }
-    oneOf(schemas) {
-        Object.assign(this.schema, { oneOf: schemas });
-        return this;
-    }
-    allOf(schemas) {
-        Object.assign(this.schema, { allOf: schemas });
-        return this;
-    }
     instanceof(of) {
         this.schema.instanceof = of;
         return this;
@@ -165,6 +161,11 @@ export class JsonSchemaAnyBuilder {
         }
         return this;
     }
+    nullable() {
+        return new JsonSchemaAnyBuilder({
+            anyOf: [this.build(), { type: 'null' }],
+        });
+    }
     /**
      * Produces a "clean schema object" without methods.
      * Same as if it would be JSON.stringified.
@@ -294,6 +295,9 @@ export class JsonSchemaStringBuilder extends JsonSchemaAnyBuilder {
     isoDateTime() {
         return this.format('IsoDateTime').branded().description('IsoDateTime');
     }
+    jwt() {
+        return this.regex(JWT_REGEX);
+    }
     transformModify(t, add) {
         if (add) {
             this.schema.transform = _uniq([...(this.schema.transform || []), t]);

package/dist/json-schema/jsonSchemas.d.ts

@@ -1,2 +1,2 @@
 import type { BaseDBEntity } from '../types.js';
-export declare const baseDBEntityJsonSchema: import("./jsonSchemaBuilder.js").JsonSchemaObjectBuilder<BaseDBEntity>;
+export declare const baseDBEntityJsonSchema: import("./jsonSchemaBuilder.js").JsonSchemaObjectBuilder<BaseDBEntity, false>;

package/dist/types.d.ts

@@ -266,6 +266,7 @@ export type ShortBoolean = '1';
 export type Base64String = string;
 export type Base64UrlString = string;
 export type JWTString = string;
+export declare const JWT_REGEX: RegExp;
 export type SemVerString = string;
 /**
  * Named type for JSON.parse / JSON.stringify second argument

package/dist/types.js

@@ -20,6 +20,7 @@ export const _passUndefinedMapper = () => undefined;
 export const _noop = (..._args) => undefined;
 export const _passthroughPredicate = () => true;
 export const _passNothingPredicate = () => false;
+export const JWT_REGEX = /^[\w-]+\.[\w-]+\.[\w-]+$/;
 /**
  * Like _stringMapValues, but values are sorted.
  */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/js-lib",
   "type": "module",
-  "version": "15.35.0",
+  "version": "15.37.0",
   "dependencies": {
     "tslib": "^2",
     "undici": "^7",

package/src/json-schema/jsonSchema.model.ts

@@ -13,7 +13,7 @@ export type JsonSchema<T = unknown> =
   | JsonSchemaNumber
   | JsonSchemaBoolean
   | JsonSchemaNull
-  | JsonSchemaObject // cannot use <T>, because T needs to extend AnyObject
+  | JsonSchemaObject<T extends AnyObject ? T : AnyObject>
   | JsonSchemaArray<T>
   | JsonSchemaTuple<T>
 
@@ -28,7 +28,7 @@ export interface JsonSchemaAny<T = unknown> {
   readOnly?: boolean
   writeOnly?: boolean
 
-  type?: string
+  type?: string | string[]
 
   default?: T
 

package/src/json-schema/jsonSchemaBuilder.ts

@@ -1,7 +1,15 @@
 import { _uniq } from '../array/array.util.js'
 import { _deepCopy } from '../object/object.util.js'
 import { _sortObject } from '../object/sortObject.js'
-import type { AnyObject, BaseDBEntity, IsoDate, IsoDateTime, UnixTimestamp } from '../types.js'
+import {
+  type AnyObject,
+  type BaseDBEntity,
+  type IsoDate,
+  type IsoDateTime,
+  JWT_REGEX,
+  type JWTString,
+  type UnixTimestamp,
+} from '../types.js'
 import { JSON_SCHEMA_ORDER } from './jsonSchema.cnst.js'
 import type {
   JsonSchema,
@@ -35,7 +43,7 @@ export const j = {
   any<T = unknown>() {
     return new JsonSchemaAnyBuilder<T, JsonSchemaAny<T>>({})
   },
-  const<T = unknown>(value: T) {
+  const<T extends string | number | boolean | null>(value: T) {
     return new JsonSchemaAnyBuilder<T, JsonSchemaConst<T>>({
       const: value,
     })
@@ -82,6 +90,9 @@ export const j = {
   string<T extends string = string>() {
     return new JsonSchemaStringBuilder<T>()
   },
+  jwt() {
+    return new JsonSchemaStringBuilder<JWTString>().jwt()
+  },
 
   /**
    * Accepts only the `YYYY-MM-DD` shape from all ISO 8601 variants.
@@ -122,10 +133,15 @@ export const j = {
   tuple<T extends any[] = unknown[]>(items: JsonSchemaAnyBuilder[]) {
     return new JsonSchemaTupleBuilder<T>(items)
   },
-  oneOf<T = unknown>(items: JsonSchemaAnyBuilder[]) {
-    return new JsonSchemaAnyBuilder<T, JsonSchemaOneOf<T>>({
+  oneOf<Builders extends JsonSchemaAnyBuilder<any, any, any>[]>(
+    items: [...Builders],
+  ): JsonSchemaAnyBuilder<
+    Builders[number] extends JsonSchemaAnyBuilder<infer U, any, any> ? U : never,
+    JsonSchemaOneOf<Builders[number] extends JsonSchemaAnyBuilder<infer U, any, any> ? U : never>
+  > {
+    return new JsonSchemaAnyBuilder({
       oneOf: items.map(b => b.build()),
-    })
+    }) as any
   },
   allOf<T = unknown>(items: JsonSchemaAnyBuilder[]) {
     return new JsonSchemaAnyBuilder<T, JsonSchemaAllOf<T>>({
@@ -134,8 +150,11 @@ export const j = {
   },
 }
 
-export class JsonSchemaAnyBuilder<T = unknown, SCHEMA_TYPE extends JsonSchema<T> = JsonSchema<T>>
-  implements JsonSchemaBuilder<T>
+export class JsonSchemaAnyBuilder<
+  T = unknown,
+  SCHEMA_TYPE extends JsonSchema<T> = JsonSchema<T>,
+  Opt extends boolean = false,
+> implements JsonSchemaBuilder<T>
 {
   constructor(protected schema: SCHEMA_TYPE) {}
 
@@ -186,27 +205,17 @@ export class JsonSchemaAnyBuilder<T = unknown, SCHEMA_TYPE extends JsonSchema<T>
     return this
   }
 
-  oneOf(schemas: JsonSchema[]): this {
-    Object.assign(this.schema, { oneOf: schemas })
-    return this
-  }
-
-  allOf(schemas: JsonSchema[]): this {
-    Object.assign(this.schema, { allOf: schemas })
-    return this
-  }
-
   instanceof(of: string): this {
     this.schema.instanceof = of
     return this
   }
 
-  optional(): JsonSchemaAnyBuilder<T | undefined, JsonSchema<T | undefined>>
-  optional(optional: true): JsonSchemaAnyBuilder<T | undefined, JsonSchema<T | undefined>>
+  optional(): JsonSchemaAnyBuilder<T | undefined, JsonSchema<T | undefined>, true>
+  optional(optional: true): JsonSchemaAnyBuilder<T | undefined, JsonSchema<T | undefined>, true>
   optional(
     optional: false,
-  ): JsonSchemaAnyBuilder<Exclude<T, undefined>, JsonSchema<Exclude<T, undefined>>>
-  optional(optional = true): JsonSchemaAnyBuilder<any, JsonSchema<any>> {
+  ): JsonSchemaAnyBuilder<Exclude<T, undefined>, JsonSchema<Exclude<T, undefined>>, false>
+  optional(optional = true): JsonSchemaAnyBuilder<any, JsonSchema<any>, false> {
     if (optional) {
       this.schema.optionalField = true
     } else {
@@ -215,6 +224,12 @@ export class JsonSchemaAnyBuilder<T = unknown, SCHEMA_TYPE extends JsonSchema<T>
     return this
   }
 
+  nullable(): JsonSchemaAnyBuilder<T | null, JsonSchema<T | null>, Opt> {
+    return new JsonSchemaAnyBuilder<T | null, JsonSchema<T | null>, Opt>({
+      anyOf: [this.build(), { type: 'null' }],
+    })
+  }
+
   /**
    * Produces a "clean schema object" without methods.
    * Same as if it would be JSON.stringified.
@@ -223,8 +238,8 @@ export class JsonSchemaAnyBuilder<T = unknown, SCHEMA_TYPE extends JsonSchema<T>
     return _sortObject(JSON.parse(JSON.stringify(this.schema)), JSON_SCHEMA_ORDER)
   }
 
-  clone(): JsonSchemaAnyBuilder<T, SCHEMA_TYPE> {
-    return new JsonSchemaAnyBuilder<T, SCHEMA_TYPE>(_deepCopy(this.schema))
+  clone(): JsonSchemaAnyBuilder<T, SCHEMA_TYPE, Opt> {
+    return new JsonSchemaAnyBuilder<T, SCHEMA_TYPE, Opt>(_deepCopy(this.schema))
   }
 
   /**
@@ -233,10 +248,10 @@ export class JsonSchemaAnyBuilder<T = unknown, SCHEMA_TYPE extends JsonSchema<T>
   infer!: T
 }
 
-export class JsonSchemaNumberBuilder<T extends number = number> extends JsonSchemaAnyBuilder<
-  T,
-  JsonSchemaNumber<T>
-> {
+export class JsonSchemaNumberBuilder<
+  T extends number = number,
+  Opt extends boolean = false,
+> extends JsonSchemaAnyBuilder<T, JsonSchemaNumber<T>, Opt> {
   constructor() {
     super({
       type: 'number',
@@ -306,10 +321,10 @@ export class JsonSchemaNumberBuilder<T extends number = number> extends JsonSche
   }
 }
 
-export class JsonSchemaStringBuilder<T extends string = string> extends JsonSchemaAnyBuilder<
-  T,
-  JsonSchemaString<T>
-> {
+export class JsonSchemaStringBuilder<
+  T extends string = string,
+  Opt extends boolean = false,
+> extends JsonSchemaAnyBuilder<T, JsonSchemaString<T>, Opt> {
   constructor() {
     super({
       type: 'string',
@@ -380,6 +395,10 @@ export class JsonSchemaStringBuilder<T extends string = string> extends JsonSche
     return this.format('IsoDateTime').branded<IsoDateTime>().description('IsoDateTime')
   }
 
+  jwt(): this {
+    return this.regex(JWT_REGEX)
+  }
+
   private transformModify(t: 'trim' | 'toLowerCase' | 'toUpperCase', add: boolean): this {
     if (add) {
       this.schema.transform = _uniq([...(this.schema.transform || []), t])
@@ -393,10 +412,10 @@ export class JsonSchemaStringBuilder<T extends string = string> extends JsonSche
   // contentEncoding?: string
 }
 
-export class JsonSchemaObjectBuilder<T extends AnyObject> extends JsonSchemaAnyBuilder<
-  T,
-  JsonSchemaObject<T>
-> {
+export class JsonSchemaObjectBuilder<
+  T extends AnyObject,
+  Opt extends boolean = false,
+> extends JsonSchemaAnyBuilder<T, JsonSchemaObject<T>, Opt> {
   constructor() {
     super({
       type: 'object',
@@ -460,17 +479,20 @@ export class JsonSchemaObjectBuilder<T extends AnyObject> extends JsonSchemaAnyB
     return this.addRequired(['id', 'created', 'updated']) as any
   }
 
-  extend<T2 extends AnyObject>(s2: JsonSchemaObjectBuilder<T2>): JsonSchemaObjectBuilder<T & T2> {
-    const builder = new JsonSchemaObjectBuilder<T & T2>()
+  extend<T2 extends AnyObject>(
+    s2: JsonSchemaObjectBuilder<T2>,
+  ): JsonSchemaObjectBuilder<T & T2 extends infer O ? { [K in keyof O]: O[K] } : never> {
+    const builder = new JsonSchemaObjectBuilder<any>()
     Object.assign(builder.schema, _deepCopy(this.schema))
     mergeJsonSchemaObjects(builder.schema, s2.schema)
     return builder
   }
 }
 
-export class JsonSchemaArrayBuilder<ITEM> extends JsonSchemaAnyBuilder<
+export class JsonSchemaArrayBuilder<ITEM, Opt extends boolean = false> extends JsonSchemaAnyBuilder<
   ITEM[],
-  JsonSchemaArray<ITEM>
+  JsonSchemaArray<ITEM>,
+  Opt
 > {
   constructor(itemsSchema: JsonSchemaBuilder<ITEM>) {
     super({
@@ -509,16 +531,25 @@ export class JsonSchemaTupleBuilder<T extends any[]> extends JsonSchemaAnyBuilde
   }
 }
 
-// TODO and Notes
-// The issue is that in `j` we mix two approaches:
-// 1) the builder driven approach
-// 2) the type driven approach.
-
-function object<P extends Record<string, JsonSchemaAnyBuilder<any, any>>>(
+function object<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(
   props: P,
-): JsonSchemaObjectBuilder<{
-  [K in keyof P]: P[K] extends JsonSchemaAnyBuilder<infer U, any> ? U : never
-}>
+): JsonSchemaObjectBuilder<
+  {
+    [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer Opt>
+      ? Opt extends true
+        ? never
+        : K
+      : never]: P[K] extends JsonSchemaAnyBuilder<infer U, any, any> ? U : never
+  } & {
+    [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer Opt>
+      ? Opt extends true
+        ? K
+        : never
+      : never]?: P[K] extends JsonSchemaAnyBuilder<infer U, any, any> ? U : never
+  } extends infer O
+    ? { [K in keyof O]: O[K] }
+    : never
+>
 function object<T extends AnyObject>(props: {
   [K in keyof T]: JsonSchemaAnyBuilder<T[K]>
 }): JsonSchemaObjectBuilder<T>

package/src/types.ts

@@ -335,6 +335,7 @@ export type ShortBoolean = '1'
 export type Base64String = string
 export type Base64UrlString = string
 export type JWTString = string
+export const JWT_REGEX = /^[\w-]+\.[\w-]+\.[\w-]+$/
 
 export type SemVerString = string