@naturalcycles/nodejs-lib 15.77.0 → 15.77.1

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

@@ -248,15 +248,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<IN & {
-        [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer IsOpt> ? IsOpt extends true ? never : K : never]: P[K] extends JsonSchemaAnyBuilder<infer IN2, any, any> ? IN2 : never;
-    } & {
-        [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer IsOpt> ? IsOpt extends true ? K : never : never]?: P[K] extends JsonSchemaAnyBuilder<infer IN2, any, any> ? IN2 : never;
-    }, OUT & {
+    extend<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(props: P): JsonSchemaObjectBuilder<RelaxIndexSignature<IN & {
+        [K in keyof P]?: P[K] extends JsonSchemaAnyBuilder<infer IN2, any, any> ? IN2 : never;
+    }>, AllowExtraKeys<RelaxIndexSignature<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.
      *
@@ -279,15 +277,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<IN & {
+    dbEntity(): JsonSchemaObjectBuilder<RelaxIndexSignature<IN & {
+        id?: string | undefined;
+        created?: any;
+        updated?: any;
+    }>, AllowExtraKeys<RelaxIndexSignature<OUT & {
         id: string;
         created: any;
         updated: any;
-    } & {}, OUT & {
-        id: string;
-        created: any;
-        updated: any;
-    } & {}, false>;
+    } & {}>>, false>;
     minProperties(minProperties: number): this;
     maxProperties(maxProperties: number): this;
     exclusiveProperties(propNames: readonly (keyof IN & string)[]): this;
@@ -455,7 +453,22 @@ declare function withEnumKeys<const T extends readonly (string | number)[] | Str
 type Expand<T> = {
     [K in keyof T]: T[K];
 };
-type ExactMatch<A, B> = (<T>() => T extends Expand<A> ? 1 : 2) extends <T>() => T extends Expand<B> ? 1 : 2 ? (<T>() => T extends Expand<B> ? 1 : 2) extends <T>() => T extends Expand<A> ? 1 : 2 ? true : false : false;
+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 : {
+    [K in keyof T]: RelaxIndexSignature<T[K]>;
+} : T;
+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 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>[]> = {
     [K in keyof B]: B[K] extends JsonSchemaAnyBuilder<any, infer O, any> ? O : never;
 }[number];

package/package.json

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

package/src/validation/ajv/jsonSchemaBuilder.ts

@@ -869,36 +869,30 @@ export class JsonSchemaObjectBuilder<
   extend<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(
     props: P,
   ): JsonSchemaObjectBuilder<
-    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<infer IN2, any, any> ? IN2 : 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<infer IN2, any, any> ? IN2 : never
-    },
-    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
-    },
+    RelaxIndexSignature<
+      IN & {
+        [K in keyof P]?: P[K] extends JsonSchemaAnyBuilder<infer IN2, any, any> ? IN2 : never
+      }
+    >,
+    AllowExtraKeys<
+      RelaxIndexSignature<
+        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()
@@ -1445,13 +1439,50 @@ function withEnumKeys<
 
 type Expand<T> = { [K in keyof T]: T[K] }
 
-type ExactMatch<A, B> =
-  (<T>() => T extends Expand<A> ? 1 : 2) extends <T>() => T extends Expand<B> ? 1 : 2
-    ? (<T>() => T extends Expand<B> ? 1 : 2) extends <T>() => T extends Expand<A> ? 1 : 2
+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
+      : { [K in keyof T]: RelaxIndexSignature<T[K]> }
+    : T
+
+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 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>[]> = {
   [K in keyof B]: B[K] extends JsonSchemaAnyBuilder<any, infer O, any> ? O : never
 }[number]