@naturalcycles/nodejs-lib 14.2.1 → 14.3.1

package/dist/fs/fs2.d.ts

@@ -41,6 +41,7 @@ declare class FS2 {
     outputFileAsync(filePath: string, data: string | Buffer): Promise<void>;
     pathExists(filePath: string): boolean;
     pathExistsAsync(filePath: string): Promise<boolean>;
+    requireFileToExist(filePath: string): void;
     ensureDir(dirPath: string): void;
     ensureDirAsync(dirPath: string): Promise<void>;
     ensureFile(filePath: string): void;

package/dist/fs/fs2.js

@@ -21,7 +21,6 @@ import { _isTruthy, _jsonParse } from '@naturalcycles/js-lib';
 import yaml from 'js-yaml';
 import { transformToNDJson } from '../stream/ndjson/transformToNDJson.js';
 import { transformSplitOnNewline } from '../stream/transform/transformSplit.js';
-import { requireFileToExist } from '../util/env.util.js';
 /**
  * fs2 conveniently groups filesystem functions together.
  * Supposed to be almost a drop-in replacement for these things together:
@@ -137,6 +136,11 @@ class FS2 {
             return false;
         }
     }
+    requireFileToExist(filePath) {
+        if (!fs.existsSync(filePath)) {
+            throw new Error(`Required file should exist: ${filePath}`);
+        }
+    }
     ensureDir(dirPath) {
         fs.mkdirSync(dirPath, {
             mode: 0o777,
@@ -303,7 +307,7 @@ class FS2 {
     ])
      */
     createReadStreamAsNDJSON(inputPath) {
-        requireFileToExist(inputPath);
+        this.requireFileToExist(inputPath);
         let stream = fs
             .createReadStream(inputPath, {
             highWaterMark: 64 * 1024, // no observed speedup

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

@@ -10,4 +10,7 @@ import type { ValuesOf } from '@naturalcycles/js-lib';
 export declare function requireEnvKeys<T extends readonly string[]>(...keys: T): {
     [k in ValuesOf<T>]: string;
 };
+/**
+ * @deprecated use fs2.requireFileToExist
+ */
 export declare function requireFileToExist(filePath: string): void;

package/dist/util/env.util.js

@@ -1,5 +1,5 @@
 import 'dotenv/config'; // ensure .env is read before requiring keys
-import { existsSync } from 'node:fs';
+import { fs2 } from '../fs/fs2.js';
 /**
  * @example
  *
@@ -17,8 +17,9 @@ export function requireEnvKeys(...keys) {
         return r;
     }, {});
 }
+/**
+ * @deprecated use fs2.requireFileToExist
+ */
 export function requireFileToExist(filePath) {
-    if (!existsSync(filePath)) {
-        throw new Error(`Required file should exist: ${filePath}`);
-    }
+    fs2.requireFileToExist(filePath);
 }

package/dist/validation/ajv/ajvSchema.js

@@ -1,7 +1,6 @@
 import { _filterNullishValues, _isObject, _substringBefore, JsonSchemaAnyBuilder, } from '@naturalcycles/js-lib';
 import { fs2 } from '../../fs/fs2.js';
 import { _inspect } from '../../string/inspect.js';
-import { requireFileToExist } from '../../util/env.util.js';
 import { AjvValidationError } from './ajvValidationError.js';
 import { getAjv } from './getAjv.js';
 /**
@@ -58,7 +57,7 @@ export class AjvSchema {
      * Convenient method that just does fs.readFileSync for you.
      */
     static readJsonSync(filePath, cfg = {}) {
-        requireFileToExist(filePath);
+        fs2.requireFileToExist(filePath);
         const schema = fs2.readJson(filePath);
         return new AjvSchema(schema, cfg);
     }

package/package.json

@@ -1,27 +1,8 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "14.2.1",
-  "scripts": {
-    "prepare": "husky",
-    "build": "dev-lib build",
-    "test": "dev-lib test",
-    "lint": "dev-lib lint",
-    "bt": "dev-lib bt",
-    "lbt": "dev-lib lbt",
-    "docs-serve": "vuepress dev docs",
-    "docs-build": "vuepress build docs",
-    "slack-this-debug": "tsx ./src/bin/slack-this.ts --channel test --msg 'Hello slack!'",
-    "secrets-gen-key-debug": "tsx ./src/bin/secrets-gen-key.ts",
-    "secrets-encrypt-debug": "tsx ./src/bin/secrets-encrypt.ts",
-    "secrets-decrypt-debug": "tsx ./src/bin/secrets-decrypt.ts",
-    "kpy-debug": "tsx ./src/bin/kpy.ts --verbose scripts tmp/scripts",
-    "kpy-debug2": "tsx ./src/bin/kpy.ts --verbose scripts bench non-ex non-ex/** colors* tmp/scripts",
-    "kpy-debug3": "tsx ./src/bin/kpy.ts --verbose src colors csv stream non-ex non-ex/** tmp/src",
-    "json2env-debug": "tsx ./src/bin/json2env.ts ./src/test/someFile.json"
-  },
+  "version": "14.3.1",
   "dependencies": {
-    "@naturalcycles/js-lib": "^15",
     "@types/js-yaml": "^4",
     "@types/jsonwebtoken": "^9",
     "@types/yargs": "^16",
@@ -36,15 +17,11 @@
     "lru-cache": "^11",
     "through2-concurrent": "^2",
     "tinyglobby": "^0.2",
-    "yargs": "^17"
+    "yargs": "^17",
+    "@naturalcycles/js-lib": "^15.0.0"
   },
   "devDependencies": {
-    "@naturalcycles/bench-lib": "^4",
-    "@naturalcycles/dev-lib": "^18",
-    "@types/node": "^22",
-    "@types/through2-concurrent": "^2",
-    "tsx": "^4",
-    "vitest": "^3"
+    "@types/through2-concurrent": "^2"
   },
   "bin": {
     "kpy": "dist/bin/kpy.js",
@@ -70,7 +47,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/NaturalCycles/nodejs-lib"
+    "url": "git@github.com:NaturalCycles/js-lib.git",
+    "directory": "packages/nodejs-lib"
   },
   "engines": {
     "node": ">=22.12.0"
@@ -81,5 +59,20 @@
   "envByBranch": {
     "master": "master",
     "*": "branch"
+  },
+  "scripts": {
+    "build": "dev-lib build",
+    "test": "dev-lib test",
+    "lint": "dev-lib lint",
+    "bt": "dev-lib bt",
+    "lbt": "dev-lib lbt",
+    "slack-this-debug": "tsx ./src/bin/slack-this.ts --channel test --msg 'Hello slack!'",
+    "secrets-gen-key-debug": "tsx ./src/bin/secrets-gen-key.ts",
+    "secrets-encrypt-debug": "tsx ./src/bin/secrets-encrypt.ts",
+    "secrets-decrypt-debug": "tsx ./src/bin/secrets-decrypt.ts",
+    "kpy-debug": "tsx ./src/bin/kpy.ts --verbose scripts tmp/scripts",
+    "kpy-debug2": "tsx ./src/bin/kpy.ts --verbose scripts bench non-ex non-ex/** colors* tmp/scripts",
+    "kpy-debug3": "tsx ./src/bin/kpy.ts --verbose src colors csv stream non-ex non-ex/** tmp/src",
+    "json2env-debug": "tsx ./src/bin/json2env.ts ./src/test/someFile.json"
   }
-}
+}

package/src/fs/fs2.ts

@@ -25,7 +25,6 @@ import yaml from 'js-yaml'
 import { transformToNDJson } from '../stream/ndjson/transformToNDJson.js'
 import type { ReadableTyped, TransformTyped } from '../stream/stream.model.js'
 import { transformSplitOnNewline } from '../stream/transform/transformSplit.js'
-import { requireFileToExist } from '../util/env.util.js'
 
 /**
  * fs2 conveniently groups filesystem functions together.
@@ -168,6 +167,12 @@ class FS2 {
     }
   }
 
+  requireFileToExist(filePath: string): void {
+    if (!fs.existsSync(filePath)) {
+      throw new Error(`Required file should exist: ${filePath}`)
+    }
+  }
+
   ensureDir(dirPath: string): void {
     fs.mkdirSync(dirPath, {
       mode: 0o777,
@@ -350,7 +355,7 @@ class FS2 {
   ])
    */
   createReadStreamAsNDJSON<ROW = any>(inputPath: string): ReadableTyped<ROW> {
-    requireFileToExist(inputPath)
+    this.requireFileToExist(inputPath)
 
     let stream: ReadableTyped<ROW> = fs
       .createReadStream(inputPath, {

package/src/util/env.util.ts

@@ -1,6 +1,6 @@
 import 'dotenv/config' // ensure .env is read before requiring keys
-import { existsSync } from 'node:fs'
 import type { ValuesOf } from '@naturalcycles/js-lib'
+import { fs2 } from '../fs/fs2.js'
 
 /**
  * @example
@@ -24,8 +24,9 @@ export function requireEnvKeys<T extends readonly string[]>(
   )
 }
 
+/**
+ * @deprecated use fs2.requireFileToExist
+ */
 export function requireFileToExist(filePath: string): void {
-  if (!existsSync(filePath)) {
-    throw new Error(`Required file should exist: ${filePath}`)
-  }
+  fs2.requireFileToExist(filePath)
 }

package/src/validation/ajv/ajvSchema.ts

@@ -8,7 +8,6 @@ import {
 import type { Ajv, ValidateFunction } from 'ajv'
 import { fs2 } from '../../fs/fs2.js'
 import { _inspect } from '../../string/inspect.js'
-import { requireFileToExist } from '../../util/env.util.js'
 import { AjvValidationError } from './ajvValidationError.js'
 import { getAjv } from './getAjv.js'
 
@@ -133,7 +132,7 @@ export class AjvSchema<T = unknown> {
     filePath: string,
     cfg: Partial<AjvSchemaCfg> = {},
   ): AjvSchema<T> {
-    requireFileToExist(filePath)
+    fs2.requireFileToExist(filePath)
     const schema = fs2.readJson<JsonSchema<T>>(filePath)
     return new AjvSchema<T>(schema, cfg)
   }