@naturalcycles/nodejs-lib 15.98.0 → 15.100.0

package/dist/bin/secrets-decrypt.d.ts

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-import 'dotenv/config';
+export {};

package/dist/bin/secrets-decrypt.js

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-import 'dotenv/config';
 import { dimGrey } from '../colors/colors.js';
 import { runScript } from '../script/runScript.js';
 import { secretsDecrypt } from '../secret/secrets-decrypt.util.js';

package/dist/bin/secrets-encrypt.d.ts

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-import 'dotenv/config';
+export {};

package/dist/bin/secrets-encrypt.js

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-import 'dotenv/config';
 import { dimGrey } from '../colors/colors.js';
 import { runScript } from '../script/runScript.js';
 import { secretsEncrypt } from '../secret/secrets-encrypt.util.js';

package/dist/fs/fs2.js

@@ -53,7 +53,6 @@ class FS2 {
     }
     async readJsonAsync(filePath) {
         const str = await fsp.readFile(filePath, 'utf8');
-        // eslint-disable-next-line @typescript-eslint/return-await
         return _jsonParse(str);
     }
     writeFile(filePath, data) {

package/dist/fs/yaml2.d.ts

@@ -1,8 +1,9 @@
 import type { CreateNodeOptions, DocumentOptions, ParseOptions, SchemaOptions, ToStringOptions } from 'yaml';
+export type YamlParseOptions = ParseOptions & DocumentOptions & SchemaOptions;
 export type YamlStringifyOptions = DocumentOptions & SchemaOptions & ParseOptions & CreateNodeOptions & ToStringOptions;
 declare class Yaml2 {
-    readYaml<T = unknown>(filePath: string): T;
-    readYamlAsync<T = unknown>(filePath: string): Promise<T>;
+    readYaml<T = unknown>(filePath: string, opt?: YamlParseOptions): T;
+    readYamlAsync<T = unknown>(filePath: string, opt?: YamlParseOptions): Promise<T>;
     writeYaml(filePath: string, data: any, opt?: YamlStringifyOptions): void;
     writeYamlAsync(filePath: string, data: any, opt?: YamlStringifyOptions): Promise<void>;
     outputYaml(filePath: string, data: any, opt?: YamlStringifyOptions): void;

package/dist/fs/yaml2.js

@@ -3,11 +3,11 @@ import fsp from 'node:fs/promises';
 import { parse, stringify } from 'yaml';
 import { fs2 } from './fs2.js';
 class Yaml2 {
-    readYaml(filePath) {
-        return parse(fs.readFileSync(filePath, 'utf8'));
+    readYaml(filePath, opt) {
+        return parse(fs.readFileSync(filePath, 'utf8'), opt);
     }
-    async readYamlAsync(filePath) {
-        return parse(await fsp.readFile(filePath, 'utf8'));
+    async readYamlAsync(filePath, opt) {
+        return parse(await fsp.readFile(filePath, 'utf8'), opt);
     }
     writeYaml(filePath, data, opt) {
         const str = stringify(data, opt);

package/dist/index.d.ts

@@ -2,6 +2,7 @@ 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 './node.util.js';
 export * from './security/crypto.util.js';
 export * from './security/hash.util.js';
 export * from './security/id.util.js';

package/dist/index.js

@@ -2,6 +2,7 @@ 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 './node.util.js';
 export * from './security/crypto.util.js';
 export * from './security/hash.util.js';
 export * from './security/id.util.js';

package/dist/node.util.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Returns true if load was successful
+ */
+export declare function loadEnvFileIfExists(path?: string): boolean;

package/dist/node.util.js

@@ -0,0 +1,16 @@
+/**
+ * Returns true if load was successful
+ */
+export function loadEnvFileIfExists(path = '.env') {
+    try {
+        process.loadEnvFile(path);
+        return true;
+    }
+    catch (err) {
+        if (err.code === 'ENOENT') {
+            // gracefully ignore that the file does not exist
+            return false;
+        }
+        throw err;
+    }
+}

package/dist/script/runScript.d.ts

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

package/dist/script/runScript.js

@@ -1,9 +1,10 @@
-import 'dotenv/config';
 import os from 'node:os';
 import { pDelay } from '@naturalcycles/js-lib/promise/pDelay.js';
 import { setGlobalStringifyFunction } from '@naturalcycles/js-lib/string/stringify.js';
 import { dimGrey } from '../colors/colors.js';
+import { loadEnvFileIfExists } from '../node.util.js';
 import { inspectStringifyFn } from '../string/inspect.js';
+loadEnvFileIfExists();
 const { DEBUG_RUN_SCRIPT } = process.env;
 /**
  * Use it in your top-level scripts like this:

package/dist/secret/secrets-decrypt.util.js

@@ -1,7 +1,6 @@
-import fs from 'node:fs';
+import fs, { globSync } from 'node:fs';
 import path from 'node:path';
 import { _assert } from '@naturalcycles/js-lib/error/assert.js';
-import { globSync } from 'tinyglobby';
 import { dimGrey, yellow } from '../colors/colors.js';
 import { fs2 } from '../fs/fs2.js';
 import { decryptObject, decryptRandomIVBuffer } from '../security/crypto.util.js';

package/dist/security/secret.util.js

@@ -11,7 +11,7 @@ const secretMap = {};
  * Does NOT delete previous secrets from secretMap.
  */
 export function loadSecretsFromEnv() {
-    // require('dotenv').config() // ensure .env is loaded
+    // loadEnvFileIfExists() // ensure .env is loaded
     const secrets = {};
     Object.keys(process.env)
         .filter(k => k.toUpperCase().startsWith('SECRET_'))

package/dist/validation/ajv/getAjv.js

@@ -4,7 +4,6 @@ import { _deepCopy, _mapObject, Set2 } from '@naturalcycles/js-lib/object';
 import { _substringAfterLast } from '@naturalcycles/js-lib/string';
 import { Ajv2020 } from 'ajv/dist/2020.js';
 import { validTLDs } from '../tlds.js';
-/* eslint-disable @typescript-eslint/prefer-string-starts-ends-with */
 // oxlint-disable unicorn/prefer-code-point
 const AJV_OPTIONS = {
     removeAdditional: true,

package/dist/validation/ajv/jSchema.js

@@ -1,5 +1,3 @@
-/* eslint-disable id-denylist */
-// oxlint-disable max-lines
 import { _isObject, _isUndefined, _numberEnumValues, _stringEnumValues, getEnumType, } from '@naturalcycles/js-lib';
 import { _uniq } from '@naturalcycles/js-lib/array';
 import { _assert, _try } from '@naturalcycles/js-lib/error';
@@ -822,7 +820,7 @@ export class JObject extends JBuilder {
     /**
      * Extends the current schema with `id`, `created` and `updated` according to NC DB conventions.
      */
-    // oxlint-disable-next-line @typescript-eslint/explicit-function-return-type, @typescript-eslint/explicit-module-boundary-types
+    // oxlint-disable-next-line @typescript-eslint/explicit-function-return-type
     dbEntity() {
         return this.extend({
             id: j.string(),
@@ -872,7 +870,7 @@ export class JObjectInfer extends JBuilder {
     /**
      * Extends the current schema with `id`, `created` and `updated` according to NC DB conventions.
      */
-    // oxlint-disable-next-line @typescript-eslint/explicit-function-return-type, @typescript-eslint/explicit-module-boundary-types
+    // oxlint-disable-next-line @typescript-eslint/explicit-function-return-type
     dbEntity() {
         return this.extend({
             id: j.string(),

package/dist/yargs/yargs.util.js

@@ -5,7 +5,7 @@ import { hideBin } from 'yargs/helpers';
  * Quick yargs helper to make it work in esm.
  * It also allows to not have yargs and `@types/yargs` to be declared as dependencies.
  */
-// oxlint-disable-next-line @typescript-eslint/explicit-function-return-type, @typescript-eslint/explicit-module-boundary-types
+// oxlint-disable-next-line @typescript-eslint/explicit-function-return-type
 export function _yargs() {
     return yargs(hideBin(process.argv));
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.98.0",
+  "version": "15.100.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@standard-schema/spec": "^1",
@@ -9,7 +9,6 @@
     "@types/yargs": "^16",
     "ajv": "^8",
     "ansis": "^4",
-    "dotenv": "^17",
     "jsonwebtoken": "^9",
     "lru-cache": "^11",
     "tinyglobby": "^0.2",

package/src/bin/secrets-decrypt.ts

@@ -1,6 +1,5 @@
 #!/usr/bin/env node
 
-import 'dotenv/config'
 import { dimGrey } from '../colors/colors.js'
 import { runScript } from '../script/runScript.js'
 import type { DecryptCLIOptions } from '../secret/secrets-decrypt.util.js'

package/src/bin/secrets-encrypt.ts

@@ -1,6 +1,5 @@
 #!/usr/bin/env node
 
-import 'dotenv/config'
 import { dimGrey } from '../colors/colors.js'
 import { runScript } from '../script/runScript.js'
 import type { EncryptCLIOptions } from '../secret/secrets-encrypt.util.js'

package/src/fs/fs2.ts

@@ -62,7 +62,6 @@ class FS2 {
 
   async readJsonAsync<T = unknown>(filePath: string): Promise<T> {
     const str = await fsp.readFile(filePath, 'utf8')
-    // eslint-disable-next-line @typescript-eslint/return-await
     return _jsonParse(str)
   }
 

package/src/fs/yaml2.ts

@@ -10,6 +10,8 @@ import type {
 import { parse, stringify } from 'yaml'
 import { fs2 } from './fs2.js'
 
+export type YamlParseOptions = ParseOptions & DocumentOptions & SchemaOptions
+
 export type YamlStringifyOptions = DocumentOptions &
   SchemaOptions &
   ParseOptions &
@@ -17,12 +19,12 @@ export type YamlStringifyOptions = DocumentOptions &
   ToStringOptions
 
 class Yaml2 {
-  readYaml<T = unknown>(filePath: string): T {
-    return parse(fs.readFileSync(filePath, 'utf8')) as T
+  readYaml<T = unknown>(filePath: string, opt?: YamlParseOptions): T {
+    return parse(fs.readFileSync(filePath, 'utf8'), opt) as T
   }
 
-  async readYamlAsync<T = unknown>(filePath: string): Promise<T> {
-    return parse(await fsp.readFile(filePath, 'utf8')) as T
+  async readYamlAsync<T = unknown>(filePath: string, opt?: YamlParseOptions): Promise<T> {
+    return parse(await fsp.readFile(filePath, 'utf8'), opt) as T
   }
 
   writeYaml(filePath: string, data: any, opt?: YamlStringifyOptions): void {

package/src/index.ts

@@ -2,6 +2,7 @@ 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 './node.util.js'
 export * from './security/crypto.util.js'
 export * from './security/hash.util.js'
 export * from './security/id.util.js'

package/src/node.util.ts

@@ -0,0 +1,16 @@
+/**
+ * Returns true if load was successful
+ */
+export function loadEnvFileIfExists(path = '.env'): boolean {
+  try {
+    process.loadEnvFile(path)
+    return true
+  } catch (err) {
+    if ((err as NodeJS.ErrnoException).code === 'ENOENT') {
+      // gracefully ignore that the file does not exist
+      return false
+    }
+
+    throw err
+  }
+}

package/src/script/runScript.ts

@@ -1,12 +1,14 @@
-import 'dotenv/config'
 import os from 'node:os'
 import type { CommonLogger } from '@naturalcycles/js-lib/log'
 import { pDelay } from '@naturalcycles/js-lib/promise/pDelay.js'
 import { setGlobalStringifyFunction } from '@naturalcycles/js-lib/string/stringify.js'
 import type { AnyObject } from '@naturalcycles/js-lib/types'
 import { dimGrey } from '../colors/colors.js'
+import { loadEnvFileIfExists } from '../node.util.js'
 import { inspectStringifyFn } from '../string/inspect.js'
 
+loadEnvFileIfExists()
+
 export interface RunScriptOptions {
   /**
    * @default false

package/src/secret/secrets-decrypt.util.ts

@@ -1,7 +1,6 @@
-import fs from 'node:fs'
+import fs, { globSync } from 'node:fs'
 import path from 'node:path'
 import { _assert } from '@naturalcycles/js-lib/error/assert.js'
-import { globSync } from 'tinyglobby'
 import { dimGrey, yellow } from '../colors/colors.js'
 import { fs2 } from '../fs/fs2.js'
 import { decryptObject, decryptRandomIVBuffer } from '../security/crypto.util.js'

package/src/security/secret.util.ts

@@ -15,7 +15,7 @@ const secretMap: StringMap = {}
  * Does NOT delete previous secrets from secretMap.
  */
 export function loadSecretsFromEnv(): void {
-  // require('dotenv').config() // ensure .env is loaded
+  // loadEnvFileIfExists() // ensure .env is loaded
 
   const secrets: StringMap = {}
   Object.keys(process.env)

package/src/stream/stream.model.ts

@@ -50,12 +50,9 @@ export interface ReadableTyped<T = unknown> extends Readable {
 }
 
 // oxlint-disable no-unused-vars
-// eslint-disable-next-line @typescript-eslint/naming-convention
 export interface WritableTyped<_T> extends Writable {}
 
-// eslint-disable-next-line @typescript-eslint/naming-convention
 export interface TransformTyped<_IN = unknown, _OUT = unknown> extends Transform {}
-// oxlint-enable
 
 export interface TransformOptions {
   /**

package/src/validation/ajv/getAjv.ts

@@ -15,7 +15,6 @@ import type {
   JsonSchemaStringEmailOptions,
 } from './jSchema.js'
 
-/* eslint-disable @typescript-eslint/prefer-string-starts-ends-with */
 // oxlint-disable unicorn/prefer-code-point
 
 const AJV_OPTIONS: Options = {

package/src/validation/ajv/jSchema.ts

@@ -1,6 +1,3 @@
-/* eslint-disable id-denylist */
-// oxlint-disable max-lines
-
 import type { ValidationFunction, ValidationFunctionResult } from '@naturalcycles/js-lib'
 import {
   _isObject,
@@ -1122,7 +1119,7 @@ export class JObject<OUT extends AnyObject, Opt extends boolean = false> extends
   /**
    * Extends the current schema with `id`, `created` and `updated` according to NC DB conventions.
    */
-  // oxlint-disable-next-line @typescript-eslint/explicit-function-return-type, @typescript-eslint/explicit-module-boundary-types
+  // oxlint-disable-next-line @typescript-eslint/explicit-function-return-type
   dbEntity() {
     return this.extend({
       id: j.string(),
@@ -1229,7 +1226,7 @@ export class JObjectInfer<
   /**
    * Extends the current schema with `id`, `created` and `updated` according to NC DB conventions.
    */
-  // oxlint-disable-next-line @typescript-eslint/explicit-function-return-type, @typescript-eslint/explicit-module-boundary-types
+  // oxlint-disable-next-line @typescript-eslint/explicit-function-return-type
   dbEntity() {
     return this.extend({
       id: j.string(),

package/src/yargs/yargs.util.ts

@@ -6,7 +6,7 @@ import { hideBin } from 'yargs/helpers'
  * Quick yargs helper to make it work in esm.
  * It also allows to not have yargs and `@types/yargs` to be declared as dependencies.
  */
-// oxlint-disable-next-line @typescript-eslint/explicit-function-return-type, @typescript-eslint/explicit-module-boundary-types
+// oxlint-disable-next-line @typescript-eslint/explicit-function-return-type
 export function _yargs() {
   return yargs(hideBin(process.argv))
 }