@altano/satori-fit-text 0.1.0 → 0.1.1

package/dist/{BrowserTextMeasurer-IY3VY5L4.js → BrowserTextMeasurer-TCSGQHDB.js}

@@ -2,7 +2,7 @@ import {
   TextMeasurer,
   getWidthAdjustedForInlineBleed,
   log_default
-} from "./chunk-MLBSPHAO.js";
+} from "./chunk-JIONCYY3.js";
 
 // src/TextMeasurer/BrowserTextMeasurer.ts
 var BrowserTextMeasurer = class extends TextMeasurer {

package/dist/{HeadlessTextMeasurer-SN5RPZSG.js → HeadlessTextMeasurer-46CHWL7H.js}

@@ -2,7 +2,7 @@ import {
   TextMeasurer,
   getWidthAdjustedForInlineBleed,
   log_default
-} from "./chunk-MLBSPHAO.js";
+} from "./chunk-JIONCYY3.js";
 
 // src/TextMeasurer/HeadlessTextMeasurer.ts
 import { SVG, registerWindow } from "@svgdotjs/svg.js";

package/dist/{chunk-MLBSPHAO.js → chunk-JIONCYY3.js}

@@ -5,40 +5,6 @@ var log_default = log;
 
 // src/TextMeasurer/TextMeasurer.ts
 import satori from "satori";
-
-// src/getSatoriFriendlyVNode.ts
-import { html as htmlToVNode } from "satori-html";
-import he from "he";
-function walkJsxTree(vnode, callback) {
-  callback(vnode);
-  const { children } = vnode.props;
-  if (children == null || typeof children === "string") {
-    return;
-  } else if (Array.isArray(children)) {
-    children.forEach((child) => walkJsxTree(child, callback));
-  } else {
-    walkJsxTree(children, callback);
-  }
-}
-function patchJsxTreeForSatori(vnode) {
-  walkJsxTree(vnode, (vnode2) => {
-    const { style } = vnode2.props;
-    if (style != null && typeof style["lineHeight"] === "string" && style["lineHeight"] != "") {
-      const num = Number(style["lineHeight"]);
-      if (!isNaN(num)) {
-        style["lineHeight"] = num;
-      }
-    }
-  });
-}
-function getSatoriFriendlyVNode(html) {
-  const htmlWithDecodedHtmlEntities = he.decode(html);
-  const vnode = htmlToVNode(htmlWithDecodedHtmlEntities);
-  patchJsxTreeForSatori(vnode);
-  return vnode;
-}
-
-// src/TextMeasurer/TextMeasurer.ts
 var TextMeasurer = class {
   constructor(text, font, maxWidth, maxHeight, lineHeight) {
     this.text = text;
@@ -54,21 +20,47 @@ var TextMeasurer = class {
     return width <= this.maxWidth && height <= this.maxHeight;
   }
   async generateSvg(fontSize) {
-    const html = `
-      <div style="
-        margin: 0;
-        padding: 0;
-        font-size: ${fontSize}px;
-        max-width: ${this.maxWidth}px;
-        line-height: ${this.lineHeight};
-        box-sizing: border-box;
-        border: solid red 1px;
-      ">
-        ${this.text}
-      </div>
-    `.trim();
-    const vnode = getSatoriFriendlyVNode(html);
-    return satori(vnode, {
+    const node = {
+      type: "div",
+      props: {
+        style: {
+          all: "initial",
+          display: "flex",
+          flexDirection: "column",
+          width: "100%",
+          height: "100%",
+          margin: 0,
+          padding: 0
+        },
+        children: [
+          {
+            type: "div",
+            props: {
+              style: {
+                // Static styles
+                margin: 0,
+                padding: 0,
+                boxSizing: "border-box",
+                // We render a border so that we measure the true dimensions of the text.
+                // Without one, the bounding box might not include significant whitespace.
+                // For example, if the last line of text has no descenders, the bounding box
+                // would only extend to the baseline of the last line. With a border, the
+                // bounding box will include all the whitespace between the baseline and the
+                // descent of the text.
+                border: "solid red 1px",
+                // Dynamic styles based on input
+                fontSize,
+                fontFamily: this.font.name,
+                maxWidth: this.maxWidth,
+                lineHeight: this.lineHeight
+              },
+              children: this.text
+            }
+          }
+        ]
+      }
+    };
+    return satori(node, {
       fonts: this.#fonts,
       width: this.maxWidth * 2,
       height: this.maxHeight * 2

package/dist/index.js

@@ -1,10 +1,10 @@
 // src/TextMeasurer/getTextMeasurer.ts
 async function getTextMeasurer(...args) {
   if (typeof window !== "undefined") {
-    const Measurer = await import("./BrowserTextMeasurer-IY3VY5L4.js");
+    const Measurer = await import("./BrowserTextMeasurer-TCSGQHDB.js");
     return new Measurer.default(...args);
   } else {
-    const Measurer = await import("./HeadlessTextMeasurer-SN5RPZSG.js");
+    const Measurer = await import("./HeadlessTextMeasurer-46CHWL7H.js");
     return new Measurer.default(...args);
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@altano/satori-fit-text",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Fit text to a bounding box in Node or the browser",
   "type": "module",
   "sideEffects": false,
@@ -58,9 +58,9 @@
     "typescript": "^5.1.6",
     "vite": "^4.4.9",
     "vitest": "^0.34.3",
-    "@altano/tiny-async-pool": "1.0.2",
     "@altano/assets": "0.0.0",
-    "@altano/tsconfig": "0.0.0"
+    "@altano/tsconfig": "0.0.0",
+    "@altano/tiny-async-pool": "1.0.2"
   },
   "scripts": {
     "build": "tsup",

package/dist/getSatoriFriendlyVNode.d.ts

@@ -1,4 +0,0 @@
-import { html as htmlToVNode } from "satori-html";
-export type VNode = ReturnType<typeof htmlToVNode>;
-export default function getSatoriFriendlyVNode(html: string): VNode;
-//# sourceMappingURL=getSatoriFriendlyVNode.d.ts.map