@naturalcycles/nodejs-lib 15.129.1 → 15.130.1

package/dist/fs/fs2.d.ts

@@ -24,11 +24,15 @@ declare class FS2 {
     readJsonAsync<T = unknown>(filePath: string): Promise<T>;
     writeFile(filePath: string, data: string | Buffer, opt?: WriteFileOptions): void;
     writeFileAsync(filePath: string, data: string | Buffer, opt?: WriteFileOptions): Promise<void>;
+    writePrettyJson(filePath: string, data: any): void;
     writeJson(filePath: string, data: any, opt?: JsonOptions): void;
+    writePrettyJsonAsync(filePath: string, data: any): Promise<void>;
     writeJsonAsync(filePath: string, data: any, opt?: JsonOptions): Promise<void>;
     appendFile(filePath: string, data: string | Buffer): void;
     appendFileAsync(filePath: string, data: string | Buffer): Promise<void>;
+    outputPrettyJson(filePath: string, data: any): void;
     outputJson(filePath: string, data: any, opt?: JsonOptions): void;
+    outputPrettyJsonAsync(filePath: string, data: any): Promise<void>;
     outputJsonAsync(filePath: string, data: any, opt?: JsonOptions): Promise<void>;
     outputFile(filePath: string, data: string | Buffer): void;
     outputFileAsync(filePath: string, data: string | Buffer): Promise<void>;

package/dist/fs/fs2.js

@@ -61,10 +61,16 @@ class FS2 {
     async writeFileAsync(filePath, data, opt) {
         await fsp.writeFile(filePath, data, opt);
     }
+    writePrettyJson(filePath, data) {
+        this.writeJson(filePath, data, prettyJsonOptions);
+    }
     writeJson(filePath, data, opt) {
         const str = stringify(data, opt);
         fs.writeFileSync(filePath, str);
     }
+    async writePrettyJsonAsync(filePath, data) {
+        await this.writeJsonAsync(filePath, data, prettyJsonOptions);
+    }
     async writeJsonAsync(filePath, data, opt) {
         const str = stringify(data, opt);
         await fsp.writeFile(filePath, str);
@@ -75,10 +81,16 @@ class FS2 {
     async appendFileAsync(filePath, data) {
         await fsp.appendFile(filePath, data);
     }
+    outputPrettyJson(filePath, data) {
+        this.outputJson(filePath, data, prettyJsonOptions);
+    }
     outputJson(filePath, data, opt) {
         const str = stringify(data, opt);
         this.outputFile(filePath, str);
     }
+    async outputPrettyJsonAsync(filePath, data) {
+        await this.outputJsonAsync(filePath, data, prettyJsonOptions);
+    }
     async outputJsonAsync(filePath, data, opt) {
         const str = stringify(data, opt);
         await this.outputFileAsync(filePath, str);
@@ -266,6 +278,7 @@ class FS2 {
     createReadStream = fs.createReadStream;
 }
 export const fs2 = new FS2();
+const prettyJsonOptions = { spaces: 2 };
 function stringify(data, opt) {
     // If pretty-printing is enabled (spaces) - also add a newline at the end (to match our prettier config)
     return JSON.stringify(data, null, opt?.spaces) + (opt?.spaces ? '\n' : '');

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

@@ -24,7 +24,7 @@ export function secretsDecrypt(dir, file, encKeyBuffer, del = false, jsonMode =
             _assert(!filename.endsWith('.plain.json'), `${path.basename(filename)} MUST NOT end with '.plain.json'`);
             plainFilename = filename.replace('.json', '.plain.json');
             const json = decryptObject(fs2.readJson(filename), encKeyBuffer);
-            fs2.writeJson(plainFilename, json, { spaces: 2 });
+            fs2.writePrettyJson(plainFilename, json);
         }
         else {
             const enc = fs.readFileSync(filename);

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

@@ -23,7 +23,7 @@ export function secretsEncrypt(pattern, file, encKeyBuffer, del = false, jsonMod
             _assert(filename.endsWith('.plain.json'), `${path.basename(filename)} MUST end with '.plain.json'`);
             encFilename = filename.replace('.plain', '');
             const json = encryptObject(fs2.readJson(filename), encKeyBuffer);
-            fs2.writeJson(encFilename, json, { spaces: 2 });
+            fs2.writePrettyJson(encFilename, json);
         }
         else {
             const plain = fs.readFileSync(filename);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.129.1",
+  "version": "15.130.1",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@standard-schema/spec": "^1",

package/src/fs/fs2.ts

@@ -77,11 +77,19 @@ class FS2 {
     await fsp.writeFile(filePath, data, opt)
   }
 
+  writePrettyJson(filePath: string, data: any): void {
+    this.writeJson(filePath, data, prettyJsonOptions)
+  }
+
   writeJson(filePath: string, data: any, opt?: JsonOptions): void {
     const str = stringify(data, opt)
     fs.writeFileSync(filePath, str)
   }
 
+  async writePrettyJsonAsync(filePath: string, data: any): Promise<void> {
+    await this.writeJsonAsync(filePath, data, prettyJsonOptions)
+  }
+
   async writeJsonAsync(filePath: string, data: any, opt?: JsonOptions): Promise<void> {
     const str = stringify(data, opt)
     await fsp.writeFile(filePath, str)
@@ -95,11 +103,19 @@ class FS2 {
     await fsp.appendFile(filePath, data)
   }
 
+  outputPrettyJson(filePath: string, data: any): void {
+    this.outputJson(filePath, data, prettyJsonOptions)
+  }
+
   outputJson(filePath: string, data: any, opt?: JsonOptions): void {
     const str = stringify(data, opt)
     this.outputFile(filePath, str)
   }
 
+  async outputPrettyJsonAsync(filePath: string, data: any): Promise<void> {
+    await this.outputJsonAsync(filePath, data, prettyJsonOptions)
+  }
+
   async outputJsonAsync(filePath: string, data: any, opt?: JsonOptions): Promise<void> {
     const str = stringify(data, opt)
     await this.outputFileAsync(filePath, str)
@@ -311,6 +327,8 @@ class FS2 {
 
 export const fs2 = new FS2()
 
+const prettyJsonOptions: JsonOptions = { spaces: 2 }
+
 export interface JsonOptions {
   spaces?: number
 }

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

@@ -49,7 +49,7 @@ export function secretsDecrypt(
 
       const json = decryptObject(fs2.readJson(filename), encKeyBuffer)
 
-      fs2.writeJson(plainFilename, json, { spaces: 2 })
+      fs2.writePrettyJson(plainFilename, json)
     } else {
       const enc = fs.readFileSync(filename)
       const plain = decryptRandomIVBuffer(enc, encKeyBuffer)

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

@@ -44,7 +44,7 @@ export function secretsEncrypt(
 
       const json = encryptObject(fs2.readJson(filename), encKeyBuffer)
 
-      fs2.writeJson(encFilename, json, { spaces: 2 })
+      fs2.writePrettyJson(encFilename, json)
     } else {
       const plain = fs.readFileSync(filename)
       const enc = encryptRandomIVBuffer(plain, encKeyBuffer)