@naturalcycles/nodejs-lib 12.103.2 → 13.0.0

package/src/fs/fs.util.ts

@@ -19,6 +19,48 @@ import * as fsp from 'node:fs/promises'
 import * as path from 'node:path'
 import { _jsonParse } from '@naturalcycles/js-lib'
 
+/**
+ * fs2 conveniently groups filesystem functions together.
+ * Supposed to be almost a drop-in replacement for these things together:
+ *
+ * 1. node:fs
+ * 2. node:fs/promises
+ * 3. fs-extra
+ */
+export const fs2 = {
+  // "Omit" is here to workaround this TS error:
+  // Exported variable 'fs2' has or is using name 'StreamOptions' from external module "fs" but cannot be named.
+  ...(fs as Omit<typeof fs, 'StreamOptions'>),
+  readFile: _readFile,
+  readFileSync: _readFileSync,
+  readFileAsBuffer: _readFileAsBuffer,
+  readFileAsBufferSync: _readFileAsBufferSync,
+  readJson: _readJson,
+  readJsonSync: _readJsonSync,
+  writeFile: _writeFile,
+  writeFileSync: _writeFileSync,
+  outputJson: _outputJson,
+  outputJsonSync: _outputJsonSync,
+  writeJson: _writeJson,
+  writeJsonSync: _writeJsonSync,
+  outputFile: _outputFile,
+  outputFileSync: _outputFileSync,
+  pathExists: _pathExists,
+  pathExistsSync: _pathExistsSync,
+  ensureDir: _ensureDir,
+  ensureDirSync: _ensureDirSync,
+  ensureFile: _ensureFile,
+  ensureFileSync: _ensureFileSync,
+  removePath: _removePath,
+  removePathSync: _removePathSync,
+  emptyDir: _emptyDir,
+  emptyDirSync: _emptyDirSync,
+  copyPath: _copyPath,
+  copyPathSync: _copyPathSync,
+  movePath: _movePath,
+  movePathSync: _movePathSync,
+}
+
 export interface JsonOptions {
   spaces?: number
 }
@@ -30,6 +72,10 @@ export async function _readFile(filePath: string): Promise<string> {
   return await fsp.readFile(filePath, 'utf8')
 }
 
+export async function _readFileAsBuffer(filePath: string): Promise<Buffer> {
+  return await fsp.readFile(filePath)
+}
+
 /**
  * Convenience wrapper that defaults to utf-8 string output.
  */
@@ -37,26 +83,23 @@ export function _readFileSync(filePath: string): string {
   return fs.readFileSync(filePath, 'utf8')
 }
 
+/**
+ * Convenience wrapper that defaults to utf-8 string output.
+ */
+export function _readFileAsBufferSync(filePath: string): Buffer {
+  return fs.readFileSync(filePath)
+}
+
 export async function _readJson<T = unknown>(filePath: string): Promise<T> {
   const str = await fsp.readFile(filePath, 'utf8')
   return _jsonParse(str)
 }
 
-/**
- * @deprecated use _readJson
- */
-export const _readJsonFile = _readJson
-
 export function _readJsonSync<T = unknown>(filePath: string): T {
   const str = fs.readFileSync(filePath, 'utf8')
   return _jsonParse(str)
 }
 
-/**
- * @deprecated use _readJsonSync
- */
-export const _readJsonFileSync = _readJsonSync
-
 export async function _writeFile(filePath: string, data: string | Buffer): Promise<void> {
   await fsp.writeFile(filePath, data)
 }
@@ -88,41 +131,21 @@ export async function _writeJson(filePath: string, data: any, opt?: JsonOptions)
   await fsp.writeFile(filePath, str)
 }
 
-/**
- * @deprecated use _writeJson
- */
-export const _writeJsonFile = _writeJson
-
 export function _writeJsonSync(filePath: string, data: any, opt?: JsonOptions): void {
   const str = JSON.stringify(data, null, opt?.spaces)
   fs.writeFileSync(filePath, str)
 }
 
-/**
- * @deprecated use _writeJsonSync
- */
-export const _writeJsonFileSync = _writeJsonSync
-
 export async function _outputJson(filePath: string, data: any, opt?: JsonOptions): Promise<void> {
   const str = JSON.stringify(data, null, opt?.spaces)
   await _outputFile(filePath, str)
 }
 
-/**
- * @deprecated use _outputJson
- */
-export const _outputJsonFile = _outputJson
-
 export function _outputJsonSync(filePath: string, data: any, opt?: JsonOptions): void {
   const str = JSON.stringify(data, null, opt?.spaces)
   _outputFileSync(filePath, str)
 }
 
-/**
- * @deprecated use _outputJsonSync
- */
-export const _outputJsonFileSync = _outputJsonSync
-
 export async function _pathExists(filePath: string): Promise<boolean> {
   try {
     await fsp.access(filePath)

package/src/fs/json2env.ts

@@ -1,6 +1,6 @@
 import * as fs from 'node:fs'
 import { AnyObject } from '@naturalcycles/js-lib'
-import { dimGrey } from '../colors'
+import { dimGrey } from '../colors/colors'
 import { _pathExistsSync, _readJsonSync, _writeFileSync } from './fs.util'
 
 export interface Json2EnvOptions {
@@ -95,7 +95,7 @@ export function appendToBashEnv(obj: AnyObject, prefix = ''): void {
   if (BASH_ENV) {
     const data = objectToShellExport(obj, prefix)
     fs.appendFileSync(BASH_ENV, data)
-    console.log(`BASH_ENV file appended (${dimGrey(BASH_ENV)})\n${data}`)
+    console.log(`BASH_ENV appended:\n${data}`)
   }
 }
 
@@ -104,7 +104,7 @@ export function appendToGithubEnv(obj: AnyObject, prefix = ''): void {
   if (GITHUB_ENV) {
     const data = objectToGithubActionsEnv(obj, prefix)
     fs.appendFileSync(GITHUB_ENV, data)
-    console.log(`GITHUB_ENV file appended (${dimGrey(GITHUB_ENV)})\n${data}`)
+    console.log(`GITHUB_ENV appended:\n${data}`)
   }
 }
 
@@ -113,7 +113,18 @@ export function appendToGithubOutput(obj: AnyObject, prefix = ''): void {
   if (GITHUB_OUTPUT) {
     const data = objectToGithubActionsEnv(obj, prefix)
     fs.appendFileSync(GITHUB_OUTPUT, data)
-    console.log(`GITHUB_OUTPUT file appended (${dimGrey(GITHUB_OUTPUT)})\n${data}`)
+    console.log(`GITHUB_OUTPUT appended:\n${data}`)
+  }
+}
+
+/**
+ * https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#adding-a-job-summary
+ */
+export function appendToGithubSummary(str: string): void {
+  const { GITHUB_STEP_SUMMARY } = process.env
+  if (GITHUB_STEP_SUMMARY) {
+    fs.appendFileSync(GITHUB_STEP_SUMMARY, str + '\n')
+    console.log(`GITHUB_STEP_SUMMARY appended:\n${str}`)
   }
 }
 

package/src/fs/kpy.ts

@@ -1,6 +1,6 @@
 import * as path from 'node:path'
 import { _since } from '@naturalcycles/js-lib'
-import { boldWhite, dimGrey, grey, yellow } from '../colors'
+import { boldWhite, dimGrey, grey, yellow } from '../colors/colors'
 import {
   _copyPath,
   _copyPathSync,

package/src/index.ts

@@ -88,9 +88,12 @@ 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,

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

@@ -1,21 +1,24 @@
 import * as path from 'node:path'
 import * as fs from 'node:fs'
 import { _assert } from '@naturalcycles/js-lib'
-import { dimGrey, yellow } from '../colors'
+import { dimGrey, yellow } from '../colors/colors'
 import { _readJsonSync, _writeJsonSync, fastGlob } from '../index'
 import { decryptObject, decryptRandomIVBuffer } from '../security/crypto.util'
 
 export interface DecryptCLIOptions {
   dir: string[]
   file?: string
-  encKey: string
+  encKeyBuffer: Buffer
   del?: boolean
   jsonMode?: boolean
 }
 
 // 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`.
@@ -24,7 +27,7 @@ export interface DecryptCLIOptions {
 export function secretsDecrypt(
   dir: string[],
   file: string | undefined,
-  encKey: string,
+  encKeyBuffer: Buffer,
   del = false,
   jsonMode = false,
 ): void {
@@ -44,12 +47,12 @@ export function secretsDecrypt(
       )
       plainFilename = filename.replace('.json', '.plain.json')
 
-      const json = decryptObject(_readJsonSync(filename), encKey)
+      const json = decryptObject(_readJsonSync(filename), encKeyBuffer)
 
       _writeJsonSync(plainFilename, json, { spaces: 2 })
     } else {
       const enc = fs.readFileSync(filename)
-      const plain = decryptRandomIVBuffer(enc, encKey)
+      const plain = decryptRandomIVBuffer(enc, encKeyBuffer)
       plainFilename = filename.slice(0, filename.length - '.enc'.length)
       fs.writeFileSync(plainFilename, plain)
     }

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

@@ -1,14 +1,14 @@
 import * as fs from 'node:fs'
 import * as path from 'node:path'
 import { _assert } from '@naturalcycles/js-lib'
-import { dimGrey, yellow } from '../colors'
+import { dimGrey, yellow } from '../colors/colors'
 import { _readJsonSync, _writeJsonSync, fastGlob } from '../index'
 import { encryptObject, encryptRandomIVBuffer } from '../security/crypto.util'
 
 export interface EncryptCLIOptions {
   pattern: string[]
   file?: string
-  encKey: string
+  encKeyBuffer: Buffer
   del?: boolean
   jsonMode?: boolean
 }
@@ -20,7 +20,7 @@ export interface EncryptCLIOptions {
 export function secretsEncrypt(
   pattern: string[],
   file: string | undefined,
-  encKey: string,
+  encKeyBuffer: Buffer,
   del = false,
   jsonMode = false,
 ): void {
@@ -41,12 +41,12 @@ export function secretsEncrypt(
       )
       encFilename = filename.replace('.plain', '')
 
-      const json = encryptObject(_readJsonSync(filename), encKey)
+      const json = encryptObject(_readJsonSync(filename), encKeyBuffer)
 
       _writeJsonSync(encFilename, json, { spaces: 2 })
     } else {
       const plain = fs.readFileSync(filename)
-      const enc = encryptRandomIVBuffer(plain, encKey)
+      const enc = encryptRandomIVBuffer(plain, encKeyBuffer)
       encFilename = `${filename}.enc`
       fs.writeFileSync(encFilename, enc)
     }

package/src/security/crypto.util.ts

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

package/src/security/secret.util.ts

@@ -62,7 +62,8 @@ export function loadSecretsFromEncryptedJsonFile(
 
   if (secretEncryptionKey) {
     const buf = fs.readFileSync(filePath)
-    const plain = decryptRandomIVBuffer(buf, secretEncryptionKey).toString('utf8')
+    const encKeyBuffer = Buffer.from(secretEncryptionKey, 'base64')
+    const plain = decryptRandomIVBuffer(buf, encKeyBuffer).toString('utf8')
     secrets = JSON.parse(plain)
   } else {
     secrets = JSON.parse(fs.readFileSync(filePath, 'utf8'))
@@ -94,7 +95,8 @@ export function loadSecretsFromEncryptedJsonFileValues(
   let secrets: StringMap = JSON.parse(fs.readFileSync(filePath, 'utf8'))
 
   if (secretEncryptionKey) {
-    secrets = decryptObject(secrets, secretEncryptionKey)
+    const encKeyBuffer = Buffer.from(secretEncryptionKey, 'base64')
+    secrets = decryptObject(secrets, encKeyBuffer)
   }
 
   Object.entries(secrets).forEach(([k, v]) => (secretMap[k.toUpperCase()] = v))

package/src/stream/ndjson/ndjson.model.ts

@@ -1,5 +1,5 @@
 import { _hb, _ms } from '@naturalcycles/js-lib'
-import { boldWhite, dimWhite } from '../../colors'
+import { boldWhite, dimWhite } from '../../colors/colors'
 
 export class NDJsonStats {
   static create(o: Partial<NDJsonStats> = {}): NDJsonStats {

package/src/stream/ndjson/pipelineFromNDJsonFile.ts

@@ -2,7 +2,7 @@ import { createUnzip, ZlibOptions } from 'node:zlib'
 import * as fs from 'node:fs'
 import { _hb } from '@naturalcycles/js-lib'
 import { transformTap, _pipeline, transformSplit } from '../..'
-import { dimWhite, grey } from '../../colors'
+import { dimWhite, grey } from '../../colors/colors'
 import { NDJsonStats } from './ndjson.model'
 import { transformJsonParse, TransformJsonParseOptions } from './transformJsonParse'
 

package/src/stream/ndjson/pipelineToNDJsonFile.ts

@@ -2,7 +2,7 @@ import { createGzip, ZlibOptions } from 'node:zlib'
 import * as fs from 'node:fs'
 import { AppError } from '@naturalcycles/js-lib'
 import { transformTap, _pipeline, _pathExistsSync, _ensureFileSync } from '../..'
-import { grey } from '../../colors'
+import { grey } from '../../colors/colors'
 import { NDJsonStats } from './ndjson.model'
 import { transformToNDJson, TransformToNDJsonOptions } from './transformToNDJson'
 

package/src/stream/sizeStack.ts

@@ -1,5 +1,5 @@
 import { _hb, CommonLogger, NumberStack } from '@naturalcycles/js-lib'
-import { yellow } from '../colors'
+import { yellow } from '../colors/colors'
 import { gzipBuffer } from '../util/zip.util'
 
 export class SizeStack extends NumberStack {

package/src/stream/transform/transformLogProgress.ts

@@ -8,8 +8,7 @@ import {
   CommonLogger,
   localTime,
 } from '@naturalcycles/js-lib'
-import { boldWhite, dimGrey, white, yellow } from '../../colors'
-import { hasColors } from '../../colors/colors'
+import { hasColors, boldWhite, dimGrey, white, yellow } from '../../colors/colors'
 import { SizeStack } from '../sizeStack'
 import { TransformOptions, TransformTyped } from '../stream.model'
 

package/src/stream/transform/transformMap.ts

@@ -9,7 +9,7 @@ import {
   SKIP,
 } from '@naturalcycles/js-lib'
 import through2Concurrent = require('through2-concurrent')
-import { yellow } from '../../colors'
+import { yellow } from '../../colors/colors'
 import { AbortableTransform } from '../pipeline/pipeline'
 import { TransformTyped } from '../stream.model'
 import { pipelineClose } from '../stream.util'

package/src/stream/transform/transformMapSync.ts

@@ -7,7 +7,7 @@ import {
   Predicate,
   SKIP,
 } from '@naturalcycles/js-lib'
-import { yellow } from '../../colors'
+import { yellow } from '../../colors/colors'
 import { AbortableTransform } from '../pipeline/pipeline'
 import { TransformTyped } from '../stream.model'
 import { pipelineClose } from '../stream.util'

package/src/util/git.util.ts

@@ -1,7 +1,7 @@
 import * as cp from 'node:child_process'
 import * as path from 'node:path'
 import type { UnixTimestampNumber } from '@naturalcycles/js-lib'
-import { grey } from '../colors'
+import { grey } from '../colors/colors'
 
 export function getLastGitCommitMsg(): string {
   return execSync('git log -1 --pretty=%B')

package/dist/colors/index.d.ts

@@ -1,28 +0,0 @@
-import * as chalk from 'chalk';
-export { chalk };
-export declare const white: chalk.Chalk;
-export declare const dimWhite: chalk.Chalk;
-export declare const boldWhite: chalk.Chalk;
-export declare const inverseWhite: chalk.Chalk;
-export declare const grey: chalk.Chalk;
-export declare const dimGrey: chalk.Chalk;
-export declare const boldGrey: chalk.Chalk;
-export declare const yellow: chalk.Chalk;
-export declare const dimYellow: chalk.Chalk;
-export declare const boldYellow: chalk.Chalk;
-export declare const inverseYellow: chalk.Chalk;
-export declare const green: chalk.Chalk;
-export declare const dimGreen: chalk.Chalk;
-export declare const boldGreen: chalk.Chalk;
-export declare const red: chalk.Chalk;
-export declare const dimRed: chalk.Chalk;
-export declare const boldRed: chalk.Chalk;
-export declare const blue: chalk.Chalk;
-export declare const dimBlue: chalk.Chalk;
-export declare const boldBlue: chalk.Chalk;
-export declare const magenta: chalk.Chalk;
-export declare const dimMagenta: chalk.Chalk;
-export declare const boldMagenta: chalk.Chalk;
-export declare const cyan: chalk.Chalk;
-export declare const dimCyan: chalk.Chalk;
-export declare const boldCyan: chalk.Chalk;

package/dist/colors/index.js

@@ -1,35 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.boldCyan = exports.dimCyan = exports.cyan = exports.boldMagenta = exports.dimMagenta = exports.magenta = exports.boldBlue = exports.dimBlue = exports.blue = exports.boldRed = exports.dimRed = exports.red = exports.boldGreen = exports.dimGreen = exports.green = exports.inverseYellow = exports.boldYellow = exports.dimYellow = exports.yellow = exports.boldGrey = exports.dimGrey = exports.grey = exports.inverseWhite = exports.boldWhite = exports.dimWhite = exports.white = exports.chalk = void 0;
-const chalk = require("chalk");
-exports.chalk = chalk;
-// 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
-exports.white = chalk.white;
-exports.dimWhite = chalk.dim.white;
-exports.boldWhite = chalk.bold.white;
-exports.inverseWhite = chalk.inverse.white;
-exports.grey = chalk.grey;
-exports.dimGrey = chalk.dim.grey;
-exports.boldGrey = chalk.bold.grey;
-exports.yellow = chalk.yellow;
-exports.dimYellow = chalk.dim.yellow;
-exports.boldYellow = chalk.bold.yellow;
-exports.inverseYellow = chalk.inverse.yellow;
-exports.green = chalk.green;
-exports.dimGreen = chalk.dim.green;
-exports.boldGreen = chalk.bold.green;
-exports.red = chalk.red;
-exports.dimRed = chalk.dim.red;
-exports.boldRed = chalk.bold.red;
-exports.blue = chalk.blue;
-exports.dimBlue = chalk.dim.blue;
-exports.boldBlue = chalk.bold.blue;
-exports.magenta = chalk.magenta;
-exports.dimMagenta = chalk.dim.magenta;
-exports.boldMagenta = chalk.bold.magenta;
-exports.cyan = chalk.cyan;
-exports.dimCyan = chalk.dim.cyan;
-exports.boldCyan = chalk.bold.cyan;

package/dist/fs/index.d.ts

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

package/dist/fs/index.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./del"), exports);
-tslib_1.__exportStar(require("./json2env"), exports);
-tslib_1.__exportStar(require("./kpy"), exports);

package/src/colors/index.ts

@@ -1,35 +0,0 @@
-import * as chalk from 'chalk'
-
-export { chalk }
-
-// 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/index.ts

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