@thi.ng/text-canvas 3.0.22 → 3.0.24

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2024-04-23T07:02:18Z
+- **Last updated**: 2024-06-21T19:34:38Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -9,6 +9,12 @@ 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.
 
+### [3.0.24](https://github.com/thi-ng/umbrella/tree/@thi.ng/text-canvas@3.0.24) (2024-06-21)
+
+#### ♻️ Refactoring
+
+- enforce uniform naming convention of internal functions ([56992b2](https://github.com/thi-ng/umbrella/commit/56992b2))
+
 ### [3.0.3](https://github.com/thi-ng/umbrella/tree/@thi.ng/text-canvas@3.0.3) (2024-02-22)
 
 #### ♻️ Refactoring

package/README.md

@@ -7,7 +7,7 @@
 [![Mastodon Follow](https://img.shields.io/mastodon/follow/109331703950160316?domain=https%3A%2F%2Fmastodon.thi.ng&style=social)](https://mastodon.thi.ng/@toxi)
 
 > [!NOTE]
-> This is one of 192 standalone projects, maintained as part
+> This is one of 193 standalone projects, maintained as part
 > of the [@thi.ng/umbrella](https://github.com/thi-ng/umbrella/) monorepo
 > and anti-framework.
 >
@@ -81,7 +81,7 @@ For Node.js REPL:
 const tc = await import("@thi.ng/text-canvas");
 ```
 
-Package sizes (brotli'd, pre-treeshake): ESM: 6.24 KB
+Package sizes (brotli'd, pre-treeshake): ESM: 6.23 KB
 
 ## Dependencies
 

package/bars.js

@@ -32,9 +32,9 @@ const barChartHLines = (width, vals, min, max) => {
   return [...map((x) => barHorizontal(width, x, min, max), $vals)];
 };
 const barChartHStr = (width, vals, min, max) => barChartHLines(width, vals, min, max).join("\n");
-const barHorizontal = (width, x, min = 0, max = 1) => bar(BARS_H, width, false, x, min, max, "");
-const barVertical = (height, x, min = 0, max = 1, delim = "\n") => bar(BARS_V, height, true, x, min, max, delim);
-const bar = (chars, size, left, x, min, max, delim) => {
+const barHorizontal = (width, x, min = 0, max = 1) => __bar(BARS_H, width, false, x, min, max, "");
+const barVertical = (height, x, min = 0, max = 1, delim = "\n") => __bar(BARS_V, height, true, x, min, max, delim);
+const __bar = (chars, size, left, x, min, max, delim) => {
   x = fitClamped(x, min, max, 0, size);
   const f = fract(x) * 9 | 0;
   const full = repeat(chars[8] + delim, x | 0);

package/canvas.js

@@ -5,8 +5,7 @@ var __decorateClass = (decorators, target, key, kind) => {
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp(target, key, result);
+  if (kind && result) __defProp(target, key, result);
   return result;
 };
 import {
@@ -139,8 +138,8 @@ const beginClip = (canvas2, x, y, w, h) => {
     )
   );
 };
-const pop = (stack) => stack.length > 1 && stack.pop();
-const endClip = (canvas2) => pop(canvas2.clipRects);
+const __pop = (stack) => stack.length > 1 && stack.pop();
+const endClip = (canvas2) => __pop(canvas2.clipRects);
 const withClip = (canvas2, x, y, w, h, fn) => {
   beginClip(canvas2, x, y, w, h);
   fn();
@@ -149,7 +148,7 @@ const withClip = (canvas2, x, y, w, h, fn) => {
 const beginStyle = (canvas2, style) => {
   canvas2.styles.push(style);
 };
-const endStyle = (canvas2) => pop(canvas2.styles);
+const endStyle = (canvas2) => __pop(canvas2.styles);
 const withStyle = (canvas2, style, fn) => {
   canvas2.styles.push(style);
   fn();
@@ -171,8 +170,7 @@ const setAt = (canvas2, x, y, code, format = canvas2.format) => {
   x |= 0;
   y |= 0;
   const { x1, y1, x2, y2 } = peek(canvas2.clipRects);
-  if (x < x1 || y < y1 || x >= x2 || y >= y2)
-    return;
+  if (x < x1 || y < y1 || x >= x2 || y >= y2) return;
   canvas2.data[x + y * canvas2.width] = charCode(code, format);
 };
 export {

package/circle.js

@@ -2,14 +2,12 @@ import { peek } from "@thi.ng/arrays/peek";
 import { hline } from "./hvline.js";
 import { charCode, intersectRectCircle } from "./utils.js";
 const circle = (canvas, cx, cy, r, char, fill = false, format = canvas.format) => {
-  if (r < 1)
-    return;
+  if (r < 1) return;
   cx |= 0;
   cy |= 0;
   r |= 0;
   const { x1, y1, x2, y2, w: clipw, h: cliph } = peek(canvas.clipRects);
-  if (!intersectRectCircle(x1, y1, clipw, cliph, cx, cy, r))
-    return;
+  if (!intersectRectCircle(x1, y1, clipw, cliph, cx, cy, r)) return;
   char = charCode(
     char !== void 0 ? char : peek(canvas.styles).dot,
     format

package/hvline.js

@@ -2,8 +2,7 @@ import { peek } from "@thi.ng/arrays/peek";
 import { charCode } from "./utils.js";
 const hline = (canvas, x, y, len, s, e, m, format = canvas.format) => {
   const { x1, y1, x2, y2 } = peek(canvas.clipRects);
-  if (len < 1 || y < y1 || y >= y2 || x >= x2)
-    return;
+  if (len < 1 || y < y1 || y >= y2 || x >= x2) return;
   _hvline(
     canvas.data,
     x,
@@ -22,8 +21,7 @@ const hline = (canvas, x, y, len, s, e, m, format = canvas.format) => {
 };
 const vline = (canvas, x, y, len, s, e, m, format = canvas.format) => {
   const { x1, x2, y1, y2 } = peek(canvas.clipRects);
-  if (len < 1 || x < x1 || x >= x2 || y >= y2)
-    return;
+  if (len < 1 || x < x1 || x >= x2 || y >= y2) return;
   _hvline(
     canvas.data,
     y,

package/image.d.ts

@@ -16,7 +16,7 @@ export declare const blit: (dest: Canvas, src: Canvas, x?: number, y?: number) =
  * pixels/chars will be copied. Supports region clipping.
  *
  * @example
- * ```ts
+ * ```ts tangle:../export/blit-mask.ts
  * import {
  *   blitMask, canvas, canvasFromText, clear, formatCanvas
  * } from "@thi.ng/text-canvas";
@@ -30,17 +30,19 @@ export declare const blit: (dest: Canvas, src: Canvas, x?: number, y?: number) =
  *   "###==###",
  * ]);
  *
+ * console.log(formatCanvas(a));
+ *
  * // destination canvas (filled w/ "-")
  * const b = canvas(12,7);
  * clear(b, true, "-");
  *
  * // paste `a` several times into `b` using "#" as mask
- * blitMask(b, -4, -2, a, "#"); // top-left (partially outside)
- * blitMask(b, 2, 1, a, "#");   // center
- * blitMask(b, 8, 4, a, "#");   // bottom-right (part outside)
+ * blitMask(b, a, -4, -2, "#"); // top-left (partially outside)
+ * blitMask(b, a, 2, 1, "#"); // center
+ * blitMask(b, a, 8, 4, "#"); // bottom-right (part outside)
  *
  * // show result
- * console.log(formatCanvas(b))
+ * console.log(formatCanvas(b));
  * // ===---------
  * // ==---==-----
  * // =---====----

package/image.js

@@ -41,16 +41,14 @@ const __initBlit = (dest, x, y, src) => {
     { x1: x, y1: y, x2: x + sw, y2: y + sh, w: sw, h: sh },
     peek(dest.clipRects)
   );
-  if (!iw || !ih)
-    return;
+  if (!iw || !ih) return;
   const sx = clamp0(x1 - x);
   const sy = clamp0(y1 - y);
   return { sbuf, dbuf, sw, dw, x, y, x1, y1, y2, iw, ih, sx, sy };
 };
 const blit = (dest, src, x = 0, y = 0) => {
   const state = __initBlit(dest, x, y, src);
-  if (!state)
-    return;
+  if (!state) return;
   const { sbuf, dbuf, x1, y1, y2, sx, sy, iw, sw, dw } = state;
   for (let yy = sy, dy = y1; dy < y2; yy++, dy++) {
     let sidx = sx + yy * sw;
@@ -60,8 +58,7 @@ const blit = (dest, src, x = 0, y = 0) => {
 };
 const blitMask = (dest, src, x = 0, y = 0, mask = 32) => {
   const state = __initBlit(dest, x, y, src);
-  if (!state)
-    return;
+  if (!state) return;
   const { sbuf, dbuf, x1, y1, y2, sx, sy, iw, sw, dw } = state;
   mask = charCode(mask, 0);
   for (let yy = sy, dy = y1; dy < y2; yy++, dy++) {
@@ -72,8 +69,7 @@ const blitMask = (dest, src, x = 0, y = 0, mask = 32) => {
 };
 const blitBarsV = (dest, src, x = 0, y = 0, blend = blendBarsVAdd) => {
   const state = __initBlit(dest, x, y, src);
-  if (!state)
-    return;
+  if (!state) return;
   const { sbuf, dbuf, x1, y1, y2, sx, sy, iw, sw, dw } = state;
   for (let yy = sy, dy = y1; dy < y2; yy++, dy++) {
     let sidx = sx + yy * sw;
@@ -251,8 +247,7 @@ const BLEND_ADD = {
   }
 };
 const resize = (canvas2, newWidth, newHeight) => {
-  if (canvas2.width === newWidth && canvas2.height === newHeight)
-    return;
+  if (canvas2.width === newWidth && canvas2.height === newHeight) return;
   const dest = new Canvas(newWidth, newHeight);
   dest.data.fill(charCode(32, canvas2.format));
   blit(dest, canvas2);
@@ -302,9 +297,8 @@ const image = (canvas2, x, y, w, h, pixels, opts = {}) => {
     sy,
     w: iw,
     h: ih
-  } = imgRect(canvas2, x, y, w, h);
-  if (!iw || !ih)
-    return;
+  } = __imgRect(canvas2, x, y, w, h);
+  if (!iw || !ih) return;
   const {
     chars = SHADES_BLOCK,
     format = canvas2.format,
@@ -341,9 +335,8 @@ const imageRaw = (canvas2, x, y, w, h, pixels, char = "\u2588") => {
     sy,
     w: iw,
     h: ih
-  } = imgRect(canvas2, x, y, w, h);
-  if (!iw || !ih)
-    return;
+  } = __imgRect(canvas2, x, y, w, h);
+  if (!iw || !ih) return;
   const code = char.charCodeAt(0);
   for (let yy = sy, dy = y1; dy < y2; yy++, dy++) {
     let sidx = sx + yy * w;
@@ -368,9 +361,8 @@ const imageRawFmtOnly = (canvas2, x, y, w, h, pixels) => {
     sy,
     w: iw,
     h: ih
-  } = imgRect(canvas2, x, y, w, h);
-  if (!iw || !ih)
-    return;
+  } = __imgRect(canvas2, x, y, w, h);
+  if (!iw || !ih) return;
   for (let yy = sy, dy = y1; dy < y2; yy++, dy++) {
     let sidx = sx + yy * w;
     let didx = x1 + dy * width;
@@ -396,9 +388,8 @@ const imageBraille = (canvas2, x, y, w, h, pixels, thresh, format) => {
     sy,
     w: iw,
     h: ih
-  } = imgRect(canvas2, x, y, w >> 1, h >> 2);
-  if (!iw || !ih)
-    return;
+  } = __imgRect(canvas2, x, y, w >> 1, h >> 2);
+  if (!iw || !ih) return;
   const w2 = w * 2;
   const w3 = w * 3;
   const braille = (i) => (pixels[i] >= thresh ? 1 : 0) | (pixels[i + w] >= thresh ? 2 : 0) | (pixels[i + w2] >= thresh ? 4 : 0) | (pixels[i + w3] >= thresh ? 8 : 0) | (pixels[i + 1] >= thresh ? 16 : 0) | (pixels[i + w + 1] >= thresh ? 32 : 0) | (pixels[i + w2 + 1] >= thresh ? 64 : 0) | (pixels[i + w3 + 1] >= thresh ? 128 : 0) | 10240;
@@ -422,7 +413,7 @@ const imageCanvas565 = (src, char) => {
   return dest;
 };
 const imageString565 = (src, char, fmt = FMT_ANSI565) => formatCanvas(imageCanvas565(src, char), fmt);
-const imgRect = (canvas2, x, y, w, h) => {
+const __imgRect = (canvas2, x, y, w, h) => {
   const rect = intersectRect(
     { x1: x, y1: y, x2: x + w, y2: y + h, w, h },
     peek(canvas2.clipRects)

package/line.js

@@ -5,8 +5,7 @@ import { charCode } from "./utils.js";
 const line = (canvas, ax, ay, bx, by, char, format = canvas.format) => {
   const { x1, y1, x2, y2 } = peek(canvas.clipRects);
   const clipped = liangBarsky2Raw(ax, ay, bx, by, x1, y1, x2, y2);
-  if (!clipped)
-    return;
+  if (!clipped) return;
   ax = clipped[0] | 0;
   ay = clipped[1] | 0;
   bx = clipped[2] | 0;
@@ -23,8 +22,7 @@ const line = (canvas, ax, ay, bx, by, char, format = canvas.format) => {
   );
   while (true) {
     canvas.data[ax + ay * w] = char;
-    if (ax === bx && ay === by)
-      return;
+    if (ax === bx && ay === by) return;
     let t = err << 1;
     if (t < dx) {
       err += dx;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/text-canvas",
-  "version": "3.0.22",
+  "version": "3.0.24",
   "description": "Text based canvas, drawing, plotting, tables with arbitrary formatting (incl. ANSI/HTML)",
   "type": "module",
   "module": "./index.js",
@@ -10,7 +10,7 @@
     "type": "git",
     "url": "https://github.com/thi-ng/umbrella.git"
   },
-  "homepage": "https://github.com/thi-ng/umbrella/tree/develop/packages/text-canvas#readme",
+  "homepage": "https://thi.ng/text-canvas",
   "funding": [
     {
       "type": "github",
@@ -36,22 +36,22 @@
     "tool:tangle": "../../node_modules/.bin/tangle src/**/*.ts"
   },
   "dependencies": {
-    "@thi.ng/api": "^8.11.1",
-    "@thi.ng/arrays": "^2.9.5",
-    "@thi.ng/checks": "^3.6.3",
-    "@thi.ng/errors": "^2.5.6",
-    "@thi.ng/geom-clip-line": "^2.3.88",
-    "@thi.ng/math": "^5.10.12",
-    "@thi.ng/strings": "^3.7.32",
-    "@thi.ng/text-format": "^2.2.4",
-    "@thi.ng/transducers": "^9.0.4"
+    "@thi.ng/api": "^8.11.3",
+    "@thi.ng/arrays": "^2.9.7",
+    "@thi.ng/checks": "^3.6.5",
+    "@thi.ng/errors": "^2.5.8",
+    "@thi.ng/geom-clip-line": "^2.3.90",
+    "@thi.ng/math": "^5.11.0",
+    "@thi.ng/strings": "^3.7.34",
+    "@thi.ng/text-format": "^2.2.6",
+    "@thi.ng/transducers": "^9.0.6"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.43.0",
-    "esbuild": "^0.20.2",
-    "tslib": "^2.6.2",
-    "typedoc": "^0.25.12",
-    "typescript": "^5.4.3"
+    "@microsoft/api-extractor": "^7.47.0",
+    "esbuild": "^0.21.5",
+    "tslib": "^2.6.3",
+    "typedoc": "^0.25.13",
+    "typescript": "^5.5.2"
   },
   "keywords": [
     "4bit",
@@ -147,5 +147,5 @@
     ],
     "year": 2020
   },
-  "gitHead": "aed3421c21044c005fbcb7cc37965ccf85a870d2\n"
+  "gitHead": "154c95cf9d6bab32174498ec3b5b5d87e42be7f9\n"
 }

package/plot.js

@@ -34,18 +34,15 @@ const plotLineChart = (canvas, x, y, height, vals, min, max, format = canvas.for
   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;
+    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, 9472 | format);
     } else {
       let [y1, y2] = minMax(ya, yb);
-      while (++y1 < y2)
-        canvas.setAt(xx, y1, 9474 | format);
+      while (++y1 < y2) canvas.setAt(xx, y1, 9474 | format);
       canvas.setAt(xx, ya, (ya < yb ? 9582 : 9583) | format);
       canvas.setAt(xx, yb, (ya < yb ? 9584 : 9581) | format);
     }

package/rect.js

@@ -18,8 +18,7 @@ const clear = (canvas, reset = false, code = 32) => {
 };
 const clearFormat = ({ data }, format = NONE) => {
   format <<= 16;
-  for (let i = data.length; i-- > 0; )
-    data[i] = data[i] & 65535 | format;
+  for (let i = data.length; i-- > 0; ) data[i] = data[i] & 65535 | format;
 };
 const fillRect = (canvas, x, y, w, h, char, format = canvas.format) => {
   x |= 0;
@@ -36,8 +35,7 @@ const fillRect = (canvas, x, y, w, h, char, format = canvas.format) => {
     y = y1;
   }
   const { data, width } = canvas;
-  if (w < 1 || h < 1 || x >= x2 || y >= y2)
-    return;
+  if (w < 1 || h < 1 || x >= x2 || y >= y2) return;
   w = Math.min(w, x2 - x);
   h = Math.min(h, y2 - y);
   char = charCode(char, format);
@@ -49,8 +47,7 @@ const fillRect = (canvas, x, y, w, h, char, format = canvas.format) => {
 const strokeRect = (canvas, x, y, w, h, format = canvas.format) => {
   w |= 0;
   h |= 0;
-  if (w < 2 || h < 2)
-    return;
+  if (w < 2 || h < 2) return;
   const style = peek(canvas.styles);
   hline(canvas, x, y, w, style.tl, style.tr, style.hl, format);
   hline(canvas, x, y + h - 1, w, style.bl, style.br, style.hl, format);

package/text.js

@@ -12,8 +12,7 @@ const textLine = (canvas, x, y, line, format = canvas.format) => {
   x |= 0;
   y |= 0;
   const { x1, y1, x2, y2 } = peek(canvas.clipRects);
-  if (y < y1 || y >= y2 || x >= x2)
-    return;
+  if (y < y1 || y >= y2 || x >= x2) return;
   let i = 0;
   if (x < x1) {
     i = x1 - x;
@@ -41,8 +40,7 @@ const textColumn = (canvas, x, y, width, txt, format = canvas.format, hard = fal
   for (let line of wordWrapLines(txt, { width, hard })) {
     textLine(canvas, x, y, line.toString(), format);
     y++;
-    if (y >= height)
-      break;
+    if (y >= height) break;
   }
   return y;
 };

package/utils.js

@@ -6,8 +6,8 @@ const intersectRect = (a, b) => {
   const y2 = Math.min(a.y2, b.y2);
   return { x1, y1, x2, y2, w: Math.max(x2 - x1, 0), h: Math.max(y2 - y1, 0) };
 };
-const axis = (a, b, c) => (a < b ? a - b : a > b + c ? a - b - c : 0) ** 2;
-const intersectRectCircle = (x, y, w, h, cx, cy, r) => axis(cx, x, w) + axis(cy, y, h) <= r * r;
+const __axis = (a, b, c) => (a < b ? a - b : a > b + c ? a - b - c : 0) ** 2;
+const intersectRectCircle = (x, y, w, h, cx, cy, r) => __axis(cx, x, w) + __axis(cy, y, h) <= r * r;
 export {
   charCode,
   intersectRect,