@naturalcycles/nodejs-lib 14.7.0 → 15.0.0

package/dist/bin/generate-build-info.js

@@ -4,7 +4,7 @@ import path from 'node:path';
 import { appendToBashEnv, appendToGithubEnv, appendToGithubOutput } from '../fs/json2env.js';
 import { runScript } from '../script/runScript.js';
 import { generateBuildInfo } from '../util/buildInfo.util.js';
-import { _yargs } from '../yargs.util.js';
+import { _yargs } from '../yargs/yargs.util.js';
 runScript(async () => {
     const { dir, overrideTimestamp } = _yargs().options({
         dir: {

package/dist/bin/json2env.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { json2env } from '../fs/json2env.js';
 import { runScript } from '../script/runScript.js';
-import { _yargs } from '../yargs.util.js';
+import { _yargs } from '../yargs/yargs.util.js';
 runScript(() => {
     const { argv } = _yargs()
         .demandCommand(1)

package/dist/bin/kpy.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { kpySync } from '../fs/kpy.js';
 import { runScript } from '../script/runScript.js';
-import { _yargs } from '../yargs.util.js';
+import { _yargs } from '../yargs/yargs.util.js';
 runScript(() => {
     const { _: [baseDir, ...inputPatterns], ...opt } = _yargs()
         .demandCommand(2)

package/dist/bin/secrets-decrypt.js

@@ -3,7 +3,7 @@ import 'dotenv/config';
 import { dimGrey } from '../colors/colors.js';
 import { runScript } from '../script/runScript.js';
 import { secretsDecrypt } from '../secret/secrets-decrypt.util.js';
-import { _yargs } from '../yargs.util.js';
+import { _yargs } from '../yargs/yargs.util.js';
 runScript(() => {
     const { dir, file, encKeyBuffer, del, jsonMode } = getDecryptCLIOptions();
     secretsDecrypt(dir, file, encKeyBuffer, del, jsonMode);

package/dist/bin/secrets-encrypt.js

@@ -3,7 +3,7 @@ import 'dotenv/config';
 import { dimGrey } from '../colors/colors.js';
 import { runScript } from '../script/runScript.js';
 import { secretsEncrypt } from '../secret/secrets-encrypt.util.js';
-import { _yargs } from '../yargs.util.js';
+import { _yargs } from '../yargs/yargs.util.js';
 runScript(() => {
     const { pattern, file, encKeyBuffer, del, jsonMode } = getEncryptCLIOptions();
     secretsEncrypt(pattern, file, encKeyBuffer, del, jsonMode);

package/dist/bin/secrets-gen-key.js

@@ -2,7 +2,7 @@
 import { randomBytes } from 'node:crypto';
 import { dimGrey } from '../colors/colors.js';
 import { runScript } from '../script/runScript.js';
-import { _yargs } from '../yargs.util.js';
+import { _yargs } from '../yargs/yargs.util.js';
 runScript(() => {
     const { sizeBytes } = _yargs().option('sizeBytes', {
         type: 'number',

package/dist/bin/slack-this.js

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

package/dist/csv/index.d.ts

@@ -0,0 +1,3 @@
+export * from './csvReader.js';
+export * from './csvWriter.js';
+export * from './transformToCSV.js';

package/dist/csv/index.js

@@ -0,0 +1,3 @@
+export * from './csvReader.js';
+export * from './csvWriter.js';
+export * from './transformToCSV.js';

package/dist/fs/index.d.ts

@@ -0,0 +1,3 @@
+export * from './fs2.js';
+export * from './json2env.js';
+export * from './kpy.js';

package/dist/fs/index.js

@@ -0,0 +1,3 @@
+export * from './fs2.js';
+export * from './json2env.js';
+export * from './kpy.js';

package/dist/glob/index.d.ts

@@ -0,0 +1 @@
+export { glob, globSync } from 'tinyglobby';

package/dist/glob/index.js

@@ -0,0 +1 @@
+export { glob, globSync } from 'tinyglobby';

package/dist/index.d.ts

@@ -1,17 +1,7 @@
-import Ajv from 'ajv';
-export { glob, globSync } from 'tinyglobby';
-import type { AlternativesSchema, AnySchema, ArraySchema, BinarySchema, BooleanSchema, DateSchema, FunctionSchema, ObjectSchema, ValidationErrorItem } from 'joi';
 export * from './buffer/buffer.util.js';
 export * from './colors/colors.js';
-export * from './csv/csvReader.js';
-export * from './csv/csvWriter.js';
-export * from './csv/transformToCSV.js';
 export * from './diff/tableDiff.js';
-export * from './fs/fs2.js';
-export * from './fs/json2env.js';
-export * from './fs/kpy.js';
 export * from './infra/process.util.js';
-export * from './jwt/jwt.service.js';
 export * from './log/log.util.js';
 export * from './script/runScript.js';
 export * from './security/crypto.util.js';
@@ -21,39 +11,6 @@ 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 './stream/ndjson/ndjson.model.js';
-export * from './stream/ndjson/ndjsonMap.js';
-export * from './stream/ndjson/ndjsonStreamForEach.js';
-export * from './stream/ndjson/transformJsonParse.js';
-export * from './stream/ndjson/transformToNDJson.js';
-export * from './stream/pipeline/pipeline.js';
-export * from './stream/progressLogger.js';
-export * from './stream/readable/readableCreate.js';
-export * from './stream/readable/readableForEach.js';
-export * from './stream/readable/readableFromArray.js';
-export * from './stream/readable/readableToArray.js';
-export * from './stream/stream.model.js';
-export * from './stream/transform/transformChunk.js';
-export * from './stream/transform/transformFilter.js';
-export * from './stream/transform/transformLimit.js';
-export * from './stream/transform/transformLogProgress.js';
-export * from './stream/transform/transformMap.js';
-export * from './stream/transform/transformMapSimple.js';
-export * from './stream/transform/transformMapSync.js';
-export * from './stream/transform/transformNoOp.js';
-export * from './stream/transform/transformOffset.js';
-export * from './stream/transform/transformSplit.js';
-export * from './stream/transform/transformTap.js';
-export * from './stream/transform/transformTee.js';
-export * from './stream/transform/transformThrottle.js';
-export * from './stream/transform/transformToArray.js';
-export * from './stream/transform/worker/baseWorkerClass.js';
-export * from './stream/transform/worker/transformMultiThreaded.js';
-export * from './stream/transform/worker/transformMultiThreaded.model.js';
-export * from './stream/writable/writableForEach.js';
-export * from './stream/writable/writableFork.js';
-export * from './stream/writable/writablePushToArray.js';
-export * from './stream/writable/writableVoid.js';
 export * from './string/inspect.js';
 export * from './util/buildInfo.util.js';
 export * from './util/env.util.js';
@@ -61,16 +18,3 @@ export * from './util/exec2.js';
 export * from './util/git2.js';
 export * from './util/lruMemoCache.js';
 export * from './util/zip.util.js';
-export * from './validation/ajv/ajv.util.js';
-export * from './validation/ajv/ajvSchema.js';
-export * from './validation/ajv/ajvValidationError.js';
-export * from './validation/ajv/getAjv.js';
-export * from './validation/joi/joi.extensions.js';
-export * from './validation/joi/joi.model.js';
-export * from './validation/joi/joi.shared.schemas.js';
-export * from './validation/joi/joi.validation.error.js';
-export * from './validation/joi/joi.validation.util.js';
-export type { StringSchema } from './validation/joi/string.extensions.js';
-export * from './yargs.util.js';
-export type { AlternativesSchema, AnySchema, ArraySchema, BinarySchema, BooleanSchema, DateSchema, FunctionSchema, ObjectSchema, ValidationErrorItem, };
-export { Ajv };

package/dist/index.js

@@ -1,16 +1,7 @@
-import Ajv from 'ajv';
-export { glob, globSync } from 'tinyglobby';
 export * from './buffer/buffer.util.js';
 export * from './colors/colors.js';
-export * from './csv/csvReader.js';
-export * from './csv/csvWriter.js';
-export * from './csv/transformToCSV.js';
 export * from './diff/tableDiff.js';
-export * from './fs/fs2.js';
-export * from './fs/json2env.js';
-export * from './fs/kpy.js';
 export * from './infra/process.util.js';
-export * from './jwt/jwt.service.js';
 export * from './log/log.util.js';
 export * from './script/runScript.js';
 export * from './security/crypto.util.js';
@@ -20,39 +11,6 @@ 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 './stream/ndjson/ndjson.model.js';
-export * from './stream/ndjson/ndjsonMap.js';
-export * from './stream/ndjson/ndjsonStreamForEach.js';
-export * from './stream/ndjson/transformJsonParse.js';
-export * from './stream/ndjson/transformToNDJson.js';
-export * from './stream/pipeline/pipeline.js';
-export * from './stream/progressLogger.js';
-export * from './stream/readable/readableCreate.js';
-export * from './stream/readable/readableForEach.js';
-export * from './stream/readable/readableFromArray.js';
-export * from './stream/readable/readableToArray.js';
-export * from './stream/stream.model.js';
-export * from './stream/transform/transformChunk.js';
-export * from './stream/transform/transformFilter.js';
-export * from './stream/transform/transformLimit.js';
-export * from './stream/transform/transformLogProgress.js';
-export * from './stream/transform/transformMap.js';
-export * from './stream/transform/transformMapSimple.js';
-export * from './stream/transform/transformMapSync.js';
-export * from './stream/transform/transformNoOp.js';
-export * from './stream/transform/transformOffset.js';
-export * from './stream/transform/transformSplit.js';
-export * from './stream/transform/transformTap.js';
-export * from './stream/transform/transformTee.js';
-export * from './stream/transform/transformThrottle.js';
-export * from './stream/transform/transformToArray.js';
-export * from './stream/transform/worker/baseWorkerClass.js';
-export * from './stream/transform/worker/transformMultiThreaded.js';
-export * from './stream/transform/worker/transformMultiThreaded.model.js';
-export * from './stream/writable/writableForEach.js';
-export * from './stream/writable/writableFork.js';
-export * from './stream/writable/writablePushToArray.js';
-export * from './stream/writable/writableVoid.js';
 export * from './string/inspect.js';
 export * from './util/buildInfo.util.js';
 export * from './util/env.util.js';
@@ -60,14 +18,3 @@ export * from './util/exec2.js';
 export * from './util/git2.js';
 export * from './util/lruMemoCache.js';
 export * from './util/zip.util.js';
-export * from './validation/ajv/ajv.util.js';
-export * from './validation/ajv/ajvSchema.js';
-export * from './validation/ajv/ajvValidationError.js';
-export * from './validation/ajv/getAjv.js';
-export * from './validation/joi/joi.extensions.js';
-export * from './validation/joi/joi.model.js';
-export * from './validation/joi/joi.shared.schemas.js';
-export * from './validation/joi/joi.validation.error.js';
-export * from './validation/joi/joi.validation.util.js';
-export * from './yargs.util.js';
-export { Ajv };

package/dist/jwt/index.d.ts

@@ -0,0 +1 @@
+export * from './jwt.service.js';

package/dist/jwt/index.js

@@ -0,0 +1 @@
+export * from './jwt.service.js';

package/dist/stream/index.d.ts

@@ -0,0 +1,33 @@
+export * from './ndjson/ndjson.model.js';
+export * from './ndjson/ndjsonMap.js';
+export * from './ndjson/ndjsonStreamForEach.js';
+export * from './ndjson/transformJsonParse.js';
+export * from './ndjson/transformToNDJson.js';
+export * from './pipeline/pipeline.js';
+export * from './progressLogger.js';
+export * from './readable/readableCreate.js';
+export * from './readable/readableForEach.js';
+export * from './readable/readableFromArray.js';
+export * from './readable/readableToArray.js';
+export * from './stream.model.js';
+export * from './transform/transformChunk.js';
+export * from './transform/transformFilter.js';
+export * from './transform/transformLimit.js';
+export * from './transform/transformLogProgress.js';
+export * from './transform/transformMap.js';
+export * from './transform/transformMapSimple.js';
+export * from './transform/transformMapSync.js';
+export * from './transform/transformNoOp.js';
+export * from './transform/transformOffset.js';
+export * from './transform/transformSplit.js';
+export * from './transform/transformTap.js';
+export * from './transform/transformTee.js';
+export * from './transform/transformThrottle.js';
+export * from './transform/transformToArray.js';
+export * from './transform/worker/baseWorkerClass.js';
+export * from './transform/worker/transformMultiThreaded.js';
+export * from './transform/worker/transformMultiThreaded.model.js';
+export * from './writable/writableForEach.js';
+export * from './writable/writableFork.js';
+export * from './writable/writablePushToArray.js';
+export * from './writable/writableVoid.js';

package/dist/stream/index.js

@@ -0,0 +1,33 @@
+export * from './ndjson/ndjson.model.js';
+export * from './ndjson/ndjsonMap.js';
+export * from './ndjson/ndjsonStreamForEach.js';
+export * from './ndjson/transformJsonParse.js';
+export * from './ndjson/transformToNDJson.js';
+export * from './pipeline/pipeline.js';
+export * from './progressLogger.js';
+export * from './readable/readableCreate.js';
+export * from './readable/readableForEach.js';
+export * from './readable/readableFromArray.js';
+export * from './readable/readableToArray.js';
+export * from './stream.model.js';
+export * from './transform/transformChunk.js';
+export * from './transform/transformFilter.js';
+export * from './transform/transformLimit.js';
+export * from './transform/transformLogProgress.js';
+export * from './transform/transformMap.js';
+export * from './transform/transformMapSimple.js';
+export * from './transform/transformMapSync.js';
+export * from './transform/transformNoOp.js';
+export * from './transform/transformOffset.js';
+export * from './transform/transformSplit.js';
+export * from './transform/transformTap.js';
+export * from './transform/transformTee.js';
+export * from './transform/transformThrottle.js';
+export * from './transform/transformToArray.js';
+export * from './transform/worker/baseWorkerClass.js';
+export * from './transform/worker/transformMultiThreaded.js';
+export * from './transform/worker/transformMultiThreaded.model.js';
+export * from './writable/writableForEach.js';
+export * from './writable/writableFork.js';
+export * from './writable/writablePushToArray.js';
+export * from './writable/writableVoid.js';

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

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

package/dist/stream/ndjson/ndjsonMap.js

@@ -1,5 +1,6 @@
 import { ErrorMode } from '@naturalcycles/js-lib';
-import { _pipeline, fs2, transformLimit, transformLogProgress, transformMap } from '../../index.js';
+import { fs2 } from '../../fs/index.js';
+import { _pipeline, transformLimit, transformLogProgress, transformMap } from '../index.js';
 /**
  * Unzips input file automatically, if it ends with `.gz`.
  * Zips output file automatically, if it ends with `.gz`.

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

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

package/dist/stream/ndjson/ndjsonStreamForEach.js

@@ -1,5 +1,6 @@
 import { ErrorMode } from '@naturalcycles/js-lib';
-import { _pipeline, fs2, transformLogProgress, transformMap, writableVoid } from '../../index.js';
+import { fs2 } from '../../fs/index.js';
+import { _pipeline, transformLogProgress, transformMap, writableVoid } from '../index.js';
 /**
  * Convenience function to `forEach` through an ndjson file.
  */

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

@@ -1,5 +1,5 @@
 import type { AbortableAsyncMapper, Mapper } from '@naturalcycles/js-lib';
-import type { ReadableTyped } from '../../index.js';
+import type { ReadableTyped } from '../index.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';
-import { _pipeline } from '../../index.js';
+import { _pipeline } from '../index.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';
-import { AbortableTransform } from '../../index.js';
+import { AbortableTransform } from '../index.js';
 import type { TransformOptions, TransformTyped } from '../stream.model.js';
 export interface TransformLimitOptions extends TransformOptions {
     /**

package/dist/stream/transform/transformLimit.js

@@ -1,4 +1,4 @@
-import { AbortableTransform, transformNoOp } from '../../index.js';
+import { AbortableTransform, transformNoOp } from '../index.js';
 import { pipelineClose } from '../stream.util.js';
 /**
  * Class only exists to be able to do `instanceof TransformLimit`

package/dist/stream/transform/transformOffset.js

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

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

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

package/dist/stream/writable/writableForEach.js

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

package/dist/stream/writable/writableFork.js

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

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

@@ -1,5 +1,4 @@
 import type { JsonSchema, JsonSchemaBuilder } from '@naturalcycles/js-lib';
-import type { ZodJSONSchema } from '@naturalcycles/js-lib/zod';
 import type { Ajv } from 'ajv';
 import { AjvValidationError } from './ajvValidationError.js';
 export interface AjvValidationOptions {
@@ -45,7 +44,7 @@ export declare class AjvSchema<T = unknown> {
      * Implementation note: JsonSchemaBuilder goes first in the union type, otherwise TypeScript fails to infer <T> type
      * correctly for some reason.
      */
-    static create<T>(schema: JsonSchemaBuilder<T> | JsonSchema<T> | AjvSchema<T> | ZodJSONSchema, cfg?: Partial<AjvSchemaCfg>): AjvSchema<T>;
+    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.

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

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

package/dist/validation/ajv/index.js

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

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

@@ -0,0 +1,8 @@
+import type { AlternativesSchema, AnySchema, ArraySchema, BinarySchema, BooleanSchema, DateSchema, FunctionSchema, ObjectSchema, ValidationErrorItem } from 'joi';
+export * from './joi.extensions.js';
+export * from './joi.model.js';
+export * from './joi.shared.schemas.js';
+export * from './joi.validation.error.js';
+export * from './joi.validation.util.js';
+export type { StringSchema } from './string.extensions.js';
+export type { AlternativesSchema, AnySchema, ArraySchema, BinarySchema, BooleanSchema, DateSchema, FunctionSchema, ObjectSchema, ValidationErrorItem, };

package/dist/validation/joi/index.js

@@ -0,0 +1,5 @@
+export * from './joi.extensions.js';
+export * from './joi.model.js';
+export * from './joi.shared.schemas.js';
+export * from './joi.validation.error.js';
+export * from './joi.validation.util.js';

package/dist/yargs/index.d.ts

@@ -0,0 +1 @@
+export * from './yargs.util.js';

package/dist/yargs/index.js

@@ -0,0 +1 @@
+export * from './yargs.util.js';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "14.7.0",
+  "version": "15.0.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@types/js-yaml": "^4",
@@ -25,6 +25,17 @@
     "@naturalcycles/dev-lib": "*",
     "@types/through2-concurrent": "^2"
   },
+  "exports": {
+    ".": "./dist/index.js",
+    "./csv": "./dist/csv/index.js",
+    "./fs": "./dist/fs/index.js",
+    "./glob": "./dist/glob/index.js",
+    "./jwt": "./dist/jwt/index.js",
+    "./stream": "./dist/stream/index.js",
+    "./yargs": "./dist/yargs/index.js",
+    "./ajv": "./dist/validation/ajv/index.js",
+    "./joi": "./dist/validation/joi/index.js"
+  },
   "bin": {
     "kpy": "dist/bin/kpy.js",
     "json2env": "dist/bin/json2env.js",

package/src/bin/generate-build-info.ts

@@ -6,7 +6,7 @@ import type { UnixTimestamp } from '@naturalcycles/js-lib'
 import { appendToBashEnv, appendToGithubEnv, appendToGithubOutput } from '../fs/json2env.js'
 import { runScript } from '../script/runScript.js'
 import { generateBuildInfo } from '../util/buildInfo.util.js'
-import { _yargs } from '../yargs.util.js'
+import { _yargs } from '../yargs/yargs.util.js'
 
 runScript(async () => {
   const { dir, overrideTimestamp } = _yargs().options({

package/src/bin/json2env.ts

@@ -2,7 +2,7 @@
 
 import { json2env } from '../fs/json2env.js'
 import { runScript } from '../script/runScript.js'
-import { _yargs } from '../yargs.util.js'
+import { _yargs } from '../yargs/yargs.util.js'
 
 runScript(() => {
   const { argv } = _yargs()

package/src/bin/kpy.ts

@@ -2,7 +2,7 @@
 
 import { kpySync } from '../fs/kpy.js'
 import { runScript } from '../script/runScript.js'
-import { _yargs } from '../yargs.util.js'
+import { _yargs } from '../yargs/yargs.util.js'
 
 runScript(() => {
   const {

package/src/bin/secrets-decrypt.ts

@@ -5,7 +5,7 @@ import { dimGrey } from '../colors/colors.js'
 import { runScript } from '../script/runScript.js'
 import type { DecryptCLIOptions } from '../secret/secrets-decrypt.util.js'
 import { secretsDecrypt } from '../secret/secrets-decrypt.util.js'
-import { _yargs } from '../yargs.util.js'
+import { _yargs } from '../yargs/yargs.util.js'
 
 runScript(() => {
   const { dir, file, encKeyBuffer, del, jsonMode } = getDecryptCLIOptions()

package/src/bin/secrets-encrypt.ts

@@ -5,7 +5,7 @@ import { dimGrey } from '../colors/colors.js'
 import { runScript } from '../script/runScript.js'
 import type { EncryptCLIOptions } from '../secret/secrets-encrypt.util.js'
 import { secretsEncrypt } from '../secret/secrets-encrypt.util.js'
-import { _yargs } from '../yargs.util.js'
+import { _yargs } from '../yargs/yargs.util.js'
 
 runScript(() => {
   const { pattern, file, encKeyBuffer, del, jsonMode } = getEncryptCLIOptions()

package/src/bin/secrets-gen-key.ts

@@ -3,7 +3,7 @@
 import { randomBytes } from 'node:crypto'
 import { dimGrey } from '../colors/colors.js'
 import { runScript } from '../script/runScript.js'
-import { _yargs } from '../yargs.util.js'
+import { _yargs } from '../yargs/yargs.util.js'
 
 runScript(() => {
   const { sizeBytes } = _yargs().option('sizeBytes', {

package/src/bin/slack-this.ts

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

package/src/csv/index.ts

@@ -0,0 +1,3 @@
+export * from './csvReader.js'
+export * from './csvWriter.js'
+export * from './transformToCSV.js'

package/src/fs/index.ts

@@ -0,0 +1,3 @@
+export * from './fs2.js'
+export * from './json2env.js'
+export * from './kpy.js'

package/src/glob/index.ts

@@ -0,0 +1 @@
+export { glob, globSync } from 'tinyglobby'

package/src/index.ts

@@ -1,27 +1,7 @@
-import Ajv from 'ajv'
-export { glob, globSync } from 'tinyglobby'
-import type {
-  AlternativesSchema,
-  AnySchema,
-  ArraySchema,
-  BinarySchema,
-  BooleanSchema,
-  DateSchema,
-  FunctionSchema,
-  ObjectSchema,
-  ValidationErrorItem,
-} from 'joi'
 export * from './buffer/buffer.util.js'
 export * from './colors/colors.js'
-export * from './csv/csvReader.js'
-export * from './csv/csvWriter.js'
-export * from './csv/transformToCSV.js'
 export * from './diff/tableDiff.js'
-export * from './fs/fs2.js'
-export * from './fs/json2env.js'
-export * from './fs/kpy.js'
 export * from './infra/process.util.js'
-export * from './jwt/jwt.service.js'
 export * from './log/log.util.js'
 export * from './script/runScript.js'
 export * from './security/crypto.util.js'
@@ -31,39 +11,6 @@ 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 './stream/ndjson/ndjson.model.js'
-export * from './stream/ndjson/ndjsonMap.js'
-export * from './stream/ndjson/ndjsonStreamForEach.js'
-export * from './stream/ndjson/transformJsonParse.js'
-export * from './stream/ndjson/transformToNDJson.js'
-export * from './stream/pipeline/pipeline.js'
-export * from './stream/progressLogger.js'
-export * from './stream/readable/readableCreate.js'
-export * from './stream/readable/readableForEach.js'
-export * from './stream/readable/readableFromArray.js'
-export * from './stream/readable/readableToArray.js'
-export * from './stream/stream.model.js'
-export * from './stream/transform/transformChunk.js'
-export * from './stream/transform/transformFilter.js'
-export * from './stream/transform/transformLimit.js'
-export * from './stream/transform/transformLogProgress.js'
-export * from './stream/transform/transformMap.js'
-export * from './stream/transform/transformMapSimple.js'
-export * from './stream/transform/transformMapSync.js'
-export * from './stream/transform/transformNoOp.js'
-export * from './stream/transform/transformOffset.js'
-export * from './stream/transform/transformSplit.js'
-export * from './stream/transform/transformTap.js'
-export * from './stream/transform/transformTee.js'
-export * from './stream/transform/transformThrottle.js'
-export * from './stream/transform/transformToArray.js'
-export * from './stream/transform/worker/baseWorkerClass.js'
-export * from './stream/transform/worker/transformMultiThreaded.js'
-export * from './stream/transform/worker/transformMultiThreaded.model.js'
-export * from './stream/writable/writableForEach.js'
-export * from './stream/writable/writableFork.js'
-export * from './stream/writable/writablePushToArray.js'
-export * from './stream/writable/writableVoid.js'
 export * from './string/inspect.js'
 export * from './util/buildInfo.util.js'
 export * from './util/env.util.js'
@@ -71,31 +18,3 @@ export * from './util/exec2.js'
 export * from './util/git2.js'
 export * from './util/lruMemoCache.js'
 export * from './util/zip.util.js'
-export * from './validation/ajv/ajv.util.js'
-export * from './validation/ajv/ajvSchema.js'
-export * from './validation/ajv/ajvValidationError.js'
-export * from './validation/ajv/getAjv.js'
-export * from './validation/joi/joi.extensions.js'
-export * from './validation/joi/joi.model.js'
-export * from './validation/joi/joi.shared.schemas.js'
-export * from './validation/joi/joi.validation.error.js'
-export * from './validation/joi/joi.validation.util.js'
-export type { StringSchema } from './validation/joi/string.extensions.js'
-export * from './yargs.util.js'
-
-export type {
-  AlternativesSchema,
-  AnySchema,
-  ArraySchema,
-  BinarySchema,
-  BooleanSchema,
-  DateSchema,
-  FunctionSchema,
-  ObjectSchema,
-  ValidationErrorItem,
-  // extended
-  // NumberSchema,
-  // StringSchema,
-}
-
-export { Ajv }

package/src/jwt/index.ts

@@ -0,0 +1 @@
+export * from './jwt.service.js'

package/src/stream/index.ts

@@ -0,0 +1,33 @@
+export * from './ndjson/ndjson.model.js'
+export * from './ndjson/ndjsonMap.js'
+export * from './ndjson/ndjsonStreamForEach.js'
+export * from './ndjson/transformJsonParse.js'
+export * from './ndjson/transformToNDJson.js'
+export * from './pipeline/pipeline.js'
+export * from './progressLogger.js'
+export * from './readable/readableCreate.js'
+export * from './readable/readableForEach.js'
+export * from './readable/readableFromArray.js'
+export * from './readable/readableToArray.js'
+export * from './stream.model.js'
+export * from './transform/transformChunk.js'
+export * from './transform/transformFilter.js'
+export * from './transform/transformLimit.js'
+export * from './transform/transformLogProgress.js'
+export * from './transform/transformMap.js'
+export * from './transform/transformMapSimple.js'
+export * from './transform/transformMapSync.js'
+export * from './transform/transformNoOp.js'
+export * from './transform/transformOffset.js'
+export * from './transform/transformSplit.js'
+export * from './transform/transformTap.js'
+export * from './transform/transformTee.js'
+export * from './transform/transformThrottle.js'
+export * from './transform/transformToArray.js'
+export * from './transform/worker/baseWorkerClass.js'
+export * from './transform/worker/transformMultiThreaded.js'
+export * from './transform/worker/transformMultiThreaded.model.js'
+export * from './writable/writableForEach.js'
+export * from './writable/writableFork.js'
+export * from './writable/writablePushToArray.js'
+export * from './writable/writableVoid.js'

package/src/stream/ndjson/ndjsonMap.ts

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

package/src/stream/ndjson/ndjsonStreamForEach.ts

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

package/src/stream/readable/readableForEach.ts

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

package/src/stream/transform/transformLimit.ts

@@ -1,6 +1,6 @@
 import type { Readable } from 'node:stream'
 import type { CommonLogger } from '@naturalcycles/js-lib'
-import { AbortableTransform, transformNoOp } from '../../index.js'
+import { AbortableTransform, transformNoOp } from '../index.js'
 import type { TransformOptions, TransformTyped } from '../stream.model.js'
 import { pipelineClose } from '../stream.util.js'
 

package/src/stream/transform/transformOffset.ts

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

package/src/stream/writable/writableForEach.ts

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

package/src/stream/writable/writableFork.ts

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

package/src/validation/ajv/ajvSchema.ts

@@ -5,7 +5,6 @@ import {
   _substringBefore,
   JsonSchemaAnyBuilder,
 } from '@naturalcycles/js-lib'
-import type { ZodJSONSchema } from '@naturalcycles/js-lib/zod'
 import type { Ajv, ValidateFunction } from 'ajv'
 import { fs2 } from '../../fs/fs2.js'
 import { _inspect } from '../../string/inspect.js'
@@ -83,7 +82,7 @@ export class AjvSchema<T = unknown> {
    * correctly for some reason.
    */
   static create<T>(
-    schema: JsonSchemaBuilder<T> | JsonSchema<T> | AjvSchema<T> | ZodJSONSchema,
+    schema: JsonSchemaBuilder<T> | JsonSchema<T> | AjvSchema<T>,
     cfg: Partial<AjvSchemaCfg> = {},
   ): AjvSchema<T> {
     if (schema instanceof AjvSchema) return schema

package/src/validation/ajv/index.ts

@@ -0,0 +1,8 @@
+import Ajv from 'ajv'
+
+export * from './ajv.util.js'
+export * from './ajvSchema.js'
+export * from './ajvValidationError.js'
+export * from './getAjv.js'
+
+export { Ajv }

package/src/validation/joi/index.ts

@@ -0,0 +1,33 @@
+import type {
+  AlternativesSchema,
+  AnySchema,
+  ArraySchema,
+  BinarySchema,
+  BooleanSchema,
+  DateSchema,
+  FunctionSchema,
+  ObjectSchema,
+  ValidationErrorItem,
+} from 'joi'
+
+export * from './joi.extensions.js'
+export * from './joi.model.js'
+export * from './joi.shared.schemas.js'
+export * from './joi.validation.error.js'
+export * from './joi.validation.util.js'
+export type { StringSchema } from './string.extensions.js'
+
+export type {
+  AlternativesSchema,
+  AnySchema,
+  ArraySchema,
+  BinarySchema,
+  BooleanSchema,
+  DateSchema,
+  FunctionSchema,
+  ObjectSchema,
+  ValidationErrorItem,
+  // extended
+  // NumberSchema,
+  // StringSchema,
+}

package/src/yargs/index.ts

@@ -0,0 +1 @@
+export * from './yargs.util.js'