rsformat 0.2.2 → 0.2.3

package/README.md

@@ -90,7 +90,7 @@ format('{:.>7}', [1,2]); // '....1,2'
 
 #### Pretty Printing
 
-In some instances (namely debug and hexadecimal formatting), adding a `#` before the format specifier will use an alternative 'pretty' printing style. This amounts to using non-compact `util.inspect` for debug printing (spanning multiple lines), and adding 0x to hexadecimal numbers.
+In some instances (namely debug, binary, octal and hexadecimal formatting), adding a `#` before the format specifier will use an alternative 'pretty' printing style. This amounts to using non-compact `util.inspect` for debug printing (spanning multiple lines), and adding 0b/0o/0x as a prefix for the numbers formatted as powers of two.
 
 ```js
 format('{:#X}', 255); // '0xFF'

package/lib/format.js

@@ -165,9 +165,20 @@ function fmt_raw(str, params, options = { colors: false }) {
             else {
                 maybe_sign = '';
             }
-            //If the type is x or X and pretty printing enabled, add 0x
-            if ((($type === 'x') || ($type === 'X')) && ($pretty === '#')) {
-                maybe_sign += '0x';
+            // If pretty printing is enabled and the formating calls for a prefix, add it
+            if ($pretty === '#') {
+                switch ($type) {
+                    case 'o':
+                        maybe_sign += "0o";
+                        break;
+                    case 'x':
+                    case 'X':
+                        maybe_sign += "0x";
+                        break;
+                    case 'b':
+                        maybe_sign += "0b";
+                        break;
+                }
             }
             //pad with zeroes if specified  
             if ($pad_zeroes === '0') {

package/lib/print.d.ts

@@ -1,6 +1,8 @@
 /// <reference types="node" />
 import { Writable } from 'node:stream';
-export declare function Printer(outStream?: Writable, errStream?: Writable): {
+export declare function Printer(outStream?: Writable, errStream?: Writable, options?: {
+    debugColors: boolean;
+}): {
     /**
      * Print a format string to an output stream (usually process.stdout).
      *

package/lib/print.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.eprintln = exports.eprint = exports.println = exports.print = exports.Printer = void 0;
 const node_process_1 = __importDefault(require("node:process"));
 const format_1 = require("./format");
-function Printer(outStream = node_process_1.default.stdout, errStream = node_process_1.default.stderr) {
+function Printer(outStream = node_process_1.default.stdout, errStream = node_process_1.default.stderr, options = { debugColors: true }) {
     return {
         /**
          * Print a format string to an output stream (usually process.stdout).
@@ -16,7 +16,7 @@ function Printer(outStream = node_process_1.default.stdout, errStream = node_pro
          * @param params Parameters to be inserted into the format string
          */
         print: function print(format_string, ...params) {
-            outStream.write((0, format_1.fmt_raw)(format_string, params, { colors: true }));
+            outStream.write((0, format_1.fmt_raw)(format_string, params, { colors: options.debugColors }));
         },
         /**
          * Print a format string to an output stream (usually process.stdout)
@@ -26,7 +26,7 @@ function Printer(outStream = node_process_1.default.stdout, errStream = node_pro
          * @param params Parameters to be inserted into the format string
          */
         println: function println(format_string, ...params) {
-            outStream.write((0, format_1.fmt_raw)(format_string, params, { colors: true }) + '\n');
+            outStream.write((0, format_1.fmt_raw)(format_string, params, { colors: options.debugColors }) + '\n');
         },
         /**
          * Print a format string to an error stream (usually process.stderr).
@@ -35,7 +35,7 @@ function Printer(outStream = node_process_1.default.stdout, errStream = node_pro
          * @param params Parameters to be inserted into the format string
          */
         eprint: function eprint(format_string, ...params) {
-            errStream.write((0, format_1.fmt_raw)(format_string, params, { colors: true }));
+            errStream.write((0, format_1.fmt_raw)(format_string, params, { colors: options.debugColors }));
         },
         /**
          * Print a format string to an error stream (usually process.stderr)
@@ -45,7 +45,7 @@ function Printer(outStream = node_process_1.default.stdout, errStream = node_pro
          * @param params Parameters to be inserted into the format string
          */
         eprintln: function eprintln(format_string, ...params) {
-            errStream.write((0, format_1.fmt_raw)(format_string, params, { colors: true }) + '\n');
+            errStream.write((0, format_1.fmt_raw)(format_string, params, { colors: options.debugColors }) + '\n');
         },
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsformat",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Formatting/printing library for JavaScript that takes after rust's string formatting ",
   "files": [
     "lib",