@naturalcycles/nodejs-lib 15.46.0 → 15.46.2

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

@@ -1,5 +1,5 @@
 import type { Set2 } from '@naturalcycles/js-lib/object';
-import { type AnyObject, type IANATimezone, type Inclusiveness, type IsoDate, type IsoDateTime, type NumberEnum, type StringEnum, type StringMap, type UnixTimestamp, type UnixTimestampMillis } from '@naturalcycles/js-lib/types';
+import { type AnyObject, type BaseDBEntity, type IANATimezone, type Inclusiveness, type IsoDate, type IsoDateTime, type NumberEnum, type StringEnum, type StringMap, type UnixTimestamp, type UnixTimestampMillis } from '@naturalcycles/js-lib/types';
 export declare const j: {
     string(): JsonSchemaStringBuilder<string, string, false>;
     number(): JsonSchemaNumberBuilder<number, number, false>;
@@ -252,21 +252,33 @@ 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>;
-}): JsonSchemaObjectBuilder<IN, IN, false>;
+declare function objectDbEntity(props: AnyObject): never;
+declare function objectDbEntity<IN extends BaseDBEntity & AnyObject, EXTRA_KEYS extends Exclude<keyof IN, keyof BaseDBEntity> = Exclude<keyof IN, keyof BaseDBEntity>>(props: {
+    [K in EXTRA_KEYS]-?: BuilderFor<IN[K]>;
+} & (ExactMatch<IN['id'], BaseDBEntity['id']> extends true ? {
+    id?: BuilderFor<BaseDBEntity['id']>;
+} : {
+    id: BuilderFor<IN['id']>;
+}) & (ExactMatch<IN['created'], BaseDBEntity['created']> extends true ? {
+    created?: BuilderFor<BaseDBEntity['created']>;
+} : {
+    created: BuilderFor<IN['created']>;
+}) & (ExactMatch<IN['updated'], BaseDBEntity['updated']> extends true ? {
+    updated?: BuilderFor<BaseDBEntity['updated']>;
+} : {
+    updated: BuilderFor<IN['updated']>;
+})): 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];
 type BuilderInUnion<B extends readonly JsonSchemaAnyBuilder<any, any, any>[]> = {
     [K in keyof B]: B[K] extends JsonSchemaAnyBuilder<infer I, any, any> ? I : never;
 }[number];
+type BuilderFor<T> = JsonSchemaAnyBuilder<any, T, any>;
 interface JsonBuilderRuleOpt {
     /**
      * Text of error message to return when the validation fails for the given rule:

package/package.json

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

package/src/validation/ajv/jsonSchemaBuilder.ts

@@ -13,6 +13,7 @@ import type { Set2 } from '@naturalcycles/js-lib/object'
 import { _deepCopy, _sortObject } from '@naturalcycles/js-lib/object'
 import {
   type AnyObject,
+  type BaseDBEntity,
   type IANATimezone,
   type Inclusiveness,
   type IsoDate,
@@ -888,22 +889,28 @@ 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
-  >
-}): JsonSchemaObjectBuilder<IN, IN, false>
-
-function objectDbEntity<IN extends AnyObject>(props?: {
-  [key in keyof PartiallyOptional<IN, 'id' | 'created' | 'updated'>]: JsonSchemaAnyBuilder<
-    any,
-    IN[key],
-    any
-  >
-}): JsonSchemaObjectBuilder<IN, IN, false> {
+function objectDbEntity(props: AnyObject): never
+function objectDbEntity<
+  IN extends BaseDBEntity & AnyObject,
+  EXTRA_KEYS extends Exclude<keyof IN, keyof BaseDBEntity> = Exclude<keyof IN, keyof BaseDBEntity>,
+>(
+  props: {
+    // ✅ all non-system fields must be explicitly provided
+    [K in EXTRA_KEYS]-?: BuilderFor<IN[K]>
+  } &
+    // ✅ if `id` differs, it’s required
+    (ExactMatch<IN['id'], BaseDBEntity['id']> extends true
+      ? { id?: BuilderFor<BaseDBEntity['id']> }
+      : { id: BuilderFor<IN['id']> }) &
+    (ExactMatch<IN['created'], BaseDBEntity['created']> extends true
+      ? { created?: BuilderFor<BaseDBEntity['created']> }
+      : { created: BuilderFor<IN['created']> }) &
+    (ExactMatch<IN['updated'], BaseDBEntity['updated']> extends true
+      ? { updated?: BuilderFor<BaseDBEntity['updated']> }
+      : { updated: BuilderFor<IN['updated']> }),
+): JsonSchemaObjectBuilder<IN, IN, false>
+
+function objectDbEntity(props: AnyObject): any {
   return j.object({
     id: j.string(),
     created: j.number().unixTimestamp2000(),
@@ -917,8 +924,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]
@@ -927,6 +932,8 @@ type BuilderInUnion<B extends readonly JsonSchemaAnyBuilder<any, any, any>[]> =
   [K in keyof B]: B[K] extends JsonSchemaAnyBuilder<infer I, any, any> ? I : never
 }[number]
 
+type BuilderFor<T> = JsonSchemaAnyBuilder<any, T, any>
+
 interface JsonBuilderRuleOpt {
   /**
    * Text of error message to return when the validation fails for the given rule: