@weasel-js/text 1.14.2 → 1.15.0

package/dist/{chunk-5BJN6MC6.js → chunk-ZNSU5C43.js}

@@ -1,5 +1,5 @@
 import { isSolidPaint, resolveFill, resolveScreenLength, fillHasInk, strokeHasInk, paintKey, strokeKey } from '@weasel-js/paint';
-import { cssFamilyName, resolveFontVariant, syntheticBoldGrowth, glyphOutline, faceMetricsOf, glyphGeneration, faceGeneration, metricsOf, warnNoMetrics, resolveColorCluster, glyphIn, resolveGlyph } from '@weasel-js/font';
+import { cssFamilyName, cachedFontVariant, syntheticBoldGrowth, glyphOutline, faceMetricsOf, glyphGeneration, faceGeneration, metricsOf, warnNoMetrics, resolveColorCluster, glyphIn, resolveGlyph } from '@weasel-js/font';
 import { mergeRegion, growRegion, pathToD, pathFromD } from '@weasel-js/geom';
 
 var __defProp = Object.defineProperty;
@@ -147,7 +147,7 @@ function shapeableBytes(resolved2) {
 }
 function shapesWithFeature(family, weight, style, tag, shaper = registered) {
   if (shaper === null) return false;
-  const bytes = shapeableBytes(resolveFontVariant(family, weight, style));
+  const bytes = shapeableBytes(cachedFontVariant(family, weight, style));
   return bytes !== null && shaper.hasFeature(bytes, tag);
 }
 
@@ -649,7 +649,7 @@ function within(ranges, cp2) {
   return false;
 }
 var warnedLogicalRtl = false;
-function warnRtlWithoutEngine(codePoints) {
+function warnRtlWithoutEngine(codePoints, who = "weasel layoutRuns") {
   if (warnedLogicalRtl) return;
   for (let i = 0; i < codePoints.length; i++) {
     const cp2 = codePoints[i];
@@ -658,7 +658,7 @@ function warnRtlWithoutEngine(codePoints) {
     console.warn(
       // Naming the import in `from "<pkg>"` form would trip labkit's
       // consumer smoke test, which greps dist for that exact shape.
-      "weasel layoutRuns: this text contains right-to-left characters but no `bidi` engine is registered, so it is being laid out in logical order \u2014 the glyphs will appear reversed. Import `bidi` out of the `@weasel-js/bidi` package and call `registerBidi(bidi)` once at startup."
+      `${who}: this text contains right-to-left characters but no \`bidi\` engine is registered, so it is being laid out in logical order \u2014 the glyphs will appear reversed. Import \`bidi\` out of the \`@weasel-js/bidi\` package and call \`registerBidi(bidi)\` once at startup.`
     );
     return;
   }
@@ -1197,7 +1197,7 @@ function measureRuns(runs, tabSize, pool, into, shaper = null) {
   let srcIndex = 0;
   for (let runIndex = 0; runIndex < runs.length; runIndex++) {
     const run = runs[runIndex];
-    const resolved2 = resolveFontVariant(run.fontFamily, run.fontWeight, run.fontStyle);
+    const resolved2 = cachedFontVariant(run.fontFamily, run.fontWeight, run.fontStyle);
     const metrics = metricsOf(resolved2);
     if (!metrics) {
       warnNoMetrics(run.fontFamily, run.fontWeight, run.fontStyle);
@@ -1588,7 +1588,7 @@ function resolveLayoutOpts(opts, out = {
   tabSize: 0
 }) {
   out.maxWidth = opts.maxWidth;
-  out.alignWidth = opts.alignWidth ?? opts.maxWidth;
+  storeAlignWidth(out, opts);
   out.lineHeight = opts.lineHeight;
   out.align = opts.align;
   out.justify = opts.justify === true || opts.align === "justify";
@@ -1598,6 +1598,10 @@ function resolveLayoutOpts(opts, out = {
   out.tabSize = opts.tabSize ?? DEFAULT_TAB_SIZE;
   return out;
 }
+function storeAlignWidth(out, opts) {
+  if (opts.alignWidth === void 0) out.alignWidth = opts.maxWidth;
+  else out.alignWidth = opts.alignWidth;
+}
 function layoutBidi(opts) {
   return opts.bidi ?? registeredBidi();
 }
@@ -1894,7 +1898,7 @@ function faceOutlineD(g) {
   return glyphOutline(family, weight, style, g.cp);
 }
 function runFaces(runs) {
-  const faces = runs.map((r) => faceMetricsOf(resolveFontVariant(r.fontFamily, r.fontWeight, r.fontStyle)));
+  const faces = runs.map((r) => faceMetricsOf(cachedFontVariant(r.fontFamily, r.fontWeight, r.fontStyle)));
   return (run) => faces[run];
 }
 var isDecorated = (r) => r.underline || r.strikethrough || r.overline;
@@ -1990,7 +1994,8 @@ function entryFor(runs) {
       painting: null,
       paintedOn: null,
       paintedStamp: 0,
-      paintMin: void 0
+      paintMin: void 0,
+      listed: null
     };
     entries.set(runs, e);
   }
@@ -2001,11 +2006,15 @@ function dropEntry(runs) {
   if (e !== void 0) entries.delete(runs);
   return e;
 }
-function giveEntry(e) {
+function emptyEntry(e) {
   e.generation = -1;
   e.painting = null;
   e.paintedOn = null;
   e.paintMin = void 0;
+  e.listed = null;
+}
+function giveEntry(e) {
+  emptyEntry(e);
   if (spare2.length < SPARE_MAX2) spare2.push(e);
 }
 function _resetRunsEntriesForTests() {
@@ -2104,12 +2113,16 @@ function cachedPaintRuns(laid, runs, opts = {}, use = "keep") {
   if (list.length >= PAINT_CACHE_VARIANT_LIMIT) list.shift();
   list.push(p);
   const e = mine ?? entryFor(runs);
+  if (e.painting !== null && e.painting !== p) settlePainting(e.painting, runs);
   e.paintedOn = laid;
   e.paintedStamp = stamp;
   e.painting = p;
   e.paintMin = min;
   return handOut(p, use);
 }
+function settlePainting(p, runs) {
+  if (p.runs === runs) keyOf(p);
+}
 function handOut(p, use) {
   if (use === "keep") p.pinned = true;
   return p.painted;
@@ -2183,7 +2196,7 @@ function disown(vs) {
 var NO_LAYOUT = { lines: [], bounds: { width: 0, height: 0 } };
 function fill(v, opts, bidi, laid) {
   v.maxWidth = opts.maxWidth;
-  v.alignWidth = opts.alignWidth ?? opts.maxWidth;
+  storeAlignWidth(v, opts);
   v.lineHeight = opts.lineHeight;
   v.align = opts.align;
   v.justify = opts.justify === true || opts.align === "justify";
@@ -2197,9 +2210,9 @@ function fill(v, opts, bidi, laid) {
 function variant(opts, bidi, laid) {
   const spare4 = spareVariants.pop();
   if (spare4 !== void 0) return fill(spare4, opts, bidi, laid);
-  return {
+  const v = {
     maxWidth: opts.maxWidth,
-    alignWidth: opts.alignWidth ?? opts.maxWidth,
+    alignWidth: opts.maxWidth,
     lineHeight: opts.lineHeight,
     align: opts.align,
     justify: opts.justify === true || opts.align === "justify",
@@ -2209,6 +2222,8 @@ function variant(opts, bidi, laid) {
     shaper: layoutShaper(opts),
     laid
   };
+  storeAlignWidth(v, opts);
+  return v;
 }
 function mix(h, n) {
   return Math.imul(h ^ n, 16777619);
@@ -2279,7 +2294,7 @@ function cachedLayoutRuns(runs, opts, use = "keep") {
       return handOut2(v.laid, use);
     }
   }
-  const laid = structuralLayout(runs, opts, bidi, fonts);
+  const laid = structuralLayout(runs, opts, bidi, fonts, entry);
   const vs = entry.variants;
   if (vs.length >= LAYOUT_CACHE_VARIANT_LIMIT) disown(vs);
   vs.unshift(variant(opts, bidi, laid));
@@ -2293,9 +2308,12 @@ function dropRuns(runs) {
   disown(entry.variants);
   giveEntry(entry);
 }
-function structuralLayout(runs, opts, bidi, fonts) {
+function structuralLayout(runs, opts, bidi, fonts, entry) {
   if (structuralGeneration !== fonts) {
-    for (const s of structural) unlist(s);
+    for (const s of structural) {
+      unlist(s);
+      s.runs = NO_RUNS;
+    }
     structural = [];
     structuralGeneration = fonts;
   }
@@ -2316,11 +2334,29 @@ function structuralLayout(runs, opts, bidi, fonts) {
   filled.hash = hash;
   filled.runs = runs;
   filled.used = ++clock;
+  entry.listed = filled;
   const cols = columnsOf(laid);
   if (cols !== null) cols.listed = true;
   if (!full) structural.push(filled);
   return laid;
 }
+function clearRuns(runs) {
+  const entry = entryOf(runs);
+  if (entry === void 0) return;
+  const s = entry.listed;
+  if (s !== null && s.runs === runs) {
+    unlist(s);
+    s.laid = NO_LAYOUT;
+    s.runs = NO_RUNS;
+    s.hash = -1;
+    s.used = 0;
+  }
+  const p = entry.painting;
+  disown(entry.variants);
+  if (p !== null) settlePainting(p, runs);
+  emptyEntry(entry);
+}
+var NO_RUNS = [];
 function structuralEntry(opts, bidi, laid) {
   return fill({
     maxWidth: 0,
@@ -2351,6 +2387,6 @@ function _resetLayoutCacheForTests() {
   clock = 0;
 }
 
-export { BREAK_ALLOWED, BREAK_MANDATORY, DECORATION_KINDS, DEFAULT_DECORATION_METRICS, DEFAULT_TAB_SIZE, DEFAULT_TEXT_FILL, DEFAULT_TEXT_STYLE, LAYOUT_CACHE_STRUCTURAL_LIMIT, LAYOUT_CACHE_VARIANT_LIMIT, NO_BREAK, QUAD_STRIDE, _resetBidiWarningForTests, _resetLayoutCacheForTests, cachedLayoutRuns, cachedPaintRuns, decorationMetrics, decorationRule, dropRuns, emboldenGlyph, emboldenGlyphD, faceOutlineD, fontString, graphemeCount, hangs, hasGlyphQuad, isHardLineBreak, layoutRuns, lineBreakOpportunities, lineDecorations, paintRuns, paragraphDirection, registerBidi, registerShaper, resolveAlign, resolveTextStyle, resolveTextStyleInto, runFaces, shapesWithFeature, syntheticBoldOffset, tabAdvance, widthWithTabs, wrapLines };
-//# sourceMappingURL=chunk-5BJN6MC6.js.map
-//# sourceMappingURL=chunk-5BJN6MC6.js.map
+export { BREAK_ALLOWED, BREAK_MANDATORY, DECORATION_KINDS, DEFAULT_DECORATION_METRICS, DEFAULT_TAB_SIZE, DEFAULT_TEXT_FILL, DEFAULT_TEXT_STYLE, LAYOUT_CACHE_STRUCTURAL_LIMIT, LAYOUT_CACHE_VARIANT_LIMIT, NO_BREAK, QUAD_STRIDE, _resetBidiWarningForTests, _resetLayoutCacheForTests, cachedLayoutRuns, cachedPaintRuns, clearRuns, decorationMetrics, decorationRule, dropRuns, emboldenGlyph, emboldenGlyphD, faceOutlineD, fontString, graphemeCount, hangs, hasGlyphQuad, isHardLineBreak, layoutRuns, lineBreakOpportunities, lineDecorations, paintRuns, paragraphDirection, registerBidi, registerShaper, registeredBidi, resolveAlign, resolveTextStyle, resolveTextStyleInto, runFaces, shapesWithFeature, syntheticBoldOffset, tabAdvance, warnRtlWithoutEngine, widthWithTabs, wrapLines };
+//# sourceMappingURL=chunk-ZNSU5C43.js.map
+//# sourceMappingURL=chunk-ZNSU5C43.js.map