refactor(transducers): deprecate hex(), update hexDump() xform & deps

thi-ng · Aug 8, 2018 · b1ea9a5 · b1ea9a5
1 parent 5864f2c
commit b1ea9a5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/packages/transducers/package.json b/packages/transducers/package.json
@@ -32,7 +32,8 @@
         "@thi.ng/checks": "^1.5.7",
         "@thi.ng/compare": "^0.1.6",
         "@thi.ng/equiv": "^0.1.7",
-        "@thi.ng/errors": "^0.1.6"
+        "@thi.ng/errors": "^0.1.6",
+        "@thi.ng/strings": "^0.1.1"
     },
     "keywords": [
         "ES6",
@@ -48,4 +49,4 @@
     "publishConfig": {
         "access": "public"
     }
-}
+}
diff --git a/packages/transducers/src/func/hex.ts b/packages/transducers/src/func/hex.ts
@@ -1,8 +1,9 @@
-const ZEROES = "00000000";
+import { radix } from "@thi.ng/strings/radix";
 
-export function hex(digits = 2, prefix = "") {
-    return (x: number) => {
-        const s = x.toString(16);
-        return prefix + (s.length >= digits ? s : ZEROES.substring(0, digits - s.length) + s);
-    }
-}
+/**
+ * @deprecated use thi.ng/strings `radix()` instead
+ *
+ * @param digits
+ * @param prefix
+ */
+export const hex = (digits = 2, prefix = "") => radix(16, digits, prefix);
diff --git a/packages/transducers/src/xform/hex-dump.ts b/packages/transducers/src/xform/hex-dump.ts
@@ -1,7 +1,8 @@
+import { U8, U32 } from "@thi.ng/strings/radix";
+
 import { Transducer } from "../api";
 
 import { comp } from "../func/comp";
-import { hex } from "../func/hex";
 import { juxt } from "../func/juxt";
 
 import { map } from "./map";
@@ -29,14 +30,14 @@ import { partition } from "./partition";
 export function hexDump(cols = 16, addr = 0): Transducer<number, string> {
     return comp(
         padLast(cols, 0),
-        map(juxt(hex(), (x) => x > 31 && x < 128 ? String.fromCharCode(x) : ".")),
+        map(juxt(U8, (x) => x > 31 && x < 128 ? String.fromCharCode(x) : ".")),
         partition(cols, true),
         map(
             juxt(
                 (x) => x.map(y => y[0]).join(" "),
                 (x) => x.map(y => y[1]).join("")
             )
         ),
-        mapIndexed((i, [h, a]) => `${hex(8)(addr + i * cols)} | ${h} | ${a}`)
+        mapIndexed((i, [h, a]) => `${U32(addr + i * cols)} | ${h} | ${a}`)
     );
 }