@naturalcycles/nodejs-lib 12.86.1 → 12.88.0

package/dist/stream/pipeline/pipeline.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbortableTransform = exports._pipelineToArray = exports._pipeline = void 0;
 const node_stream_1 = require("node:stream");
+const promises_1 = require("node:stream/promises");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const index_1 = require("../../index");
 /**
@@ -52,19 +53,17 @@ async function _pipeline(streams, opt = {}) {
             }
         });
     }
-    return new Promise((resolve, reject) => {
-        (0, node_stream_1.pipeline)(first, ...rest, (err) => {
-            if (err) {
-                if (opt.allowClose && err?.code === 'ERR_STREAM_PREMATURE_CLOSE') {
-                    console.log('_pipeline closed (as expected)');
-                    return resolve();
-                }
-                // console.log(`_pipeline error`, err)
-                return reject(err);
-            }
-            resolve();
-        });
-    });
+    try {
+        return await (0, promises_1.pipeline)(first, ...rest);
+    }
+    catch (err) {
+        if (opt.allowClose && err?.code === 'ERR_STREAM_PREMATURE_CLOSE') {
+            console.log('_pipeline closed (as expected)');
+            return;
+        }
+        // console.log(`_pipeline error`, err)
+        throw err;
+    }
 }
 exports._pipeline = _pipeline;
 /**

package/dist/validation/joi/joi.model.d.ts

@@ -25,3 +25,10 @@ export interface ObjectSchemaTyped<IN, OUT = IN> extends ObjectSchema<IN>, AnySc
 }
 export interface StringSchemaTyped extends StringSchema, AnySchemaTyped<string> {
 }
+/**
+ * This type is useful to allow "joi schema merging".
+ * Because by default Joi doesn't allow normal merging.
+ * E.g `joiSchema.concat` doesn't play well when some property exists
+ * in both left and right side.
+ */
+export type JoiSchemaObject<T> = Partial<Record<keyof T, any>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "12.86.1",
+  "version": "12.88.0",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",
@@ -78,7 +78,7 @@
     "url": "https://github.com/NaturalCycles/nodejs-lib"
   },
   "engines": {
-    "node": ">=16.10.0"
+    "node": ">=18.12.0"
   },
   "description": "Standard library for Node.js",
   "author": "Natural Cycles Team",

package/src/stream/pipeline/pipeline.ts

@@ -1,4 +1,5 @@
-import { pipeline, Readable, Transform, Writable } from 'node:stream'
+import { Readable, Transform, Writable } from 'node:stream'
+import { pipeline } from 'node:stream/promises'
 import { _last, AnyFunction, DeferredPromise, pDefer } from '@naturalcycles/js-lib'
 import { writablePushToArray } from '../../index'
 
@@ -74,20 +75,16 @@ export async function _pipeline(streams: AnyStream[], opt: PipelineOptions = {})
     })
   }
 
-  return new Promise<void>((resolve, reject) => {
-    pipeline(first, ...(rest as any[]), (err: Error) => {
-      if (err) {
-        if (opt.allowClose && (err as any)?.code === 'ERR_STREAM_PREMATURE_CLOSE') {
-          console.log('_pipeline closed (as expected)')
-          return resolve()
-        }
-        // console.log(`_pipeline error`, err)
-        return reject(err)
-      }
-
-      resolve()
-    })
-  })
+  try {
+    return await pipeline(first, ...(rest as any[]))
+  } catch (err) {
+    if (opt.allowClose && (err as any)?.code === 'ERR_STREAM_PREMATURE_CLOSE') {
+      console.log('_pipeline closed (as expected)')
+      return
+    }
+    // console.log(`_pipeline error`, err)
+    throw err
+  }
 }
 
 /**

package/src/validation/joi/joi.model.ts

@@ -42,3 +42,11 @@ export interface ObjectSchemaTyped<IN, OUT = IN>
   extends ObjectSchema<IN>,
     AnySchemaTyped<IN, OUT> {}
 export interface StringSchemaTyped extends StringSchema, AnySchemaTyped<string> {}
+
+/**
+ * This type is useful to allow "joi schema merging".
+ * Because by default Joi doesn't allow normal merging.
+ * E.g `joiSchema.concat` doesn't play well when some property exists
+ * in both left and right side.
+ */
+export type JoiSchemaObject<T> = Partial<Record<keyof T, any>>