@thi.ng/text-canvas 2.3.7 → 2.3.8

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2022-06-09T16:14:01Z
+- **Last updated**: 2022-06-28T13:48:51Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -9,6 +9,13 @@ See [Conventional Commits](https://conventionalcommits.org/) for commit guidelin
 **Note:** Unlisted _patch_ versions only involve non-code or otherwise excluded changes
 and/or version bumps of transitive dependencies.
 
+### [2.3.8](https://github.com/thi-ng/umbrella/tree/@thi.ng/text-canvas@2.3.8) (2022-06-28)
+
+#### ♻️ Refactoring
+
+- update/simplify formatCanvas() ([e2f3ab9](https://github.com/thi-ng/umbrella/commit/e2f3ab9))
+  - re-use new single-line formatting fns from [@thi.ng/text-format](https://github.com/thi-ng/umbrella/tree/main/packages/text-format)
+
 ## [2.3.0](https://github.com/thi-ng/umbrella/tree/@thi.ng/text-canvas@2.3.0) (2022-04-07)
 
 #### 🚀 Features

package/README.md

@@ -70,7 +70,7 @@ node --experimental-repl-await
 > const textCanvas = await import("@thi.ng/text-canvas");
 ```
 
-Package sizes (gzipped, pre-treeshake): ESM: 5.36 KB
+Package sizes (gzipped, pre-treeshake): ESM: 5.24 KB
 
 ## Dependencies
 

package/format.d.ts

@@ -6,7 +6,7 @@ import type { Canvas } from "./canvas.js";
  * any character format data.
  *
  * @param canvas -
- * @param format -
+ * @param fmt -
  */
-export declare const formatCanvas: (canvas: Canvas, format?: StringFormat) => string;
+export declare const formatCanvas: (canvas: Canvas, fmt?: StringFormat) => string;
 //# sourceMappingURL=format.d.ts.map

package/format.js

@@ -1,43 +1,24 @@
+import { format, formatNone } from "@thi.ng/text-format/format";
 /**
  * Returns string representation of canvas, optionally using given string
  * formatter. If none is given, returns plain string representation, ignoring
  * any character format data.
  *
  * @param canvas -
- * @param format -
+ * @param fmt -
  */
-export const formatCanvas = (canvas, format) => {
+export const formatCanvas = (canvas, fmt) => {
     const { data, width, height } = canvas;
     const res = [];
-    if (format) {
-        const { start, end, prefix, suffix, zero } = format;
-        let prevID, ch, id;
-        const check = zero ? () => prevID !== -1 : () => prevID !== 0;
-        for (let y = 0, i = 0; y < height; y++) {
-            prevID = zero ? -1 : 0;
-            res.push(prefix);
-            for (let x = 0; x < width; x++, i++) {
-                ch = data[i];
-                id = ch >>> 16;
-                if (id != prevID) {
-                    check() && res.push(end);
-                    (zero || id) && res.push(start(id));
-                    prevID = id;
-                }
-                res.push(String.fromCharCode(ch & 0xffff));
-            }
-            check() && res.push(end);
-            res.push(suffix);
+    if (fmt) {
+        for (let y = 0; y < height; y++) {
+            res.push(format(fmt, data, width, y * width));
         }
-        return res.join("");
     }
     else {
-        for (let y = 0, i = 0; y < height; y++) {
-            for (let x = 0; x < width; x++, i++) {
-                res.push(String.fromCharCode(data[i] & 0xffff));
-            }
-            res.push("\n");
+        for (let y = 0; y < height; y++) {
+            res.push(formatNone(data, width, y * width));
         }
-        return res.join("");
     }
+    return res.join("");
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/text-canvas",
-  "version": "2.3.7",
+  "version": "2.3.8",
   "description": "Text based canvas, drawing, tables with arbitrary formatting (incl. ANSI/HTML)",
   "type": "module",
   "module": "./index.js",
@@ -37,10 +37,10 @@
     "@thi.ng/api": "^8.3.7",
     "@thi.ng/arrays": "^2.2.5",
     "@thi.ng/checks": "^3.2.1",
-    "@thi.ng/geom-clip-line": "^2.1.16",
+    "@thi.ng/geom-clip-line": "^2.1.17",
     "@thi.ng/math": "^5.3.3",
     "@thi.ng/strings": "^3.3.5",
-    "@thi.ng/text-format": "^1.1.7",
+    "@thi.ng/text-format": "^1.2.0",
     "@thi.ng/transducers": "^8.3.5"
   },
   "devDependencies": {
@@ -138,5 +138,5 @@
     ],
     "year": 2020
   },
-  "gitHead": "73139849c7b46c0451693d994e14a34bc2434280\n"
+  "gitHead": "207404f1e1fcfd3596780322d9218156aeaac3dd\n"
 }