@alchemy.run/sigil 0.0.0-alpha.4 → 0.0.0-alpha.6

package/src/output.ts

@@ -1,308 +0,0 @@
-import { sliceAnsi } from "#/ansi/slice.ts";
-import { stringWidth } from "#/ansi/string-width.ts";
-import {
-  type StyledChar,
-  styledCharsFromTokens,
-  styledCharsToString,
-  tokenize,
-} from "#/ansi/tokenize.ts";
-import { type OutputTransformer } from "#/render-node-to-output.ts";
-
-/**
-"Virtual" output class
-
-Handles the positioning and saving of the output of each node in the tree. Also responsible for applying transformations to each character of the output.
-
-Used to generate the final output of all nodes before writing it to actual output stream (e.g. stdout)
-*/
-
-type Options = {
-  width: number;
-  height: number;
-};
-
-type Operation = WriteOperation | ClipOperation | UnclipOperation;
-
-type WriteOperation = {
-  type: "write";
-  x: number;
-  y: number;
-  text: string;
-  transformers: OutputTransformer[];
-};
-
-type ClipOperation = {
-  type: "clip";
-  clip: Clip;
-};
-
-type Clip = {
-  x1: number | undefined;
-  x2: number | undefined;
-  y1: number | undefined;
-  y2: number | undefined;
-};
-
-type UnclipOperation = {
-  type: "unclip";
-};
-
-class OutputCaches {
-  widths = new Map<string, number>();
-  blockWidths = new Map<string, number>();
-  styledChars = new Map<string, StyledChar[]>();
-
-  getStyledChars(line: string): StyledChar[] {
-    let cached = this.styledChars.get(line);
-    if (cached === undefined) {
-      cached = styledCharsFromTokens(tokenize(line));
-      this.styledChars.set(line, cached);
-    }
-
-    return cached;
-  }
-
-  getStringWidth(text: string): number {
-    let cached = this.widths.get(text);
-    if (cached === undefined) {
-      cached = stringWidth(text);
-      this.widths.set(text, cached);
-    }
-
-    return cached;
-  }
-
-  getWidestLine(text: string): number {
-    let cached = this.blockWidths.get(text);
-    if (cached === undefined) {
-      let lineWidth = 0;
-      for (const line of text.split("\n")) {
-        lineWidth = Math.max(lineWidth, this.getStringWidth(line));
-      }
-
-      cached = lineWidth;
-      this.blockWidths.set(text, cached);
-    }
-
-    return cached;
-  }
-}
-
-export class Output {
-  width: number;
-  height: number;
-
-  private readonly operations: Operation[] = [];
-  private readonly caches: OutputCaches = new OutputCaches();
-
-  constructor(options: Options) {
-    const { width, height } = options;
-
-    this.width = width;
-    this.height = height;
-  }
-
-  write(x: number, y: number, text: string, options: { transformers: OutputTransformer[] }): void {
-    const { transformers } = options;
-
-    if (!text) {
-      return;
-    }
-
-    this.operations.push({
-      type: "write",
-      x,
-      y,
-      text,
-      transformers,
-    });
-  }
-
-  clip(clip: Clip) {
-    this.operations.push({
-      type: "clip",
-      clip,
-    });
-  }
-
-  unclip() {
-    this.operations.push({
-      type: "unclip",
-    });
-  }
-
-  get(): { output: string; height: number } {
-    // Initialize output array with a specific set of rows, so that margin/padding at the bottom is preserved
-    const output: StyledChar[][] = [];
-
-    for (let y = 0; y < this.height; y++) {
-      const row: StyledChar[] = [];
-
-      for (let x = 0; x < this.width; x++) {
-        row.push({
-          type: "char",
-          value: " ",
-          fullWidth: false,
-          styles: [],
-        });
-      }
-
-      output.push(row);
-    }
-
-    const clips: Clip[] = [];
-
-    for (const operation of this.operations) {
-      if (operation.type === "clip") {
-        clips.push(operation.clip);
-      }
-
-      if (operation.type === "unclip") {
-        clips.pop();
-      }
-
-      if (operation.type === "write") {
-        const { text, transformers } = operation;
-        let { x, y } = operation;
-        let lines = text.split("\n");
-
-        const clip = clips.at(-1);
-
-        if (clip) {
-          const clipHorizontally = typeof clip?.x1 === "number" && typeof clip?.x2 === "number";
-
-          const clipVertically = typeof clip?.y1 === "number" && typeof clip?.y2 === "number";
-
-          // If text is positioned outside of clipping area altogether,
-          // skip to the next operation to avoid unnecessary calculations
-          if (clipHorizontally) {
-            const width = this.caches.getWidestLine(text);
-
-            if (x + width < clip.x1! || x > clip.x2!) {
-              continue;
-            }
-          }
-
-          if (clipVertically) {
-            const height = lines.length;
-
-            if (y + height < clip.y1! || y > clip.y2!) {
-              continue;
-            }
-          }
-
-          if (clipHorizontally) {
-            lines = lines.map((line) => {
-              const from = x < clip.x1! ? clip.x1! - x : 0;
-              const width = this.caches.getStringWidth(line);
-              const to = x + width > clip.x2! ? clip.x2! - x : width;
-
-              return sliceAnsi(line, from, to);
-            });
-
-            if (x < clip.x1!) {
-              x = clip.x1!;
-            }
-          }
-
-          if (clipVertically) {
-            const from = y < clip.y1! ? clip.y1! - y : 0;
-            const height = lines.length;
-            const to = y + height > clip.y2! ? clip.y2! - y : height;
-
-            lines = lines.slice(from, to);
-
-            if (y < clip.y1!) {
-              y = clip.y1!;
-            }
-          }
-        }
-
-        let offsetY = 0;
-
-        for (let [index, line] of lines.entries()) {
-          const currentLine = output[y + offsetY];
-
-          // Line can be missing if `text` is taller than height of pre-initialized `this.output`
-          if (!currentLine) {
-            continue;
-          }
-
-          for (const transformer of transformers) {
-            line = transformer(line, index);
-          }
-
-          const characters = this.caches.getStyledChars(line);
-          let offsetX = x;
-
-          // Nothing to write (e.g. line was clipped away).
-          if (characters.length === 0) {
-            offsetY++;
-            continue;
-          }
-
-          const spaceCell: StyledChar = {
-            type: "char",
-            value: " ",
-            fullWidth: false,
-            styles: [],
-          };
-
-          // Wide characters (e.g. CJK) occupy two cells: a leading
-          // cell with the character and a trailing placeholder with
-          // value ''. When an overlapping write lands in the middle
-          // of a wide character, the boundary cells need cleanup so
-          // the terminal never renders a half-visible wide character.
-          if (
-            currentLine[offsetX]?.value === "" &&
-            offsetX > 0 &&
-            this.caches.getStringWidth(currentLine[offsetX - 1]?.value ?? "") > 1
-          ) {
-            currentLine[offsetX - 1] = spaceCell;
-          }
-
-          for (const character of characters) {
-            currentLine[offsetX] = character;
-
-            // Determine printed width using string-width to align with measurement
-            const characterWidth = Math.max(1, this.caches.getStringWidth(character.value));
-
-            // For multi-column characters, clear following cells to avoid stray spaces/artifacts
-            if (characterWidth > 1) {
-              for (let columnOffset = 1; columnOffset < characterWidth; columnOffset++) {
-                currentLine[offsetX + columnOffset] = {
-                  type: "char",
-                  value: "",
-                  fullWidth: false,
-                  styles: character.styles,
-                };
-              }
-            }
-
-            offsetX += characterWidth;
-          }
-
-          if (currentLine[offsetX]?.value === "") {
-            currentLine[offsetX] = spaceCell;
-          }
-
-          offsetY++;
-        }
-      }
-    }
-
-    const generatedOutput = output
-      .map((line) => {
-        // See https://github.com/vadimdemedes/ink/pull/564#issuecomment-1637022742
-        const lineWithoutEmptyItems = line.filter((item) => item !== undefined);
-
-        return styledCharsToString(lineWithoutEmptyItems).trimEnd();
-      })
-      .join("\n");
-
-    return {
-      output: generatedOutput,
-      height: output.length,
-    };
-  }
-}

package/src/renderer.ts

@@ -1,73 +0,0 @@
-import { type DOMElement } from "#/dom.ts";
-import { Output } from "#/output.ts";
-import { renderNodeToOutput, renderNodeToScreenReaderOutput } from "#/render-node-to-output.ts";
-
-type Result = {
-  output: string;
-  outputHeight: number;
-  staticOutput: string;
-};
-
-export const renderer = (node: DOMElement, isScreenReaderEnabled: boolean): Result => {
-  if (node.yogaNode) {
-    if (isScreenReaderEnabled) {
-      const output = renderNodeToScreenReaderOutput(node, {
-        skipStaticElements: true,
-      });
-
-      const outputHeight = output === "" ? 0 : output.split("\n").length;
-
-      let staticOutput = "";
-
-      if (node.staticNode) {
-        staticOutput = renderNodeToScreenReaderOutput(node.staticNode, {
-          skipStaticElements: false,
-        });
-      }
-
-      return {
-        output,
-        outputHeight,
-        staticOutput: staticOutput ? `${staticOutput}\n` : "",
-      };
-    }
-
-    const output = new Output({
-      width: node.yogaNode.getComputedWidth(),
-      height: node.yogaNode.getComputedHeight(),
-    });
-
-    renderNodeToOutput(node, output, {
-      skipStaticElements: true,
-    });
-
-    let staticOutput;
-
-    if (node.staticNode?.yogaNode) {
-      staticOutput = new Output({
-        width: node.staticNode.yogaNode.getComputedWidth(),
-        height: node.staticNode.yogaNode.getComputedHeight(),
-      });
-
-      renderNodeToOutput(node.staticNode, staticOutput, {
-        skipStaticElements: false,
-      });
-    }
-
-    const { output: generatedOutput, height: outputHeight } = output.get();
-
-    return {
-      output: generatedOutput,
-      outputHeight,
-      // Newline at the end is needed, because static output doesn't have one, so
-      // interactive output will override last line of static output
-      staticOutput: staticOutput ? `${staticOutput.get().output}\n` : "",
-    };
-  }
-
-  return {
-    output: "",
-    outputHeight: 0,
-    staticOutput: "",
-  };
-};