@thi.ng/text-canvas 2.6.22 → 2.6.23

package/line.js

@@ -8,81 +8,74 @@ 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
- * the current clip rect and format into account. If `char` is not
- * given, uses current style's `dot` char.
- *
- * @param canvas -
- * @param ax -
- * @param ay -
- * @param bx -
- * @param by -
- * @param char -
- */
-export 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;
-    ax = clipped[0] | 0;
-    ay = clipped[1] | 0;
-    bx = clipped[2] | 0;
-    by = clipped[3] | 0;
-    const dx = Math.abs(bx - ax);
-    const dy = -Math.abs(by - ay);
-    const w = canvas.width;
-    let sx = ax < bx ? 1 : -1;
-    let sy = ay < by ? 1 : -1;
-    let err = dx + dy;
-    char = charCode(char !== undefined ? char : peek(canvas.styles).dot, format);
-    while (true) {
-        canvas.data[ax + ay * w] = char;
-        if (ax === bx && ay === by)
-            return;
-        let t = err << 1;
-        if (t < dx) {
-            err += dx;
-            ay += sy;
-        }
-        if (t > dy) {
-            err += dy;
-            ax += sx;
-        }
+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;
+  ax = clipped[0] | 0;
+  ay = clipped[1] | 0;
+  bx = clipped[2] | 0;
+  by = clipped[3] | 0;
+  const dx = Math.abs(bx - ax);
+  const dy = -Math.abs(by - ay);
+  const w = canvas.width;
+  let sx = ax < bx ? 1 : -1;
+  let sy = ay < by ? 1 : -1;
+  let err = dx + dy;
+  char = charCode(
+    char !== void 0 ? char : peek(canvas.styles).dot,
+    format
+  );
+  while (true) {
+    canvas.data[ax + ay * w] = char;
+    if (ax === bx && ay === by)
+      return;
+    let t = err << 1;
+    if (t < dx) {
+      err += dx;
+      ay += sy;
     }
+    if (t > dy) {
+      err += dy;
+      ax += sx;
+    }
+  }
 };
-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); // ╰ ╭
-        }
+const lineChart = (canvas, x, y, height, vals, min, max, format = canvas.format) => {
+  const $vals = ensureArray(vals);
+  min = min !== void 0 ? min : $min($vals);
+  max = max !== void 0 ? 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, 9472 | format);
+    } else {
+      let [y1, y2] = minMax(ya, yb);
+      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);
     }
+  }
+};
+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);
 };
-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);
+export {
+  line,
+  lineChart,
+  lineChartStr
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/text-canvas",
-  "version": "2.6.22",
+  "version": "2.6.23",
   "description": "Text based canvas, drawing, tables with arbitrary formatting (incl. ANSI/HTML)",
   "type": "module",
   "module": "./index.js",
@@ -24,7 +24,9 @@
   "author": "Karsten Schmidt (https://thi.ng)",
   "license": "Apache-2.0",
   "scripts": {
-    "build": "yarn clean && tsc --declaration",
+    "build": "yarn build:esbuild && yarn build:decl",
+    "build:decl": "tsc --declaration --emitDeclarationOnly",
+    "build:esbuild": "esbuild --format=esm --platform=neutral --target=es2022 --tsconfig=tsconfig.json --outdir=. src/**/*.ts",
     "clean": "rimraf --glob '*.js' '*.d.ts' '*.map' doc",
     "doc": "typedoc --excludePrivate --excludeInternal --out doc src/index.ts",
     "doc:ae": "mkdir -p .ae/doc .ae/temp && api-extractor run --local --verbose",
@@ -33,18 +35,19 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@thi.ng/api": "^8.9.11",
-    "@thi.ng/arrays": "^2.7.7",
-    "@thi.ng/checks": "^3.4.11",
-    "@thi.ng/errors": "^2.4.5",
-    "@thi.ng/geom-clip-line": "^2.3.49",
-    "@thi.ng/math": "^5.7.6",
-    "@thi.ng/strings": "^3.7.2",
-    "@thi.ng/text-format": "^1.4.20",
-    "@thi.ng/transducers": "^8.8.14"
+    "@thi.ng/api": "^8.9.12",
+    "@thi.ng/arrays": "^2.7.8",
+    "@thi.ng/checks": "^3.4.12",
+    "@thi.ng/errors": "^2.4.6",
+    "@thi.ng/geom-clip-line": "^2.3.50",
+    "@thi.ng/math": "^5.7.7",
+    "@thi.ng/strings": "^3.7.3",
+    "@thi.ng/text-format": "^1.4.21",
+    "@thi.ng/transducers": "^8.8.15"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.38.3",
+    "esbuild": "^0.19.8",
     "rimraf": "^5.0.5",
     "tools": "^0.0.1",
     "tslib": "^2.6.2",
@@ -137,5 +140,5 @@
     ],
     "year": 2020
   },
-  "gitHead": "25f2ac8ff795a432a930119661b364d4d93b59a0\n"
+  "gitHead": "5e7bafedfc3d53bc131469a28de31dd8e5b4a3ff\n"
 }

package/rect.js

@@ -2,95 +2,73 @@ import { peek } from "@thi.ng/arrays/peek";
 import { NONE } from "@thi.ng/text-format/api";
 import { hline, vline } from "./hvline.js";
 import { charCode } from "./utils.js";
-/**
- * Clears/fills the canvas' current clip rect with given char (default:
- * 0x20 / space). If `reset` is true, first resets all internal state
- * (clipping, format, style), so that entire canvas will be cleared.
- *
- * @param canvas -
- * @param reset -
- * @param code -
- */
-export const clear = (canvas, reset = false, code = 0x20) => {
-    const rects = canvas.clipRects;
-    if (reset) {
-        rects.length = canvas.styles.length = 1;
-        canvas.format = canvas.defaultFormat;
-    }
-    code = charCode(code, canvas.format);
-    if (rects.length > 1) {
-        const { x1, y1, w, h } = peek(rects);
-        fillRect(canvas, x1, y1, w, h, code);
-    }
-    else {
-        canvas.data.fill(code);
-    }
+const clear = (canvas, reset = false, code = 32) => {
+  const rects = canvas.clipRects;
+  if (reset) {
+    rects.length = canvas.styles.length = 1;
+    canvas.format = canvas.defaultFormat;
+  }
+  code = charCode(code, canvas.format);
+  if (rects.length > 1) {
+    const { x1, y1, w, h } = peek(rects);
+    fillRect(canvas, x1, y1, w, h, code);
+  } else {
+    canvas.data.fill(code);
+  }
 };
-/**
- * Clears or resets format of entire canvas.
- *
- * @param canvas -
- * @param format -
- */
-export const clearFormat = ({ data }, format = NONE) => {
-    format <<= 16;
-    for (let i = data.length; i-- > 0;)
-        data[i] = (data[i] & 0xffff) | format;
+const clearFormat = ({ data }, format = NONE) => {
+  format <<= 16;
+  for (let i = data.length; i-- > 0; )
+    data[i] = data[i] & 65535 | format;
 };
-/**
- * Fills given rect with char, taking currect clip rect and format into
- * account.
- *
- * @param canvas -
- * @param x -
- * @param y -
- * @param w -
- * @param h -
- * @param char -
- */
-export const fillRect = (canvas, x, y, w, h, char, format = canvas.format) => {
-    x |= 0;
-    y |= 0;
-    w |= 0;
-    h |= 0;
-    const { x1, y1, x2, y2 } = peek(canvas.clipRects);
-    if (x < x1) {
-        w += x - x1;
-        x = x1;
-    }
-    if (y < y1) {
-        h += y - y1;
-        y = y1;
-    }
-    const { data, width } = canvas;
-    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);
-    for (; h-- > 0; y++) {
-        const idx = x + y * width;
-        data.fill(char, idx, idx + w);
-    }
+const fillRect = (canvas, x, y, w, h, char, format = canvas.format) => {
+  x |= 0;
+  y |= 0;
+  w |= 0;
+  h |= 0;
+  const { x1, y1, x2, y2 } = peek(canvas.clipRects);
+  if (x < x1) {
+    w += x - x1;
+    x = x1;
+  }
+  if (y < y1) {
+    h += y - y1;
+    y = y1;
+  }
+  const { data, width } = canvas;
+  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);
+  for (; h-- > 0; y++) {
+    const idx = x + y * width;
+    data.fill(char, idx, idx + w);
+  }
 };
-/**
- * Draws an outline of given rect, taking the current clip rect, format
- * and style into account.
- *
- * @param canvas -
- * @param x -
- * @param y -
- * @param w -
- * @param h -
- */
-export const strokeRect = (canvas, x, y, w, h, format = canvas.format) => {
-    w |= 0;
-    h |= 0;
-    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);
-    vline(canvas, x, y + 1, h - 2, undefined, undefined, undefined, format);
-    vline(canvas, x + w - 1, y + 1, h - 2, undefined, undefined, undefined, format);
+const strokeRect = (canvas, x, y, w, h, format = canvas.format) => {
+  w |= 0;
+  h |= 0;
+  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);
+  vline(canvas, x, y + 1, h - 2, void 0, void 0, void 0, format);
+  vline(
+    canvas,
+    x + w - 1,
+    y + 1,
+    h - 2,
+    void 0,
+    void 0,
+    void 0,
+    format
+  );
+};
+export {
+  clear,
+  clearFormat,
+  fillRect,
+  strokeRect
 };

package/style.js

@@ -1,28 +1,32 @@
-export const horizontalOnly = ({ hl, dot }) => ({
-    hl: hl,
-    vl: " ",
-    tl: hl,
-    tr: hl,
-    bl: hl,
-    br: hl,
-    tjl: hl,
-    tjr: hl,
-    tjt: hl,
-    tjb: hl,
-    jct: hl,
-    dot,
+const horizontalOnly = ({ hl, dot }) => ({
+  hl,
+  vl: " ",
+  tl: hl,
+  tr: hl,
+  bl: hl,
+  br: hl,
+  tjl: hl,
+  tjr: hl,
+  tjt: hl,
+  tjb: hl,
+  jct: hl,
+  dot
 });
-export const verticalOnly = ({ vl, dot }) => ({
-    hl: " ",
-    vl: vl,
-    tl: vl,
-    tr: vl,
-    bl: vl,
-    br: vl,
-    tjl: vl,
-    tjr: vl,
-    tjt: vl,
-    tjb: vl,
-    jct: vl,
-    dot,
+const verticalOnly = ({ vl, dot }) => ({
+  hl: " ",
+  vl,
+  tl: vl,
+  tr: vl,
+  bl: vl,
+  br: vl,
+  tjl: vl,
+  tjr: vl,
+  tjt: vl,
+  tjb: vl,
+  jct: vl,
+  dot
 });
+export {
+  horizontalOnly,
+  verticalOnly
+};