@naturalcycles/nodejs-lib 12.79.0 → 12.80.1

package/dist/fs/del.d.ts

@@ -12,7 +12,7 @@ export interface DelOptions {
     debug?: boolean;
     dry?: boolean;
 }
-export declare type DelSingleOption = string;
+export type DelSingleOption = string;
 /**
  * Delete files that match input patterns.
  *

package/dist/slack/slack.service.model.d.ts

@@ -78,7 +78,7 @@ export interface SlackMessageAttachment {
 /**
  * Return `null` to skip (filter out) the message completely.
  */
-export declare type SlackMessagePrefixHook<CTX = any> = (msg: SlackMessage<CTX>) => string[] | null | Promise<string[] | null>;
+export type SlackMessagePrefixHook<CTX = any> = (msg: SlackMessage<CTX>) => string[] | null | Promise<string[] | null>;
 export interface SlackServiceCfg<CTX = any> {
     /**
      * Undefined means slack is disabled.

package/dist/stream/pipeline/pipeline.d.ts

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 import { Readable, Transform } from 'node:stream';
 import { DeferredPromise } from '@naturalcycles/js-lib';
-declare type AnyStream = NodeJS.ReadableStream | NodeJS.WritableStream | NodeJS.ReadWriteStream;
+type AnyStream = NodeJS.ReadableStream | NodeJS.WritableStream | NodeJS.ReadWriteStream;
 export interface PipelineOptions {
     /**
      * Set to true to allow ERR_STREAM_PREMATURE_CLOSE.

package/dist/stream/readable/readableMap.js

@@ -5,8 +5,9 @@ const node_stream_1 = require("node:stream");
 const js_lib_1 = require("@naturalcycles/js-lib");
 function readableMap(readable, mapper) {
     let i = -1;
-    // todo: check if we need to handle errors somehow specifically
-    return readable.pipe(new node_stream_1.Transform({
+    const stream = readable
+        .on('error', err => stream.emit('error', err))
+        .pipe(new node_stream_1.Transform({
         objectMode: true,
         async transform(chunk, _enc, cb) {
             try {
@@ -25,5 +26,6 @@ function readableMap(readable, mapper) {
             }
         },
     }));
+    return stream;
 }
 exports.readableMap = readableMap;

package/dist/util/lruMemoCache.d.ts

@@ -1,6 +1,6 @@
 import { MemoCache } from '@naturalcycles/js-lib';
 import * as LRUCache from 'lru-cache';
-export declare type LRUMemoCacheOptions<KEY, VALUE> = Partial<LRUCache.Options<KEY, VALUE>>;
+export type LRUMemoCacheOptions<KEY, VALUE> = Partial<LRUCache.Options<KEY, VALUE>>;
 /**
  * @example
  * Use it like this:

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

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { AlternativesSchema, AnySchema, ArraySchema, BinarySchema, BooleanSchema, DateSchema, FunctionSchema, NumberSchema, ObjectSchema, StringSchema } from 'joi';
-export declare type SchemaTyped<IN, OUT = IN> = AnySchemaTyped<IN, OUT> | ArraySchemaTyped<IN> | AlternativesSchemaTyped<IN> | BinarySchemaTyped | BooleanSchemaTyped | DateSchemaTyped<IN> | FunctionSchemaTyped<IN> | NumberSchemaTyped | ObjectSchemaTyped<IN, OUT> | StringSchemaTyped;
+export type SchemaTyped<IN, OUT = IN> = AnySchemaTyped<IN, OUT> | ArraySchemaTyped<IN> | AlternativesSchemaTyped<IN> | BinarySchemaTyped | BooleanSchemaTyped | DateSchemaTyped<IN> | FunctionSchemaTyped<IN> | NumberSchemaTyped | ObjectSchemaTyped<IN, OUT> | StringSchemaTyped;
 /**
  * IN - value before validation/conversion
  * OUT - value after validation/conversion (can be different due to conversion, stripping, etc)

package/dist/validation/joi/joi.shared.schemas.d.ts

@@ -16,6 +16,14 @@ export declare function objectSchema<IN, OUT = IN>(schema?: {
 export declare function oneOfSchema<T = any>(...schemas: AnySchemaTyped<any>[]): AlternativesSchemaTyped<T>;
 export declare const anySchema: import("joi").AnySchema;
 export declare const anyObjectSchema: import("joi").ObjectSchema<any>;
+export declare const BASE62_REGEX: RegExp;
+export declare const BASE64_REGEX: RegExp;
+export declare const BASE64URL_REGEX: RegExp;
+export declare const base62Schema: import("./string.extensions").ExtendedStringSchema;
+export declare const base64Schema: import("./string.extensions").ExtendedStringSchema;
+export declare const base64UrlSchema: import("./string.extensions").ExtendedStringSchema;
+export declare const JWT_REGEX: RegExp;
+export declare const jwtSchema: import("./string.extensions").ExtendedStringSchema;
 /**
  * [a-zA-Z0-9_]*
  * 6-64 length
@@ -24,13 +32,10 @@ export declare const idSchema: import("./string.extensions").ExtendedStringSchem
 export declare const idBase62Schema: import("./string.extensions").ExtendedStringSchema;
 export declare const idBase64Schema: import("./string.extensions").ExtendedStringSchema;
 export declare const idBase64UrlSchema: import("./string.extensions").ExtendedStringSchema;
-export declare const base62Schema: import("./string.extensions").ExtendedStringSchema;
-export declare const base64Schema: import("./string.extensions").ExtendedStringSchema;
-export declare const base64UrlSchema: import("./string.extensions").ExtendedStringSchema;
 /**
  * `_` should NOT be allowed to be able to use slug-ids as part of natural ids with `_` separator.
  */
-export declare const SLUG_PATTERN: RegExp;
+export declare const SLUG_REGEX: RegExp;
 /**
  * "Slug" - a valid URL, filename, etc.
  */
@@ -59,7 +64,7 @@ export declare const emailSchema: import("./string.extensions").ExtendedStringSc
 /**
  * Pattern is simplified for our use, it's not a canonical SemVer.
  */
-export declare const SEM_VER_PATTERN: RegExp;
+export declare const SEM_VER_REGEX: RegExp;
 export declare const semVerSchema: import("./string.extensions").ExtendedStringSchema;
 export declare const userAgentSchema: import("./string.extensions").ExtendedStringSchema;
 export declare const utcOffsetSchema: import("./number.extensions").ExtendedNumberSchema;

package/dist/validation/joi/joi.shared.schemas.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.savedDBEntitySchema = exports.baseDBEntitySchema = exports.ipAddressSchema = exports.utcOffsetSchema = exports.userAgentSchema = exports.semVerSchema = exports.SEM_VER_PATTERN = exports.emailSchema = exports.verSchema = exports.unixTimestampMillis2000Schema = exports.unixTimestampMillisSchema = exports.unixTimestamp2000Schema = exports.unixTimestampSchema = exports.slugSchema = exports.SLUG_PATTERN = exports.base64UrlSchema = exports.base64Schema = exports.base62Schema = exports.idBase64UrlSchema = exports.idBase64Schema = exports.idBase62Schema = exports.idSchema = exports.anyObjectSchema = exports.anySchema = exports.oneOfSchema = exports.objectSchema = exports.arraySchema = exports.urlSchema = exports.binarySchema = exports.dateStringSchema = exports.percentageSchema = exports.integerSchema = exports.numberSchema = exports.stringSchema = exports.booleanDefaultToFalseSchema = exports.booleanSchema = void 0;
+exports.savedDBEntitySchema = exports.baseDBEntitySchema = exports.ipAddressSchema = exports.utcOffsetSchema = exports.userAgentSchema = exports.semVerSchema = exports.SEM_VER_REGEX = exports.emailSchema = exports.verSchema = exports.unixTimestampMillis2000Schema = exports.unixTimestampMillisSchema = exports.unixTimestamp2000Schema = exports.unixTimestampSchema = exports.slugSchema = exports.SLUG_REGEX = exports.idBase64UrlSchema = exports.idBase64Schema = exports.idBase62Schema = exports.idSchema = exports.jwtSchema = exports.JWT_REGEX = exports.base64UrlSchema = exports.base64Schema = exports.base62Schema = exports.BASE64URL_REGEX = exports.BASE64_REGEX = exports.BASE62_REGEX = exports.anyObjectSchema = exports.anySchema = exports.oneOfSchema = exports.objectSchema = exports.arraySchema = exports.urlSchema = exports.binarySchema = exports.dateStringSchema = exports.percentageSchema = exports.integerSchema = exports.numberSchema = exports.stringSchema = exports.booleanDefaultToFalseSchema = exports.booleanSchema = void 0;
 const joi_extensions_1 = require("./joi.extensions");
 exports.booleanSchema = joi_extensions_1.Joi.boolean();
 exports.booleanDefaultToFalseSchema = joi_extensions_1.Joi.boolean().default(false);
@@ -26,26 +26,31 @@ function oneOfSchema(...schemas) {
 exports.oneOfSchema = oneOfSchema;
 exports.anySchema = joi_extensions_1.Joi.any();
 exports.anyObjectSchema = joi_extensions_1.Joi.object().options({ stripUnknown: false });
+exports.BASE62_REGEX = /^[a-zA-Z0-9]+$/;
+exports.BASE64_REGEX = /^[A-Za-z0-9+/]+={0,2}$/;
+exports.BASE64URL_REGEX = /^[\w-/]+$/;
+exports.base62Schema = exports.stringSchema.regex(exports.BASE62_REGEX);
+exports.base64Schema = exports.stringSchema.regex(exports.BASE64_REGEX);
+exports.base64UrlSchema = exports.stringSchema.regex(exports.BASE64URL_REGEX);
+exports.JWT_REGEX = /^[\w-]+\.[\w-]+\.[\w-]+$/;
+exports.jwtSchema = exports.stringSchema.regex(exports.JWT_REGEX);
 // 1g498efj5sder3324zer
 /**
  * [a-zA-Z0-9_]*
  * 6-64 length
  */
 exports.idSchema = exports.stringSchema.regex(/^[a-zA-Z0-9_]{6,64}$/);
-exports.idBase62Schema = exports.stringSchema.regex(/^[a-zA-Z0-9]{8,64}$/);
-exports.idBase64Schema = exports.stringSchema.regex(/^[a-zA-Z0-9+/]{8,64}$/);
-exports.idBase64UrlSchema = exports.stringSchema.regex(/^[a-zA-Z0-9-_]{8,64}$/);
-exports.base62Schema = exports.stringSchema.regex(/^[a-zA-Z0-9]+$/);
-exports.base64Schema = exports.stringSchema.regex(/^[a-zA-Z0-9+/]+$/);
-exports.base64UrlSchema = exports.stringSchema.regex(/^[a-zA-Z0-9-_]+$/);
+exports.idBase62Schema = exports.base62Schema.min(8).max(64);
+exports.idBase64Schema = exports.base64Schema.min(8).max(64);
+exports.idBase64UrlSchema = exports.base64UrlSchema.min(8).max(64);
 /**
  * `_` should NOT be allowed to be able to use slug-ids as part of natural ids with `_` separator.
  */
-exports.SLUG_PATTERN = /^[a-z0-9-]*$/;
+exports.SLUG_REGEX = /^[a-z0-9-]*$/;
 /**
  * "Slug" - a valid URL, filename, etc.
  */
-exports.slugSchema = exports.stringSchema.regex(/^[a-z0-9-_]{1,255}$/);
+exports.slugSchema = exports.stringSchema.regex(exports.SLUG_REGEX).min(1).max(255);
 const TS_2500 = 16725225600; // 2500-01-01
 const TS_2000 = 946684800; // 2000-01-01
 /**
@@ -79,8 +84,8 @@ exports.emailSchema = exports.stringSchema.email().lowercase();
 /**
  * Pattern is simplified for our use, it's not a canonical SemVer.
  */
-exports.SEM_VER_PATTERN = /^[0-9]+\.[0-9]+\.[0-9]+$/;
-exports.semVerSchema = exports.stringSchema.regex(exports.SEM_VER_PATTERN);
+exports.SEM_VER_REGEX = /^[0-9]+\.[0-9]+\.[0-9]+$/;
+exports.semVerSchema = exports.stringSchema.regex(exports.SEM_VER_REGEX);
 // todo: .error(() => 'should be SemVer')
 exports.userAgentSchema = exports.stringSchema
     .min(5) // I've seen UA of `Android` (7 characters)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "12.79.0",
+  "version": "12.80.1",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",

package/src/stream/readable/readableMap.ts

@@ -8,24 +8,27 @@ export function readableMap<IN, OUT>(
 ): ReadableTyped<OUT> {
   let i = -1
 
-  // todo: check if we need to handle errors somehow specifically
-  return readable.pipe(
-    new Transform({
-      objectMode: true,
-      async transform(chunk, _enc, cb) {
-        try {
-          const r = await mapper(chunk, ++i)
-          if (r === SKIP) {
-            cb()
-          } else {
-            // _assert(r !== END, `readableMap END not supported`)
-            cb(null, r)
+  const stream: ReadableTyped<OUT> = readable
+    .on('error', err => stream.emit('error', err))
+    .pipe(
+      new Transform({
+        objectMode: true,
+        async transform(chunk, _enc, cb) {
+          try {
+            const r = await mapper(chunk, ++i)
+            if (r === SKIP) {
+              cb()
+            } else {
+              // _assert(r !== END, `readableMap END not supported`)
+              cb(null, r)
+            }
+          } catch (err) {
+            console.error(err)
+            cb(err as Error)
           }
-        } catch (err) {
-          console.error(err)
-          cb(err as Error)
-        }
-      },
-    }),
-  )
+        },
+      }),
+    )
+
+  return stream
 }

package/src/validation/joi/joi.shared.schemas.ts

@@ -40,6 +40,16 @@ export function oneOfSchema<T = any>(
 export const anySchema = Joi.any()
 export const anyObjectSchema = Joi.object().options({ stripUnknown: false })
 
+export const BASE62_REGEX = /^[a-zA-Z0-9]+$/
+export const BASE64_REGEX = /^[A-Za-z0-9+/]+={0,2}$/
+export const BASE64URL_REGEX = /^[\w-/]+$/
+export const base62Schema = stringSchema.regex(BASE62_REGEX)
+export const base64Schema = stringSchema.regex(BASE64_REGEX)
+export const base64UrlSchema = stringSchema.regex(BASE64URL_REGEX)
+
+export const JWT_REGEX = /^[\w-]+\.[\w-]+\.[\w-]+$/
+export const jwtSchema = stringSchema.regex(JWT_REGEX)
+
 // 1g498efj5sder3324zer
 /**
  * [a-zA-Z0-9_]*
@@ -47,23 +57,19 @@ export const anyObjectSchema = Joi.object().options({ stripUnknown: false })
  */
 export const idSchema = stringSchema.regex(/^[a-zA-Z0-9_]{6,64}$/)
 
-export const idBase62Schema = stringSchema.regex(/^[a-zA-Z0-9]{8,64}$/)
-export const idBase64Schema = stringSchema.regex(/^[a-zA-Z0-9+/]{8,64}$/)
-export const idBase64UrlSchema = stringSchema.regex(/^[a-zA-Z0-9-_]{8,64}$/)
-
-export const base62Schema = stringSchema.regex(/^[a-zA-Z0-9]+$/)
-export const base64Schema = stringSchema.regex(/^[a-zA-Z0-9+/]+$/)
-export const base64UrlSchema = stringSchema.regex(/^[a-zA-Z0-9-_]+$/)
+export const idBase62Schema = base62Schema.min(8).max(64)
+export const idBase64Schema = base64Schema.min(8).max(64)
+export const idBase64UrlSchema = base64UrlSchema.min(8).max(64)
 
 /**
  * `_` should NOT be allowed to be able to use slug-ids as part of natural ids with `_` separator.
  */
-export const SLUG_PATTERN = /^[a-z0-9-]*$/
+export const SLUG_REGEX = /^[a-z0-9-]*$/
 
 /**
  * "Slug" - a valid URL, filename, etc.
  */
-export const slugSchema = stringSchema.regex(/^[a-z0-9-_]{1,255}$/)
+export const slugSchema = stringSchema.regex(SLUG_REGEX).min(1).max(255)
 
 const TS_2500 = 16725225600 // 2500-01-01
 const TS_2000 = 946684800 // 2000-01-01
@@ -102,8 +108,8 @@ export const emailSchema = stringSchema.email().lowercase()
 /**
  * Pattern is simplified for our use, it's not a canonical SemVer.
  */
-export const SEM_VER_PATTERN = /^[0-9]+\.[0-9]+\.[0-9]+$/
-export const semVerSchema = stringSchema.regex(SEM_VER_PATTERN)
+export const SEM_VER_REGEX = /^[0-9]+\.[0-9]+\.[0-9]+$/
+export const semVerSchema = stringSchema.regex(SEM_VER_REGEX)
 // todo: .error(() => 'should be SemVer')
 
 export const userAgentSchema = stringSchema