@thi.ng/text-canvas 2.6.22 → 2.6.24

package/circle.js

@@ -1,72 +1,61 @@
 import { peek } from "@thi.ng/arrays/peek";
 import { hline } from "./hvline.js";
 import { charCode, intersectRectCircle } from "./utils.js";
-/**
- * Draws a circle (filled or outline) at given center position and
- * radius and taking the current clip rect and format into account. If
- * `char` is not given, uses current style's `dot` char.
- *
- * @param canvas -
- * @param cx -
- * @param cy -
- * @param r -
- * @param char -
- * @param fill -
- */
-export const circle = (canvas, cx, cy, r, char, fill = false, format = canvas.format) => {
-    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;
-    char = charCode(char !== undefined ? char : peek(canvas.styles).dot, format);
-    let x = 0;
-    let y = r;
-    let ymax = r * r;
-    let sum = ymax + r;
-    let dx2 = 1;
-    let dy2 = 2 * r - 1;
-    const { data, width } = canvas;
-    const $ = (ox, oy) => ox >= x1 &&
-        oy >= y1 &&
-        ox < x2 &&
-        oy < y2 &&
-        (data[ox + oy * width] = char);
-    while (x <= y) {
-        if (fill) {
-            hline(canvas, cx - y, cy + x, y << 1, char, char, char);
-            x && hline(canvas, cx - y, cy - x, y << 1, char, char, char);
+const circle = (canvas, cx, cy, r, char, fill = false, format = canvas.format) => {
+  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;
+  char = charCode(
+    char !== void 0 ? char : peek(canvas.styles).dot,
+    format
+  );
+  let x = 0;
+  let y = r;
+  let ymax = r * r;
+  let sum = ymax + r;
+  let dx2 = 1;
+  let dy2 = 2 * r - 1;
+  const { data, width } = canvas;
+  const $ = (ox, oy) => ox >= x1 && oy >= y1 && ox < x2 && oy < y2 && (data[ox + oy * width] = char);
+  while (x <= y) {
+    if (fill) {
+      hline(canvas, cx - y, cy + x, y << 1, char, char, char);
+      x && hline(canvas, cx - y, cy - x, y << 1, char, char, char);
+    } else {
+      $(cx - y, cy + x);
+      y && $(cx + y, cy + x);
+      if (x) {
+        $(cx - y, cy - x);
+        y && $(cx + y, cy - x);
+      }
+      if (x !== y) {
+        $(cx - x, cy - y);
+        x && $(cx + x, cy - y);
+        if (y) {
+          $(cx - x, cy + y);
+          x && $(cx + x, cy + y);
         }
-        else {
-            $(cx - y, cy + x);
-            y && $(cx + y, cy + x);
-            if (x) {
-                $(cx - y, cy - x);
-                y && $(cx + y, cy - x);
-            }
-            if (x !== y) {
-                $(cx - x, cy - y);
-                x && $(cx + x, cy - y);
-                if (y) {
-                    $(cx - x, cy + y);
-                    x && $(cx + x, cy + y);
-                }
-            }
-        }
-        sum -= dx2;
-        if (sum <= ymax) {
-            if (fill && x !== y) {
-                hline(canvas, cx - x, cy - y, x << 1, char, char, char);
-                y && hline(canvas, cx - x, cy + y, x << 1, char, char, char);
-            }
-            y--;
-            ymax -= dy2;
-            dy2 -= 2;
-        }
-        x++;
-        dx2 += 2;
+      }
     }
+    sum -= dx2;
+    if (sum <= ymax) {
+      if (fill && x !== y) {
+        hline(canvas, cx - x, cy - y, x << 1, char, char, char);
+        y && hline(canvas, cx - x, cy + y, x << 1, char, char, char);
+      }
+      y--;
+      ymax -= dy2;
+      dy2 -= 2;
+    }
+    x++;
+    dx2 += 2;
+  }
+};
+export {
+  circle
 };

package/format.js

@@ -1,24 +1,18 @@
 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 fmt -
- */
-export const formatCanvas = (canvas, fmt) => {
-    const { data, width, height } = canvas;
-    const res = [];
-    if (fmt) {
-        for (let y = 0; y < height; y++) {
-            res.push(format(fmt, data, width, y * width));
-        }
+const formatCanvas = (canvas, fmt) => {
+  const { data, width, height } = canvas;
+  const res = [];
+  if (fmt) {
+    for (let y = 0; y < height; y++) {
+      res.push(format(fmt, data, width, y * width));
     }
-    else {
-        for (let y = 0; y < height; y++) {
-            res.push(formatNone(data, width, y * width));
-        }
+  } else {
+    for (let y = 0; y < height; y++) {
+      res.push(formatNone(data, width, y * width));
     }
-    return res.join("");
+  }
+  return res.join("");
+};
+export {
+  formatCanvas
 };

package/hvline.js

@@ -1,68 +1,71 @@
 import { peek } from "@thi.ng/arrays/peek";
 import { charCode } from "./utils.js";
-/**
- * Draws horizontal line from `x`,`y`, taking the current clip rect,
- * format and style into account. The optional `s`, `e` (line endings)
- * and `m` (line middle) chars can be used to override the currently
- * active style.
- *
- * @param canvas -
- * @param x -
- * @param y -
- * @param len -
- * @param s -
- * @param e -
- * @param m -
- */
-export 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;
-    _hvline(canvas.data, x, y, 1, canvas.width, x1, x2, len, format, peek(canvas.styles).hl, s, e, m);
+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;
+  _hvline(
+    canvas.data,
+    x,
+    y,
+    1,
+    canvas.width,
+    x1,
+    x2,
+    len,
+    format,
+    peek(canvas.styles).hl,
+    s,
+    e,
+    m
+  );
 };
-/**
- * Draws a vertical line from `x`,`y`, taking the current clip rect,
- * format and style into account. The optional `s`, `e` (line endings)
- * and `m` (line middle) chars can be used to override the currently
- * active style.
- *
- * @param canvas -
- * @param x -
- * @param y -
- * @param len -
- * @param s -
- * @param e -
- * @param m -
- */
-export 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;
-    _hvline(canvas.data, y, x, canvas.width, 1, y1, y2, len, format, peek(canvas.styles).vl, s, e, m);
+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;
+  _hvline(
+    canvas.data,
+    y,
+    x,
+    canvas.width,
+    1,
+    y1,
+    y2,
+    len,
+    format,
+    peek(canvas.styles).vl,
+    s,
+    e,
+    m
+  );
 };
 const _hvline = (buf, a, b, astride, bstride, amin, amax, len, format, style, s, e, m) => {
-    a |= 0;
-    b |= 0;
-    len |= 0;
-    let idx;
-    if (a < amin) {
-        len += a - amin;
-        a = amin;
-        idx = a * astride + b * bstride;
-    }
-    else {
-        idx = a * astride + b * bstride;
-        buf[idx] = charCode(s !== undefined && len > 1 ? s : style, format);
-        idx += astride;
-        a++;
-        len--;
-    }
+  a |= 0;
+  b |= 0;
+  len |= 0;
+  let idx;
+  if (a < amin) {
+    len += a - amin;
+    a = amin;
+    idx = a * astride + b * bstride;
+  } else {
+    idx = a * astride + b * bstride;
+    buf[idx] = charCode(s !== void 0 && len > 1 ? s : style, format);
+    idx += astride;
+    a++;
     len--;
-    m = charCode(m != undefined ? m : style, format);
-    for (let i = 0; i < len && a < amax; i++, a++, idx += astride) {
-        buf[idx] = m;
-    }
-    if (len >= 0 && a < amax) {
-        buf[idx] = charCode(e !== undefined ? e : style, format);
-    }
+  }
+  len--;
+  m = charCode(m != void 0 ? m : style, format);
+  for (let i = 0; i < len && a < amax; i++, a++, idx += astride) {
+    buf[idx] = m;
+  }
+  if (len >= 0 && a < amax) {
+    buf[idx] = charCode(e !== void 0 ? e : style, format);
+  }
+};
+export {
+  hline,
+  vline
 };