@naturalcycles/nodejs-lib 15.97.1 → 15.97.2

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

@@ -53,9 +53,9 @@ export declare const j: {
         withEnumKeys: typeof withEnumKeys;
         withRegexKeys: typeof withRegexKeys;
     };
-    array<OUT, Opt>(itemSchema: JBuilder<OUT, Opt>): JArray<OUT, Opt>;
-    tuple<const S extends JBuilder<any, any>[]>(items: S): JTuple<S>;
-    set<OUT, Opt>(itemSchema: JBuilder<OUT, Opt>): JSet2Builder<OUT, Opt>;
+    array<OUT, Opt>(itemSchema: JSchema<OUT, Opt>): JArray<OUT, Opt>;
+    tuple<const S extends JSchema<any, any>[]>(items: S): JTuple<S>;
+    set<OUT, Opt>(itemSchema: JSchema<OUT, Opt>): JSet2Builder<OUT, Opt>;
     buffer(): JBuilder<Buffer<ArrayBufferLike>, false>;
     enum<const T extends any>(input: T, opt?: JsonBuilderRuleOpt | undefined): JEnum<T extends readonly (infer U)[] ? U : T extends StringEnum ? T[keyof T] : T extends NumberEnum ? T[keyof T] : never, false>;
     /**
@@ -69,7 +69,7 @@ export declare const j: {
      * Use `anyOf` when schemas may overlap (e.g., AccountId | PartnerId with same format).
      * Use `oneOf` when schemas are mutually exclusive.
      */
-    oneOf<B extends readonly JBuilder<any, boolean>[], OUT = BuilderOutUnion<B>>(items: [...B]): JBuilder<OUT, false>;
+    oneOf<B extends readonly JSchema<any, boolean>[], OUT = BuilderOutUnion<B>>(items: [...B]): JBuilder<OUT, false>;
     /**
      * Use only with primitive values, otherwise this function will throw to avoid bugs.
      * To validate objects, use `anyOfBy` or `anyOfThese`.
@@ -81,7 +81,7 @@ export declare const j: {
      * Use `anyOf` when schemas may overlap (e.g., AccountId | PartnerId with same format).
      * Use `oneOf` when schemas are mutually exclusive.
      */
-    anyOf<B extends readonly JBuilder<any, boolean>[], OUT = BuilderOutUnion<B>>(items: [...B]): JBuilder<OUT, false>;
+    anyOf<B extends readonly JSchema<any, boolean>[], OUT = BuilderOutUnion<B>>(items: [...B]): JBuilder<OUT, false>;
     /**
      * Pick validation schema for an object based on the value of a specific property.
      *
@@ -103,7 +103,7 @@ export declare const j: {
      * const schema = j.anyOfThese([successSchema, errorSchema])
      * ```
      */
-    anyOfThese<B extends readonly JBuilder<any, boolean>[], OUT = BuilderOutUnion<B>>(items: [...B]): JBuilder<OUT, false>;
+    anyOfThese<B extends readonly JSchema<any, boolean>[], OUT = BuilderOutUnion<B>>(items: [...B]): JBuilder<OUT, false>;
     and(): {
         silentBob: () => never;
     };
@@ -331,10 +331,10 @@ export declare class JObject<OUT extends AnyObject, Opt extends boolean = false>
      * When set, the validation will not strip away properties that are not specified explicitly in the schema.
      */
     allowAdditionalProperties(): this;
-    extend<P extends Record<string, JBuilder<any, any>>>(props: P): JObject<Override<OUT, {
-        [K in keyof P as P[K] extends JBuilder<any, infer IsOpt> ? IsOpt extends true ? never : K : never]: P[K] extends JBuilder<infer OUT2, any> ? OUT2 : never;
+    extend<P extends Record<string, JSchema<any, any>>>(props: P): JObject<Override<OUT, {
+        [K in keyof P as P[K] extends JSchema<any, infer IsOpt> ? IsOpt extends true ? never : K : never]: P[K] extends JSchema<infer OUT2, any> ? OUT2 : never;
     } & {
-        [K in keyof P as P[K] extends JBuilder<any, infer IsOpt> ? IsOpt extends true ? K : never : never]?: P[K] extends JBuilder<infer OUT2, any> ? OUT2 : never;
+        [K in keyof P as P[K] extends JSchema<any, infer IsOpt> ? IsOpt extends true ? K : never : never]?: P[K] extends JSchema<infer OUT2, any> ? OUT2 : never;
     }>, false>;
     /**
      * Concatenates another schema to the current schema.
@@ -349,8 +349,8 @@ export declare class JObject<OUT extends AnyObject, Opt extends boolean = false>
      */
     dbEntity(): JObject<Override<OUT, {
         id: string;
-        created: any;
-        updated: any;
+        created: UnixTimestamp;
+        updated: UnixTimestamp;
     } & {}>, false>;
     minProperties(minProperties: number): this;
     maxProperties(maxProperties: number): this;
@@ -384,7 +384,7 @@ export declare class JObjectInfer<PROPS extends Record<string, JSchema<any, any>
     }[K] : K extends keyof PROPS ? PROPS[K] : never; }, Opt>;
 }
 export declare class JArray<OUT, Opt> extends JBuilder<OUT[], Opt> {
-    constructor(itemsSchema: JBuilder<OUT, Opt>);
+    constructor(itemsSchema: JSchema<OUT, Opt>);
     minLength(minItems: number): this;
     maxLength(maxItems: number): this;
     length(exactLength: number): this;
@@ -393,7 +393,7 @@ export declare class JArray<OUT, Opt> extends JBuilder<OUT[], Opt> {
     unique(): this;
 }
 declare class JSet2Builder<OUT, Opt> extends JBuilder<Set2<OUT>, Opt> {
-    constructor(itemsSchema: JBuilder<OUT, Opt>);
+    constructor(itemsSchema: JSchema<OUT, Opt>);
     min(minItems: number): this;
     max(maxItems: number): this;
 }
@@ -401,7 +401,7 @@ export declare class JEnum<OUT extends string | number | boolean | null, Opt ext
     constructor(enumValues: readonly OUT[], baseType: EnumBaseType, opt?: JsonBuilderRuleOpt);
     branded<B extends OUT>(): JEnum<B, Opt>;
 }
-export declare class JTuple<ITEMS extends JBuilder<any, any>[]> extends JBuilder<TupleOut<ITEMS>, false> {
+export declare class JTuple<ITEMS extends JSchema<any, any>[]> extends JBuilder<TupleOut<ITEMS>, false> {
     constructor(items: ITEMS);
 }
 declare function object(props: AnyObject): never;
@@ -425,12 +425,12 @@ declare function objectDbEntity<OUT extends BaseDBEntity, EXTRA_KEYS extends Exc
 } : {
     updated: BuilderFor<OUT['updated']>;
 })): JObject<OUT, false>;
-declare function record<KS extends JBuilder<any, any>, VS extends JBuilder<any, any>, Opt extends boolean = SchemaOpt<VS>>(keySchema: KS, valueSchema: VS): JObject<Opt extends true ? Partial<Record<SchemaOut<KS>, SchemaOut<VS>>> : Record<SchemaOut<KS>, SchemaOut<VS>>, false>;
-declare function withRegexKeys<S extends JBuilder<any, any>>(keyRegex: RegExp | string, schema: S): JObject<StringMap<SchemaOut<S>>, false>;
+declare function record<KS extends JSchema<any, any>, VS extends JSchema<any, any>, Opt extends boolean = SchemaOpt<VS>>(keySchema: KS, valueSchema: VS): JObject<Opt extends true ? Partial<Record<SchemaOut<KS>, SchemaOut<VS>>> : Record<SchemaOut<KS>, SchemaOut<VS>>, false>;
+declare function withRegexKeys<S extends JSchema<any, any>>(keyRegex: RegExp | string, schema: S): JObject<StringMap<SchemaOut<S>>, false>;
 /**
  * Builds the object schema with the indicated `keys` and uses the `schema` for their validation.
  */
-declare function withEnumKeys<const T extends readonly (string | number)[] | StringEnum | NumberEnum, S extends JBuilder<any, any>, K extends string | number = EnumKeyUnion<T>, Opt extends boolean = SchemaOpt<S>>(keys: T, schema: S): JObject<Opt extends true ? {
+declare function withEnumKeys<const T extends readonly (string | number)[] | StringEnum | NumberEnum, S extends JSchema<any, any>, K extends string | number = EnumKeyUnion<T>, Opt extends boolean = SchemaOpt<S>>(keys: T, schema: S): JObject<Opt extends true ? {
     [P in K]?: SchemaOut<S>;
 } : {
     [P in K]: SchemaOut<S>;
@@ -621,13 +621,13 @@ type IsAny<T> = 0 extends 1 & T ? true : false;
 type IsAssignableRelaxed<A, B> = IsAny<RelaxIndexSignature<A>> extends true ? true : [RelaxIndexSignature<A>] extends [B] ? true : false;
 type ExactMatchBase<A, B> = (<T>() => T extends A ? 1 : 2) extends <T>() => (T extends B ? 1 : 2) ? (<T>() => T extends B ? 1 : 2) extends <T>() => (T extends A ? 1 : 2) ? true : false : false;
 type ExactMatch<A, B> = HasAllowExtraKeys<B> extends true ? IsAssignableRelaxed<B, A> : ExactMatchBase<Expand<A>, Expand<B>> extends true ? true : ExactMatchBase<Expand<StripIndexSignatureDeep<A>>, Expand<StripIndexSignatureDeep<B>>>;
-type BuilderOutUnion<B extends readonly JBuilder<any, any>[]> = {
-    [K in keyof B]: B[K] extends JBuilder<infer O, any> ? O : never;
+type BuilderOutUnion<B extends readonly JSchema<any, any>[]> = {
+    [K in keyof B]: B[K] extends JSchema<infer O, any> ? O : never;
 }[number];
 type AnyOfByOut<D extends Record<PropertyKey, JSchema<any, any>>> = {
     [K in keyof D]: D[K] extends JSchema<infer O, any> ? O : never;
 }[keyof D];
-type BuilderFor<T> = JBuilder<T, any>;
+type BuilderFor<T> = JSchema<T, any>;
 export interface JsonBuilderRuleOpt {
     /**
      * Text of error message to return when the validation fails for the given rule:
@@ -643,9 +643,9 @@ export interface JsonBuilderRuleOpt {
     name?: string;
 }
 type EnumKeyUnion<T> = T extends readonly (infer U)[] ? U : T extends StringEnum | NumberEnum ? T[keyof T] : never;
-type SchemaOut<S> = S extends JBuilder<infer OUT, any> ? OUT : never;
-type SchemaOpt<S> = S extends JBuilder<any, infer Opt> ? (Opt extends true ? true : false) : false;
-type TupleOut<T extends readonly JBuilder<any, any>[]> = {
-    [K in keyof T]: T[K] extends JBuilder<infer O, any> ? O : never;
+type SchemaOut<S> = S extends JSchema<infer OUT, any> ? OUT : never;
+type SchemaOpt<S> = S extends JSchema<any, infer Opt> ? (Opt extends true ? true : false) : false;
+type TupleOut<T extends readonly JSchema<any, any>[]> = {
+    [K in keyof T]: T[K] extends JSchema<infer O, any> ? O : never;
 };
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.97.1",
+  "version": "15.97.2",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@standard-schema/spec": "^1",

package/src/validation/ajv/jSchema.ts

@@ -140,15 +140,15 @@ export const j = {
     withRegexKeys,
   }),
 
-  array<OUT, Opt>(itemSchema: JBuilder<OUT, Opt>): JArray<OUT, Opt> {
+  array<OUT, Opt>(itemSchema: JSchema<OUT, Opt>): JArray<OUT, Opt> {
     return new JArray(itemSchema)
   },
 
-  tuple<const S extends JBuilder<any, any>[]>(items: S): JTuple<S> {
+  tuple<const S extends JSchema<any, any>[]>(items: S): JTuple<S> {
     return new JTuple<S>(items)
   },
 
-  set<OUT, Opt>(itemSchema: JBuilder<OUT, Opt>): JSet2Builder<OUT, Opt> {
+  set<OUT, Opt>(itemSchema: JSchema<OUT, Opt>): JSet2Builder<OUT, Opt> {
     return new JSet2Builder(itemSchema)
   },
 
@@ -206,7 +206,7 @@ export const j = {
    * Use `anyOf` when schemas may overlap (e.g., AccountId | PartnerId with same format).
    * Use `oneOf` when schemas are mutually exclusive.
    */
-  oneOf<B extends readonly JBuilder<any, boolean>[], OUT = BuilderOutUnion<B>>(
+  oneOf<B extends readonly JSchema<any, boolean>[], OUT = BuilderOutUnion<B>>(
     items: [...B],
   ): JBuilder<OUT, false> {
     const schemas = items.map(b => b.build())
@@ -231,7 +231,7 @@ export const j = {
    * Use `anyOf` when schemas may overlap (e.g., AccountId | PartnerId with same format).
    * Use `oneOf` when schemas are mutually exclusive.
    */
-  anyOf<B extends readonly JBuilder<any, boolean>[], OUT = BuilderOutUnion<B>>(
+  anyOf<B extends readonly JSchema<any, boolean>[], OUT = BuilderOutUnion<B>>(
     items: [...B],
   ): JBuilder<OUT, false> {
     const schemas = items.map(b => b.build())
@@ -284,7 +284,7 @@ export const j = {
    * const schema = j.anyOfThese([successSchema, errorSchema])
    * ```
    */
-  anyOfThese<B extends readonly JBuilder<any, boolean>[], OUT = BuilderOutUnion<B>>(
+  anyOfThese<B extends readonly JSchema<any, boolean>[], OUT = BuilderOutUnion<B>>(
     items: [...B],
   ): JBuilder<OUT, false> {
     return new JBuilder<OUT, false>({
@@ -1063,25 +1063,25 @@ export class JObject<OUT extends AnyObject, Opt extends boolean = false> extends
     return this.cloneAndUpdateSchema({ additionalProperties: true })
   }
 
-  extend<P extends Record<string, JBuilder<any, any>>>(
+  extend<P extends Record<string, JSchema<any, any>>>(
     props: P,
   ): JObject<
     Override<
       OUT,
       {
         // required keys
-        [K in keyof P as P[K] extends JBuilder<any, infer IsOpt>
+        [K in keyof P as P[K] extends JSchema<any, infer IsOpt>
           ? IsOpt extends true
             ? never
             : K
-          : never]: P[K] extends JBuilder<infer OUT2, any> ? OUT2 : never
+          : never]: P[K] extends JSchema<infer OUT2, any> ? OUT2 : never
       } & {
         // optional keys
-        [K in keyof P as P[K] extends JBuilder<any, infer IsOpt>
+        [K in keyof P as P[K] extends JSchema<any, infer IsOpt>
           ? IsOpt extends true
             ? K
             : never
-          : never]?: P[K] extends JBuilder<infer OUT2, any> ? OUT2 : never
+          : never]?: P[K] extends JSchema<infer OUT2, any> ? OUT2 : never
       }
     >,
     false
@@ -1232,7 +1232,7 @@ export class JObjectInfer<
 }
 
 export class JArray<OUT, Opt> extends JBuilder<OUT[], Opt> {
-  constructor(itemsSchema: JBuilder<OUT, Opt>) {
+  constructor(itemsSchema: JSchema<OUT, Opt>) {
     super({
       type: 'array',
       items: itemsSchema.build(),
@@ -1264,7 +1264,7 @@ export class JArray<OUT, Opt> extends JBuilder<OUT[], Opt> {
 }
 
 class JSet2Builder<OUT, Opt> extends JBuilder<Set2<OUT>, Opt> {
-  constructor(itemsSchema: JBuilder<OUT, Opt>) {
+  constructor(itemsSchema: JSchema<OUT, Opt>) {
     super({
       type: ['array', 'object'],
       Set2: itemsSchema.build(),
@@ -1302,7 +1302,7 @@ export class JEnum<
   }
 }
 
-export class JTuple<ITEMS extends JBuilder<any, any>[]> extends JBuilder<TupleOut<ITEMS>, false> {
+export class JTuple<ITEMS extends JSchema<any, any>[]> extends JBuilder<TupleOut<ITEMS>, false> {
   constructor(items: ITEMS) {
     super({
       type: 'array',
@@ -1366,8 +1366,8 @@ function objectDbEntity(props: AnyObject): any {
 }
 
 function record<
-  KS extends JBuilder<any, any>,
-  VS extends JBuilder<any, any>,
+  KS extends JSchema<any, any>,
+  VS extends JSchema<any, any>,
   Opt extends boolean = SchemaOpt<VS>,
 >(
   keySchema: KS,
@@ -1402,7 +1402,7 @@ function record<
   })
 }
 
-function withRegexKeys<S extends JBuilder<any, any>>(
+function withRegexKeys<S extends JSchema<any, any>>(
   keyRegex: RegExp | string,
   schema: S,
 ): JObject<StringMap<SchemaOut<S>>, false> {
@@ -1428,7 +1428,7 @@ function withRegexKeys<S extends JBuilder<any, any>>(
  */
 function withEnumKeys<
   const T extends readonly (string | number)[] | StringEnum | NumberEnum,
-  S extends JBuilder<any, any>,
+  S extends JSchema<any, any>,
   K extends string | number = EnumKeyUnion<T>,
   Opt extends boolean = SchemaOpt<S>,
 >(
@@ -2117,15 +2117,15 @@ type ExactMatch<A, B> =
       ? true
       : ExactMatchBase<Expand<StripIndexSignatureDeep<A>>, Expand<StripIndexSignatureDeep<B>>>
 
-type BuilderOutUnion<B extends readonly JBuilder<any, any>[]> = {
-  [K in keyof B]: B[K] extends JBuilder<infer O, any> ? O : never
+type BuilderOutUnion<B extends readonly JSchema<any, any>[]> = {
+  [K in keyof B]: B[K] extends JSchema<infer O, any> ? O : never
 }[number]
 
 type AnyOfByOut<D extends Record<PropertyKey, JSchema<any, any>>> = {
   [K in keyof D]: D[K] extends JSchema<infer O, any> ? O : never
 }[keyof D]
 
-type BuilderFor<T> = JBuilder<T, any>
+type BuilderFor<T> = JSchema<T, any>
 
 export interface JsonBuilderRuleOpt {
   /**
@@ -2151,9 +2151,9 @@ type EnumKeyUnion<T> =
       ? T[keyof T]
       : never
 
-type SchemaOut<S> = S extends JBuilder<infer OUT, any> ? OUT : never
-type SchemaOpt<S> = S extends JBuilder<any, infer Opt> ? (Opt extends true ? true : false) : false
+type SchemaOut<S> = S extends JSchema<infer OUT, any> ? OUT : never
+type SchemaOpt<S> = S extends JSchema<any, infer Opt> ? (Opt extends true ? true : false) : false
 
-type TupleOut<T extends readonly JBuilder<any, any>[]> = {
-  [K in keyof T]: T[K] extends JBuilder<infer O, any> ? O : never
+type TupleOut<T extends readonly JSchema<any, any>[]> = {
+  [K in keyof T]: T[K] extends JSchema<infer O, any> ? O : never
 }