@vyaz/core 0.0.9 → 0.0.11

package/dist/index.browser.js

@@ -18200,21 +18200,55 @@ function normaliseWeight(weight) {
     return mapped;
   return weight;
 }
-function cacheKey2(family, weight, style) {
-  return `${family}_${normaliseWeight(weight)}_${style}`;
+function weightToNumber(weight) {
+  const num = parseInt(weight, 10);
+  return isNaN(num) ? 400 : num;
+}
+function variantKey(weight, style) {
+  return `${normaliseWeight(weight)}_${style}`;
+}
+function nearestWeight(registeredWeights, requested) {
+  if (registeredWeights.length === 0)
+    return null;
+  let best = registeredWeights[0];
+  let bestDist = Math.abs(best - requested);
+  for (let i = 1;i < registeredWeights.length; i++) {
+    const w = registeredWeights[i];
+    const dist = Math.abs(w - requested);
+    if (dist < bestDist || dist === bestDist && w > best) {
+      best = w;
+      bestDist = dist;
+    }
+  }
+  return best;
 }
 
 class FontMetricsProvider {
-  cache = new Map;
+  registry = new Map;
   metricsCache = new Map;
   mode = "browser";
+  pendingRegistrations = new Set;
+  _measureCanvas = null;
+  _measureCtx = null;
+  _getMeasureContext() {
+    if (!this._measureCtx) {
+      if (typeof OffscreenCanvas !== "undefined") {
+        this._measureCanvas = new OffscreenCanvas(1, 1);
+        this._measureCtx = this._measureCanvas.getContext("2d");
+      } else {
+        this._measureCanvas = document.createElement("canvas");
+        this._measureCtx = this._measureCanvas.getContext("2d");
+      }
+    }
+    return this._measureCtx;
+  }
   setMode(mode) {
     if (this.mode === mode)
       return;
     this.mode = mode;
     this.metricsCache.clear();
     if (mode === "office") {
-      enableOfficeTextMeasure(this.cache);
+      enableOfficeTextMeasure(this._flattenCache());
     } else {
       disableOfficeTextMeasure();
     }
@@ -18222,7 +18256,25 @@ class FontMetricsProvider {
   getMode() {
     return this.mode;
   }
+  _flattenCache() {
+    const flat = new Map;
+    for (const [family, variants] of this.registry) {
+      for (const [vKey, font] of variants) {
+        flat.set(`${family}_${vKey}`, font);
+      }
+    }
+    return flat;
+  }
   async registerFont(family, options, source, sourcePath) {
+    const promise = this._registerFontInternal(family, options, source, sourcePath);
+    this.pendingRegistrations.add(promise);
+    try {
+      await promise;
+    } finally {
+      this.pendingRegistrations.delete(promise);
+    }
+  }
+  async _registerFontInternal(family, options, source, sourcePath) {
     const { createFontFace: createFontFace2 } = await Promise.resolve().then(() => exports_FontEngine);
     const { registerCanvasFont: registerCanvasFont2 } = await init_canvas_polyfill().then(() => exports_canvas_polyfill);
     if (typeof source === "string") {
@@ -18230,25 +18282,107 @@ class FontMetricsProvider {
       source = await getFontBuffer2(source);
     }
     const font = await createFontFace2(source);
-    const key = cacheKey2(family, options.weight || "normal", options.style || "normal");
-    this.cache.set(key, font);
-    this.metricsCache.delete(key);
+    const w = options.weight || "normal";
+    const s = options.style || "normal";
+    const vKey = variantKey(w, s);
+    if (!this.registry.has(family)) {
+      this.registry.set(family, new Map);
+    }
+    this.registry.get(family).set(vKey, font);
+    for (const key of this.metricsCache.keys()) {
+      if (key.startsWith(family)) {
+        this.metricsCache.delete(key);
+      }
+    }
     if (sourcePath) {
       registerCanvasFont2(sourcePath, family);
     }
   }
+  async waitForPendingRegistrations() {
+    await Promise.all(this.pendingRegistrations);
+  }
+  getRegisteredFamilies() {
+    return Array.from(this.registry.keys());
+  }
+  getFamilyVariants(family) {
+    const variants = this.registry.get(family);
+    return variants ? Array.from(variants.keys()) : [];
+  }
   getFont(family, weight = "normal", style = "normal") {
-    const key = cacheKey2(family, weight, style);
-    return this.cache.get(key);
+    const resolved = this._resolveFont(family, weight, style);
+    if (!resolved)
+      return;
+    return resolved.font;
+  }
+  _resolveFont(family, weight, style) {
+    const variants = this.registry.get(family);
+    if (!variants || variants.size === 0)
+      return null;
+    const normalisedW = normaliseWeight(weight);
+    const normalisedS = style;
+    let key = variantKey(normalisedW, normalisedS);
+    let font = variants.get(key);
+    if (font)
+      return { font, resolvedWeight: normalisedW, resolvedStyle: normalisedS };
+    if (normalisedS === "italic") {
+      key = variantKey(normalisedW, "normal");
+      font = variants.get(key);
+      if (font)
+        return { font, resolvedWeight: normalisedW, resolvedStyle: "normal" };
+    }
+    const sameStyleWeights = [];
+    for (const vKey of variants.keys()) {
+      const [_w, _s] = vKey.split("_");
+      if (_s === normalisedS) {
+        sameStyleWeights.push(weightToNumber(_w));
+      }
+    }
+    const sameStyleNearest = nearestWeight(sameStyleWeights, weightToNumber(normalisedW));
+    if (sameStyleNearest !== null) {
+      key = variantKey(String(sameStyleNearest), normalisedS);
+      font = variants.get(key);
+      if (font)
+        return { font, resolvedWeight: String(sameStyleNearest), resolvedStyle: normalisedS };
+    }
+    if (normalisedS === "italic") {
+      const normalWeights = [];
+      for (const vKey of variants.keys()) {
+        const [_w, _s] = vKey.split("_");
+        if (_s === "normal") {
+          normalWeights.push(weightToNumber(_w));
+        }
+      }
+      const normalNearest = nearestWeight(normalWeights, weightToNumber(normalisedW));
+      if (normalNearest !== null) {
+        key = variantKey(String(normalNearest), "normal");
+        font = variants.get(key);
+        if (font)
+          return { font, resolvedWeight: String(normalNearest), resolvedStyle: "normal" };
+      }
+    }
+    const firstKey = variants.keys().next().value;
+    if (firstKey) {
+      font = variants.get(firstKey);
+      if (font) {
+        const [_w, _s] = firstKey.split("_");
+        return { font, resolvedWeight: _w, resolvedStyle: _s };
+      }
+    }
+    return null;
   }
   getMetrics(fontFamily, fontSize, weight = "normal", style = "normal") {
-    const key = cacheKey2(fontFamily, weight, style);
-    const metricsKey = `${key}_${fontSize}_${this.mode}`;
+    const _process2 = typeof globalThis !== "undefined" ? globalThis.process : undefined;
+    if (this.pendingRegistrations.size > 0 && _process2?.env?.NODE_ENV !== "production") {
+      console.warn("[vyaz] getMetrics() called while registerFont() promises are still pending. Wait for registerFont() to resolve before layout to avoid inaccurate metrics. Use fontMetricsProvider.waitForPendingRegistrations() if needed.");
+    }
+    const normalisedW = normaliseWeight(weight);
+    const metricsKey = `${fontFamily}_${normalisedW}_${style}_${fontSize}_${this.mode}`;
     const cached = this.metricsCache.get(metricsKey);
     if (cached)
       return cached;
-    const font = this.cache.get(key);
-    if (font) {
+    const resolved = this._resolveFont(fontFamily, weight, style);
+    if (resolved) {
+      const font = resolved.font;
       const scale = fontSize / font.unitsPerEm;
       let ascent;
       let descent;
@@ -18272,13 +18406,12 @@ class FontMetricsProvider {
       this.metricsCache.set(metricsKey, metrics);
       return metrics;
     }
-    if (this.cache.size > 0) {
+    if (this.registry.has(fontFamily)) {
       throw new FontNotFoundError(fontFamily, weight, style);
     }
     if (typeof document !== "undefined") {
       try {
-        const canvas = document.createElement("canvas");
-        const ctx = canvas.getContext("2d");
+        const ctx = this._getMeasureContext();
         ctx.font = `${style} ${weight} ${fontSize}px ${fontFamily}`;
         const m = ctx.measureText("M");
         const metrics = {
@@ -24338,15 +24471,15 @@ function isLineStartCursor(cursor) {
   return cursor.segmentIndex === 0 && cursor.graphemeIndex === 0;
 }
 function getCollapsedSpaceWidth(font, letterSpacing, cache) {
-  const cacheKey3 = `${font}\x00${letterSpacing}`;
-  const cached = cache.get(cacheKey3);
+  const cacheKey2 = `${font}\x00${letterSpacing}`;
+  const cached = cache.get(cacheKey2);
   if (cached !== undefined)
     return cached;
   const options = letterSpacing === 0 ? undefined : { letterSpacing };
   const joinedWidth = measureNaturalWidth(prepareWithSegments("A A", font, options));
   const compactWidth = measureNaturalWidth(prepareWithSegments("AA", font, options));
   const collapsedWidth = Math.max(0, joinedWidth - compactWidth);
-  cache.set(cacheKey3, collapsedWidth);
+  cache.set(cacheKey2, collapsedWidth);
   return collapsedWidth;
 }
 function prepareWholeItemLine(prepared) {
@@ -24591,11 +24724,11 @@ class ParagraphLayoutEngine {
   layout(paragraph, maxWidth, yOffset = 0, fontProvider, listStyle, listIndex, listMarkerWidth) {
     const provider = fontProvider || fontMetricsProvider;
     const items = compileParagraph(paragraph);
-    const cacheKey3 = JSON.stringify(paragraph);
-    let prepared = this.preparedCache.get(cacheKey3);
+    const cacheKey2 = JSON.stringify(paragraph);
+    let prepared = this.preparedCache.get(cacheKey2);
     if (!prepared) {
       prepared = prepareRichInline(items);
-      this.preparedCache.set(cacheKey3, prepared);
+      this.preparedCache.set(cacheKey2, prepared);
     }
     const effectiveMaxWidth = paragraph.style.whiteSpace === "nowrap" ? Infinity : maxWidth;
     const pretextLines = [];

package/dist/index.d.ts

@@ -5,7 +5,46 @@
  * layout engines, font metric providers, renderers, and utilities.
  */
 export type { TextFrame, Paragraph, ParagraphStyle, TextRun, InlineWidget, AutofitConfig, TextAlignment, WritingMode, TextOrientation, VerticalAlignment, ScriptType, WhiteSpace, MultiColumnConfig, DominantBaseline, LineFitEdge, TextAlignLast, WordBreak, LineBreak, OverflowWrap, TextDecorationStyle, TextTransform, ListType, NumberFormat, ListStylePosition, ListStyle, } from './types/Document.js';
-export { DEFAULT_PARAGRAPH_STYLE, DEFAULT_TEXT_STYLE, } from './types/Document.js';
+export declare const DEFAULT_PARAGRAPH_STYLE: {
+    alignment: import("./index.js").TextAlignment;
+    lineHeight: number;
+    spaceBefore: number;
+    spaceAfter: number;
+    indent?: number;
+    leftIndent?: number;
+    rightIndent?: number;
+    textIndent?: number;
+    letterSpacing?: number;
+    textAlignLast?: import("./index.js").TextAlignLast;
+    wordBreak?: import("./index.js").WordBreak;
+    lineBreak?: import("./index.js").LineBreak;
+    overflowWrap?: import("./index.js").OverflowWrap;
+    hyphens?: boolean;
+    whiteSpace?: import("./index.js").WhiteSpace;
+    listStyle?: import("./index.js").ListStyle;
+    listRestart?: boolean;
+};
+export declare const DEFAULT_TEXT_STYLE: {
+    type?: "text" | "inline-box" | undefined;
+    text?: string | undefined;
+    inlineWidget?: import("./index.js").InlineWidget | undefined;
+    fontFamily?: string | undefined;
+    fontSize?: number | undefined;
+    fontWeight?: number | "bold" | "normal" | undefined;
+    fontStyle?: "normal" | "italic" | undefined;
+    color?: string | undefined;
+    backgroundColor?: string | undefined;
+    letterSpacing?: number | undefined;
+    script?: import("./index.js").ScriptType | undefined;
+    underline?: boolean | undefined;
+    strikethrough?: boolean | undefined;
+    overline?: boolean | undefined;
+    textDecorationStyle?: import("./index.js").TextDecorationStyle | undefined;
+    textDecorationColor?: string | undefined;
+    textTransform?: import("./index.js").TextTransform | undefined;
+    fullWidth?: boolean | undefined;
+    fullSizeKana?: boolean | undefined;
+};
 export type { ParagraphLayoutResult, Line, Span, SpanFontMetrics, SemanticParagraph, SemanticLine, SemanticFragment, } from './types/LayoutTypes.js';
 export type { FontMetrics, IFontMetricsProvider, GlyphData, } from './types/FontTypes.js';
 export { ParagraphLayoutEngine, paragraphLayoutEngine } from './layout/ParagraphLayoutEngine.js';
@@ -19,7 +58,12 @@ export type { AutoFitOptions, AutoFitResult } from './layout/AutoFitEngine.js';
 export { groupLinesByParagraph } from './utils/groupLinesByParagraph.js';
 export type { ParagraphGroup } from './utils/groupLinesByParagraph.js';
 export { transformText } from './utils/textTransform.js';
-export { formatListNumber, defaultBulletChar, BULLET_CHARACTERS } from './utils/list.js';
+import { formatListNumber as _fln, defaultBulletChar as _dbc } from './utils/list.js';
+export declare const formatListNumber: typeof _fln;
+export declare const defaultBulletChar: typeof _dbc;
+export declare const BULLET_CHARACTERS: {
+    [x: number]: string;
+};
 export { compileParagraph, getParagraphText, makeFontToken, splitParagraphByHardBreaks, collapseSegmentWhitespace } from './compile/DocumentCompiler.js';
 export type { PreparedRichInlineItem } from './compile/DocumentCompiler.js';
 export type { FontFace } from './measure/FontEngine.js';