@thi.ng/text-canvas 2.6.22 → 2.6.24

package/table.js

@@ -2,132 +2,147 @@ import { peek } from "@thi.ng/arrays/peek";
 import { isString } from "@thi.ng/checks/is-string";
 import { wordWrapLines } from "@thi.ng/strings/word-wrap";
 import { Border } from "./api.js";
-import { beginClip, beginStyle, canvas, endClip, endStyle, setAt, } from "./canvas.js";
+import {
+  beginClip,
+  beginStyle,
+  canvas,
+  endClip,
+  endStyle,
+  setAt
+} from "./canvas.js";
 import { hline, vline } from "./hvline.js";
 import { fillRect, strokeRect } from "./rect.js";
 import { horizontalOnly, verticalOnly } from "./style.js";
 import { textLines } from "./text.js";
-export const initTable = (opts, cells) => {
-    const b = opts.border !== undefined ? opts.border : Border.ALL;
-    const bH = b & Border.H ? 1 : 0;
-    const bV = b & Border.V ? 1 : 0;
-    const bF = (bH && bV) || b & Border.FRAME ? 1 : 0;
-    const bFH = bF | bH;
-    const bFV = bF | bV;
-    const [padH, padV] = (opts.padding || [0, 0]).map((x) => x << 1);
-    const cols = opts.cols;
-    const numCols = cols.length - 1;
-    const numRows = cells.length - 1;
-    const rowHeights = new Array(numRows + 1).fill(0);
-    const wrapped = [];
-    for (let i = 0; i <= numRows; i++) {
-        const row = cells[i];
-        const wrappedRow = [];
-        for (let j = 0; j <= numCols; j++) {
-            const cell = isString(row[j])
-                ? { body: row[j] }
-                : row[j];
-            const lines = cell.wrap !== false
-                ? wordWrapLines(cell.body, {
-                    width: cols[j].width,
-                    hard: cell.hard || opts.hard,
-                }).map((l) => l.toString())
-                : cell.body.split(/\r?\n/g);
-            wrappedRow.push({
-                body: lines,
-                format: cell.format,
-            });
-            rowHeights[i] = Math.max(rowHeights[i], lines.length, cell.height || 0);
-        }
-        wrapped.push(wrappedRow);
+const initTable = (opts, cells) => {
+  const b = opts.border !== void 0 ? opts.border : Border.ALL;
+  const bH = b & Border.H ? 1 : 0;
+  const bV = b & Border.V ? 1 : 0;
+  const bF = bH && bV || b & Border.FRAME ? 1 : 0;
+  const bFH = bF | bH;
+  const bFV = bF | bV;
+  const [padH, padV] = (opts.padding || [0, 0]).map((x) => x << 1);
+  const cols = opts.cols;
+  const numCols = cols.length - 1;
+  const numRows = cells.length - 1;
+  const rowHeights = new Array(numRows + 1).fill(0);
+  const wrapped = [];
+  for (let i = 0; i <= numRows; i++) {
+    const row = cells[i];
+    const wrappedRow = [];
+    for (let j = 0; j <= numCols; j++) {
+      const cell = isString(row[j]) ? { body: row[j] } : row[j];
+      const lines = cell.wrap !== false ? wordWrapLines(cell.body, {
+        width: cols[j].width,
+        hard: cell.hard || opts.hard
+      }).map((l) => l.toString()) : cell.body.split(/\r?\n/g);
+      wrappedRow.push({
+        body: lines,
+        format: cell.format
+      });
+      rowHeights[i] = Math.max(
+        rowHeights[i],
+        lines.length,
+        cell.height || 0
+      );
     }
-    return {
-        style: opts.style,
-        format: opts.format,
-        formatHead: opts.formatHead,
-        width: cols.reduce((acc, x) => acc + x.width, 0) +
-            2 * bFV +
-            numCols * bV +
-            (numCols + 1) * padH,
-        height: rowHeights.reduce((acc, x) => acc + x, 0) +
-            2 * bFH +
-            numRows * bH +
-            (numRows + 1) * padV,
-        cells: wrapped,
-        rowHeights,
-        cols,
-        numCols,
-        numRows,
-        padH,
-        padV,
-        b,
-        bH,
-        bV,
-        bFH,
-        bFV,
-    };
+    wrapped.push(wrappedRow);
+  }
+  return {
+    style: opts.style,
+    format: opts.format,
+    formatHead: opts.formatHead,
+    width: cols.reduce((acc, x) => acc + x.width, 0) + 2 * bFV + numCols * bV + (numCols + 1) * padH,
+    height: rowHeights.reduce((acc, x) => acc + x, 0) + 2 * bFH + numRows * bH + (numRows + 1) * padV,
+    cells: wrapped,
+    rowHeights,
+    cols,
+    numCols,
+    numRows,
+    padH,
+    padV,
+    b,
+    bH,
+    bV,
+    bFH,
+    bFV
+  };
 };
-export const drawTable = (canvas, x, y, opts) => {
-    const { cells, cols, numCols, numRows, rowHeights, width, height, padH, padV, bH, bV, bFH, bFV, } = opts;
-    const fmt = opts.format !== undefined ? opts.format : canvas.format;
-    const fmtHd = opts.formatHead !== undefined ? opts.formatHead : fmt;
-    const currFormat = canvas.format;
-    canvas.format = fmt;
-    let style = opts.style || peek(canvas.styles);
-    style =
-        opts.b === Border.H
-            ? horizontalOnly(style)
-            : opts.b === Border.V
-                ? verticalOnly(style)
-                : style;
-    beginStyle(canvas, style);
-    fillRect(canvas, x + bFV, y + bFH, width - 2 * bFV, height - 2 * bFH, " ");
-    opts.b && strokeRect(canvas, x, y, width, height);
-    if (bV) {
-        for (let i = 1, xx = x + cols[0].width + padH + 1; i <= numCols; xx += cols[i].width + padH + 1, i++) {
-            vline(canvas, xx, y, height, style.tjt, style.tjb, style.vl);
-        }
+const drawTable = (canvas2, x, y, opts) => {
+  const {
+    cells,
+    cols,
+    numCols,
+    numRows,
+    rowHeights,
+    width,
+    height,
+    padH,
+    padV,
+    bH,
+    bV,
+    bFH,
+    bFV
+  } = opts;
+  const fmt = opts.format !== void 0 ? opts.format : canvas2.format;
+  const fmtHd = opts.formatHead !== void 0 ? opts.formatHead : fmt;
+  const currFormat = canvas2.format;
+  canvas2.format = fmt;
+  let style = opts.style || peek(canvas2.styles);
+  style = opts.b === Border.H ? horizontalOnly(style) : opts.b === Border.V ? verticalOnly(style) : style;
+  beginStyle(canvas2, style);
+  fillRect(canvas2, x + bFV, y + bFH, width - 2 * bFV, height - 2 * bFH, " ");
+  opts.b && strokeRect(canvas2, x, y, width, height);
+  if (bV) {
+    for (let i = 1, xx = x + cols[0].width + padH + 1; i <= numCols; xx += cols[i].width + padH + 1, i++) {
+      vline(canvas2, xx, y, height, style.tjt, style.tjb, style.vl);
     }
-    for (let i = 0, yy = y + bFH; i <= numRows; i++) {
-        const row = cells[i];
-        const rowH = rowHeights[i];
-        const y2 = yy + rowH + padV;
-        if (bH && i < numRows) {
-            hline(canvas, x, y2, width, style.tjl, style.tjr, style.hl);
-        }
-        for (let j = 0, xx = x + bFV; j <= numCols; j++) {
-            const col = cols[j];
-            const curr = row[j];
-            if (curr.body) {
-                beginClip(canvas, xx, yy, col.width + padH, rowH + padV);
-                textLines(canvas, xx + padH / 2, yy + padV / 2, curr.body, curr.format || (i ? fmt : fmtHd));
-                endClip(canvas);
-            }
-            if (bH && bV && j > 0 && i < numRows) {
-                setAt(canvas, xx - 1, y2, style.jct);
-            }
-            xx += col.width + bV + padH;
-        }
-        yy = y2 + bH;
+  }
+  for (let i = 0, yy = y + bFH; i <= numRows; i++) {
+    const row = cells[i];
+    const rowH = rowHeights[i];
+    const y2 = yy + rowH + padV;
+    if (bH && i < numRows) {
+      hline(canvas2, x, y2, width, style.tjl, style.tjr, style.hl);
     }
-    endStyle(canvas);
-    canvas.format = currFormat;
+    for (let j = 0, xx = x + bFV; j <= numCols; j++) {
+      const col = cols[j];
+      const curr = row[j];
+      if (curr.body) {
+        beginClip(canvas2, xx, yy, col.width + padH, rowH + padV);
+        textLines(
+          canvas2,
+          xx + padH / 2,
+          yy + padV / 2,
+          curr.body,
+          curr.format || (i ? fmt : fmtHd)
+        );
+        endClip(canvas2);
+      }
+      if (bH && bV && j > 0 && i < numRows) {
+        setAt(canvas2, xx - 1, y2, style.jct);
+      }
+      xx += col.width + bV + padH;
+    }
+    yy = y2 + bH;
+  }
+  endStyle(canvas2);
+  canvas2.format = currFormat;
+};
+const table = (canvas2, x, y, opts, cells) => {
+  const spec = initTable(opts, cells);
+  drawTable(canvas2, x, y, spec);
+  return [spec.width, spec.height];
 };
-export const table = (canvas, x, y, opts, cells) => {
-    const spec = initTable(opts, cells);
-    drawTable(canvas, x, y, spec);
-    return [spec.width, spec.height];
+const tableCanvas = (opts, cells) => {
+  const tbl = initTable(opts, cells);
+  const result = canvas(tbl.width, tbl.height);
+  drawTable(result, 0, 0, tbl);
+  return result;
 };
-/**
- * Initializes table with given options and contents. Then creates
- * auto-sized canvas for it, renders table and returns canvas.
- *
- * @param opts - table config
- * @param cells - table cells (row major)
- */
-export const tableCanvas = (opts, cells) => {
-    const tbl = initTable(opts, cells);
-    const result = canvas(tbl.width, tbl.height);
-    drawTable(result, 0, 0, tbl);
-    return result;
+export {
+  drawTable,
+  initTable,
+  table,
+  tableCanvas
 };

package/text.js

@@ -1,116 +1,94 @@
 import { peek } from "@thi.ng/arrays/peek";
 import { clamp0 } from "@thi.ng/math/interval";
 import { wordWrapLines } from "@thi.ng/strings/word-wrap";
-import { beginClip, beginStyle, endClip, endStyle, } from "./canvas.js";
+import {
+  beginClip,
+  beginStyle,
+  endClip,
+  endStyle
+} from "./canvas.js";
 import { fillRect, strokeRect } from "./rect.js";
-/**
- * Writes given string at position `x`,`y`, taking the current clip rect
- * and format into account. The string MUST not include linebreaks or
- * other control chars.
- *
- * @param canvas -
- * @param x -
- * @param y -
- * @param line -
- */
-export 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;
-    let i = 0;
-    if (x < x1) {
-        i = x1 - x;
-        x = x1;
-    }
-    const { data, width } = canvas;
-    const n = line.length;
-    format <<= 16;
-    for (let idx = x + y * width; i < n && x < x2; i++, x++, idx++) {
-        data[idx] = line.charCodeAt(i) | format;
-    }
+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;
+  let i = 0;
+  if (x < x1) {
+    i = x1 - x;
+    x = x1;
+  }
+  const { data, width } = canvas;
+  const n = line.length;
+  format <<= 16;
+  for (let idx = x + y * width; i < n && x < x2; i++, x++, idx++) {
+    data[idx] = line.charCodeAt(i) | format;
+  }
 };
-export const textLines = (canvas, x, y, lines, format = canvas.format) => {
-    for (let line of lines) {
-        textLine(canvas, x, y, line, format);
-        y++;
-    }
-    return y;
+const textLines = (canvas, x, y, lines, format = canvas.format) => {
+  for (let line of lines) {
+    textLine(canvas, x, y, line, format);
+    y++;
+  }
+  return y;
 };
-/**
- * Writes multiline string at position `x`,`y` and using column `width`,
- * also taking the current clip rect and format into account. Applies
- * word wrapping.
- *
- * @param canvas -
- * @param x -
- * @param y -
- * @param width -
- * @param txt -
- * @param format -
- * @param hardWrap -
- */
-export const textColumn = (canvas, x, y, width, txt, format = canvas.format, hard = false) => {
-    x |= 0;
-    y |= 0;
-    width |= 0;
-    const height = canvas.height;
-    for (let line of wordWrapLines(txt, { width, hard })) {
-        textLine(canvas, x, y, line.toString(), format);
-        y++;
-        if (y >= height)
-            break;
-    }
-    return y;
+const textColumn = (canvas, x, y, width, txt, format = canvas.format, hard = false) => {
+  x |= 0;
+  y |= 0;
+  width |= 0;
+  const height = canvas.height;
+  for (let line of wordWrapLines(txt, { width, hard })) {
+    textLine(canvas, x, y, line.toString(), format);
+    y++;
+    if (y >= height)
+      break;
+  }
+  return y;
 };
-/**
- * Draws a text box at given position and dimension. If `height < 0`, the inner
- * box height will be set to the number of lines required to fit the given (word
- * wrapped) text.
- *
- * @remarks
- * The width and height will include any configured padding and the box frame.
- *
- * @param canvas -
- * @param x -
- * @param y -
- * @param width -
- * @param height -
- * @param txt -
- * @param opts -
- */
-export const textBox = (canvas, x, y, width, height, txt, opts) => {
-    const { format, style, padding: [padX, padY], hard, } = {
-        format: canvas.format,
-        padding: [0, 0],
-        hard: false,
-        ...opts,
-    };
-    const currFmt = canvas.format;
-    canvas.format = format;
-    style && beginStyle(canvas, style);
-    x |= 0;
-    y |= 0;
-    width |= 0;
-    let innerW = width - 2 - 2 * padX;
-    let innerH = 0;
-    const lines = wordWrapLines(txt, { width: innerW, hard }).map((l) => l.toString());
-    if (height < 0) {
-        innerH = lines.length + 2;
-        height = innerH + 2 * padY;
-    }
-    else {
-        innerH = clamp0(height - 2);
-    }
-    strokeRect(canvas, x, y, width, height);
-    fillRect(canvas, x + 1, y + 1, width - 2, height - 2, " ");
-    x += 1 + padX;
-    y += 1 + padY;
-    beginClip(canvas, x, y, innerW, innerH);
-    y = textLines(canvas, x, y, lines);
-    endClip(canvas);
-    style && endStyle(canvas);
-    canvas.format = currFmt;
-    return y + height;
+const textBox = (canvas, x, y, width, height, txt, opts) => {
+  const {
+    format,
+    style,
+    padding: [padX, padY],
+    hard
+  } = {
+    format: canvas.format,
+    padding: [0, 0],
+    hard: false,
+    ...opts
+  };
+  const currFmt = canvas.format;
+  canvas.format = format;
+  style && beginStyle(canvas, style);
+  x |= 0;
+  y |= 0;
+  width |= 0;
+  let innerW = width - 2 - 2 * padX;
+  let innerH = 0;
+  const lines = wordWrapLines(txt, { width: innerW, hard }).map(
+    (l) => l.toString()
+  );
+  if (height < 0) {
+    innerH = lines.length + 2;
+    height = innerH + 2 * padY;
+  } else {
+    innerH = clamp0(height - 2);
+  }
+  strokeRect(canvas, x, y, width, height);
+  fillRect(canvas, x + 1, y + 1, width - 2, height - 2, " ");
+  x += 1 + padX;
+  y += 1 + padY;
+  beginClip(canvas, x, y, innerW, innerH);
+  y = textLines(canvas, x, y, lines);
+  endClip(canvas);
+  style && endStyle(canvas);
+  canvas.format = currFmt;
+  return y + height;
+};
+export {
+  textBox,
+  textColumn,
+  textLine,
+  textLines
 };

package/utils.js

@@ -1,10 +1,15 @@
-export const charCode = (x, format) => (typeof x === "string" ? x.charCodeAt(0) : x) | (format << 16);
-export const intersectRect = (a, b) => {
-    const x1 = Math.max(a.x1, b.x1);
-    const y1 = Math.max(a.y1, b.y1);
-    const x2 = Math.min(a.x2, b.x2);
-    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 charCode = (x, format) => (typeof x === "string" ? x.charCodeAt(0) : x) | format << 16;
+const intersectRect = (a, b) => {
+  const x1 = Math.max(a.x1, b.x1);
+  const y1 = Math.max(a.y1, b.y1);
+  const x2 = Math.min(a.x2, b.x2);
+  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;
-export const intersectRectCircle = (x, y, w, h, cx, cy, r) => axis(cx, x, w) + axis(cy, y, h) <= r * r;
+const intersectRectCircle = (x, y, w, h, cx, cy, r) => axis(cx, x, w) + axis(cy, y, h) <= r * r;
+export {
+  charCode,
+  intersectRect,
+  intersectRectCircle
+};