@thi.ng/text-canvas 2.5.0 → 2.6.0

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2023-08-14T13:30:45Z
+- **Last updated**: 2023-08-24T05:28:47Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -9,6 +9,17 @@ 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.6.0](https://github.com/thi-ng/umbrella/tree/@thi.ng/text-canvas@2.6.0) (2023-08-24)
+
+#### 🚀 Features
+
+- add lineChart() & lineChartStr() ([097e00c](https://github.com/thi-ng/umbrella/commit/097e00c))
+
+#### ♻️ Refactoring
+
+- update bar chart min/max handling ([e45247d](https://github.com/thi-ng/umbrella/commit/e45247d))
+  - auto-compute value range if not specified
+
 ## [2.5.0](https://github.com/thi-ng/umbrella/tree/@thi.ng/text-canvas@2.5.0) (2023-08-14)
 
 #### 🚀 Features

package/README.md

@@ -8,7 +8,7 @@
 [![Mastodon Follow](https://img.shields.io/mastodon/follow/109331703950160316?domain=https%3A%2F%2Fmastodon.thi.ng&style=social)](https://mastodon.thi.ng/@toxi)
 
 This project is part of the
-[@thi.ng/umbrella](https://github.com/thi-ng/umbrella/) monorepo.
+[@thi.ng/umbrella](https://github.com/thi-ng/umbrella/) monorepo and anti-framework.
 
 - [About](#about)
 - [Status](#status)

package/bars.js

@@ -1,12 +1,18 @@
+import { ensureArray } from "@thi.ng/arrays/ensure-array";
 import { fitClamped } from "@thi.ng/math/fit";
 import { fract } from "@thi.ng/math/prec";
 import { padLeft } from "@thi.ng/strings/pad-left";
 import { padRight } from "@thi.ng/strings/pad-right";
 import { repeat } from "@thi.ng/strings/repeat";
 import { map } from "@thi.ng/transducers/map";
+import { max as $max } from "@thi.ng/transducers/max";
+import { min as $min } from "@thi.ng/transducers/min";
 import { BARS_H, BARS_V } from "./api.js";
-export const barChartHLines = (height, vals, min = 0, max = 1) => {
-    const bars = [...map((x) => barVertical(height, x, min, max, ""), vals)];
+export const barChartHLines = (height, vals, min, max) => {
+    const $vals = ensureArray(vals);
+    min = min !== undefined ? min : $min($vals);
+    max = max !== undefined ? max : $max($vals);
+    const bars = [...map((x) => barVertical(height, x, min, max, ""), $vals)];
     const num = bars.length;
     const res = [];
     for (let i = 0; i < height; i++) {
@@ -19,7 +25,12 @@ export const barChartHLines = (height, vals, min = 0, max = 1) => {
     return res;
 };
 export const barChartHStr = (height, vals, min, max) => barChartHLines(height, vals, min, max).join("\n");
-export const barChartVLines = (width, vals, min = 0, max = 1) => [...map((x) => barHorizontal(width, x, min, max), vals)];
+export const barChartVLines = (width, vals, min, max) => {
+    const $vals = ensureArray(vals);
+    min = min !== undefined ? min : $min($vals);
+    max = max !== undefined ? max : $max($vals);
+    return [...map((x) => barHorizontal(width, x, min, max), $vals)];
+};
 export const barChartVStr = (width, vals, min, max) => barChartVLines(width, vals, min, max).join("\n");
 export const barHorizontal = (width, x, min = 0, max = 1) => bar(BARS_H, width, false, x, min, max, "");
 export const barVertical = (height, x, min = 0, max = 1, delim = "\n") => bar(BARS_V, height, true, x, min, max, delim);

package/line.d.ts

@@ -1,5 +1,5 @@
 import type { NumOrString } from "@thi.ng/api";
-import type { Canvas } from "./canvas.js";
+import { Canvas } from "./canvas.js";
 /**
  * Draws a line between `ax`,`ay` and `bx`,`by`, using `char` and taking
  * the current clip rect and format into account. If `char` is not
@@ -13,4 +13,6 @@ import type { Canvas } from "./canvas.js";
  * @param char -
  */
 export declare const line: (canvas: Canvas, ax: number, ay: number, bx: number, by: number, char?: NumOrString, format?: number) => void;
+export declare const lineChart: (canvas: Canvas, x: number, y: number, height: number, vals: Iterable<number>, min?: number, max?: number, format?: number) => void;
+export declare const lineChartStr: (height: number, vals: Iterable<number>, min?: number, max?: number) => string;
 //# sourceMappingURL=line.d.ts.map

package/line.js

@@ -1,5 +1,12 @@
+import { ensureArray } from "@thi.ng/arrays/ensure-array";
 import { peek } from "@thi.ng/arrays/peek";
 import { liangBarsky2Raw } from "@thi.ng/geom-clip-line/liang-barsky";
+import { fitClamped } from "@thi.ng/math/fit";
+import { minMax } from "@thi.ng/math/interval";
+import { max as $max } from "@thi.ng/transducers/max";
+import { min as $min } from "@thi.ng/transducers/min";
+import { Canvas } from "./canvas.js";
+import { formatCanvas } from "./format.js";
 import { charCode } from "./utils.js";
 /**
  * Draws a line between `ax`,`ay` and `bx`,`by`, using `char` and taking
@@ -44,3 +51,38 @@ export const line = (canvas, ax, ay, bx, by, char, format = canvas.format) => {
         }
     }
 };
+export const lineChart = (canvas, x, y, height, vals, min, max, format = canvas.format) => {
+    const $vals = ensureArray(vals);
+    min = min !== undefined ? min : $min($vals);
+    max = max !== undefined ? max : $max($vals);
+    height--;
+    format <<= 16;
+    const { x1, x2 } = peek(canvas.clipRects);
+    for (let i = 0, n = $vals.length - 1; i < n; i++) {
+        const xx = x + i;
+        if (xx < x1)
+            continue;
+        if (xx > x2)
+            break;
+        const ya = Math.round(fitClamped($vals[i], min, max, height, 0)) + y;
+        const yb = Math.round(fitClamped($vals[i + 1], min, max, height, 0)) + y;
+        if (ya === yb) {
+            canvas.setAt(xx, ya, 0x2500 | format); // ─
+        }
+        else {
+            // vline to new Y
+            let [y1, y2] = minMax(ya, yb);
+            while (++y1 < y2)
+                canvas.setAt(xx, y1, 0x2502 | format); // │
+            // end points
+            canvas.setAt(xx, ya, (ya < yb ? 0x256e : 0x256f) | format); // ╮ ╯
+            canvas.setAt(xx, yb, (ya < yb ? 0x2570 : 0x256d) | format); // ╰ ╭
+        }
+    }
+};
+export const lineChartStr = (height, vals, min, max) => {
+    const $vals = ensureArray(vals);
+    const surf = new Canvas($vals.length, height);
+    lineChart(surf, 0, 0, height, $vals, min, max);
+    return formatCanvas(surf);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/text-canvas",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "Text based canvas, drawing, tables with arbitrary formatting (incl. ANSI/HTML)",
   "type": "module",
   "module": "./index.js",
@@ -34,19 +34,19 @@
     "test": "testament test"
   },
   "dependencies": {
-    "@thi.ng/api": "^8.9.3",
-    "@thi.ng/arrays": "^2.5.19",
-    "@thi.ng/checks": "^3.4.3",
-    "@thi.ng/errors": "^2.3.3",
-    "@thi.ng/geom-clip-line": "^2.3.25",
-    "@thi.ng/math": "^5.5.4",
-    "@thi.ng/strings": "^3.4.11",
-    "@thi.ng/text-format": "^1.4.11",
-    "@thi.ng/transducers": "^8.5.5"
+    "@thi.ng/api": "^8.9.4",
+    "@thi.ng/arrays": "^2.5.20",
+    "@thi.ng/checks": "^3.4.4",
+    "@thi.ng/errors": "^2.3.4",
+    "@thi.ng/geom-clip-line": "^2.3.27",
+    "@thi.ng/math": "^5.6.0",
+    "@thi.ng/strings": "^3.4.12",
+    "@thi.ng/text-format": "^1.4.12",
+    "@thi.ng/transducers": "^8.6.1"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.36.4",
-    "@thi.ng/testament": "^0.3.21",
+    "@thi.ng/testament": "^0.3.22",
     "rimraf": "^5.0.1",
     "tools": "^0.0.1",
     "tslib": "^2.6.1",
@@ -139,5 +139,5 @@
     ],
     "year": 2020
   },
-  "gitHead": "4e8f1abeeba7b919e069954eada917ecd2e9a8e9\n"
+  "gitHead": "04f545c7be1811ed24be1a6824d867b1ea9bded1\n"
 }