@altano/satori-fit-text 0.1.2 → 0.1.4

package/README.md

@@ -21,7 +21,7 @@ pnpm add @altano/satori-fit-text
 import { findLargestUsableFontSize, type Font } from "@altano/satori-fit-text";
 
 async function getInter(): Promise<Font> {
-  const interSemiBoldBuffer = await fetch(`https://files.terriblefish.com/fonts/Inter/v4/extras/otf/Inter-SemiBold.otf`).then((res) => res.arrayBuffer());
+  const interSemiBoldBuffer = await fetch(`https://cdn.jsdelivr.net/npm/@fontsource/inter@5.0.17/files/inter-latin-600-normal.woff`).then((res) => res.arrayBuffer());
 
   const font = {
     name: "Inter",

package/dist/TextMeasurer/BrowserTextMeasurer.d.ts

@@ -1,4 +1,4 @@
-import { TextMeasurer, type Dimensions } from "./TextMeasurer";
+import { TextMeasurer, type Dimensions } from "./TextMeasurer.js";
 export default class BrowserTextMeasurer extends TextMeasurer {
     #private;
     getDimensions(fontSize: number): Promise<Dimensions>;

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

@@ -1,11 +1,7 @@
-import {
-  TextMeasurer,
-  getWidthAdjustedForInlineBleed,
-  log_default
-} from "./chunk-JIONCYY3.js";
-
-// src/TextMeasurer/BrowserTextMeasurer.ts
-var BrowserTextMeasurer = class extends TextMeasurer {
+import log from "../log.js";
+import { TextMeasurer } from "./TextMeasurer.js";
+import getWidthAdjustedForInlineBleed from "./getWidthAdjustedForInlineBleed.js";
+class BrowserTextMeasurer extends TextMeasurer {
   #getSvgElement(svgText) {
     const div = document.createElement("div");
     div.style.position = "fixed";
@@ -23,7 +19,7 @@ var BrowserTextMeasurer = class extends TextMeasurer {
       document.body.appendChild(svg);
       const { width, height } = svg.getBBox();
       const widthAdjusted = getWidthAdjustedForInlineBleed(svg, width);
-      log_default({
+      log({
         fontSize,
         width,
         widthAdjusted,
@@ -36,7 +32,7 @@ var BrowserTextMeasurer = class extends TextMeasurer {
       svg.parentElement?.removeChild?.(svg);
     }
   }
-};
+}
 export {
   BrowserTextMeasurer as default
 };

package/dist/TextMeasurer/HeadlessTextMeasurer.d.ts

@@ -1,5 +1,5 @@
-import type { Font } from "../types";
-import { TextMeasurer, type Dimensions } from "./TextMeasurer";
+import type { Font } from "../types.js";
+import { TextMeasurer, type Dimensions } from "./TextMeasurer.js";
 export default class HeadlessTextMeasurer extends TextMeasurer {
     #private;
     constructor(text: string, font: Font, maxWidth: number, maxHeight: number, lineHeight: number | "normal");

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

@@ -1,13 +1,9 @@
-import {
-  TextMeasurer,
-  getWidthAdjustedForInlineBleed,
-  log_default
-} from "./chunk-JIONCYY3.js";
-
-// src/TextMeasurer/HeadlessTextMeasurer.ts
 import { SVG, registerWindow } from "@svgdotjs/svg.js";
 import { createSVGWindow } from "svgdom";
-var HeadlessTextMeasurer = class extends TextMeasurer {
+import log from "../log.js";
+import { TextMeasurer } from "./TextMeasurer.js";
+import getWidthAdjustedForInlineBleed from "./getWidthAdjustedForInlineBleed.js";
+class HeadlessTextMeasurer extends TextMeasurer {
   #canvas;
   constructor(text, font, maxWidth, maxHeight, lineHeight) {
     super(text, font, maxWidth, maxHeight, lineHeight);
@@ -23,7 +19,7 @@ var HeadlessTextMeasurer = class extends TextMeasurer {
       this.#canvas.node,
       width
     );
-    log_default({
+    log({
       fontSize,
       width,
       widthAdjusted,
@@ -38,7 +34,7 @@ var HeadlessTextMeasurer = class extends TextMeasurer {
     this.#canvas.clear();
     this.#canvas.svg(svgText);
   }
-};
+}
 export {
   HeadlessTextMeasurer as default
 };

package/dist/TextMeasurer/TextMeasurer.d.ts

@@ -1,4 +1,4 @@
-import type { Font } from "../types";
+import type { Font } from "../types.js";
 export type Dimensions = Pick<DOMRect, "width" | "height">;
 export declare abstract class TextMeasurer {
     #private;

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

@@ -1,11 +1,5 @@
-// src/log.ts
-import debug from "debug";
-var log = debug("satori-text-fit");
-var log_default = log;
-
-// src/TextMeasurer/TextMeasurer.ts
 import satori from "satori";
-var TextMeasurer = class {
+class TextMeasurer {
   constructor(text, font, maxWidth, maxHeight, lineHeight) {
     this.text = text;
     this.font = font;
@@ -66,26 +60,7 @@ var TextMeasurer = class {
       height: this.maxHeight * 2
     });
   }
-};
-
-// src/TextMeasurer/getWidthAdjustedForInlineBleed.ts
-function getWidthAdjustedForInlineBleed(svg, svgWidth) {
-  let smallestXValue = 0;
-  let largestYValue = svgWidth;
-  for (const child of svg.children) {
-    if ("getBBox" in child && typeof child["getBBox"] === "function") {
-      const { x, y } = child.getBBox();
-      smallestXValue = Math.min(smallestXValue, x);
-      largestYValue = Math.max(largestYValue, y);
-    }
-  }
-  const xAdjustment = Math.ceil(Math.abs(smallestXValue));
-  const yAdjustment = largestYValue <= svgWidth ? 0 : Math.ceil(largestYValue) - svgWidth;
-  return svgWidth - xAdjustment - yAdjustment;
 }
-
 export {
-  log_default,
-  TextMeasurer,
-  getWidthAdjustedForInlineBleed
+  TextMeasurer
 };

package/dist/TextMeasurer/getTextMeasurer.d.ts

@@ -1,3 +1,3 @@
-import type { TextMeasurer } from "./TextMeasurer";
+import type { TextMeasurer } from "./TextMeasurer.js";
 export declare function getTextMeasurer(...args: ConstructorParameters<typeof TextMeasurer>): Promise<TextMeasurer>;
 //# sourceMappingURL=getTextMeasurer.d.ts.map

package/dist/TextMeasurer/getTextMeasurer.js

@@ -0,0 +1,12 @@
+async function getTextMeasurer(...args) {
+  if (typeof window !== "undefined") {
+    const Measurer = await import("./BrowserTextMeasurer.js");
+    return new Measurer.default(...args);
+  } else {
+    const Measurer = await import("./HeadlessTextMeasurer.js");
+    return new Measurer.default(...args);
+  }
+}
+export {
+  getTextMeasurer
+};

package/dist/TextMeasurer/getWidthAdjustedForInlineBleed.js

@@ -0,0 +1,17 @@
+function getWidthAdjustedForInlineBleed(svg, svgWidth) {
+  let smallestXValue = 0;
+  let largestYValue = svgWidth;
+  for (const child of svg.children) {
+    if ("getBBox" in child && typeof child["getBBox"] === "function") {
+      const { x, y } = child.getBBox();
+      smallestXValue = Math.min(smallestXValue, x);
+      largestYValue = Math.max(largestYValue, y);
+    }
+  }
+  const xAdjustment = Math.ceil(Math.abs(smallestXValue));
+  const yAdjustment = largestYValue <= svgWidth ? 0 : Math.ceil(largestYValue) - svgWidth;
+  return svgWidth - xAdjustment - yAdjustment;
+}
+export {
+  getWidthAdjustedForInlineBleed as default
+};

package/dist/fitText.d.ts

@@ -1,4 +1,4 @@
-import type { Font } from "./types";
+import type { Font } from "./types.js";
 export type FindOptions = {
     /**
      * The text you want to fit

package/dist/fitText.js

@@ -0,0 +1,41 @@
+import { getTextMeasurer } from "./TextMeasurer/getTextMeasurer.js";
+async function findLargestUsableFontSize({
+  text,
+  font,
+  maxWidth,
+  maxHeight,
+  lineHeight = "normal",
+  minFontSize = 1,
+  maxFontSize = 1e3,
+  maxTries = 1e3
+}) {
+  if (maxTries < 2) {
+    throw new Error("`maxTries` must be >= 2");
+  }
+  const textMeasurer = await getTextMeasurer(
+    text,
+    font,
+    maxWidth,
+    maxHeight,
+    lineHeight
+  );
+  for (let tries = 1, lower = minFontSize, upper = maxFontSize; tries < maxTries; ++tries) {
+    const searchCutoffThreshold = Math.min(1, lower);
+    if (upper - lower <= searchCutoffThreshold) {
+      return Math.floor(lower);
+    }
+    const sizeCandidate = Math.floor(lower + (upper - lower) / 2);
+    const doesFit = await textMeasurer.doesSizeFit(sizeCandidate);
+    if (doesFit) {
+      lower = sizeCandidate;
+    } else {
+      upper = sizeCandidate;
+    }
+  }
+  throw new Error(
+    `Could not find a valid font size in ${maxTries - 1} attempts. Giving up. Please try again after constraining the search space, e.g. by restricting the min/max font size difference.`
+  );
+}
+export {
+  findLargestUsableFontSize
+};

package/dist/index.d.ts

@@ -1,47 +1,3 @@
-import { Font as Font$1 } from 'satori';
-
-type Font = Font$1;
-
-type FindOptions = {
-    /**
-     * The text you want to fit
-     */
-    text: string;
-    /**
-     * The font of your text. Options are the same as [those taken by
-     * Satori](https://github.com/vercel/satori#fonts), but only one font and not
-     * an array of fonts is accepted here.
-     */
-    font: Font;
-    /**
-     * The max width the text must be contained in
-     */
-    maxWidth: number;
-    /**
-     * The max height the text must be contained in
-     */
-    maxHeight: number;
-    /**
-     * Optional: the CSS line height factor to use, e.g. 1.1
-     */
-    lineHeight?: number | "normal";
-    /**
-     * The minimum font size that should be returned, even if smaller fonts fit
-     */
-    minFontSize?: number;
-    /**
-     * The maximum font size that should be returned, even if larger fonts fit
-     */
-    maxFontSize?: number;
-    /**
-     * The maximum number of font sizes to try before giving up. Defaults to 1000.
-     */
-    maxTries?: number;
-};
-/**
- * Given text, dimensions, and some options, returns the largest font size that
- * would keep the text contained within the dimensions.
- */
-declare function findLargestUsableFontSize({ text, font, maxWidth, maxHeight, lineHeight, minFontSize, maxFontSize, maxTries, }: FindOptions): Promise<number>;
-
-export { type FindOptions, type Font, findLargestUsableFontSize };
+export * from "./fitText.js";
+export * from "./types.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,52 +1,2 @@
-// src/TextMeasurer/getTextMeasurer.ts
-async function getTextMeasurer(...args) {
-  if (typeof window !== "undefined") {
-    const Measurer = await import("./BrowserTextMeasurer-TCSGQHDB.js");
-    return new Measurer.default(...args);
-  } else {
-    const Measurer = await import("./HeadlessTextMeasurer-46CHWL7H.js");
-    return new Measurer.default(...args);
-  }
-}
-
-// src/fitText.ts
-async function findLargestUsableFontSize({
-  text,
-  font,
-  maxWidth,
-  maxHeight,
-  lineHeight = "normal",
-  minFontSize = 1,
-  maxFontSize = 1e3,
-  maxTries = 1e3
-}) {
-  if (maxTries < 2) {
-    throw new Error("`maxTries` must be >= 2");
-  }
-  const textMeasurer = await getTextMeasurer(
-    text,
-    font,
-    maxWidth,
-    maxHeight,
-    lineHeight
-  );
-  for (let tries = 1, lower = minFontSize, upper = maxFontSize; tries < maxTries; ++tries) {
-    const searchCutoffThreshold = Math.min(1, lower);
-    if (upper - lower <= searchCutoffThreshold) {
-      return Math.floor(lower);
-    }
-    const sizeCandidate = Math.floor(lower + (upper - lower) / 2);
-    const doesFit = await textMeasurer.doesSizeFit(sizeCandidate);
-    if (doesFit) {
-      lower = sizeCandidate;
-    } else {
-      upper = sizeCandidate;
-    }
-  }
-  throw new Error(
-    `Could not find a valid font size in ${maxTries - 1} attempts. Giving up. Please try again after constraining the search space, e.g. by restricting the min/max font size difference.`
-  );
-}
-export {
-  findLargestUsableFontSize
-};
+export * from "./fitText.js";
+export * from "./types.js";

package/dist/log.js

@@ -0,0 +1,6 @@
+import debug from "debug";
+const log = debug("satori-text-fit");
+var log_default = log;
+export {
+  log_default as default
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@altano/satori-fit-text",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Fit text to a bounding box in Node or the browser",
   "type": "module",
   "sideEffects": false,
@@ -35,47 +35,54 @@
   "dependencies": {
     "@svgdotjs/svg.js": "^3.2.0",
     "debug": "^4.3.4",
-    "he": "^1.2.0",
     "satori": "^0.10.13",
     "satori-html": "^0.3.2",
     "svgdom": "^0.1.19"
   },
   "devDependencies": {
+    "@fontsource-variable/inter": "^5.0.17",
+    "@fontsource/inter": "^5.0.17",
+    "@playwright/test": "1.40.0",
     "@resvg/resvg-js": "^2.6.0",
     "@types/debug": "^4.1.12",
     "@types/he": "^1.2.3",
     "@types/jest-image-snapshot": "^6.4.0",
+    "@types/node": "^20.11.25",
     "@types/react": "^18.2.64",
     "@types/react-dom": "^18.2.21",
     "@types/svgdom": "^0.1.2",
-    "@vitest/coverage-v8": "^1.3.1",
-    "@vitest/ui": "^1.3.1",
+    "@vitest/coverage-v8": "^1.4.0",
+    "@vitest/ui": "^1.4.0",
     "jest-image-snapshot": "^6.4.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.2.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "tsup": "^8.0.2",
     "typescript": "^5.4.2",
-    "vite": "^5.1.5",
-    "vitest": "^1.3.1",
+    "vite": "^5.2.8",
+    "vitest": "^1.4.0",
     "@altano/assets": "0.0.0",
-    "@altano/tiny-async-pool": "1.0.3",
+    "@altano/tiny-async-pool": "3.0.1",
     "@altano/tsconfig": "0.0.0"
   },
   "scripts": {
-    "build": "tsup",
-    "build:types": "tsc --emitDeclarationOnly --declaration",
-    "dev": "tsup --watch",
-    "lint": "eslint src/**/*.ts*",
-    "lint:timing": "TIMING=1 eslint src/**/*.ts*",
-    "lint:fix": "TIMING=1 eslint src/**/*.ts* --fix",
+    "build": "tsup --config build-config/tsup.config.node.ts",
+    "build:types": "tsc --project tsconfig.declarations.json",
+    "clean": "rm -rf .turbo && rm -rf .tsbuildinfo && rm -rf node_modules && rm -rf dist",
+    "dev": "pnpm run build --watch",
     "format": "prettier --check src",
     "format:fix": "prettier --write src",
-    "clean": "rm -rf .turbo && rm -rf .tsbuildinfo && rm -rf node_modules && rm -rf dist",
-    "test": "run-s test:unit test:benchmark",
-    "test:unit": "vitest --run",
-    "test:benchmark": "vitest --run bench",
-    "test:watch": "vitest tests/"
+    "lint": "eslint package.json src/**/*.ts*",
+    "lint:fix": "TIMING=1 pnpm lint --fix",
+    "lint:timing": "TIMING=1 pnpm lint",
+    "test:e2e": "playwright test",
+    "test:e2e:server": "vite --strictPort --port 3717 ./tests/e2e",
+    "test:e2e:ui": "playwright test --ui",
+    "test:unit": "run-s test:unit:run test:unit:benchmark",
+    "test:unit:benchmark": "vitest --run bench",
+    "test:unit:run": "vitest --run",
+    "test:unit:watch": "vitest",
+    "typecheck:src": "tsc --noEmit",
+    "typecheck:test": "tsc --noEmit --project ./tests/tsconfig.json"
   }
 }