@naturalcycles/nodejs-lib 15.134.0 → 15.135.1

package/dist/fs/fs2.d.ts

@@ -25,15 +25,15 @@ declare class FS2 {
     writeFile(filePath: string, data: string | Uint8Array, opt?: WriteFileOptions): void;
     writeFileAsync(filePath: string, data: string | Uint8Array, opt?: WriteFileOptions): Promise<void>;
     writePrettyJson(filePath: string, data: any): void;
-    writeJson(filePath: string, data: any, opt?: JsonOptions): void;
+    writeJson(filePath: string, data: any): void;
     writePrettyJsonAsync(filePath: string, data: any): Promise<void>;
-    writeJsonAsync(filePath: string, data: any, opt?: JsonOptions): Promise<void>;
+    writeJsonAsync(filePath: string, data: any): Promise<void>;
     appendFile(filePath: string, data: string | Uint8Array): void;
     appendFileAsync(filePath: string, data: string | Uint8Array): Promise<void>;
     outputPrettyJson(filePath: string, data: any): void;
-    outputJson(filePath: string, data: any, opt?: JsonOptions): void;
+    outputJson(filePath: string, data: any): void;
     outputPrettyJsonAsync(filePath: string, data: any): Promise<void>;
-    outputJsonAsync(filePath: string, data: any, opt?: JsonOptions): Promise<void>;
+    outputJsonAsync(filePath: string, data: any): Promise<void>;
     outputFile(filePath: string, data: string | Uint8Array): void;
     outputFileAsync(filePath: string, data: string | Uint8Array): Promise<void>;
     pathExists(filePath: string): boolean;
@@ -79,7 +79,4 @@ declare class FS2 {
     createReadStream: typeof fs.createReadStream;
 }
 export declare const fs2: FS2;
-export interface JsonOptions {
-    spaces?: number;
-}
 export {};

package/dist/fs/fs2.js

@@ -62,17 +62,19 @@ class FS2 {
         await fsp.writeFile(filePath, data, opt);
     }
     writePrettyJson(filePath, data) {
-        this.writeJson(filePath, data, prettyJsonOptions);
+        const str = stringifyPretty(data);
+        fs.writeFileSync(filePath, str);
     }
-    writeJson(filePath, data, opt) {
-        const str = stringify(data, opt);
+    writeJson(filePath, data) {
+        const str = JSON.stringify(data);
         fs.writeFileSync(filePath, str);
     }
     async writePrettyJsonAsync(filePath, data) {
-        await this.writeJsonAsync(filePath, data, prettyJsonOptions);
+        const str = stringifyPretty(data);
+        await fsp.writeFile(filePath, str);
     }
-    async writeJsonAsync(filePath, data, opt) {
-        const str = stringify(data, opt);
+    async writeJsonAsync(filePath, data) {
+        const str = JSON.stringify(data);
         await fsp.writeFile(filePath, str);
     }
     appendFile(filePath, data) {
@@ -82,17 +84,19 @@ class FS2 {
         await fsp.appendFile(filePath, data);
     }
     outputPrettyJson(filePath, data) {
-        this.outputJson(filePath, data, prettyJsonOptions);
+        const str = stringifyPretty(data);
+        this.outputFile(filePath, str);
     }
-    outputJson(filePath, data, opt) {
-        const str = stringify(data, opt);
+    outputJson(filePath, data) {
+        const str = JSON.stringify(data);
         this.outputFile(filePath, str);
     }
     async outputPrettyJsonAsync(filePath, data) {
-        await this.outputJsonAsync(filePath, data, prettyJsonOptions);
+        const str = stringifyPretty(data);
+        await this.outputFileAsync(filePath, str);
     }
-    async outputJsonAsync(filePath, data, opt) {
-        const str = stringify(data, opt);
+    async outputJsonAsync(filePath, data) {
+        const str = JSON.stringify(data);
         await this.outputFileAsync(filePath, str);
     }
     outputFile(filePath, data) {
@@ -276,8 +280,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' : '');
+function stringifyPretty(data) {
+    // Add a newline at the end (to match our prettier config)
+    return JSON.stringify(data, null, 2) + '\n';
 }

package/dist/stream/writable/writableChunk.js

@@ -36,7 +36,7 @@ export function writableChunk(splitPredicate, fn, opt = {}) {
                 logger.debug(`WritableChunk(${splitIndex}): pause`);
             }
             if (splitPredicate(chunk, ++indexWritten)) {
-                logger.log(`WritableChunk(${splitIndex}): splitting to ${splitIndex + 1}`);
+                logger.debug(`WritableChunk(${splitIndex}): splitting to ${splitIndex + 1}`);
                 splitIndex++;
                 fork.push(null);
                 lock?.resolve();
@@ -47,7 +47,7 @@ export function writableChunk(splitPredicate, fn, opt = {}) {
             cb();
         },
         async final(cb) {
-            logger.log(`WritableChunk: final`);
+            logger.debug(`WritableChunk: final`);
             // Pushing null "closes"/ends the secondary pipeline correctly
             fork.push(null);
             // Acknowledge that we've received `null` and passed it through to the fork
@@ -67,7 +67,7 @@ export function writableChunk(splitPredicate, fn, opt = {}) {
             lockCopy.resolve();
         });
         void fn(Pipeline.from(readable), currentSplitIndex).then(() => {
-            logger.log(`WritableChunk(${currentSplitIndex}): done`);
+            logger.debug(`WritableChunk(${currentSplitIndex}): done`);
         });
         return readable;
     }

package/package.json

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

package/src/fs/fs2.ts

@@ -78,20 +78,22 @@ class FS2 {
   }
 
   writePrettyJson(filePath: string, data: any): void {
-    this.writeJson(filePath, data, prettyJsonOptions)
+    const str = stringifyPretty(data)
+    fs.writeFileSync(filePath, str)
   }
 
-  writeJson(filePath: string, data: any, opt?: JsonOptions): void {
-    const str = stringify(data, opt)
+  writeJson(filePath: string, data: any): void {
+    const str = JSON.stringify(data)
     fs.writeFileSync(filePath, str)
   }
 
   async writePrettyJsonAsync(filePath: string, data: any): Promise<void> {
-    await this.writeJsonAsync(filePath, data, prettyJsonOptions)
+    const str = stringifyPretty(data)
+    await fsp.writeFile(filePath, str)
   }
 
-  async writeJsonAsync(filePath: string, data: any, opt?: JsonOptions): Promise<void> {
-    const str = stringify(data, opt)
+  async writeJsonAsync(filePath: string, data: any): Promise<void> {
+    const str = JSON.stringify(data)
     await fsp.writeFile(filePath, str)
   }
 
@@ -104,20 +106,22 @@ class FS2 {
   }
 
   outputPrettyJson(filePath: string, data: any): void {
-    this.outputJson(filePath, data, prettyJsonOptions)
+    const str = stringifyPretty(data)
+    this.outputFile(filePath, str)
   }
 
-  outputJson(filePath: string, data: any, opt?: JsonOptions): void {
-    const str = stringify(data, opt)
+  outputJson(filePath: string, data: any): void {
+    const str = JSON.stringify(data)
     this.outputFile(filePath, str)
   }
 
   async outputPrettyJsonAsync(filePath: string, data: any): Promise<void> {
-    await this.outputJsonAsync(filePath, data, prettyJsonOptions)
+    const str = stringifyPretty(data)
+    await this.outputFileAsync(filePath, str)
   }
 
-  async outputJsonAsync(filePath: string, data: any, opt?: JsonOptions): Promise<void> {
-    const str = stringify(data, opt)
+  async outputJsonAsync(filePath: string, data: any): Promise<void> {
+    const str = JSON.stringify(data)
     await this.outputFileAsync(filePath, str)
   }
 
@@ -324,13 +328,7 @@ class FS2 {
 
 export const fs2 = new FS2()
 
-const prettyJsonOptions: JsonOptions = { spaces: 2 }
-
-export interface JsonOptions {
-  spaces?: number
-}
-
-function stringify(data: any, opt?: JsonOptions): string {
-  // 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' : '')
+function stringifyPretty(data: any): string {
+  // Add a newline at the end (to match our prettier config)
+  return JSON.stringify(data, null, 2) + '\n'
 }

package/src/stream/writable/writableChunk.ts

@@ -48,7 +48,7 @@ export function writableChunk<T>(
       }
 
       if (splitPredicate(chunk, ++indexWritten)) {
-        logger.log(`WritableChunk(${splitIndex}): splitting to ${splitIndex + 1}`)
+        logger.debug(`WritableChunk(${splitIndex}): splitting to ${splitIndex + 1}`)
         splitIndex++
         fork.push(null)
         lock?.resolve()
@@ -60,7 +60,7 @@ export function writableChunk<T>(
       cb()
     },
     async final(cb) {
-      logger.log(`WritableChunk: final`)
+      logger.debug(`WritableChunk: final`)
 
       // Pushing null "closes"/ends the secondary pipeline correctly
       fork.push(null)
@@ -84,7 +84,7 @@ export function writableChunk<T>(
     })
 
     void fn(Pipeline.from<T>(readable), currentSplitIndex).then(() => {
-      logger.log(`WritableChunk(${currentSplitIndex}): done`)
+      logger.debug(`WritableChunk(${currentSplitIndex}): done`)
     })
 
     return readable