@naturalcycles/js-lib 15.42.0 → 15.42.1

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

@@ -19,7 +19,7 @@ export declare const j: {
     integer<T extends number = number>(): JsonSchemaNumberBuilder<T, false>;
     string<T extends string = string>(): JsonSchemaStringBuilder<T, false>;
     object: typeof object;
-    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>;
+    dbEntity<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(props: P): JsonSchemaObjectBuilder<BaseDBEntity & { [K in keyof P]: P[K] extends JsonSchemaAnyBuilder<infer U, any, any> ? U : never; }>;
     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>;
@@ -139,12 +139,14 @@ export declare class JsonSchemaArrayBuilder<ITEM, Opt extends boolean = false> e
     constructor(itemsSchema: JsonSchemaBuilder<ITEM>);
     min(minItems: number): this;
     max(maxItems: number): this;
-    unique(uniqueItems: number): this;
+    unique(uniqueItems?: boolean): this;
 }
 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, any>>>(props?: P): JsonSchemaObjectBuilder<{
+declare function object<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(props?: {
+    [K in keyof P]: P[K] & JsonSchemaAnyBuilder<any, any, any>;
+}): 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;

package/dist/json-schema/jsonSchemaBuilder.js

@@ -392,7 +392,7 @@ export class JsonSchemaArrayBuilder extends JsonSchemaAnyBuilder {
         Object.assign(this.schema, { maxItems });
         return this;
     }
-    unique(uniqueItems) {
+    unique(uniqueItems = true) {
         Object.assign(this.schema, { uniqueItems });
         return this;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/js-lib",
   "type": "module",
-  "version": "15.42.0",
+  "version": "15.42.1",
   "dependencies": {
     "tslib": "^2",
     "undici": "^7",
@@ -13,7 +13,7 @@
     "@types/semver": "^7",
     "crypto-js": "^4",
     "dayjs": "^1",
-    "@naturalcycles/dev-lib": "20.4.2"
+    "@naturalcycles/dev-lib": "18.4.2"
   },
   "exports": {
     ".": "./dist/index.js",

package/src/json-schema/jsonSchemaBuilder.ts

@@ -119,14 +119,18 @@ export const j = {
 
   // complex types
   object,
-  dbEntity<T extends AnyObject>(props: T) {
+  dbEntity<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(props: P) {
     return j
       .object<BaseDBEntity>({
         id: j.string(),
         created: j.integer().unixTimestamp2000(),
         updated: j.integer().unixTimestamp2000(),
       })
-      .extend(j.object(props))
+      .extend(j.object(props)) as JsonSchemaObjectBuilder<
+      BaseDBEntity & {
+        [K in keyof P]: P[K] extends JsonSchemaAnyBuilder<infer U, any, any> ? U : never
+      }
+    >
   },
 
   rootObject<T extends AnyObject>(props: {
@@ -541,7 +545,7 @@ export class JsonSchemaArrayBuilder<ITEM, Opt extends boolean = false> extends J
     return this
   }
 
-  unique(uniqueItems: number): this {
+  unique(uniqueItems = true): this {
     Object.assign(this.schema, { uniqueItems })
     return this
   }
@@ -561,9 +565,9 @@ export class JsonSchemaTupleBuilder<T extends any[]> extends JsonSchemaAnyBuilde
   }
 }
 
-function object<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(
-  props?: P,
-): JsonSchemaObjectBuilder<
+function object<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(props?: {
+  [K in keyof P]: P[K] & JsonSchemaAnyBuilder<any, any, any>
+}): JsonSchemaObjectBuilder<
   {
     [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer Opt>
       ? Opt extends true