@naturalcycles/nodejs-lib 15.3.0 → 15.4.0

package/dist/bin/slack-this.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { SlackService } from '../index.js';
 import { runScript } from '../script/runScript.js';
+import { SlackService } from '../slack/index.js';
 import { _yargs } from '../yargs/yargs.util.js';
 runScript(async () => {
     const { channel, msg, username, emoji, webhook: webhookUrl, } = _yargs().options({

package/dist/{exec2.js → exec2/exec2.js}

@@ -2,7 +2,7 @@ import { execSync, spawn, spawnSync } from 'node:child_process';
 import { _since } from '@naturalcycles/js-lib/datetime';
 import { AppError } from '@naturalcycles/js-lib/error';
 import { _substringAfterLast } from '@naturalcycles/js-lib/string';
-import { dimGrey, dimRed, hasColors, white } from './colors/colors.js';
+import { dimGrey, dimRed, hasColors, white } from '../colors/colors.js';
 /**
  * Set of utility functions to work with Spawn / Exec.
  *

package/dist/index.d.ts

@@ -2,14 +2,11 @@ export * from './buffer/buffer.util.js';
 export * from './diff/tableDiff.js';
 export * from './infra/process.util.js';
 export * from './log/log.util.js';
-export * from './script/runScript.js';
 export * from './security/crypto.util.js';
 export * from './security/hash.util.js';
 export * from './security/id.util.js';
 export * from './security/nanoid.js';
 export * from './security/secret.util.js';
-export * from './slack/slack.service.js';
-export * from './slack/slack.service.model.js';
 export * from './string/inspect.js';
 export * from './util/buildInfo.util.js';
 export * from './util/env.util.js';

package/dist/index.js

@@ -2,14 +2,11 @@ export * from './buffer/buffer.util.js';
 export * from './diff/tableDiff.js';
 export * from './infra/process.util.js';
 export * from './log/log.util.js';
-export * from './script/runScript.js';
 export * from './security/crypto.util.js';
 export * from './security/hash.util.js';
 export * from './security/id.util.js';
 export * from './security/nanoid.js';
 export * from './security/secret.util.js';
-export * from './slack/slack.service.js';
-export * from './slack/slack.service.model.js';
 export * from './string/inspect.js';
 export * from './util/buildInfo.util.js';
 export * from './util/env.util.js';

package/dist/script/runScript.d.ts

@@ -1,3 +1,4 @@
+import 'dotenv/config';
 import type { CommonLogger } from '@naturalcycles/js-lib/log';
 export interface RunScriptOptions {
     /**

package/dist/script/runScript.js

@@ -1,6 +1,8 @@
+import 'dotenv/config';
 import os from 'node:os';
 import { pDelay } from '@naturalcycles/js-lib/promise';
 import { setGlobalStringifyFunction } from '@naturalcycles/js-lib/string';
+import { dimGrey } from '../colors/colors.js';
 import { inspectStringifyFn } from '../string/inspect.js';
 const { DEBUG_RUN_SCRIPT } = process.env;
 /**
@@ -22,6 +24,7 @@ const { DEBUG_RUN_SCRIPT } = process.env;
  * Set env DEBUG_RUN_SCRIPT for extra debugging.
  */
 export function runScript(fn, opt = {}) {
+    checkAndlogEnvironment();
     setGlobalStringifyFunction(inspectStringifyFn);
     const { logger = console, noExit, registerUncaughtExceptionHandlers = true } = opt;
     if (registerUncaughtExceptionHandlers || DEBUG_RUN_SCRIPT) {
@@ -40,8 +43,6 @@ export function runScript(fn, opt = {}) {
     const timeout = setTimeout(() => { }, 10000000);
     void (async () => {
         try {
-            await import('dotenv/config');
-            await checkAndlogEnvironment();
             await fn();
             await pDelay(); // to ensure all async operations are completed
             if (DEBUG_RUN_SCRIPT)
@@ -62,8 +63,7 @@ export function runScript(fn, opt = {}) {
         }
     })();
 }
-async function checkAndlogEnvironment() {
-    const { dimGrey } = await import('../colors/colors.js');
+function checkAndlogEnvironment() {
     const { platform, arch, versions: { node }, env: { CPU_LIMIT, NODE_OPTIONS, TZ }, } = process;
     const cpuLimit = Number(CPU_LIMIT) || undefined;
     const availableParallelism = os.availableParallelism?.();

package/dist/slack/index.d.ts

@@ -0,0 +1,2 @@
+export * from './slack.service.js';
+export * from './slack.service.model.js';

package/dist/slack/index.js

@@ -0,0 +1,2 @@
+export * from './slack.service.js';
+export * from './slack.service.model.js';

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

@@ -1,6 +1,6 @@
 import type { CommonLogger } from '@naturalcycles/js-lib/log';
 import type { AnyObject } from '@naturalcycles/js-lib/types';
-import type { InspectAnyOptions } from '../index.js';
+import type { InspectAnyOptions } from '../string/inspect.js';
 /**
  * Properties that exists both in SlackApiBody (as per Slack API) and SlackMessage (our abstraction).
  */

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

@@ -1,5 +1,6 @@
 import type { AbortableAsyncMapper } from '@naturalcycles/js-lib/types';
-import { type TransformLogProgressOptions, type TransformMapOptions } from '../index.js';
+import { type TransformLogProgressOptions } from '../transform/transformLogProgress.js';
+import { type TransformMapOptions } from '../transform/transformMap.js';
 export interface NDJSONStreamForEachOptions<IN = any> extends TransformMapOptions<IN, void>, TransformLogProgressOptions<IN> {
     inputFilePath: string;
 }

package/dist/stream/ndjson/ndjsonStreamForEach.js

@@ -1,6 +1,9 @@
 import { ErrorMode } from '@naturalcycles/js-lib/error';
-import { createReadStreamAsNDJSON, } from '../index.js';
-import { _pipeline, transformLogProgress, transformMap, writableVoid } from '../index.js';
+import { _pipeline } from '../pipeline/pipeline.js';
+import { transformLogProgress, } from '../transform/transformLogProgress.js';
+import { transformMap } from '../transform/transformMap.js';
+import { writableVoid } from '../writable/writableVoid.js';
+import { createReadStreamAsNDJSON } from './createReadStreamAsNDJSON.js';
 /**
  * Convenience function to `forEach` through an ndjson file.
  */

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

@@ -1,5 +1,5 @@
 import type { AbortableAsyncMapper, IndexedMapper } from '@naturalcycles/js-lib/types';
-import type { ReadableTyped } from '../index.js';
+import type { ReadableTyped } from '../stream.model.js';
 import type { TransformMapOptions } from '../transform/transformMap.js';
 /**
  * Convenience function to do `.forEach` over a Readable.

package/dist/stream/readable/readableForEach.js

@@ -1,5 +1,5 @@
 import { _passNothingPredicate } from '@naturalcycles/js-lib/types';
-import { _pipeline } from '../index.js';
+import { _pipeline } from '../pipeline/pipeline.js';
 import { transformMap } from '../transform/transformMap.js';
 /**
  * Convenience function to do `.forEach` over a Readable.

package/dist/stream/transform/transformLimit.d.ts

@@ -1,6 +1,6 @@
 import type { Readable } from 'node:stream';
 import type { CommonLogger } from '@naturalcycles/js-lib/log';
-import { AbortableTransform } from '../index.js';
+import { AbortableTransform } from '../pipeline/pipeline.js';
 import type { TransformOptions, TransformTyped } from '../stream.model.js';
 export interface TransformLimitOptions extends TransformOptions {
     /**

package/dist/stream/transform/transformLimit.js

@@ -1,5 +1,6 @@
-import { AbortableTransform, transformNoOp } from '../index.js';
+import { AbortableTransform } from '../pipeline/pipeline.js';
 import { pipelineClose } from '../stream.util.js';
+import { transformNoOp } from './transformNoOp.js';
 /**
  * Class only exists to be able to do `instanceof TransformLimit`
  * and to set sourceReadable+streamDone to it in `_pipeline`.

package/dist/stream/transform/transformOffset.js

@@ -1,5 +1,5 @@
 import { Transform } from 'node:stream';
-import { transformNoOp } from '../index.js';
+import { transformNoOp } from './transformNoOp.js';
 export function transformOffset(opt) {
     const { offset } = opt;
     if (!offset) {

package/dist/stream/writable/writableForEach.d.ts

@@ -1,6 +1,6 @@
 import type { AsyncIndexedMapper, IndexedMapper } from '@naturalcycles/js-lib/types';
-import type { TransformMapOptions } from '../index.js';
 import type { WritableTyped } from '../stream.model.js';
+import { type TransformMapOptions } from '../transform/transformMap.js';
 /**
  * Just an alias to transformMap that declares OUT as void.
  */

package/dist/stream/writable/writableForEach.js

@@ -1,5 +1,6 @@
 import { _passNothingPredicate } from '@naturalcycles/js-lib/types';
-import { transformMap, transformMapSync } from '../index.js';
+import { transformMap } from '../transform/transformMap.js';
+import { transformMapSync } from '../transform/transformMapSync.js';
 /**
  * Just an alias to transformMap that declares OUT as void.
  */

package/dist/stream/writable/writableFork.js

@@ -1,5 +1,6 @@
 import { Writable } from 'node:stream';
-import { _pipeline, readableCreate } from '../index.js';
+import { _pipeline } from '../pipeline/pipeline.js';
+import { readableCreate } from '../readable/readableCreate.js';
 /**
  * Allows "forking" a stream inside pipeline into a number of pipeline chains (2 or more).
  * Currently does NOT (!) maintain backpressure.

package/dist/util/git2.js

@@ -1,6 +1,6 @@
 import { execSync } from 'node:child_process';
 import { basename } from 'node:path';
-import { exec2 } from '../exec2.js';
+import { exec2 } from '../exec2/exec2.js';
 /**
  * Set of utility functions to work with git.
  */

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

@@ -15,7 +15,6 @@ export interface AjvSchemaCfg {
      * Dependent schemas to pass to Ajv instance constructor.
      * Simpler than instantiating and passing ajv instance yourself.
      */
-    schemas?: (JsonSchema | JsonSchemaBuilder | AjvSchema)[];
     objectName?: string;
     /**
      * Option of Ajv.
@@ -24,7 +23,11 @@ export interface AjvSchemaCfg {
      *
      * This option is a "shortcut" to skip creating and passing Ajv instance.
      */
-    coerceTypes?: boolean;
+    /**
+     * If true - schema will be compiled on-demand (lazily).
+     * Default: false.
+     */
+    lazy?: boolean;
 }
 /**
  * On creation - compiles ajv validation function.
@@ -35,6 +38,10 @@ export interface AjvSchemaCfg {
 export declare class AjvSchema<T = unknown> {
     schema: JsonSchema<T>;
     private constructor();
+    /**
+     * Shortcut for AjvSchema.create(schema, { lazy: true })
+     */
+    static createLazy<T>(schema: JsonSchemaBuilder<T> | JsonSchema<T> | AjvSchema<T>, cfg?: Partial<AjvSchemaCfg>): AjvSchema<T>;
     /**
      * Conveniently allows to pass either JsonSchema or JsonSchemaBuilder, or existing AjvSchema.
      * If it's already an AjvSchema - it'll just return it without any processing.
@@ -45,13 +52,8 @@ export declare class AjvSchema<T = unknown> {
      * correctly for some reason.
      */
     static create<T>(schema: JsonSchemaBuilder<T> | JsonSchema<T> | AjvSchema<T>, cfg?: Partial<AjvSchemaCfg>): AjvSchema<T>;
-    /**
-     * Create AjvSchema directly from a filePath of json schema.
-     * Convenient method that just does fs.readFileSync for you.
-     */
-    static readJsonSync<T = unknown>(filePath: string, cfg?: Partial<AjvSchemaCfg>): AjvSchema<T>;
     readonly cfg: AjvSchemaCfg;
-    private readonly validateFunction;
+    private getValidateFunction;
     /**
      * It returns the original object just for convenience.
      * Reminder: Ajv will MUTATE your object under 2 circumstances:

package/dist/validation/ajv/ajvSchema.js

@@ -1,8 +1,7 @@
-import { _isObject } from '@naturalcycles/js-lib';
+import { _isObject, _lazyValue } from '@naturalcycles/js-lib';
 import { JsonSchemaAnyBuilder } from '@naturalcycles/js-lib/json-schema';
 import { _filterNullishValues } from '@naturalcycles/js-lib/object';
 import { _substringBefore } from '@naturalcycles/js-lib/string';
-import { fs2 } from '../../fs/fs2.js';
 import { _inspect } from '../../string/inspect.js';
 import { AjvValidationError } from './ajvValidationError.js';
 import { getAjv } from './getAjv.js';
@@ -17,23 +16,35 @@ export class AjvSchema {
     constructor(schema, cfg = {}) {
         this.schema = schema;
         this.cfg = {
+            lazy: false,
             ...cfg,
-            ajv: cfg.ajv ||
-                getAjv({
-                    schemas: cfg.schemas?.map(s => {
-                        if (s instanceof AjvSchema)
-                            return s.schema;
-                        if (s instanceof JsonSchemaAnyBuilder)
-                            return s.build();
-                        return s;
-                    }),
-                    coerceTypes: cfg.coerceTypes || false,
-                    // verbose: true,
-                }),
+            ajv: cfg.ajv || getAjv(),
+            // ajv:
+            //   cfg.ajv ||
+            //   getAjv({
+            //     schemas: cfg.schemas?.map(s => {
+            //       if (s instanceof AjvSchema) return s.schema
+            //       if (s instanceof JsonSchemaAnyBuilder) return s.build()
+            //       return s as JsonSchema
+            //     }),
+            //     coerceTypes: cfg.coerceTypes || false,
+            //     // verbose: true,
+            //   }),
             // Auto-detecting "ObjectName" from $id of the schema (e.g "Address.schema.json")
             objectName: cfg.objectName || (schema.$id ? _substringBefore(schema.$id, '.') : undefined),
         };
-        this.validateFunction = this.cfg.ajv.compile(schema);
+        if (!cfg.lazy) {
+            this.getValidateFunction(); // compile eagerly
+        }
+    }
+    /**
+     * Shortcut for AjvSchema.create(schema, { lazy: true })
+     */
+    static createLazy(schema, cfg = {}) {
+        return AjvSchema.create(schema, {
+            lazy: true,
+            ...cfg,
+        });
     }
     /**
      * Conveniently allows to pass either JsonSchema or JsonSchemaBuilder, or existing AjvSchema.
@@ -52,17 +63,8 @@ export class AjvSchema {
         }
         return new AjvSchema(schema, cfg);
     }
-    /**
-     * Create AjvSchema directly from a filePath of json schema.
-     * Convenient method that just does fs.readFileSync for you.
-     */
-    static readJsonSync(filePath, cfg = {}) {
-        fs2.requireFileToExist(filePath);
-        const schema = fs2.readJson(filePath);
-        return new AjvSchema(schema, cfg);
-    }
     cfg;
-    validateFunction;
+    getValidateFunction = _lazyValue(() => this.cfg.ajv.compile(this.schema));
     /**
      * It returns the original object just for convenience.
      * Reminder: Ajv will MUTATE your object under 2 circumstances:
@@ -78,12 +80,12 @@ export class AjvSchema {
         return obj;
     }
     isValid(obj) {
-        return this.validateFunction(obj);
+        return this.getValidateFunction()(obj);
     }
     getValidationError(obj, opt = {}) {
         if (this.isValid(obj))
             return;
-        const errors = this.validateFunction.errors;
+        const errors = this.getValidateFunction().errors;
         const { objectId = _isObject(obj) ? obj['id'] : undefined, objectName = this.cfg.objectName, } = opt;
         const name = [objectName || 'Object', objectId].filter(Boolean).join('.');
         let message = this.cfg.ajv.errorsText(errors, {

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

@@ -1,8 +1,17 @@
 import type { Options } from 'ajv';
 import { Ajv } from 'ajv';
+/**
+ * Return cached instance of Ajv with default (recommended) options.
+ *
+ * This function should be used as much as possible,
+ * to benefit from cached Ajv instance.
+ */
+export declare const getAjv: import("@naturalcycles/js-lib/types").Lazy<Ajv>;
 /**
  * Create Ajv with modified defaults.
  *
+ * !!! Please note that this function is EXPENSIVE computationally !!!
+ *
  * https://ajv.js.org/options.html
  */
-export declare function getAjv(opt?: Options): Ajv;
+export declare function createAjv(opt?: Options): Ajv;

package/dist/validation/ajv/getAjv.js

@@ -1,3 +1,4 @@
+import { _lazyValue } from '@naturalcycles/js-lib';
 import { Ajv } from 'ajv';
 import ajvFormats from 'ajv-formats';
 import ajvKeywords from 'ajv-keywords';
@@ -10,12 +11,21 @@ const AJV_OPTIONS = {
     // https://ajv.js.org/options.html#coercetypes
     coerceTypes: false, // while `false` - it won't mutate your input
 };
+/**
+ * Return cached instance of Ajv with default (recommended) options.
+ *
+ * This function should be used as much as possible,
+ * to benefit from cached Ajv instance.
+ */
+export const getAjv = _lazyValue(createAjv);
 /**
  * Create Ajv with modified defaults.
  *
+ * !!! Please note that this function is EXPENSIVE computationally !!!
+ *
  * https://ajv.js.org/options.html
  */
-export function getAjv(opt) {
+export function createAjv(opt) {
     const ajv = new Ajv({
         ...AJV_OPTIONS,
         ...opt,

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

@@ -1,5 +1,4 @@
 import Ajv from 'ajv';
-export * from './ajv.util.js';
 export * from './ajvSchema.js';
 export * from './ajvValidationError.js';
 export * from './getAjv.js';

package/dist/validation/ajv/index.js

@@ -1,5 +1,4 @@
 import Ajv from 'ajv';
-export * from './ajv.util.js';
 export * from './ajvSchema.js';
 export * from './ajvValidationError.js';
 export * from './getAjv.js';

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

@@ -17,6 +17,8 @@ export declare function validate<T>(input: any, schema?: AnySchema<T>, objectNam
  * Returns JoiValidationResult with converted value and error (if any).
  * Does not throw.
  *
+ * Joi does NOT mutate the input.
+ *
  * If `schema` is undefined - returns value as is.
  */
 export declare function getValidationResult<T>(input: any, schema?: AnySchema<T>, objectName?: string, options?: ValidationOptions): JoiValidationResult<T>;

package/dist/validation/joi/joi.validation.util.js

@@ -50,6 +50,8 @@ export function validate(input, schema, objectName, opt = {}) {
  * Returns JoiValidationResult with converted value and error (if any).
  * Does not throw.
  *
+ * Joi does NOT mutate the input.
+ *
  * If `schema` is undefined - returns value as is.
  */
 export function getValidationResult(input, schema, objectName, options = {}) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.3.0",
+  "version": "15.4.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@types/js-yaml": "^4",
@@ -30,14 +30,17 @@
     "./lruMemoCache": "./dist/cache/lruMemoCache.js",
     "./colors": "./dist/colors/colors.js",
     "./csv": "./dist/csv/index.js",
-    "./exec2": "./dist/exec2.js",
+    "./exec2": "./dist/exec2/exec2.js",
     "./fs2": "./dist/fs/fs2.js",
     "./env": "./dist/fs/json2env.js",
     "./kpy": "./dist/fs/kpy.js",
     "./yaml2": "./dist/fs/yaml2.js",
     "./glob": "./dist/glob/index.js",
     "./jwt": "./dist/jwt/jwt.service.js",
+    "./runScript": "./dist/script/runScript.js",
+    "./slack": "./dist/slack/index.js",
     "./stream": "./dist/stream/index.js",
+    "./stream/*.js": "./dist/stream/*.js",
     "./yargs": "./dist/yargs/yargs.util.js",
     "./ajv": "./dist/validation/ajv/index.js",
     "./joi": "./dist/validation/joi/index.js",
@@ -60,7 +63,6 @@
     "!src/**/__snapshots__",
     "!src/**/__exclude"
   ],
-  "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "publishConfig": {
     "access": "public"

package/src/bin/slack-this.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-import { SlackService } from '../index.js'
 import { runScript } from '../script/runScript.js'
+import { SlackService } from '../slack/index.js'
 import { _yargs } from '../yargs/yargs.util.js'
 
 runScript(async () => {

package/src/{exec2.ts → exec2/exec2.ts}

@@ -7,7 +7,7 @@ import type {
   NumberOfMilliseconds,
   UnixTimestampMillis,
 } from '@naturalcycles/js-lib/types'
-import { dimGrey, dimRed, hasColors, white } from './colors/colors.js'
+import { dimGrey, dimRed, hasColors, white } from '../colors/colors.js'
 
 /**
  * Set of utility functions to work with Spawn / Exec.

package/src/index.ts

@@ -2,14 +2,11 @@ export * from './buffer/buffer.util.js'
 export * from './diff/tableDiff.js'
 export * from './infra/process.util.js'
 export * from './log/log.util.js'
-export * from './script/runScript.js'
 export * from './security/crypto.util.js'
 export * from './security/hash.util.js'
 export * from './security/id.util.js'
 export * from './security/nanoid.js'
 export * from './security/secret.util.js'
-export * from './slack/slack.service.js'
-export * from './slack/slack.service.model.js'
 export * from './string/inspect.js'
 export * from './util/buildInfo.util.js'
 export * from './util/env.util.js'

package/src/script/runScript.ts

@@ -1,8 +1,10 @@
+import 'dotenv/config'
 import os from 'node:os'
 import type { CommonLogger } from '@naturalcycles/js-lib/log'
 import { pDelay } from '@naturalcycles/js-lib/promise'
 import { setGlobalStringifyFunction } from '@naturalcycles/js-lib/string'
 import type { AnyObject } from '@naturalcycles/js-lib/types'
+import { dimGrey } from '../colors/colors.js'
 import { inspectStringifyFn } from '../string/inspect.js'
 
 export interface RunScriptOptions {
@@ -46,6 +48,7 @@ const { DEBUG_RUN_SCRIPT } = process.env
  * Set env DEBUG_RUN_SCRIPT for extra debugging.
  */
 export function runScript(fn: (...args: any[]) => any, opt: RunScriptOptions = {}): void {
+  checkAndlogEnvironment()
   setGlobalStringifyFunction(inspectStringifyFn)
 
   const { logger = console, noExit, registerUncaughtExceptionHandlers = true } = opt
@@ -69,9 +72,6 @@ export function runScript(fn: (...args: any[]) => any, opt: RunScriptOptions = {
 
   void (async () => {
     try {
-      await import('dotenv/config')
-      await checkAndlogEnvironment()
-
       await fn()
 
       await pDelay() // to ensure all async operations are completed
@@ -93,9 +93,7 @@ export function runScript(fn: (...args: any[]) => any, opt: RunScriptOptions = {
   })()
 }
 
-async function checkAndlogEnvironment(): Promise<void> {
-  const { dimGrey } = await import('../colors/colors.js')
-
+function checkAndlogEnvironment(): void {
   const {
     platform,
     arch,

package/src/slack/index.ts

@@ -0,0 +1,2 @@
+export * from './slack.service.js'
+export * from './slack.service.model.js'

package/src/slack/slack.service.model.ts

@@ -1,6 +1,6 @@
 import type { CommonLogger } from '@naturalcycles/js-lib/log'
 import type { AnyObject } from '@naturalcycles/js-lib/types'
-import type { InspectAnyOptions } from '../index.js'
+import type { InspectAnyOptions } from '../string/inspect.js'
 
 /**
  * Properties that exists both in SlackApiBody (as per Slack API) and SlackMessage (our abstraction).

package/src/slack/slack.service.ts

@@ -8,8 +8,7 @@ import {
 import { _omit } from '@naturalcycles/js-lib/object'
 import { PQueue } from '@naturalcycles/js-lib/promise'
 import type { AnyObject } from '@naturalcycles/js-lib/types'
-import type { InspectAnyOptions } from '../index.js'
-import { _inspect } from '../index.js'
+import { _inspect, type InspectAnyOptions } from '../index.js'
 import type {
   SlackApiBody,
   SlackAttachmentField,

package/src/stream/ndjson/ndjsonStreamForEach.ts

@@ -1,11 +1,13 @@
 import { ErrorMode } from '@naturalcycles/js-lib/error'
 import type { AbortableAsyncMapper } from '@naturalcycles/js-lib/types'
+import { _pipeline } from '../pipeline/pipeline.js'
 import {
-  createReadStreamAsNDJSON,
+  transformLogProgress,
   type TransformLogProgressOptions,
-  type TransformMapOptions,
-} from '../index.js'
-import { _pipeline, transformLogProgress, transformMap, writableVoid } from '../index.js'
+} from '../transform/transformLogProgress.js'
+import { transformMap, type TransformMapOptions } from '../transform/transformMap.js'
+import { writableVoid } from '../writable/writableVoid.js'
+import { createReadStreamAsNDJSON } from './createReadStreamAsNDJSON.js'
 
 export interface NDJSONStreamForEachOptions<IN = any>
   extends TransformMapOptions<IN, void>,

package/src/stream/readable/readableForEach.ts

@@ -1,7 +1,7 @@
 import type { AbortableAsyncMapper, IndexedMapper } from '@naturalcycles/js-lib/types'
 import { _passNothingPredicate } from '@naturalcycles/js-lib/types'
-import type { ReadableTyped } from '../index.js'
-import { _pipeline } from '../index.js'
+import { _pipeline } from '../pipeline/pipeline.js'
+import type { ReadableTyped } from '../stream.model.js'
 import type { TransformMapOptions } from '../transform/transformMap.js'
 import { transformMap } from '../transform/transformMap.js'
 

package/src/stream/transform/transformLimit.ts

@@ -1,8 +1,9 @@
 import type { Readable } from 'node:stream'
 import type { CommonLogger } from '@naturalcycles/js-lib/log'
-import { AbortableTransform, transformNoOp } from '../index.js'
+import { AbortableTransform } from '../pipeline/pipeline.js'
 import type { TransformOptions, TransformTyped } from '../stream.model.js'
 import { pipelineClose } from '../stream.util.js'
+import { transformNoOp } from './transformNoOp.js'
 
 export interface TransformLimitOptions extends TransformOptions {
   /**

package/src/stream/transform/transformOffset.ts

@@ -1,6 +1,6 @@
 import { Transform } from 'node:stream'
-import { transformNoOp } from '../index.js'
 import type { TransformOptions, TransformTyped } from '../stream.model.js'
+import { transformNoOp } from './transformNoOp.js'
 
 export interface TransformOffsetOptions extends TransformOptions {
   /**

package/src/stream/writable/writableForEach.ts

@@ -1,8 +1,8 @@
 import type { AsyncIndexedMapper, IndexedMapper } from '@naturalcycles/js-lib/types'
 import { _passNothingPredicate } from '@naturalcycles/js-lib/types'
-import type { TransformMapOptions } from '../index.js'
-import { transformMap, transformMapSync } from '../index.js'
 import type { WritableTyped } from '../stream.model.js'
+import { transformMap, type TransformMapOptions } from '../transform/transformMap.js'
+import { transformMapSync } from '../transform/transformMapSync.js'
 
 /**
  * Just an alias to transformMap that declares OUT as void.

package/src/stream/writable/writableFork.ts

@@ -1,7 +1,7 @@
 import { Writable } from 'node:stream'
-import type { ReadableTyped } from '../index.js'
-import { _pipeline, readableCreate } from '../index.js'
-import type { TransformOptions, WritableTyped } from '../stream.model.js'
+import { _pipeline } from '../pipeline/pipeline.js'
+import { readableCreate } from '../readable/readableCreate.js'
+import type { ReadableTyped, TransformOptions, WritableTyped } from '../stream.model.js'
 
 /**
  * Allows "forking" a stream inside pipeline into a number of pipeline chains (2 or more).

package/src/util/git2.ts

@@ -1,7 +1,7 @@
 import { execSync } from 'node:child_process'
 import { basename } from 'node:path'
 import type { UnixTimestamp } from '@naturalcycles/js-lib/types'
-import { exec2 } from '../exec2.js'
+import { exec2 } from '../exec2/exec2.js'
 
 /**
  * Set of utility functions to work with git.

package/src/validation/ajv/ajvSchema.ts

@@ -1,10 +1,9 @@
-import { _isObject } from '@naturalcycles/js-lib'
+import { _isObject, _lazyValue } from '@naturalcycles/js-lib'
 import type { JsonSchema, JsonSchemaBuilder } from '@naturalcycles/js-lib/json-schema'
 import { JsonSchemaAnyBuilder } from '@naturalcycles/js-lib/json-schema'
 import { _filterNullishValues } from '@naturalcycles/js-lib/object'
 import { _substringBefore } from '@naturalcycles/js-lib/string'
-import type { Ajv, ValidateFunction } from 'ajv'
-import { fs2 } from '../../fs/fs2.js'
+import type { Ajv } from 'ajv'
 import { _inspect } from '../../string/inspect.js'
 import { AjvValidationError } from './ajvValidationError.js'
 import { getAjv } from './getAjv.js'
@@ -25,7 +24,7 @@ export interface AjvSchemaCfg {
    * Dependent schemas to pass to Ajv instance constructor.
    * Simpler than instantiating and passing ajv instance yourself.
    */
-  schemas?: (JsonSchema | JsonSchemaBuilder | AjvSchema)[]
+  // schemas?: (JsonSchema | JsonSchemaBuilder | AjvSchema)[]
 
   objectName?: string
 
@@ -36,7 +35,13 @@ export interface AjvSchemaCfg {
    *
    * This option is a "shortcut" to skip creating and passing Ajv instance.
    */
-  coerceTypes?: boolean
+  // coerceTypes?: boolean
+
+  /**
+   * If true - schema will be compiled on-demand (lazily).
+   * Default: false.
+   */
+  lazy?: boolean
 }
 
 /**
@@ -51,23 +56,40 @@ export class AjvSchema<T = unknown> {
     cfg: Partial<AjvSchemaCfg> = {},
   ) {
     this.cfg = {
+      lazy: false,
       ...cfg,
-      ajv:
-        cfg.ajv ||
-        getAjv({
-          schemas: cfg.schemas?.map(s => {
-            if (s instanceof AjvSchema) return s.schema
-            if (s instanceof JsonSchemaAnyBuilder) return s.build()
-            return s as JsonSchema
-          }),
-          coerceTypes: cfg.coerceTypes || false,
-          // verbose: true,
-        }),
+      ajv: cfg.ajv || getAjv(),
+      // ajv:
+      //   cfg.ajv ||
+      //   getAjv({
+      //     schemas: cfg.schemas?.map(s => {
+      //       if (s instanceof AjvSchema) return s.schema
+      //       if (s instanceof JsonSchemaAnyBuilder) return s.build()
+      //       return s as JsonSchema
+      //     }),
+      //     coerceTypes: cfg.coerceTypes || false,
+      //     // verbose: true,
+      //   }),
       // Auto-detecting "ObjectName" from $id of the schema (e.g "Address.schema.json")
       objectName: cfg.objectName || (schema.$id ? _substringBefore(schema.$id, '.') : undefined),
     }
 
-    this.validateFunction = this.cfg.ajv.compile<T>(schema)
+    if (!cfg.lazy) {
+      this.getValidateFunction() // compile eagerly
+    }
+  }
+
+  /**
+   * Shortcut for AjvSchema.create(schema, { lazy: true })
+   */
+  static createLazy<T>(
+    schema: JsonSchemaBuilder<T> | JsonSchema<T> | AjvSchema<T>,
+    cfg: Partial<AjvSchemaCfg> = {},
+  ): AjvSchema<T> {
+    return AjvSchema.create(schema, {
+      lazy: true,
+      ...cfg,
+    })
   }
 
   /**
@@ -90,21 +112,9 @@ export class AjvSchema<T = unknown> {
     return new AjvSchema<T>(schema as JsonSchema<T>, cfg)
   }
 
-  /**
-   * Create AjvSchema directly from a filePath of json schema.
-   * Convenient method that just does fs.readFileSync for you.
-   */
-  static readJsonSync<T = unknown>(
-    filePath: string,
-    cfg: Partial<AjvSchemaCfg> = {},
-  ): AjvSchema<T> {
-    fs2.requireFileToExist(filePath)
-    const schema = fs2.readJson<JsonSchema<T>>(filePath)
-    return new AjvSchema<T>(schema, cfg)
-  }
-
   readonly cfg: AjvSchemaCfg
-  private readonly validateFunction: ValidateFunction<T>
+
+  private getValidateFunction = _lazyValue(() => this.cfg.ajv.compile<T>(this.schema))
 
   /**
    * It returns the original object just for convenience.
@@ -121,13 +131,13 @@ export class AjvSchema<T = unknown> {
   }
 
   isValid(obj: T): boolean {
-    return this.validateFunction(obj)
+    return this.getValidateFunction()(obj)
   }
 
   getValidationError(obj: T, opt: AjvValidationOptions = {}): AjvValidationError | undefined {
     if (this.isValid(obj)) return
 
-    const errors = this.validateFunction.errors!
+    const errors = this.getValidateFunction().errors!
 
     const {
       objectId = _isObject(obj) ? (obj['id' as keyof T] as any) : undefined,

package/src/validation/ajv/getAjv.ts

@@ -1,3 +1,4 @@
+import { _lazyValue } from '@naturalcycles/js-lib'
 import type { Options } from 'ajv'
 import { Ajv } from 'ajv'
 import ajvFormats from 'ajv-formats'
@@ -13,12 +14,22 @@ const AJV_OPTIONS: Options = {
   coerceTypes: false, // while `false` - it won't mutate your input
 }
 
+/**
+ * Return cached instance of Ajv with default (recommended) options.
+ *
+ * This function should be used as much as possible,
+ * to benefit from cached Ajv instance.
+ */
+export const getAjv = _lazyValue(createAjv)
+
 /**
  * Create Ajv with modified defaults.
  *
+ * !!! Please note that this function is EXPENSIVE computationally !!!
+ *
  * https://ajv.js.org/options.html
  */
-export function getAjv(opt?: Options): Ajv {
+export function createAjv(opt?: Options): Ajv {
   const ajv = new Ajv({
     ...AJV_OPTIONS,
     ...opt,

package/src/validation/ajv/index.ts

@@ -1,6 +1,5 @@
 import Ajv from 'ajv'
 
-export * from './ajv.util.js'
 export * from './ajvSchema.js'
 export * from './ajvValidationError.js'
 export * from './getAjv.js'

package/src/validation/joi/joi.validation.util.ts

@@ -70,6 +70,8 @@ export function validate<T>(
  * Returns JoiValidationResult with converted value and error (if any).
  * Does not throw.
  *
+ * Joi does NOT mutate the input.
+ *
  * If `schema` is undefined - returns value as is.
  */
 export function getValidationResult<T>(

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

@@ -1,21 +0,0 @@
-import type { JsonSchema } from '@naturalcycles/js-lib/json-schema';
-import type { GlobOptions } from 'tinyglobby';
-import type { AjvSchemaCfg } from './ajvSchema.js';
-import { AjvSchema } from './ajvSchema.js';
-/**
- * Does fs.readFileSync + JSON.parse for ALL files matching the passed `glob` pattern.
- * E.g `someDir/**\/*.schema.json`
- *
- * Returns them as an array of JsonSchema.
- *
- * @experimental
- */
-export declare function readJsonSchemas(patterns: string | string[], opt?: Omit<GlobOptions, 'patterns'>): JsonSchema[];
-/**
- * Reads json schemas from given dir (glob pattern).
- * Creates new AjvSchema for each of them (ajv validates them upon creation).
- * Passes `schemas` option to ajv, so, schemas may $ref each other and it'll be fine.
- *
- * @experimental
- */
-export declare function readAjvSchemas(patterns: string | string[], cfg?: AjvSchemaCfg): AjvSchema[];

package/dist/validation/ajv/ajv.util.js

@@ -1,28 +0,0 @@
-import { globSync } from 'tinyglobby';
-import { fs2 } from '../../fs/fs2.js';
-import { AjvSchema } from './ajvSchema.js';
-/**
- * Does fs.readFileSync + JSON.parse for ALL files matching the passed `glob` pattern.
- * E.g `someDir/**\/*.schema.json`
- *
- * Returns them as an array of JsonSchema.
- *
- * @experimental
- */
-export function readJsonSchemas(patterns, opt) {
-    return globSync(patterns, opt).map(fileName => fs2.readJson(fileName));
-}
-/**
- * Reads json schemas from given dir (glob pattern).
- * Creates new AjvSchema for each of them (ajv validates them upon creation).
- * Passes `schemas` option to ajv, so, schemas may $ref each other and it'll be fine.
- *
- * @experimental
- */
-export function readAjvSchemas(patterns, cfg) {
-    const schemas = readJsonSchemas(patterns);
-    return schemas.map(schema => AjvSchema.create(schema, {
-        schemas,
-        ...cfg,
-    }));
-}

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

@@ -1,38 +0,0 @@
-import type { JsonSchema } from '@naturalcycles/js-lib/json-schema'
-import type { GlobOptions } from 'tinyglobby'
-import { globSync } from 'tinyglobby'
-import { fs2 } from '../../fs/fs2.js'
-import type { AjvSchemaCfg } from './ajvSchema.js'
-import { AjvSchema } from './ajvSchema.js'
-
-/**
- * Does fs.readFileSync + JSON.parse for ALL files matching the passed `glob` pattern.
- * E.g `someDir/**\/*.schema.json`
- *
- * Returns them as an array of JsonSchema.
- *
- * @experimental
- */
-export function readJsonSchemas(
-  patterns: string | string[],
-  opt?: Omit<GlobOptions, 'patterns'>,
-): JsonSchema[] {
-  return globSync(patterns, opt).map(fileName => fs2.readJson(fileName))
-}
-
-/**
- * Reads json schemas from given dir (glob pattern).
- * Creates new AjvSchema for each of them (ajv validates them upon creation).
- * Passes `schemas` option to ajv, so, schemas may $ref each other and it'll be fine.
- *
- * @experimental
- */
-export function readAjvSchemas(patterns: string | string[], cfg?: AjvSchemaCfg): AjvSchema[] {
-  const schemas = readJsonSchemas(patterns)
-  return schemas.map(schema =>
-    AjvSchema.create(schema, {
-      schemas,
-      ...cfg,
-    }),
-  )
-}