@naturalcycles/nodejs-lib 15.78.1 → 15.79.0

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

@@ -65,6 +65,7 @@ export declare const j: {
     and(): {
         silentBob: () => never;
     };
+    literal<const V extends string | number | boolean | null>(v: V): JsonSchemaEnumBuilder<V, V, false>;
 };
 export declare class JsonSchemaTerminal<IN, OUT, Opt> {
     protected schema: JsonSchema;
@@ -248,13 +249,13 @@ export declare class JsonSchemaObjectBuilder<IN extends AnyObject, OUT extends A
      * When set, the validation will not strip away properties that are not specified explicitly in the schema.
      */
     allowAdditionalProperties(): this;
-    extend<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(props: P): JsonSchemaObjectBuilder<RelaxIndexSignature<Override<IN, {
+    extend<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(props: P): JsonSchemaObjectBuilder<RelaxIndexSignature<OptionalDbEntityFields<Override<IN, {
         [K in keyof P]?: P[K] extends JsonSchemaAnyBuilder<infer IN2, any, any> ? IN2 : never;
-    }>>, AllowExtraKeys<RelaxIndexSignature<Override<OUT, {
+    }>>>, Override<OUT, {
         [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer IsOpt> ? IsOpt extends true ? never : K : never]: P[K] extends JsonSchemaAnyBuilder<any, infer OUT2, any> ? OUT2 : never;
     } & {
         [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer IsOpt> ? IsOpt extends true ? K : never : never]?: P[K] extends JsonSchemaAnyBuilder<any, infer OUT2, any> ? OUT2 : never;
-    }>>>, false>;
+    }>, false>;
     /**
      * Concatenates another schema to the current schema.
      *
@@ -277,15 +278,15 @@ export declare class JsonSchemaObjectBuilder<IN extends AnyObject, OUT extends A
     /**
      * Extends the current schema with `id`, `created` and `updated` according to NC DB conventions.
      */
-    dbEntity(): JsonSchemaObjectBuilder<RelaxIndexSignature<Override<IN, {
+    dbEntity(): JsonSchemaObjectBuilder<RelaxIndexSignature<OptionalDbEntityFields<Override<IN, {
         id?: string | undefined;
         created?: any;
         updated?: any;
-    }>>, AllowExtraKeys<RelaxIndexSignature<Override<OUT, {
+    }>>>, Override<OUT, {
         id: string;
         created: any;
         updated: any;
-    } & {}>>>, false>;
+    } & {}>, false>;
     minProperties(minProperties: number): this;
     maxProperties(maxProperties: number): this;
     exclusiveProperties(propNames: readonly (keyof IN & string)[]): this;
@@ -421,7 +422,7 @@ declare function object<IN extends AnyObject>(props: {
 }): 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 BaseDBEntity & AnyObject, EXTRA_KEYS extends Exclude<keyof IN, keyof BaseDBEntity> = Exclude<keyof IN, keyof BaseDBEntity>>(props: {
+declare function objectDbEntity<IN extends BaseDBEntity, 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']>;
@@ -456,18 +457,17 @@ type Expand<T> = {
 type StripIndexSignatureDeep<T> = T extends readonly unknown[] ? T : T extends Record<string, any> ? {
     [K in keyof T as string extends K ? never : number extends K ? never : symbol extends K ? never : K]: StripIndexSignatureDeep<T[K]>;
 } : T;
-type RelaxIndexSignature<T> = T extends readonly unknown[] ? T : T extends AnyObject ? string extends keyof T ? any : {
+type RelaxIndexSignature<T> = T extends readonly unknown[] ? T : T extends AnyObject ? {
     [K in keyof T]: RelaxIndexSignature<T[K]>;
 } : T;
 type Override<T, U> = Omit<T, keyof U> & U;
 declare const allowExtraKeysSymbol: unique symbol;
-type AllowExtraKeys<T> = T & {
-    readonly [allowExtraKeysSymbol]?: true;
-};
 type HasAllowExtraKeys<T> = T extends {
     readonly [allowExtraKeysSymbol]?: true;
 } ? true : false;
-type IsAssignableRelaxed<A, B> = [RelaxIndexSignature<A>] extends [B] ? true : false;
+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 OptionalDbEntityFields<T> = T extends BaseDBEntity ? Omit<T, keyof BaseDBEntity> & Partial<Pick<T, keyof BaseDBEntity>> : T;
 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 JsonSchemaAnyBuilder<any, any, any>[]> = {

package/dist/validation/ajv/jsonSchemaBuilder.js

@@ -138,6 +138,14 @@ export const j = {
             },
         };
     },
+    literal(v) {
+        let baseType = 'other';
+        if (typeof v === 'string')
+            baseType = 'string';
+        if (typeof v === 'number')
+            baseType = 'number';
+        return new JsonSchemaEnumBuilder([v], baseType);
+    },
 };
 const TS_2500 = 16725225600; // 2500-01-01
 const TS_2500_MILLIS = TS_2500 * 1000;

package/package.json

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

package/src/validation/ajv/jsonSchemaBuilder.ts

@@ -223,6 +223,13 @@ export const j = {
       },
     }
   },
+
+  literal<const V extends string | number | boolean | null>(v: V) {
+    let baseType: EnumBaseType = 'other'
+    if (typeof v === 'string') baseType = 'string'
+    if (typeof v === 'number') baseType = 'number'
+    return new JsonSchemaEnumBuilder<V>([v], baseType)
+  },
 }
 
 const TS_2500 = 16725225600 // 2500-01-01
@@ -870,35 +877,33 @@ export class JsonSchemaObjectBuilder<
     props: P,
   ): JsonSchemaObjectBuilder<
     RelaxIndexSignature<
-      Override<
-        IN,
-        {
-          [K in keyof P]?: P[K] extends JsonSchemaAnyBuilder<infer IN2, any, any> ? IN2 : never
-        }
-      >
-    >,
-    AllowExtraKeys<
-      RelaxIndexSignature<
+      OptionalDbEntityFields<
         Override<
-          OUT,
+          IN,
           {
-            // required keys
-            [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer IsOpt>
-              ? IsOpt extends true
-                ? never
-                : K
-              : never]: P[K] extends JsonSchemaAnyBuilder<any, infer OUT2, any> ? OUT2 : never
-          } & {
-            // optional keys
-            [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer IsOpt>
-              ? IsOpt extends true
-                ? K
-                : never
-              : never]?: P[K] extends JsonSchemaAnyBuilder<any, infer OUT2, any> ? OUT2 : never
+            [K in keyof P]?: P[K] extends JsonSchemaAnyBuilder<infer IN2, any, any> ? IN2 : never
           }
         >
       >
     >,
+    Override<
+      OUT,
+      {
+        // required keys
+        [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer IsOpt>
+          ? IsOpt extends true
+            ? never
+            : K
+          : never]: P[K] extends JsonSchemaAnyBuilder<any, infer OUT2, any> ? OUT2 : never
+      } & {
+        // optional keys
+        [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer IsOpt>
+          ? IsOpt extends true
+            ? K
+            : never
+          : never]?: P[K] extends JsonSchemaAnyBuilder<any, infer OUT2, any> ? OUT2 : never
+      }
+    >,
     false
   > {
     const newBuilder = new JsonSchemaObjectBuilder()
@@ -1299,7 +1304,7 @@ function objectInfer<P extends Record<string, JsonSchemaAnyBuilder<any, any, any
 
 function objectDbEntity(props: AnyObject): never
 function objectDbEntity<
-  IN extends BaseDBEntity & AnyObject,
+  IN extends BaseDBEntity,
   EXTRA_KEYS extends Exclude<keyof IN, keyof BaseDBEntity> = Exclude<keyof IN, keyof BaseDBEntity>,
 >(
   props: {
@@ -1462,20 +1467,27 @@ type StripIndexSignatureDeep<T> = T extends readonly unknown[]
 type RelaxIndexSignature<T> = T extends readonly unknown[]
   ? T
   : T extends AnyObject
-    ? string extends keyof T
-      ? any
-      : { [K in keyof T]: RelaxIndexSignature<T[K]> }
+    ? { [K in keyof T]: RelaxIndexSignature<T[K]> }
     : T
 
 type Override<T, U> = Omit<T, keyof U> & U
 
 declare const allowExtraKeysSymbol: unique symbol
 
-type AllowExtraKeys<T> = T & { readonly [allowExtraKeysSymbol]?: true }
-
 type HasAllowExtraKeys<T> = T extends { readonly [allowExtraKeysSymbol]?: true } ? true : false
 
-type IsAssignableRelaxed<A, B> = [RelaxIndexSignature<A>] extends [B] ? true : false
+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 OptionalDbEntityFields<T> = T extends BaseDBEntity
+  ? Omit<T, keyof BaseDBEntity> & Partial<Pick<T, keyof BaseDBEntity>>
+  : T
 
 type ExactMatchBase<A, B> =
   (<T>() => T extends A ? 1 : 2) extends <T>() => T extends B ? 1 : 2