@naturalcycles/nodejs-lib 13.30.0 → 13.30.2

package/dist/index.d.ts

@@ -1,20 +1,29 @@
 import Ajv from 'ajv';
-import fastGlob from 'fast-glob';
 import type { Options as FastGlobOptions } from 'fast-glob';
-import globby from 'globby';
+import fastGlob from 'fast-glob';
 import type { GlobbyOptions } from 'globby';
-import type { AnySchema, ValidationErrorItem, AlternativesSchema, ArraySchema, BinarySchema, BooleanSchema, DateSchema, FunctionSchema, ObjectSchema } from 'joi';
+import globby from 'globby';
+import type { AlternativesSchema, AnySchema, ArraySchema, BinarySchema, BooleanSchema, DateSchema, FunctionSchema, ObjectSchema, ValidationErrorItem } from 'joi';
 export * from './buffer/buffer.util';
+export * from './colors/colors';
+export * from './csv/csvReader';
+export * from './csv/csvWriter';
+export * from './csv/transformToCSV';
 export * from './diff/tableDiff';
+export * from './fs/del';
+export * from './fs/fs2';
+export * from './fs/json2env';
+export * from './fs/kpy';
 export * from './infra/process.util';
+export * from './jwt/jwt.service';
 export * from './log/debug';
-export * from './security/hash.util';
+export * from './log/log.util';
+export * from './script/runScript';
 export * from './security/crypto.util';
+export * from './security/hash.util';
 export * from './security/id.util';
 export * from './security/nanoid';
 export * from './security/secret.util';
-export * from './colors/colors';
-export * from './log/log.util';
 export * from './slack/slack.service';
 export * from './slack/slack.service.model';
 export * from './stream/ndjson/ndjson.model';
@@ -23,26 +32,26 @@ export * from './stream/ndjson/ndjsonStreamForEach';
 export * from './stream/ndjson/transformJsonParse';
 export * from './stream/ndjson/transformToNDJson';
 export * from './stream/pipeline/pipeline';
+export * from './stream/progressLogger';
 export * from './stream/readable/readableCreate';
 export * from './stream/readable/readableForEach';
 export * from './stream/readable/readableFromArray';
 export * from './stream/readable/readableToArray';
 export * from './stream/stream.model';
-export * from './stream/progressLogger';
 export * from './stream/transform/transformChunk';
 export * from './stream/transform/transformFilter';
 export * from './stream/transform/transformLimit';
-export * from './stream/transform/transformOffset';
 export * from './stream/transform/transformLogProgress';
 export * from './stream/transform/transformMap';
 export * from './stream/transform/transformMapSimple';
-export * from './stream/transform/transformNoOp';
 export * from './stream/transform/transformMapSync';
+export * from './stream/transform/transformNoOp';
+export * from './stream/transform/transformOffset';
 export * from './stream/transform/transformSplit';
 export * from './stream/transform/transformTap';
-export * from './stream/transform/transformToArray';
 export * from './stream/transform/transformTee';
 export * from './stream/transform/transformThrottle';
+export * from './stream/transform/transformToArray';
 export * from './stream/transform/worker/baseWorkerClass';
 export * from './stream/transform/worker/transformMultiThreaded';
 export * from './stream/transform/worker/transformMultiThreaded.model';
@@ -50,16 +59,13 @@ export * from './stream/writable/writableForEach';
 export * from './stream/writable/writableFork';
 export * from './stream/writable/writablePushToArray';
 export * from './stream/writable/writableVoid';
-export * from './csv/csvWriter';
-export * from './csv/csvReader';
-export * from './csv/transformToCSV';
 export * from './string/inspect';
+export * from './util/buildInfo.util';
 export * from './util/env.util';
-export * from './util/lruMemoCache';
-export * from './util/zip.util';
 export * from './util/exec.util';
 export * from './util/git.util';
-export * from './util/buildInfo.util';
+export * from './util/lruMemoCache';
+export * from './util/zip.util';
 export * from './validation/ajv/ajv.util';
 export * from './validation/ajv/ajvSchema';
 export * from './validation/ajv/ajvValidationError';
@@ -69,11 +75,5 @@ export * from './validation/joi/joi.model';
 export * from './validation/joi/joi.shared.schemas';
 export * from './validation/joi/joi.validation.error';
 export * from './validation/joi/joi.validation.util';
-export * from './script/runScript';
-export * from './jwt/jwt.service';
-export * from './fs/fs2';
-export * from './fs/del';
-export * from './fs/json2env';
-export * from './fs/kpy';
-export type { GlobbyOptions, FastGlobOptions, ValidationErrorItem, AlternativesSchema, AnySchema, ArraySchema, BinarySchema, BooleanSchema, DateSchema, FunctionSchema, ObjectSchema, };
-export { globby, fastGlob, Ajv };
+export type { AlternativesSchema, AnySchema, ArraySchema, BinarySchema, BooleanSchema, DateSchema, FastGlobOptions, FunctionSchema, GlobbyOptions, ObjectSchema, ValidationErrorItem, };
+export { Ajv, fastGlob, globby };

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Ajv = exports.fastGlob = exports.globby = void 0;
+exports.globby = exports.fastGlob = exports.Ajv = void 0;
 const tslib_1 = require("tslib");
 const ajv_1 = tslib_1.__importDefault(require("ajv"));
 exports.Ajv = ajv_1.default;
@@ -9,16 +9,25 @@ exports.fastGlob = fast_glob_1.default;
 const globby_1 = tslib_1.__importDefault(require("globby"));
 exports.globby = globby_1.default;
 tslib_1.__exportStar(require("./buffer/buffer.util"), exports);
+tslib_1.__exportStar(require("./colors/colors"), exports);
+tslib_1.__exportStar(require("./csv/csvReader"), exports);
+tslib_1.__exportStar(require("./csv/csvWriter"), exports);
+tslib_1.__exportStar(require("./csv/transformToCSV"), exports);
 tslib_1.__exportStar(require("./diff/tableDiff"), exports);
+tslib_1.__exportStar(require("./fs/del"), exports);
+tslib_1.__exportStar(require("./fs/fs2"), exports);
+tslib_1.__exportStar(require("./fs/json2env"), exports);
+tslib_1.__exportStar(require("./fs/kpy"), exports);
 tslib_1.__exportStar(require("./infra/process.util"), exports);
+tslib_1.__exportStar(require("./jwt/jwt.service"), exports);
 tslib_1.__exportStar(require("./log/debug"), exports);
-tslib_1.__exportStar(require("./security/hash.util"), exports);
+tslib_1.__exportStar(require("./log/log.util"), exports);
+tslib_1.__exportStar(require("./script/runScript"), exports);
 tslib_1.__exportStar(require("./security/crypto.util"), exports);
+tslib_1.__exportStar(require("./security/hash.util"), exports);
 tslib_1.__exportStar(require("./security/id.util"), exports);
 tslib_1.__exportStar(require("./security/nanoid"), exports);
 tslib_1.__exportStar(require("./security/secret.util"), exports);
-tslib_1.__exportStar(require("./colors/colors"), exports);
-tslib_1.__exportStar(require("./log/log.util"), exports);
 tslib_1.__exportStar(require("./slack/slack.service"), exports);
 tslib_1.__exportStar(require("./slack/slack.service.model"), exports);
 tslib_1.__exportStar(require("./stream/ndjson/ndjson.model"), exports);
@@ -27,26 +36,26 @@ tslib_1.__exportStar(require("./stream/ndjson/ndjsonStreamForEach"), exports);
 tslib_1.__exportStar(require("./stream/ndjson/transformJsonParse"), exports);
 tslib_1.__exportStar(require("./stream/ndjson/transformToNDJson"), exports);
 tslib_1.__exportStar(require("./stream/pipeline/pipeline"), exports);
+tslib_1.__exportStar(require("./stream/progressLogger"), exports);
 tslib_1.__exportStar(require("./stream/readable/readableCreate"), exports);
 tslib_1.__exportStar(require("./stream/readable/readableForEach"), exports);
 tslib_1.__exportStar(require("./stream/readable/readableFromArray"), exports);
 tslib_1.__exportStar(require("./stream/readable/readableToArray"), exports);
 tslib_1.__exportStar(require("./stream/stream.model"), exports);
-tslib_1.__exportStar(require("./stream/progressLogger"), exports);
 tslib_1.__exportStar(require("./stream/transform/transformChunk"), exports);
 tslib_1.__exportStar(require("./stream/transform/transformFilter"), exports);
 tslib_1.__exportStar(require("./stream/transform/transformLimit"), exports);
-tslib_1.__exportStar(require("./stream/transform/transformOffset"), exports);
 tslib_1.__exportStar(require("./stream/transform/transformLogProgress"), exports);
 tslib_1.__exportStar(require("./stream/transform/transformMap"), exports);
 tslib_1.__exportStar(require("./stream/transform/transformMapSimple"), exports);
-tslib_1.__exportStar(require("./stream/transform/transformNoOp"), exports);
 tslib_1.__exportStar(require("./stream/transform/transformMapSync"), exports);
+tslib_1.__exportStar(require("./stream/transform/transformNoOp"), exports);
+tslib_1.__exportStar(require("./stream/transform/transformOffset"), exports);
 tslib_1.__exportStar(require("./stream/transform/transformSplit"), exports);
 tslib_1.__exportStar(require("./stream/transform/transformTap"), exports);
-tslib_1.__exportStar(require("./stream/transform/transformToArray"), exports);
 tslib_1.__exportStar(require("./stream/transform/transformTee"), exports);
 tslib_1.__exportStar(require("./stream/transform/transformThrottle"), exports);
+tslib_1.__exportStar(require("./stream/transform/transformToArray"), exports);
 tslib_1.__exportStar(require("./stream/transform/worker/baseWorkerClass"), exports);
 tslib_1.__exportStar(require("./stream/transform/worker/transformMultiThreaded"), exports);
 tslib_1.__exportStar(require("./stream/transform/worker/transformMultiThreaded.model"), exports);
@@ -54,16 +63,13 @@ tslib_1.__exportStar(require("./stream/writable/writableForEach"), exports);
 tslib_1.__exportStar(require("./stream/writable/writableFork"), exports);
 tslib_1.__exportStar(require("./stream/writable/writablePushToArray"), exports);
 tslib_1.__exportStar(require("./stream/writable/writableVoid"), exports);
-tslib_1.__exportStar(require("./csv/csvWriter"), exports);
-tslib_1.__exportStar(require("./csv/csvReader"), exports);
-tslib_1.__exportStar(require("./csv/transformToCSV"), exports);
 tslib_1.__exportStar(require("./string/inspect"), exports);
+tslib_1.__exportStar(require("./util/buildInfo.util"), exports);
 tslib_1.__exportStar(require("./util/env.util"), exports);
-tslib_1.__exportStar(require("./util/lruMemoCache"), exports);
-tslib_1.__exportStar(require("./util/zip.util"), exports);
 tslib_1.__exportStar(require("./util/exec.util"), exports);
 tslib_1.__exportStar(require("./util/git.util"), exports);
-tslib_1.__exportStar(require("./util/buildInfo.util"), exports);
+tslib_1.__exportStar(require("./util/lruMemoCache"), exports);
+tslib_1.__exportStar(require("./util/zip.util"), exports);
 tslib_1.__exportStar(require("./validation/ajv/ajv.util"), exports);
 tslib_1.__exportStar(require("./validation/ajv/ajvSchema"), exports);
 tslib_1.__exportStar(require("./validation/ajv/ajvValidationError"), exports);
@@ -73,9 +79,3 @@ tslib_1.__exportStar(require("./validation/joi/joi.model"), exports);
 tslib_1.__exportStar(require("./validation/joi/joi.shared.schemas"), exports);
 tslib_1.__exportStar(require("./validation/joi/joi.validation.error"), exports);
 tslib_1.__exportStar(require("./validation/joi/joi.validation.util"), exports);
-tslib_1.__exportStar(require("./script/runScript"), exports);
-tslib_1.__exportStar(require("./jwt/jwt.service"), exports);
-tslib_1.__exportStar(require("./fs/fs2"), exports);
-tslib_1.__exportStar(require("./fs/del"), exports);
-tslib_1.__exportStar(require("./fs/json2env"), exports);
-tslib_1.__exportStar(require("./fs/kpy"), exports);

package/dist/jwt/jwt.service.d.ts

@@ -1,9 +1,9 @@
 import { AnyObject, ErrorData, JWTString } from '@naturalcycles/js-lib';
 import { AnySchema } from 'joi';
-import type { Algorithm, VerifyOptions, JwtHeader, SignOptions } from 'jsonwebtoken';
+import type { Algorithm, JwtHeader, SignOptions, VerifyOptions } from 'jsonwebtoken';
 import jsonwebtoken from 'jsonwebtoken';
 export { jsonwebtoken };
-export type { Algorithm, VerifyOptions, SignOptions, JwtHeader };
+export type { Algorithm, JwtHeader, SignOptions, VerifyOptions };
 export interface JWTServiceCfg {
     /**
      * Public key is required to Verify incoming tokens.

package/dist/stream/ndjson/ndjsonMap.d.ts

@@ -1,5 +1,5 @@
 import { AbortableAsyncMapper } from '@naturalcycles/js-lib';
-import { TransformMapOptions, TransformLogProgressOptions } from '../..';
+import { TransformLogProgressOptions, TransformMapOptions } from '../..';
 export interface NDJSONMapOptions<IN = any, OUT = IN> extends TransformMapOptions<IN, OUT>, TransformLogProgressOptions<IN> {
     inputFilePath: string;
     outputFilePath: string;

package/dist/stream/pipeline/pipeline.js

@@ -6,7 +6,7 @@ exports._pipelineToArray = _pipelineToArray;
 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");
+const writablePushToArray_1 = require("../writable/writablePushToArray");
 /**
  * Promisified `stream.pipeline`.
  *
@@ -77,7 +77,7 @@ async function _pipeline(streams, opt = {}) {
  */
 async function _pipelineToArray(streams, opt = {}) {
     const a = [];
-    await _pipeline([...streams, (0, index_1.writablePushToArray)(a)], opt);
+    await _pipeline([...streams, (0, writablePushToArray_1.writablePushToArray)(a)], opt);
     return a;
 }
 class AbortableTransform extends node_stream_1.Transform {

package/dist/stream/readable/readableForEach.d.ts

@@ -1,4 +1,4 @@
-import { Mapper, AbortableAsyncMapper } from '@naturalcycles/js-lib';
+import { AbortableAsyncMapper, Mapper } from '@naturalcycles/js-lib';
 import { ReadableTyped } from '../../index';
 import { TransformMapOptions } from '../transform/transformMap';
 /**

package/dist/string/inspect.d.ts

@@ -1,5 +1,5 @@
 import { InspectOptions } from 'node:util';
-import { StringifyOptions, JsonStringifyFunction } from '@naturalcycles/js-lib';
+import { JsonStringifyFunction, StringifyOptions } from '@naturalcycles/js-lib';
 export interface InspectAnyOptions extends StringifyOptions, InspectOptions {
 }
 /**

package/dist/util/env.util.d.ts

@@ -1,5 +1,5 @@
-import type { ValuesOf } from '@naturalcycles/js-lib';
 import 'dotenv/config';
+import type { ValuesOf } from '@naturalcycles/js-lib';
 /**
  * @example
  *

package/dist/util/env.util.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.requireEnvKeys = requireEnvKeys;
 exports.requireFileToExist = requireFileToExist;
 const tslib_1 = require("tslib");
-const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 require("dotenv/config"); // ensure .env is read before requiring keys
+const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 /**
  * @example
  *

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

@@ -1,4 +1,4 @@
-import { JsonSchema, JsonSchemaBuilder, CommonLogger } from '@naturalcycles/js-lib';
+import { CommonLogger, JsonSchema, JsonSchemaBuilder } from '@naturalcycles/js-lib';
 import Ajv from 'ajv';
 import { AjvValidationError } from './ajvValidationError';
 export interface AjvValidationOptions {

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

@@ -1,5 +1,5 @@
-import Ajv from 'ajv';
 import type { Options } from 'ajv';
+import Ajv from 'ajv';
 /**
  * Create Ajv with modified defaults.
  *

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

@@ -57,8 +57,8 @@ function oneOfSchema(...schemas) {
 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.BASE64_REGEX = /^[a-zA-Z0-9+/]+={0,2}$/;
+exports.BASE64URL_REGEX = /^[a-zA-Z0-9_-]+$/;
 exports.base62Schema = exports.stringSchema.regex(exports.BASE62_REGEX);
 exports.base64Schema = exports.stringSchema.regex(exports.BASE64_REGEX);
 exports.base64UrlSchema = exports.stringSchema.regex(exports.BASE64URL_REGEX);

package/package.json

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

package/src/fs/del.ts

@@ -1,4 +1,4 @@
-import { pFilter, pMap, _since } from '@naturalcycles/js-lib'
+import { _since, pFilter, pMap } from '@naturalcycles/js-lib'
 import { dimGrey, yellow } from '../colors/colors'
 import { fs2, globby } from '../index'
 

package/src/index.ts

@@ -1,30 +1,39 @@
 import Ajv from 'ajv'
-import fastGlob from 'fast-glob'
 import type { Options as FastGlobOptions } from 'fast-glob'
-import globby from 'globby'
+import fastGlob from 'fast-glob'
 import type { GlobbyOptions } from 'globby'
+import globby from 'globby'
 import type {
-  AnySchema,
-  ValidationErrorItem,
   AlternativesSchema,
+  AnySchema,
   ArraySchema,
   BinarySchema,
   BooleanSchema,
   DateSchema,
   FunctionSchema,
   ObjectSchema,
+  ValidationErrorItem,
 } from 'joi'
 export * from './buffer/buffer.util'
+export * from './colors/colors'
+export * from './csv/csvReader'
+export * from './csv/csvWriter'
+export * from './csv/transformToCSV'
 export * from './diff/tableDiff'
+export * from './fs/del'
+export * from './fs/fs2'
+export * from './fs/json2env'
+export * from './fs/kpy'
 export * from './infra/process.util'
+export * from './jwt/jwt.service'
 export * from './log/debug'
-export * from './security/hash.util'
+export * from './log/log.util'
+export * from './script/runScript'
 export * from './security/crypto.util'
+export * from './security/hash.util'
 export * from './security/id.util'
 export * from './security/nanoid'
 export * from './security/secret.util'
-export * from './colors/colors'
-export * from './log/log.util'
 export * from './slack/slack.service'
 export * from './slack/slack.service.model'
 export * from './stream/ndjson/ndjson.model'
@@ -33,26 +42,26 @@ export * from './stream/ndjson/ndjsonStreamForEach'
 export * from './stream/ndjson/transformJsonParse'
 export * from './stream/ndjson/transformToNDJson'
 export * from './stream/pipeline/pipeline'
+export * from './stream/progressLogger'
 export * from './stream/readable/readableCreate'
 export * from './stream/readable/readableForEach'
 export * from './stream/readable/readableFromArray'
 export * from './stream/readable/readableToArray'
 export * from './stream/stream.model'
-export * from './stream/progressLogger'
 export * from './stream/transform/transformChunk'
 export * from './stream/transform/transformFilter'
 export * from './stream/transform/transformLimit'
-export * from './stream/transform/transformOffset'
 export * from './stream/transform/transformLogProgress'
 export * from './stream/transform/transformMap'
 export * from './stream/transform/transformMapSimple'
-export * from './stream/transform/transformNoOp'
 export * from './stream/transform/transformMapSync'
+export * from './stream/transform/transformNoOp'
+export * from './stream/transform/transformOffset'
 export * from './stream/transform/transformSplit'
 export * from './stream/transform/transformTap'
-export * from './stream/transform/transformToArray'
 export * from './stream/transform/transformTee'
 export * from './stream/transform/transformThrottle'
+export * from './stream/transform/transformToArray'
 export * from './stream/transform/worker/baseWorkerClass'
 export * from './stream/transform/worker/transformMultiThreaded'
 export * from './stream/transform/worker/transformMultiThreaded.model'
@@ -60,16 +69,13 @@ export * from './stream/writable/writableForEach'
 export * from './stream/writable/writableFork'
 export * from './stream/writable/writablePushToArray'
 export * from './stream/writable/writableVoid'
-export * from './csv/csvWriter'
-export * from './csv/csvReader'
-export * from './csv/transformToCSV'
 export * from './string/inspect'
+export * from './util/buildInfo.util'
 export * from './util/env.util'
-export * from './util/lruMemoCache'
-export * from './util/zip.util'
 export * from './util/exec.util'
 export * from './util/git.util'
-export * from './util/buildInfo.util'
+export * from './util/lruMemoCache'
+export * from './util/zip.util'
 export * from './validation/ajv/ajv.util'
 export * from './validation/ajv/ajvSchema'
 export * from './validation/ajv/ajvValidationError'
@@ -79,28 +85,22 @@ export * from './validation/joi/joi.model'
 export * from './validation/joi/joi.shared.schemas'
 export * from './validation/joi/joi.validation.error'
 export * from './validation/joi/joi.validation.util'
-export * from './script/runScript'
-export * from './jwt/jwt.service'
-export * from './fs/fs2'
-export * from './fs/del'
-export * from './fs/json2env'
-export * from './fs/kpy'
 
 export type {
-  GlobbyOptions,
-  FastGlobOptions,
-  ValidationErrorItem,
   AlternativesSchema,
   AnySchema,
   ArraySchema,
   BinarySchema,
   BooleanSchema,
   DateSchema,
+  FastGlobOptions,
   FunctionSchema,
+  GlobbyOptions,
   ObjectSchema,
+  ValidationErrorItem,
   // extended
   // NumberSchema,
   // StringSchema,
 }
 
-export { globby, fastGlob, Ajv }
+export { Ajv, fastGlob, globby }

package/src/jwt/jwt.service.ts

@@ -1,11 +1,11 @@
 import { _assert, _errorDataAppend, AnyObject, ErrorData, JWTString } from '@naturalcycles/js-lib'
 import { AnySchema } from 'joi'
-import type { Algorithm, VerifyOptions, JwtHeader, SignOptions } from 'jsonwebtoken'
+import type { Algorithm, JwtHeader, SignOptions, VerifyOptions } from 'jsonwebtoken'
 import jsonwebtoken from 'jsonwebtoken'
 import { anyObjectSchema } from '../validation/joi/joi.shared.schemas'
 import { validate } from '../validation/joi/joi.validation.util'
 export { jsonwebtoken }
-export type { Algorithm, VerifyOptions, SignOptions, JwtHeader }
+export type { Algorithm, JwtHeader, SignOptions, VerifyOptions }
 
 export interface JWTServiceCfg {
   /**

package/src/script/runScript.ts

@@ -1,5 +1,5 @@
-import { pDelay, setGlobalStringifyFunction } from '@naturalcycles/js-lib'
 import type { CommonLogger } from '@naturalcycles/js-lib'
+import { pDelay, setGlobalStringifyFunction } from '@naturalcycles/js-lib'
 import { inspectStringifyFn } from '../string/inspect'
 
 export interface RunScriptOptions {

package/src/stream/ndjson/ndjsonMap.ts

@@ -1,12 +1,12 @@
 import { AbortableAsyncMapper, ErrorMode } from '@naturalcycles/js-lib'
 import {
+  _pipeline,
+  fs2,
   transformLimit,
   transformLogProgress,
+  TransformLogProgressOptions,
   transformMap,
   TransformMapOptions,
-  _pipeline,
-  TransformLogProgressOptions,
-  fs2,
 } from '../..'
 
 export interface NDJSONMapOptions<IN = any, OUT = IN>

package/src/stream/ndjson/ndjsonStreamForEach.ts

@@ -1,12 +1,12 @@
 import { AbortableAsyncMapper, ErrorMode } from '@naturalcycles/js-lib'
 import {
+  _pipeline,
+  fs2,
   transformLogProgress,
   TransformLogProgressOptions,
   transformMap,
   TransformMapOptions,
   writableVoid,
-  _pipeline,
-  fs2,
 } from '../..'
 
 export interface NDJSONStreamForEachOptions<IN = any>

package/src/stream/pipeline/pipeline.ts

@@ -1,7 +1,7 @@
 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'
+import { writablePushToArray } from '../writable/writablePushToArray'
 
 type AnyStream = NodeJS.ReadableStream | NodeJS.WritableStream | NodeJS.ReadWriteStream
 

package/src/stream/readable/readableForEach.ts

@@ -1,5 +1,5 @@
-import { Mapper, _passNothingPredicate, AbortableAsyncMapper } from '@naturalcycles/js-lib'
-import { ReadableTyped, _pipeline } from '../../index'
+import { _passNothingPredicate, AbortableAsyncMapper, Mapper } from '@naturalcycles/js-lib'
+import { _pipeline, ReadableTyped } from '../../index'
 import { transformMap, TransformMapOptions } from '../transform/transformMap'
 
 /**

package/src/stream/transform/worker/transformMultiThreaded.ts

@@ -1,5 +1,5 @@
 import { Worker } from 'node:worker_threads'
-import { DeferredPromise, pDefer, _range, AnyObject } from '@naturalcycles/js-lib'
+import { _range, AnyObject, DeferredPromise, pDefer } from '@naturalcycles/js-lib'
 import through2Concurrent = require('through2-concurrent')
 import { TransformTyped } from '../../stream.model'
 import { WorkerInput, WorkerOutput } from './transformMultiThreaded.model'

package/src/stream/writable/writableForEach.ts

@@ -1,4 +1,4 @@
-import { AsyncMapper, _passNothingPredicate, Mapper } from '@naturalcycles/js-lib'
+import { _passNothingPredicate, AsyncMapper, Mapper } from '@naturalcycles/js-lib'
 import { transformMap, TransformMapOptions, transformMapSync } from '../..'
 import { WritableTyped } from '../stream.model'
 

package/src/stream/writable/writableFork.ts

@@ -1,5 +1,5 @@
 import { Writable } from 'node:stream'
-import { readableCreate, ReadableTyped, _pipeline } from '../..'
+import { _pipeline, readableCreate, ReadableTyped } from '../..'
 import { TransformOptions, WritableTyped } from '../stream.model'
 
 /**

package/src/string/inspect.ts

@@ -1,5 +1,5 @@
 import { inspect, InspectOptions } from 'node:util'
-import { StringifyOptions, _stringify, JsonStringifyFunction } from '@naturalcycles/js-lib'
+import { _stringify, JsonStringifyFunction, StringifyOptions } from '@naturalcycles/js-lib'
 
 export interface InspectAnyOptions extends StringifyOptions, InspectOptions {}
 

package/src/util/env.util.ts

@@ -1,6 +1,6 @@
+import 'dotenv/config' // ensure .env is read before requiring keys
 import fs from 'node:fs'
 import type { ValuesOf } from '@naturalcycles/js-lib'
-import 'dotenv/config' // ensure .env is read before requiring keys
 
 /**
  * @example

package/src/validation/ajv/ajv.util.ts

@@ -1,6 +1,6 @@
 import { JsonSchema } from '@naturalcycles/js-lib'
-import { fastGlob, fs2 } from '../..'
 import type { FastGlobOptions } from '../..'
+import { fastGlob, fs2 } from '../..'
 import { AjvSchema, AjvSchemaCfg } from './ajvSchema'
 
 /**

package/src/validation/ajv/ajvSchema.ts

@@ -1,11 +1,11 @@
 import {
-  JsonSchema,
-  JsonSchemaAnyBuilder,
-  JsonSchemaBuilder,
   _filterNullishValues,
   _isObject,
   _substringBefore,
   CommonLogger,
+  JsonSchema,
+  JsonSchemaAnyBuilder,
+  JsonSchemaBuilder,
 } from '@naturalcycles/js-lib'
 import Ajv, { ValidateFunction } from 'ajv'
 import { _inspect, fs2, requireFileToExist } from '../../index'

package/src/validation/ajv/getAjv.ts

@@ -1,5 +1,5 @@
-import Ajv from 'ajv'
 import type { Options } from 'ajv'
+import Ajv from 'ajv'
 
 const AJV_OPTIONS: Options = {
   removeAdditional: true,

package/src/validation/joi/joi.extensions.ts

@@ -1,6 +1,6 @@
 import JoiLib from 'joi'
-import { NumberSchema, numberExtensions } from './number.extensions'
-import { StringSchema, stringExtensions } from './string.extensions'
+import { numberExtensions, NumberSchema } from './number.extensions'
+import { stringExtensions, StringSchema } from './string.extensions'
 
 export interface ExtendedJoi extends JoiLib.Root {
   // eslint-disable-next-line id-blacklist

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

@@ -76,8 +76,8 @@ export const anySchema = Joi.any()
 export const anyObjectSchema: ObjectSchema = 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 BASE64_REGEX = /^[a-zA-Z0-9+/]+={0,2}$/
+export const BASE64URL_REGEX = /^[a-zA-Z0-9_-]+$/
 export const base62Schema = stringSchema.regex(BASE62_REGEX)
 export const base64Schema = stringSchema.regex(BASE64_REGEX)
 export const base64UrlSchema = stringSchema.regex(BASE64URL_REGEX)