@naturalcycles/nodejs-lib 15.100.0 → 15.102.0

package/dist/script/runScript.js

@@ -1,5 +1,5 @@
 import os from 'node:os';
-import { pDelay } from '@naturalcycles/js-lib/promise/pDelay.js';
+import { AsyncManager } from '@naturalcycles/js-lib';
 import { setGlobalStringifyFunction } from '@naturalcycles/js-lib/string/stringify.js';
 import { dimGrey } from '../colors/colors.js';
 import { loadEnvFileIfExists } from '../node.util.js';
@@ -45,9 +45,10 @@ export function runScript(fn, opt = {}) {
     void (async () => {
         try {
             await fn();
-            await pDelay(); // to ensure all async operations are completed
             if (DEBUG_RUN_SCRIPT)
                 logger.log(`runScript promise resolved`);
+            // to ensure all async operations are completed (with a timeout)
+            await AsyncManager.allDone(600_000);
             if (!noExit) {
                 setImmediate(() => process.exit(0));
             }

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

@@ -336,11 +336,11 @@ export declare class JObject<OUT extends AnyObject, Opt extends boolean = false>
      * When set, the validation will not strip away properties that are not specified explicitly in the schema.
      */
     allowAdditionalProperties(): this;
-    extend<P extends Record<string, JSchema<any, any>>>(props: P): JObject<Override<OUT, {
+    extend<P extends Record<string, JSchema<any, any>>>(props: P): JObject<Expand<Override<OUT, {
         [K in keyof P as P[K] extends JSchema<any, infer IsOpt> ? IsOpt extends true ? never : K : never]: P[K] extends JSchema<infer OUT2, any> ? OUT2 : never;
     } & {
         [K in keyof P as P[K] extends JSchema<any, infer IsOpt> ? IsOpt extends true ? K : never : never]?: P[K] extends JSchema<infer OUT2, any> ? OUT2 : never;
-    }>, false>;
+    }>>, false>;
     /**
      * Concatenates another schema to the current schema.
      *
@@ -352,11 +352,11 @@ export declare class JObject<OUT extends AnyObject, Opt extends boolean = false>
     /**
      * Extends the current schema with `id`, `created` and `updated` according to NC DB conventions.
      */
-    dbEntity(): JObject<Override<OUT, {
+    dbEntity(): JObject<Expand<Override<OUT, {
         id: string;
         created: UnixTimestamp;
         updated: UnixTimestamp;
-    } & {}>, false>;
+    } & {}>>, false>;
     minProperties(minProperties: number): this;
     maxProperties(maxProperties: number): this;
     exclusiveProperties(propNames: readonly (keyof OUT & string)[]): this;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.100.0",
+  "version": "15.102.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@standard-schema/spec": "^1",

package/src/script/runScript.ts

@@ -1,6 +1,6 @@
 import os from 'node:os'
+import { AsyncManager } from '@naturalcycles/js-lib'
 import type { CommonLogger } from '@naturalcycles/js-lib/log'
-import { pDelay } from '@naturalcycles/js-lib/promise/pDelay.js'
 import { setGlobalStringifyFunction } from '@naturalcycles/js-lib/string/stringify.js'
 import type { AnyObject } from '@naturalcycles/js-lib/types'
 import { dimGrey } from '../colors/colors.js'
@@ -76,10 +76,11 @@ export function runScript(fn: (...args: any[]) => any, opt: RunScriptOptions = {
     try {
       await fn()
 
-      await pDelay() // to ensure all async operations are completed
-
       if (DEBUG_RUN_SCRIPT) logger.log(`runScript promise resolved`)
 
+      // to ensure all async operations are completed (with a timeout)
+      await AsyncManager.allDone(600_000)
+
       if (!noExit) {
         setImmediate(() => process.exit(0))
       }

package/src/validation/ajv/jSchema.ts

@@ -1071,23 +1071,25 @@ export class JObject<OUT extends AnyObject, Opt extends boolean = false> extends
   extend<P extends Record<string, JSchema<any, any>>>(
     props: P,
   ): JObject<
-    Override<
-      OUT,
-      {
-        // required keys
-        [K in keyof P as P[K] extends JSchema<any, infer IsOpt>
-          ? IsOpt extends true
-            ? never
-            : K
-          : never]: P[K] extends JSchema<infer OUT2, any> ? OUT2 : never
-      } & {
-        // optional keys
-        [K in keyof P as P[K] extends JSchema<any, infer IsOpt>
-          ? IsOpt extends true
-            ? K
-            : never
-          : never]?: P[K] extends JSchema<infer OUT2, any> ? OUT2 : never
-      }
+    Expand<
+      Override<
+        OUT,
+        {
+          // required keys
+          [K in keyof P as P[K] extends JSchema<any, infer IsOpt>
+            ? IsOpt extends true
+              ? never
+              : K
+            : never]: P[K] extends JSchema<infer OUT2, any> ? OUT2 : never
+        } & {
+          // optional keys
+          [K in keyof P as P[K] extends JSchema<any, infer IsOpt>
+            ? IsOpt extends true
+              ? K
+              : never
+            : never]?: P[K] extends JSchema<infer OUT2, any> ? OUT2 : never
+        }
+      >
     >,
     false
   > {