@naturalcycles/nodejs-lib 12.103.2 → 13.0.0

package/dist/index.d.ts

@@ -78,8 +78,11 @@ export * from './validation/joi/joi.model';
 export * from './validation/joi/joi.shared.schemas';
 export * from './validation/joi/joi.validation.error';
 export * from './validation/joi/joi.validation.util';
-export * from './script';
+export * from './script/runScript';
 export * from './jwt/jwt.service';
 export * from './fs/fs.util';
+export * from './fs/del';
+export * from './fs/json2env';
+export * from './fs/kpy';
 export type { GlobbyOptions, FastGlobOptions, ValidationErrorItem, Got, AfterResponseHook, BeforeErrorHook, BeforeRequestHook, AlternativesSchema, AnySchema, ArraySchema, BinarySchema, BooleanSchema, DateSchema, FunctionSchema, ObjectSchema, };
 export { globby, fastGlob, RequestError, TimeoutError, Ajv };

package/dist/index.js

@@ -83,6 +83,9 @@ tslib_1.__exportStar(require("./validation/joi/joi.model"), exports);
 tslib_1.__exportStar(require("./validation/joi/joi.shared.schemas"), exports);
 tslib_1.__exportStar(require("./validation/joi/joi.validation.error"), exports);
 tslib_1.__exportStar(require("./validation/joi/joi.validation.util"), exports);
-tslib_1.__exportStar(require("./script"), exports);
+tslib_1.__exportStar(require("./script/runScript"), exports);
 tslib_1.__exportStar(require("./jwt/jwt.service"), exports);
 tslib_1.__exportStar(require("./fs/fs.util"), exports);
+tslib_1.__exportStar(require("./fs/del"), exports);
+tslib_1.__exportStar(require("./fs/json2env"), exports);
+tslib_1.__exportStar(require("./fs/kpy"), exports);

package/dist/secret/secrets-decrypt.util.d.ts

@@ -1,7 +1,8 @@
+/// <reference types="node" />
 export interface DecryptCLIOptions {
     dir: string[];
     file?: string;
-    encKey: string;
+    encKeyBuffer: Buffer;
     del?: boolean;
     jsonMode?: boolean;
 }
@@ -9,4 +10,4 @@ export interface DecryptCLIOptions {
  * Decrypts all files in given directory (*.enc), saves decrypted versions without ending `.enc`.
  * Using provided encKey.
  */
-export declare function secretsDecrypt(dir: string[], file: string | undefined, encKey: string, del?: boolean, jsonMode?: boolean): void;
+export declare function secretsDecrypt(dir: string[], file: string | undefined, encKeyBuffer: Buffer, del?: boolean, jsonMode?: boolean): void;

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

@@ -4,17 +4,19 @@ exports.secretsDecrypt = void 0;
 const path = require("node:path");
 const fs = require("node:fs");
 const js_lib_1 = require("@naturalcycles/js-lib");
-const colors_1 = require("../colors");
+const colors_1 = require("../colors/colors");
 const index_1 = require("../index");
 const crypto_util_1 = require("../security/crypto.util");
 // Debug it like this:
-// yarn tsn ./src/bin/secrets-decrypt.ts --file ./src/test/secrets2.json --jsonMode --encKey MPd/30v0Zcce4I5mfwF4NSXrpTYD9OO4/fIqw6rjNiWp2b1GN9Xm8nQZqr7c9kKSsATqtwe0HkJFDUGzDSow44GDgDICgB1u1rGa5eNqtxnOVGRR+lIinCvN/1OnpjzeoJy2bStXPj1DKx8anMqgA8SoOZdlWRNSkEeZlolru8Ey0ujZo22dfwMyRIEniLcqvBm/iMiAkV82fn/TxYw05GarAoJcrfPeDBvuOXsARnMCyX18qTFL0iojxeTU8JHxr8TX3eXDq9cJJmridEKlwRIAzADwtetI4ttlP8lwJj1pmgsBIN3iqYssZYCkZ3HMV6BoEc7LTI5z/45rKrAT1A==
 // yarn tsn ./src/bin/secrets-encrypt.ts --file ./src/test/secrets2.plain.json --jsonMode --encKey MPd/30v0Zcce4I5mfwF4NSXrpTYD9OO4/fIqw6rjNiWp2b1GN9Xm8nQZqr7c9kKSsATqtwe0HkJFDUGzDSow44GDgDICgB1u1rGa5eNqtxnOVGRR+lIinCvN/1OnpjzeoJy2bStXPj1DKx8anMqgA8SoOZdlWRNSkEeZlolru8Ey0ujZo22dfwMyRIEniLcqvBm/iMiAkV82fn/TxYw05GarAoJcrfPeDBvuOXsARnMCyX18qTFL0iojxeTU8JHxr8TX3eXDq9cJJmridEKlwRIAzADwtetI4ttlP8lwJj1pmgsBIN3iqYssZYCkZ3HMV6BoEc7LTI5z/45rKrAT1A==
+// yarn tsn ./src/bin/secrets-decrypt.ts --file ./src/test/secrets2.json --jsonMode --encKey MPd/30v0Zcce4I5mfwF4NSXrpTYD9OO4/fIqw6rjNiWp2b1GN9Xm8nQZqr7c9kKSsATqtwe0HkJFDUGzDSow44GDgDICgB1u1rGa5eNqtxnOVGRR+lIinCvN/1OnpjzeoJy2bStXPj1DKx8anMqgA8SoOZdlWRNSkEeZlolru8Ey0ujZo22dfwMyRIEniLcqvBm/iMiAkV82fn/TxYw05GarAoJcrfPeDBvuOXsARnMCyX18qTFL0iojxeTU8JHxr8TX3eXDq9cJJmridEKlwRIAzADwtetI4ttlP8lwJj1pmgsBIN3iqYssZYCkZ3HMV6BoEc7LTI5z/45rKrAT1A==
+// yarn tsn ./src/bin/secrets-encrypt.ts --file ./src/test/secrets.json -encKey MPd/30v0Zcce4I5mfwF4NSXrpTYD9OO4/fIqw6rjNiWp2b1GN9Xm8nQZqr7c9kKSsATqtwe0HkJFDUGzDSow44GDgDICgB1u1rGa5eNqtxnOVGRR+lIinCvN/1OnpjzeoJy2bStXPj1DKx8anMqgA8SoOZdlWRNSkEeZlolru8Ey0ujZo22dfwMyRIEniLcqvBm/iMiAkV82fn/TxYw05GarAoJcrfPeDBvuOXsARnMCyX18qTFL0iojxeTU8JHxr8TX3eXDq9cJJmridEKlwRIAzADwtetI4ttlP8lwJj1pmgsBIN3iqYssZYCkZ3HMV6BoEc7LTI5z/45rKrAT1A==
+// yarn tsn ./src/bin/secrets-decrypt.ts --file ./src/test/secrets.json.enc -encKey MPd/30v0Zcce4I5mfwF4NSXrpTYD9OO4/fIqw6rjNiWp2b1GN9Xm8nQZqr7c9kKSsATqtwe0HkJFDUGzDSow44GDgDICgB1u1rGa5eNqtxnOVGRR+lIinCvN/1OnpjzeoJy2bStXPj1DKx8anMqgA8SoOZdlWRNSkEeZlolru8Ey0ujZo22dfwMyRIEniLcqvBm/iMiAkV82fn/TxYw05GarAoJcrfPeDBvuOXsARnMCyX18qTFL0iojxeTU8JHxr8TX3eXDq9cJJmridEKlwRIAzADwtetI4ttlP8lwJj1pmgsBIN3iqYssZYCkZ3HMV6BoEc7LTI5z/45rKrAT1A==
 /**
  * Decrypts all files in given directory (*.enc), saves decrypted versions without ending `.enc`.
  * Using provided encKey.
  */
-function secretsDecrypt(dir, file, encKey, del = false, jsonMode = false) {
+function secretsDecrypt(dir, file, encKeyBuffer, del = false, jsonMode = false) {
     // If `file` is provided - only this one file is used
     const patterns = file ? [file] : dir.map(d => `${d}/**/*.enc`);
     const filenames = index_1.fastGlob.sync(patterns);
@@ -24,12 +26,12 @@ function secretsDecrypt(dir, file, encKey, del = false, jsonMode = false) {
             (0, js_lib_1._assert)(filename.endsWith('.json'), `${path.basename(filename)} MUST end with '.json'`);
             (0, js_lib_1._assert)(!filename.endsWith('.plain.json'), `${path.basename(filename)} MUST NOT end with '.plain.json'`);
             plainFilename = filename.replace('.json', '.plain.json');
-            const json = (0, crypto_util_1.decryptObject)((0, index_1._readJsonSync)(filename), encKey);
+            const json = (0, crypto_util_1.decryptObject)((0, index_1._readJsonSync)(filename), encKeyBuffer);
             (0, index_1._writeJsonSync)(plainFilename, json, { spaces: 2 });
         }
         else {
             const enc = fs.readFileSync(filename);
-            const plain = (0, crypto_util_1.decryptRandomIVBuffer)(enc, encKey);
+            const plain = (0, crypto_util_1.decryptRandomIVBuffer)(enc, encKeyBuffer);
             plainFilename = filename.slice(0, filename.length - '.enc'.length);
             fs.writeFileSync(plainFilename, plain);
         }

package/dist/secret/secrets-encrypt.util.d.ts

@@ -1,7 +1,8 @@
+/// <reference types="node" />
 export interface EncryptCLIOptions {
     pattern: string[];
     file?: string;
-    encKey: string;
+    encKeyBuffer: Buffer;
     del?: boolean;
     jsonMode?: boolean;
 }
@@ -9,4 +10,4 @@ export interface EncryptCLIOptions {
  * Encrypts all files in given directory (except *.enc), saves encrypted versions as filename.ext.enc.
  * Using provided encKey.
  */
-export declare function secretsEncrypt(pattern: string[], file: string | undefined, encKey: string, del?: boolean, jsonMode?: boolean): void;
+export declare function secretsEncrypt(pattern: string[], file: string | undefined, encKeyBuffer: Buffer, del?: boolean, jsonMode?: boolean): void;

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

@@ -4,14 +4,14 @@ exports.secretsEncrypt = void 0;
 const fs = require("node:fs");
 const path = require("node:path");
 const js_lib_1 = require("@naturalcycles/js-lib");
-const colors_1 = require("../colors");
+const colors_1 = require("../colors/colors");
 const index_1 = require("../index");
 const crypto_util_1 = require("../security/crypto.util");
 /**
  * Encrypts all files in given directory (except *.enc), saves encrypted versions as filename.ext.enc.
  * Using provided encKey.
  */
-function secretsEncrypt(pattern, file, encKey, del = false, jsonMode = false) {
+function secretsEncrypt(pattern, file, encKeyBuffer, del = false, jsonMode = false) {
     const patterns = file
         ? [file]
         : [
@@ -24,12 +24,12 @@ function secretsEncrypt(pattern, file, encKey, del = false, jsonMode = false) {
         if (jsonMode) {
             (0, js_lib_1._assert)(filename.endsWith('.plain.json'), `${path.basename(filename)} MUST end with '.plain.json'`);
             encFilename = filename.replace('.plain', '');
-            const json = (0, crypto_util_1.encryptObject)((0, index_1._readJsonSync)(filename), encKey);
+            const json = (0, crypto_util_1.encryptObject)((0, index_1._readJsonSync)(filename), encKeyBuffer);
             (0, index_1._writeJsonSync)(encFilename, json, { spaces: 2 });
         }
         else {
             const plain = fs.readFileSync(filename);
-            const enc = (0, crypto_util_1.encryptRandomIVBuffer)(plain, encKey);
+            const enc = (0, crypto_util_1.encryptRandomIVBuffer)(plain, encKeyBuffer);
             encFilename = `${filename}.enc`;
             fs.writeFileSync(encFilename, enc);
         }

package/dist/security/crypto.util.d.ts

@@ -1,24 +1,34 @@
 /// <reference types="node" />
 import { Base64String, StringMap } from '@naturalcycles/js-lib';
 /**
- * Using aes-256-cbc
+ * Using aes-256-cbc.
  */
-export declare function encryptRandomIVBuffer(input: Buffer, secretKeyBase64: Base64String): Buffer;
+export declare function encryptRandomIVBuffer(input: Buffer, secretKeyBuffer: Buffer): Buffer;
 /**
- * Using aes-256-cbc
+ * Using aes-256-cbc.
  */
-export declare function decryptRandomIVBuffer(input: Buffer, secretKeyBase64: Base64String): Buffer;
+export declare function decryptRandomIVBuffer(input: Buffer, secretKeyBuffer: Buffer): Buffer;
 /**
- * Decrypts all object values.
- * Returns object with decrypted values.
+ * Decrypts all object values (base64 strings).
+ * Returns object with decrypted values (utf8 strings).
  */
-export declare function decryptObject(obj: StringMap<Base64String>, secretKey: string): StringMap;
-export declare function encryptObject(obj: StringMap, secretKey: string): StringMap<Base64String>;
+export declare function decryptObject(obj: StringMap<Base64String>, secretKeyBuffer: Buffer): StringMap;
 /**
- * Using aes-256-cbc
+ * Encrypts all object values (utf8 strings).
+ * Returns object with encrypted values (base64 strings).
  */
-export declare function decryptString(str: Base64String, secretKey: string): string;
+export declare function encryptObject(obj: StringMap, secretKeyBuffer: Buffer): StringMap<Base64String>;
 /**
- * Using aes-256-cbc
+ * Using aes-256-cbc.
+ *
+ * Input is base64 string.
+ * Output is utf8 string.
  */
-export declare function encryptString(str: string, secretKey: string): Base64String;
+export declare function decryptString(str: Base64String, secretKeyBuffer: Buffer): string;
+/**
+ * Using aes-256-cbc.
+ *
+ * Input is utf8 string.
+ * Output is base64 string.
+ */
+export declare function encryptString(str: string, secretKeyBuffer: Buffer): Base64String;

package/dist/security/crypto.util.js

@@ -6,11 +6,11 @@ const js_lib_1 = require("@naturalcycles/js-lib");
 const hash_util_1 = require("./hash.util");
 const algorithm = 'aes-256-cbc';
 /**
- * Using aes-256-cbc
+ * Using aes-256-cbc.
  */
-function encryptRandomIVBuffer(input, secretKeyBase64) {
-    // md5 to match aes-256 key length of 32 bytes
-    const key = (0, hash_util_1.md5)(Buffer.from(secretKeyBase64, 'base64'));
+function encryptRandomIVBuffer(input, secretKeyBuffer) {
+    // sha256 to match aes-256 key length
+    const key = (0, hash_util_1.sha256AsBuffer)(secretKeyBuffer);
     // Random iv to achieve non-deterministic encryption (but deterministic decryption)
     const iv = crypto.randomBytes(16);
     const cipher = crypto.createCipheriv(algorithm, key, iv);
@@ -18,11 +18,11 @@ function encryptRandomIVBuffer(input, secretKeyBase64) {
 }
 exports.encryptRandomIVBuffer = encryptRandomIVBuffer;
 /**
- * Using aes-256-cbc
+ * Using aes-256-cbc.
  */
-function decryptRandomIVBuffer(input, secretKeyBase64) {
-    // md5 to match aes-256 key length of 32 bytes
-    const key = (0, hash_util_1.md5)(Buffer.from(secretKeyBase64, 'base64'));
+function decryptRandomIVBuffer(input, secretKeyBuffer) {
+    // sha256 to match aes-256 key length
+    const key = (0, hash_util_1.sha256AsBuffer)(secretKeyBuffer);
     // iv is first 16 bytes of encrypted buffer, the rest is payload
     const iv = input.subarray(0, 16);
     const payload = input.subarray(16);
@@ -31,11 +31,11 @@ function decryptRandomIVBuffer(input, secretKeyBase64) {
 }
 exports.decryptRandomIVBuffer = decryptRandomIVBuffer;
 /**
- * Decrypts all object values.
- * Returns object with decrypted values.
+ * Decrypts all object values (base64 strings).
+ * Returns object with decrypted values (utf8 strings).
  */
-function decryptObject(obj, secretKey) {
-    const { key, iv } = getCryptoParams(secretKey);
+function decryptObject(obj, secretKeyBuffer) {
+    const { key, iv } = getCryptoParams(secretKeyBuffer);
     const r = {};
     (0, js_lib_1._stringMapEntries)(obj).forEach(([k, v]) => {
         const decipher = crypto.createDecipheriv(algorithm, key, iv);
@@ -44,8 +44,12 @@ function decryptObject(obj, secretKey) {
     return r;
 }
 exports.decryptObject = decryptObject;
-function encryptObject(obj, secretKey) {
-    const { key, iv } = getCryptoParams(secretKey);
+/**
+ * Encrypts all object values (utf8 strings).
+ * Returns object with encrypted values (base64 strings).
+ */
+function encryptObject(obj, secretKeyBuffer) {
+    const { key, iv } = getCryptoParams(secretKeyBuffer);
     const r = {};
     (0, js_lib_1._stringMapEntries)(obj).forEach(([k, v]) => {
         const cipher = crypto.createCipheriv(algorithm, key, iv);
@@ -55,25 +59,31 @@ function encryptObject(obj, secretKey) {
 }
 exports.encryptObject = encryptObject;
 /**
- * Using aes-256-cbc
+ * Using aes-256-cbc.
+ *
+ * Input is base64 string.
+ * Output is utf8 string.
  */
-function decryptString(str, secretKey) {
-    const { key, iv } = getCryptoParams(secretKey);
+function decryptString(str, secretKeyBuffer) {
+    const { key, iv } = getCryptoParams(secretKeyBuffer);
     const decipher = crypto.createDecipheriv(algorithm, key, iv);
     return decipher.update(str, 'base64', 'utf8') + decipher.final('utf8');
 }
 exports.decryptString = decryptString;
 /**
- * Using aes-256-cbc
+ * Using aes-256-cbc.
+ *
+ * Input is utf8 string.
+ * Output is base64 string.
  */
-function encryptString(str, secretKey) {
-    const { key, iv } = getCryptoParams(secretKey);
+function encryptString(str, secretKeyBuffer) {
+    const { key, iv } = getCryptoParams(secretKeyBuffer);
     const cipher = crypto.createCipheriv(algorithm, key, iv);
     return cipher.update(str, 'utf8', 'base64') + cipher.final('base64');
 }
 exports.encryptString = encryptString;
-function getCryptoParams(secretKey) {
-    const key = (0, hash_util_1.md5)(secretKey);
-    const iv = (0, hash_util_1.md5)(secretKey + key).slice(0, 16);
+function getCryptoParams(secretKeyBuffer) {
+    const key = (0, hash_util_1.sha256AsBuffer)(secretKeyBuffer);
+    const iv = (0, hash_util_1.md5AsBuffer)(Buffer.concat([secretKeyBuffer, key]));
     return { key, iv };
 }

package/dist/security/secret.util.js

@@ -48,7 +48,8 @@ function loadSecretsFromEncryptedJsonFile(filePath, secretEncryptionKey) {
     let secrets;
     if (secretEncryptionKey) {
         const buf = fs.readFileSync(filePath);
-        const plain = (0, crypto_util_1.decryptRandomIVBuffer)(buf, secretEncryptionKey).toString('utf8');
+        const encKeyBuffer = Buffer.from(secretEncryptionKey, 'base64');
+        const plain = (0, crypto_util_1.decryptRandomIVBuffer)(buf, encKeyBuffer).toString('utf8');
         secrets = JSON.parse(plain);
     }
     else {
@@ -69,7 +70,8 @@ function loadSecretsFromEncryptedJsonFileValues(filePath, secretEncryptionKey) {
     (0, js_lib_1._assert)(fs.existsSync(filePath), `loadSecretsFromEncryptedJsonFileValues() cannot load from path: ${filePath}`);
     let secrets = JSON.parse(fs.readFileSync(filePath, 'utf8'));
     if (secretEncryptionKey) {
-        secrets = (0, crypto_util_1.decryptObject)(secrets, secretEncryptionKey);
+        const encKeyBuffer = Buffer.from(secretEncryptionKey, 'base64');
+        secrets = (0, crypto_util_1.decryptObject)(secrets, encKeyBuffer);
     }
     Object.entries(secrets).forEach(([k, v]) => (secretMap[k.toUpperCase()] = v));
     loaded = true;

package/dist/stream/ndjson/ndjson.model.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NDJsonStats = void 0;
 const js_lib_1 = require("@naturalcycles/js-lib");
-const colors_1 = require("../../colors");
+const colors_1 = require("../../colors/colors");
 class NDJsonStats {
     constructor() {
         this.tookMillis = 0;

package/dist/stream/ndjson/pipelineFromNDJsonFile.js

@@ -5,7 +5,7 @@ const node_zlib_1 = require("node:zlib");
 const fs = require("node:fs");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const __1 = require("../..");
-const colors_1 = require("../../colors");
+const colors_1 = require("../../colors/colors");
 const ndjson_model_1 = require("./ndjson.model");
 const transformJsonParse_1 = require("./transformJsonParse");
 /**

package/dist/stream/ndjson/pipelineToNDJsonFile.js

@@ -5,7 +5,7 @@ const node_zlib_1 = require("node:zlib");
 const fs = require("node:fs");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const __1 = require("../..");
-const colors_1 = require("../../colors");
+const colors_1 = require("../../colors/colors");
 const ndjson_model_1 = require("./ndjson.model");
 const transformToNDJson_1 = require("./transformToNDJson");
 /**

package/dist/stream/sizeStack.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SizeStack = void 0;
 const js_lib_1 = require("@naturalcycles/js-lib");
-const colors_1 = require("../colors");
+const colors_1 = require("../colors/colors");
 const zip_util_1 = require("../util/zip.util");
 class SizeStack extends js_lib_1.NumberStack {
     constructor(name, size) {

package/dist/stream/transform/transformLogProgress.js

@@ -4,11 +4,10 @@ exports.transformLogProgress = void 0;
 const node_stream_1 = require("node:stream");
 const node_util_1 = require("node:util");
 const js_lib_1 = require("@naturalcycles/js-lib");
-const colors_1 = require("../../colors");
-const colors_2 = require("../../colors/colors");
+const colors_1 = require("../../colors/colors");
 const sizeStack_1 = require("../sizeStack");
 const inspectOpt = {
-    colors: colors_2.hasColors,
+    colors: colors_1.hasColors,
     breakLength: 300,
 };
 /**

package/dist/stream/transform/transformMap.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformMap = void 0;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const through2Concurrent = require("through2-concurrent");
-const colors_1 = require("../../colors");
+const colors_1 = require("../../colors/colors");
 const stream_util_1 = require("../stream.util");
 // doesn't work, cause here we don't construct our Transform instance ourselves
 // export class TransformMap extends AbortableTransform {}

package/dist/stream/transform/transformMapSync.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformMapSync = exports.TransformMapSync = void 0;
 const js_lib_1 = require("@naturalcycles/js-lib");
-const colors_1 = require("../../colors");
+const colors_1 = require("../../colors/colors");
 const pipeline_1 = require("../pipeline/pipeline");
 const stream_util_1 = require("../stream.util");
 class TransformMapSync extends pipeline_1.AbortableTransform {

package/dist/util/git.util.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.gitCurrentRepoName = exports.gitCurrentBranchName = exports.gitCurrentCommitTimestamp = exports.gitCurrentCommitSha = exports.gitPush = exports.gitPull = exports.gitIsAhead = exports.gitCommitAll = exports.gitHasUncommittedChanges = exports.commitMessageToTitleMessage = exports.getLastGitCommitMsg = void 0;
 const cp = require("node:child_process");
 const path = require("node:path");
-const colors_1 = require("../colors");
+const colors_1 = require("../colors/colors");
 function getLastGitCommitMsg() {
     return execSync('git log -1 --pretty=%B');
 }

package/package.json

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

package/readme.md

@@ -8,7 +8,7 @@
 [![Maintainability](https://api.codeclimate.com/v1/badges/119a3b4735c4ed81cf84/maintainability)](https://codeclimate.com/github/NaturalCycles/nodejs-lib/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/119a3b4735c4ed81cf84/test_coverage)](https://codeclimate.com/github/NaturalCycles/nodejs-lib/test_coverage)
 [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
-[![Actions](https://github.com/NaturalCycles/nodejs-lib/workflows/default/badge.svg)](https://github.com/NaturalCycles/nodejs-lib/actions)
+[![Actions](https://github.com/NaturalCycles/nodejs-lib/workflows/ci/badge.svg)](https://github.com/NaturalCycles/nodejs-lib/actions)
 
 # [Documentation](https://naturalcycles.github.io/nodejs-lib/)
 

package/src/bin/del.ts

@@ -2,7 +2,7 @@
 
 import * as yargs from 'yargs'
 import { delSync } from '../fs/del'
-import { runScript } from '../script'
+import { runScript } from '../script/runScript'
 
 runScript(async () => {
   const { _: patterns, ...opt } = yargs.demandCommand(1).options({

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

@@ -3,8 +3,8 @@
 import * as fs from 'node:fs'
 import * as path from 'node:path'
 import * as yargs from 'yargs'
-import { appendToBashEnv, appendToGithubEnv, appendToGithubOutput } from '../fs'
-import { runScript } from '../script'
+import { appendToBashEnv, appendToGithubEnv, appendToGithubOutput } from '../fs/json2env'
+import { runScript } from '../script/runScript'
 import { generateBuildInfo } from '../util/buildInfo.util'
 
 runScript(async () => {

package/src/bin/json2env.ts

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 import * as yargs from 'yargs'
-import { json2env } from '../fs'
-import { runScript } from '../script'
+import { json2env } from '../fs/json2env'
+import { runScript } from '../script/runScript'
 
 runScript(() => {
   const { argv } = yargs.demandCommand(1).options({

package/src/bin/kpy.ts

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

package/src/bin/secrets-decrypt.ts

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 
 import * as yargs from 'yargs'
-import { dimGrey } from '../colors'
-import { runScript } from '../script'
+import { dimGrey } from '../colors/colors'
+import { runScript } from '../script/runScript'
 import { DecryptCLIOptions, secretsDecrypt } from '../secret/secrets-decrypt.util'
 
 runScript(() => {
-  const { dir, file, encKey, del, jsonMode } = getDecryptCLIOptions()
+  const { dir, file, encKeyBuffer, del, jsonMode } = getDecryptCLIOptions()
 
-  secretsDecrypt(dir, file, encKey, del, jsonMode)
+  secretsDecrypt(dir, file, encKeyBuffer, del, jsonMode)
 })
 
 function getDecryptCLIOptions(): DecryptCLIOptions {
@@ -27,7 +27,7 @@ function getDecryptCLIOptions(): DecryptCLIOptions {
     },
     encKey: {
       type: 'string',
-      desc: 'Encryption key',
+      desc: 'Encryption key as base64 encoded string',
       // demandOption: true,
       // default: process.env.SECRET_ENCRYPTION_KEY!,
     },
@@ -63,6 +63,8 @@ function getDecryptCLIOptions(): DecryptCLIOptions {
     }
   }
 
+  const encKeyBuffer = Buffer.from(encKey, 'base64')
+
   // `as any` because @types/yargs can't handle string[] type properly
-  return { dir: dir as any, file, encKey, del, jsonMode }
+  return { dir: dir as any, file, encKeyBuffer, del, jsonMode }
 }

package/src/bin/secrets-encrypt.ts

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 
 import * as yargs from 'yargs'
-import { dimGrey } from '../colors'
-import { runScript } from '../script'
+import { dimGrey } from '../colors/colors'
+import { runScript } from '../script/runScript'
 import { EncryptCLIOptions, secretsEncrypt } from '../secret/secrets-encrypt.util'
 
 runScript(() => {
-  const { pattern, file, encKey, del, jsonMode } = getEncryptCLIOptions()
+  const { pattern, file, encKeyBuffer, del, jsonMode } = getEncryptCLIOptions()
 
-  secretsEncrypt(pattern, file, encKey, del, jsonMode)
+  secretsEncrypt(pattern, file, encKeyBuffer, del, jsonMode)
 })
 
 function getEncryptCLIOptions(): EncryptCLIOptions {
@@ -18,7 +18,7 @@ function getEncryptCLIOptions(): EncryptCLIOptions {
     pattern: {
       type: 'string',
       array: true,
-      desc: 'Globby pattern for secrets. Can be many.',
+      desc: 'Globby pattern for secrets. Can be multiple.',
       // demandOption: true,
       default: './secret/**',
     },
@@ -28,7 +28,7 @@ function getEncryptCLIOptions(): EncryptCLIOptions {
     },
     encKey: {
       type: 'string',
-      desc: 'Encryption key',
+      desc: 'Encryption key as base64 encoded string',
       // demandOption: true,
       // default: process.env.SECRET_ENCRYPTION_KEY!,
     },
@@ -65,6 +65,8 @@ function getEncryptCLIOptions(): EncryptCLIOptions {
     }
   }
 
+  const encKeyBuffer = Buffer.from(encKey, 'base64')
+
   // `as any` because @types/yargs can't handle string[] type properly
-  return { pattern: pattern as any, file, encKey, del, jsonMode }
+  return { pattern: pattern as any, file, encKeyBuffer, del, jsonMode }
 }

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

@@ -2,8 +2,8 @@
 
 import * as crypto from 'node:crypto'
 import * as yargs from 'yargs'
-import { dimGrey } from '../colors'
-import { runScript } from '../script'
+import { dimGrey } from '../colors/colors'
+import { runScript } from '../script/runScript'
 
 runScript(() => {
   const { sizeBytes } = yargs.option('sizeBytes', {

package/src/bin/slack-this.ts

@@ -2,7 +2,7 @@
 
 import * as yargs from 'yargs'
 import { SlackService } from '..'
-import { runScript } from '../script'
+import { runScript } from '../script/runScript'
 
 runScript(async () => {
   const {

package/src/colors/colors.ts

@@ -1,4 +1,7 @@
 import * as tty from 'node:tty'
+import * as chalk from 'chalk'
+
+export { chalk }
 
 /**
  * Based on: https://github.com/sindresorhus/yoctocolors/pull/5
@@ -6,3 +9,35 @@ import * as tty from 'node:tty'
  * @experimental
  */
 export const hasColors = !process.env['NO_COLOR'] && tty.WriteStream.prototype.hasColors()
+
+// The point of re-exporting is:
+// 1. Fix typings to allow to pass `number` (very common case)
+// 2. Easier/shorter to import, rather than from 'chalk'
+// export type ColorFn = (...args: (string | number)[]) => string
+
+export const white = chalk.white
+export const dimWhite = chalk.dim.white
+export const boldWhite = chalk.bold.white
+export const inverseWhite = chalk.inverse.white
+export const grey = chalk.grey
+export const dimGrey = chalk.dim.grey
+export const boldGrey = chalk.bold.grey
+export const yellow = chalk.yellow
+export const dimYellow = chalk.dim.yellow
+export const boldYellow = chalk.bold.yellow
+export const inverseYellow = chalk.inverse.yellow
+export const green = chalk.green
+export const dimGreen = chalk.dim.green
+export const boldGreen = chalk.bold.green
+export const red = chalk.red
+export const dimRed = chalk.dim.red
+export const boldRed = chalk.bold.red
+export const blue = chalk.blue
+export const dimBlue = chalk.dim.blue
+export const boldBlue = chalk.bold.blue
+export const magenta = chalk.magenta
+export const dimMagenta = chalk.dim.magenta
+export const boldMagenta = chalk.bold.magenta
+export const cyan = chalk.cyan
+export const dimCyan = chalk.dim.cyan
+export const boldCyan = chalk.bold.cyan

package/src/fs/del.ts

@@ -1,7 +1,7 @@
 import * as fs from 'node:fs'
 import * as fsp from 'node:fs/promises'
 import { pFilter, pMap, _since } from '@naturalcycles/js-lib'
-import { dimGrey, yellow } from '../colors'
+import { dimGrey, yellow } from '../colors/colors'
 import { _pathExists, _pathExistsSync, globby } from '../index'
 
 export interface DelOptions {