@naturalcycles/nodejs-lib 15.77.1 → 15.78.1

package/dist/util/git2.d.ts

@@ -14,6 +14,7 @@ declare class Git2 {
      * @returns true if there are not pushed commits.
      */
     isAhead(): boolean;
+    fetch(): void;
     pull(): void;
     push(): void;
     getCurrentCommitSha(full?: boolean): string;

package/dist/util/git2.js

@@ -54,6 +54,15 @@ class Git2 {
         // console.log(`gitIsAhead: ${stdout}`)
         return Number(stdout) > 0;
     }
+    fetch() {
+        const cmd = 'git fetch';
+        try {
+            execSync(cmd, {
+                stdio: 'inherit',
+            });
+        }
+        catch { }
+    }
     pull() {
         const cmd = 'git pull';
         try {

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

@@ -248,13 +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<RelaxIndexSignature<IN & {
+    extend<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(props: P): JsonSchemaObjectBuilder<RelaxIndexSignature<Override<IN, {
         [K in keyof P]?: P[K] extends JsonSchemaAnyBuilder<infer IN2, any, any> ? IN2 : never;
-    }>, AllowExtraKeys<RelaxIndexSignature<OUT & {
+    }>>, AllowExtraKeys<RelaxIndexSignature<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 +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<RelaxIndexSignature<IN & {
+    dbEntity(): JsonSchemaObjectBuilder<RelaxIndexSignature<Override<IN, {
         id?: string | undefined;
         created?: any;
         updated?: any;
-    }>, AllowExtraKeys<RelaxIndexSignature<OUT & {
+    }>>, AllowExtraKeys<RelaxIndexSignature<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;
@@ -459,6 +459,7 @@ type StripIndexSignatureDeep<T> = T extends readonly unknown[] ? T : T extends R
 type RelaxIndexSignature<T> = T extends readonly unknown[] ? T : T extends AnyObject ? string extends keyof T ? any : {
     [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;

package/package.json

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

package/src/util/git2.ts

@@ -60,6 +60,15 @@ class Git2 {
     return Number(stdout) > 0
   }
 
+  fetch(): void {
+    const cmd = 'git fetch'
+    try {
+      execSync(cmd, {
+        stdio: 'inherit',
+      })
+    } catch {}
+  }
+
   pull(): void {
     const cmd = 'git pull'
     try {

package/src/validation/ajv/jsonSchemaBuilder.ts

@@ -870,27 +870,33 @@ export class JsonSchemaObjectBuilder<
     props: P,
   ): JsonSchemaObjectBuilder<
     RelaxIndexSignature<
-      IN & {
-        [K in keyof P]?: P[K] extends JsonSchemaAnyBuilder<infer IN2, any, any> ? IN2 : never
-      }
+      Override<
+        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
-        }
+        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
@@ -1461,6 +1467,8 @@ type RelaxIndexSignature<T> = T extends readonly unknown[]
       : { [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 }