@naturalcycles/nodejs-lib 15.45.0 → 15.46.1

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

@@ -66,8 +66,8 @@ export declare class JsonSchemaStringBuilder<IN extends string = string, OUT = I
     constructor();
     regex(pattern: RegExp, opt?: JsonBuilderRuleOpt): this;
     pattern(pattern: string, opt?: JsonBuilderRuleOpt): this;
-    min(minLength: number): this;
-    max(maxLength: number): this;
+    minLength(minLength: number): this;
+    maxLength(maxLength: number): this;
     length(minLength: number, maxLength: number): this;
     email(opt?: Partial<JsonSchemaStringEmailOptions>): this;
     trim(): this;
@@ -115,6 +115,7 @@ export declare class JsonSchemaNumberBuilder<IN extends number = number, OUT = I
     lessThanOrEqual(value: number): this;
     moreThan(value: number): this;
     moreThanOrEqual(value: number): this;
+    equal(value: number): this;
     range(minimum: number, maximum: number, incl: Inclusiveness): this;
     int32(): this;
     int64(): this;
@@ -172,8 +173,10 @@ export declare class JsonSchemaObjectInferringBuilder<PROPS extends Record<strin
 }
 export declare class JsonSchemaArrayBuilder<IN, OUT, Opt> extends JsonSchemaAnyBuilder<IN[], OUT[], Opt> {
     constructor(itemsSchema: JsonSchemaAnyBuilder<IN, OUT, Opt>);
-    min(minItems: number): this;
-    max(maxItems: number): this;
+    minLength(minItems: number): this;
+    maxLength(maxItems: number): this;
+    length(minItems: number, maxItems: number): this;
+    exactLength(length: number): this;
     unique(uniqueItems: number): this;
 }
 export declare class JsonSchemaSet2Builder<IN, OUT, Opt> extends JsonSchemaAnyBuilder<Iterable<IN>, Set2<OUT>, Opt> {
@@ -249,15 +252,14 @@ declare function object<IN extends AnyObject>(props: {
     [key in keyof IN]: JsonSchemaAnyBuilder<any, IN[key], 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;
-declare function objectDbEntity<IN extends AnyObject>(props?: {
-    [key in keyof PartiallyOptional<IN, 'id' | 'created' | 'updated'>]: JsonSchemaAnyBuilder<any, IN[key], any>;
+declare function objectDbEntity(props: AnyObject): never;
+declare function objectDbEntity<IN extends AnyObject, EXTRA_KEYS extends Exclude<keyof IN, 'id' | 'created' | 'updated'> = Exclude<keyof IN, 'id' | 'created' | 'updated'>>(props: {
+    [K in EXTRA_KEYS]: JsonSchemaAnyBuilder<any, IN[K], any>;
 }): JsonSchemaObjectBuilder<IN, IN, false>;
 type Expand<T> = T extends infer O ? {
     [K in keyof O]: O[K];
 } : never;
 type ExactMatch<A, B> = (<T>() => T extends A ? 1 : 2) extends <T>() => T extends B ? 1 : 2 ? true : false;
-type PartiallyOptional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
 type BuilderOutUnion<B extends readonly JsonSchemaAnyBuilder<any, any, any>[]> = {
     [K in keyof B]: B[K] extends JsonSchemaAnyBuilder<any, infer O, any> ? O : never;
 }[number];

package/dist/validation/ajv/jsonSchemaBuilder.js

@@ -185,11 +185,11 @@ export class JsonSchemaStringBuilder extends JsonSchemaAnyBuilder {
         Object.assign(this.schema, { pattern });
         return this;
     }
-    min(minLength) {
+    minLength(minLength) {
         Object.assign(this.schema, { minLength });
         return this;
     }
-    max(maxLength) {
+    maxLength(maxLength) {
         Object.assign(this.schema, { maxLength });
         return this;
     }
@@ -334,6 +334,9 @@ export class JsonSchemaNumberBuilder extends JsonSchemaAnyBuilder {
     moreThanOrEqual(value) {
         return this.min(value);
     }
+    equal(value) {
+        return this.min(value).max(value);
+    }
     range(minimum, maximum, incl) {
         if (incl === '[)') {
             return this.moreThanOrEqual(minimum).lessThan(maximum);
@@ -507,14 +510,20 @@ export class JsonSchemaArrayBuilder extends JsonSchemaAnyBuilder {
             items: itemsSchema.build(),
         });
     }
-    min(minItems) {
+    minLength(minItems) {
         Object.assign(this.schema, { minItems });
         return this;
     }
-    max(maxItems) {
+    maxLength(maxItems) {
         Object.assign(this.schema, { maxItems });
         return this;
     }
+    length(minItems, maxItems) {
+        return this.minLength(minItems).maxLength(maxItems);
+    }
+    exactLength(length) {
+        return this.minLength(length).maxLength(length);
+    }
     unique(uniqueItems) {
         Object.assign(this.schema, { uniqueItems });
         return this;

package/package.json

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

package/src/validation/ajv/jsonSchemaBuilder.ts

@@ -256,12 +256,12 @@ export class JsonSchemaStringBuilder<
     return this
   }
 
-  min(minLength: number): this {
+  minLength(minLength: number): this {
     Object.assign(this.schema, { minLength })
     return this
   }
 
-  max(maxLength: number): this {
+  maxLength(maxLength: number): this {
     Object.assign(this.schema, { maxLength })
     return this
   }
@@ -452,6 +452,10 @@ export class JsonSchemaNumberBuilder<
     return this.min(value)
   }
 
+  equal(value: number): this {
+    return this.min(value).max(value)
+  }
+
   range(minimum: number, maximum: number, incl: Inclusiveness): this {
     if (incl === '[)') {
       return this.moreThanOrEqual(minimum).lessThan(maximum)
@@ -725,16 +729,24 @@ export class JsonSchemaArrayBuilder<IN, OUT, Opt> extends JsonSchemaAnyBuilder<I
     })
   }
 
-  min(minItems: number): this {
+  minLength(minItems: number): this {
     Object.assign(this.schema, { minItems })
     return this
   }
 
-  max(maxItems: number): this {
+  maxLength(maxItems: number): this {
     Object.assign(this.schema, { maxItems })
     return this
   }
 
+  length(minItems: number, maxItems: number): this {
+    return this.minLength(minItems).maxLength(maxItems)
+  }
+
+  exactLength(length: number): this {
+    return this.minLength(length).maxLength(length)
+  }
+
   unique(uniqueItems: number): this {
     Object.assign(this.schema, { uniqueItems })
     return this
@@ -876,21 +888,25 @@ function objectInfer<P extends Record<string, JsonSchemaAnyBuilder<any, any, any
   return new JsonSchemaObjectInferringBuilder<P, false>(props)
 }
 
-function objectDbEntity(props?: AnyObject): never
-function objectDbEntity<IN extends AnyObject>(props?: {
-  [key in keyof PartiallyOptional<IN, 'id' | 'created' | 'updated'>]: JsonSchemaAnyBuilder<
-    any,
-    IN[key],
-    any
-  >
+function objectDbEntity(props: AnyObject): never
+function objectDbEntity<
+  IN extends AnyObject,
+  EXTRA_KEYS extends Exclude<keyof IN, 'id' | 'created' | 'updated'> = Exclude<
+    keyof IN,
+    'id' | 'created' | 'updated'
+  >,
+>(props: {
+  [K in EXTRA_KEYS]: JsonSchemaAnyBuilder<any, IN[K], any>
 }): JsonSchemaObjectBuilder<IN, IN, false>
 
-function objectDbEntity<IN extends AnyObject>(props?: {
-  [key in keyof PartiallyOptional<IN, 'id' | 'created' | 'updated'>]: JsonSchemaAnyBuilder<
-    any,
-    IN[key],
-    any
-  >
+function objectDbEntity<
+  IN extends AnyObject,
+  EXTRA_KEYS extends Exclude<keyof IN, 'id' | 'created' | 'updated'> = Exclude<
+    keyof IN,
+    'id' | 'created' | 'updated'
+  >,
+>(props: {
+  [K in EXTRA_KEYS]: JsonSchemaAnyBuilder<any, IN[K], any>
 }): JsonSchemaObjectBuilder<IN, IN, false> {
   return j.object({
     id: j.string(),
@@ -905,8 +921,6 @@ type Expand<T> = T extends infer O ? { [K in keyof O]: O[K] } : never
 type ExactMatch<A, B> =
   (<T>() => T extends A ? 1 : 2) extends <T>() => T extends B ? 1 : 2 ? true : false
 
-type PartiallyOptional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>
-
 type BuilderOutUnion<B extends readonly JsonSchemaAnyBuilder<any, any, any>[]> = {
   [K in keyof B]: B[K] extends JsonSchemaAnyBuilder<any, infer O, any> ? O : never
 }[number]