modern-text 0.7.2 → 0.7.4

package/dist/index.cjs

@@ -103,12 +103,6 @@ function uploadColors(ctx, text) {
   });
 }
 
-var __defProp$5 = Object.defineProperty;
-var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$5 = (obj, key, value) => {
-  __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
 const set1 = /* @__PURE__ */ new Set(["\xA9", "\xAE", "\xF7"]);
 const set2 = /* @__PURE__ */ new Set([
   "\u2014",
@@ -148,29 +142,29 @@ class Character {
     this.content = content;
     this.index = index;
     this.parent = parent;
-    __publicField$5(this, "path", new modernPath2d.Path2D());
-    __publicField$5(this, "lineBox", new modernPath2d.BoundingBox());
-    __publicField$5(this, "inlineBox", new modernPath2d.BoundingBox());
-    __publicField$5(this, "glyphBox");
-    __publicField$5(this, "advanceWidth", 0);
-    __publicField$5(this, "advanceHeight", 0);
-    __publicField$5(this, "underlinePosition", 0);
-    __publicField$5(this, "underlineThickness", 0);
-    __publicField$5(this, "strikeoutPosition", 0);
-    __publicField$5(this, "strikeoutSize", 0);
-    __publicField$5(this, "ascender", 0);
-    __publicField$5(this, "descender", 0);
-    __publicField$5(this, "typoAscender", 0);
-    __publicField$5(this, "typoDescender", 0);
-    __publicField$5(this, "typoLineGap", 0);
-    __publicField$5(this, "winAscent", 0);
-    __publicField$5(this, "winDescent", 0);
-    __publicField$5(this, "xHeight", 0);
-    __publicField$5(this, "capHeight", 0);
-    __publicField$5(this, "baseline", 0);
-    __publicField$5(this, "centerDiviation", 0);
-    __publicField$5(this, "fontStyle");
   }
+  path = new modernPath2d.Path2D();
+  lineBox = new modernPath2d.BoundingBox();
+  inlineBox = new modernPath2d.BoundingBox();
+  glyphBox;
+  advanceWidth = 0;
+  advanceHeight = 0;
+  underlinePosition = 0;
+  underlineThickness = 0;
+  strikeoutPosition = 0;
+  strikeoutSize = 0;
+  ascender = 0;
+  descender = 0;
+  typoAscender = 0;
+  typoDescender = 0;
+  typoLineGap = 0;
+  winAscent = 0;
+  winDescent = 0;
+  xHeight = 0;
+  capHeight = 0;
+  baseline = 0;
+  centerDiviation = 0;
+  fontStyle;
   get center() {
     return this.glyphBox?.center;
   }
@@ -460,20 +454,14 @@ function needsFetch(source) {
   return source.startsWith("http://") || source.startsWith("https://") || source.startsWith("blob://");
 }
 
-var __defProp$4 = Object.defineProperty;
-var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$4 = (obj, key, value) => {
-  __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
 class Fragment {
   constructor(content, style = {}, parent) {
     this.content = content;
     this.style = style;
     this.parent = parent;
-    __publicField$4(this, "inlineBox", new modernPath2d.BoundingBox());
     this.updateComputedStyle().initCharacters();
   }
+  inlineBox = new modernPath2d.BoundingBox();
   get computedContent() {
     const style = this.computedStyle;
     return style.textTransform === "uppercase" ? this.content.toUpperCase() : style.textTransform === "lowercase" ? this.content.toLowerCase() : this.content;
@@ -496,20 +484,14 @@ class Fragment {
   }
 }
 
-var __defProp$3 = Object.defineProperty;
-var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$3 = (obj, key, value) => {
-  __defNormalProp$3(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
 class Paragraph {
   constructor(style, parentStyle) {
     this.style = style;
     this.parentStyle = parentStyle;
-    __publicField$3(this, "lineBox", new modernPath2d.BoundingBox());
-    __publicField$3(this, "fragments", []);
     this.updateComputedStyle();
   }
+  lineBox = new modernPath2d.BoundingBox();
+  fragments = [];
   updateComputedStyle() {
     this.computedStyle = {
       ...filterEmpty(this.parentStyle),
@@ -528,17 +510,30 @@ function definePlugin(options) {
   return options;
 }
 
-var __defProp$2 = Object.defineProperty;
-var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$2 = (obj, key, value) => {
-  __defNormalProp$2(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
-const _Measurer = class _Measurer {
+class Measurer {
+  static pxStyles = /* @__PURE__ */ new Set([
+    "width",
+    "height",
+    "fontSize",
+    "letterSpacing",
+    "textStrokeWidth",
+    "textIndent",
+    "shadowOffsetX",
+    "shadowOffsetY",
+    "shadowBlur",
+    "marginLeft",
+    "marginTop",
+    "marginRight",
+    "marginBottom",
+    "paddingLeft",
+    "paddingTop",
+    "paddingRight",
+    "paddingBottom"
+  ]);
   _styleToDomStyle(style) {
     const _style = { ...style };
     for (const key in style) {
-      if (_Measurer.pxStyles.has(key)) {
+      if (Measurer.pxStyles.has(key)) {
         _style[key] = `${style[key]}px`;
       } else {
         _style[key] = style[key];
@@ -782,38 +777,10 @@ const _Measurer = class _Measurer {
     destory?.();
     return result;
   }
-};
-__publicField$2(_Measurer, "pxStyles", /* @__PURE__ */ new Set([
-  "width",
-  "height",
-  "fontSize",
-  "letterSpacing",
-  "textStrokeWidth",
-  "textIndent",
-  "shadowOffsetX",
-  "shadowOffsetY",
-  "shadowBlur",
-  "marginLeft",
-  "marginTop",
-  "marginRight",
-  "marginBottom",
-  "paddingLeft",
-  "paddingTop",
-  "paddingRight",
-  "paddingBottom"
-]));
-let Measurer = _Measurer;
+}
 
-var __defProp$1 = Object.defineProperty;
-var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$1 = (obj, key, value) => {
-  __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
 class EventEmitter {
-  constructor() {
-    __publicField$1(this, "eventListeners", /* @__PURE__ */ new Map());
-  }
+  eventListeners = /* @__PURE__ */ new Map();
   addEventListener(event, listener, options) {
     const object = { value: listener, options };
     const listeners = this.eventListeners.get(event);
@@ -898,6 +865,25 @@ class EventEmitter {
   }
 }
 
+function getHighlightStyle(style) {
+  const {
+    highlight: highlight2,
+    highlightImage,
+    highlightReferImage,
+    highlightColormap,
+    highlightLine,
+    highlightSize,
+    highlightThickness
+  } = style;
+  return {
+    image: highlight2?.image ?? highlightImage ?? "none",
+    referImage: highlight2?.referImage ?? highlightReferImage ?? "none",
+    colormap: highlight2?.colormap ?? highlightColormap ?? "none",
+    line: highlight2?.line ?? highlightLine ?? "none",
+    size: highlight2?.size ?? highlightSize ?? "cover",
+    thickness: highlight2?.thickness ?? highlightThickness ?? "100%"
+  };
+}
 function highlight() {
   const paths = [];
   const clipRects = [];
@@ -930,45 +916,46 @@ function highlight() {
     name: "highlight",
     paths,
     load: async (text) => {
-      const promises = [];
+      const set = /* @__PURE__ */ new Set();
       text.forEachCharacter((character) => {
         const { computedStyle: style } = character;
-        const { highlightImage, highlightReferImage } = style;
-        if (needsFetch(highlightImage)) {
-          promises.push(loadSvg(highlightImage));
+        const { image, referImage } = getHighlightStyle(style);
+        if (needsFetch(image)) {
+          set.add(image);
         }
-        if (needsFetch(highlightReferImage)) {
-          promises.push(loadSvg(highlightReferImage));
+        if (needsFetch(referImage)) {
+          set.add(referImage);
         }
       });
-      await Promise.all(promises);
+      await Promise.all(Array.from(set).map((src) => loadSvg(src)));
     },
     update: (text) => {
       clipRects.length = 0;
       paths.length = 0;
       let groups = [];
       let group;
-      let prevStyle;
+      let prevHighlight;
       text.forEachCharacter((character) => {
         const {
           computedStyle: style
         } = character;
+        const highlight2 = getHighlightStyle(style);
         const {
-          highlightImage
-        } = style;
-        if (!isNone(highlightImage)) {
+          image,
+          colormap,
+          line,
+          size,
+          thickness
+        } = highlight2;
+        if (!isNone(image)) {
           const {
             inlineBox,
             isVertical
           } = character;
           const {
-            fontSize,
-            highlightColormap,
-            highlightLine,
-            highlightSize,
-            highlightThickness
+            fontSize
           } = style;
-          if ((!prevStyle || isEqualValue(prevStyle.highlightImage, highlightImage) && isEqualValue(prevStyle.highlightColormap, highlightColormap) && isEqualValue(prevStyle.highlightLine, highlightLine) && isEqualValue(prevStyle.highlightSize, highlightSize) && isEqualValue(prevStyle.highlightThickness, highlightThickness)) && group?.length && (isVertical ? group[0].inlineBox.left === inlineBox.left : group[0].inlineBox.top === inlineBox.top) && group[0].fontSize === fontSize) {
+          if ((!prevHighlight || isEqualValue(prevHighlight.image, image) && isEqualValue(prevHighlight.colormap, colormap) && isEqualValue(prevHighlight.line, line) && isEqualValue(prevHighlight.size, size) && isEqualValue(prevHighlight.thickness, thickness)) && group?.length && (isVertical ? group[0].inlineBox.left === inlineBox.left : group[0].inlineBox.top === inlineBox.top) && group[0].fontSize === fontSize) {
             group.push(character);
           } else {
             group = [];
@@ -981,7 +968,7 @@ function highlight() {
             groups.push(group);
           }
         }
-        prevStyle = style;
+        prevHighlight = highlight2;
       });
       groups = groups.filter((characters) => characters.length);
       for (let i = 0; i < groups.length; i++) {
@@ -995,18 +982,20 @@ function highlight() {
         } = char;
         const {
           fontSize,
-          writingMode,
-          highlightImage,
-          highlightReferImage,
-          highlightColormap,
-          highlightLine,
-          highlightSize,
-          highlightThickness
+          writingMode
         } = style;
+        const {
+          image,
+          referImage,
+          colormap,
+          line,
+          size,
+          thickness
+        } = getHighlightStyle(style);
         const isVertical = writingMode.includes("vertical");
-        const thickness = parseValueNumber(highlightThickness, { fontSize, total: groupBox.width }) / groupBox.width;
-        const colormap = parseColormap(highlightColormap);
-        const { paths: svgPaths, dom: svgDom } = getPaths(highlightImage);
+        const _thickness = parseValueNumber(thickness, { fontSize, total: groupBox.width }) / groupBox.width;
+        const _colormap = parseColormap(colormap);
+        const { paths: svgPaths, dom: svgDom } = getPaths(image);
         const aBox = modernPath2d.getPathsBoundingBox(svgPaths, true);
         const styleScale = fontSize / aBox.width * 2;
         const cBox = new modernPath2d.BoundingBox().copy(groupBox);
@@ -1017,37 +1006,37 @@ function highlight() {
         }
         const rawWidth = Math.floor(cBox.width);
         let userWidth = rawWidth;
-        if (highlightSize !== "cover") {
-          userWidth = parseValueNumber(highlightSize, { fontSize, total: groupBox.width });
+        if (size !== "cover") {
+          userWidth = parseValueNumber(size, { fontSize, total: groupBox.width }) || rawWidth;
           cBox.width = userWidth;
         }
-        if (!isNone(highlightReferImage) && isNone(highlightLine)) {
-          const bBox = modernPath2d.getPathsBoundingBox(getPaths(highlightReferImage).paths, true);
+        if (!isNone(referImage) && isNone(line)) {
+          const bBox = modernPath2d.getPathsBoundingBox(getPaths(referImage).paths, true);
           aBox.copy(bBox);
         } else {
-          let line;
-          if (isNone(highlightLine)) {
+          let _line;
+          if (isNone(line)) {
             if (aBox.width / aBox.height > 4) {
-              line = "underline";
+              _line = "underline";
               const viewBox = svgDom.getAttribute("viewBox");
               if (viewBox) {
                 const [_x, y, _w, h] = viewBox.split(" ").map((v) => Number(v));
                 const viewCenter = y + h / 2;
                 if (aBox.y < viewCenter && aBox.y + aBox.height > viewCenter) {
-                  line = "line-through";
+                  _line = "line-through";
                 } else if (aBox.y + aBox.height < viewCenter) {
-                  line = "overline";
+                  _line = "overline";
                 } else {
-                  line = "underline";
+                  _line = "underline";
                 }
               }
             } else {
-              line = "outline";
+              _line = "outline";
             }
           } else {
-            line = highlightLine;
+            _line = line;
           }
-          switch (line) {
+          switch (_line) {
             case "outline": {
               const paddingX = cBox.width * 0.2;
               const paddingY = cBox.height * 0.2;
@@ -1104,7 +1093,7 @@ function highlight() {
           svgPaths.forEach((originalPath) => {
             const path = originalPath.clone().matrix(_transform);
             if (path.style.strokeWidth) {
-              path.style.strokeWidth *= styleScale * thickness;
+              path.style.strokeWidth *= styleScale * _thickness;
             }
             if (path.style.strokeMiterlimit) {
               path.style.strokeMiterlimit *= styleScale;
@@ -1115,11 +1104,11 @@ function highlight() {
             if (path.style.strokeDasharray) {
               path.style.strokeDasharray = path.style.strokeDasharray.map((v) => v * styleScale);
             }
-            if (path.style.fill && path.style.fill in colormap) {
-              path.style.fill = colormap[path.style.fill];
+            if (path.style.fill && path.style.fill in _colormap) {
+              path.style.fill = _colormap[path.style.fill];
             }
-            if (path.style.stroke && path.style.stroke in colormap) {
-              path.style.stroke = colormap[path.style.stroke];
+            if (path.style.stroke && path.style.stroke in _colormap) {
+              path.style.stroke = _colormap[path.style.stroke];
             }
             paths.push(path);
             if (rawWidth !== userWidth) {
@@ -1492,12 +1481,6 @@ function textDecoration() {
   });
 }
 
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
 const defaultTextStyles = {
   writingMode: "horizontal-tb",
   verticalAlign: "baseline",
@@ -1528,13 +1511,6 @@ const defaultTextStyles = {
   listStyleColormap: "none",
   listStyleSize: "cover",
   listStylePosition: "outside",
-  // highlight
-  highlightImage: "none",
-  highlightReferImage: "none",
-  highlightColormap: "none",
-  highlightLine: "none",
-  highlightSize: "cover",
-  highlightThickness: "100%",
   // shadow
   shadowColor: "rgba(0, 0, 0, 0)",
   shadowOffsetX: 0,
@@ -1546,24 +1522,33 @@ const defaultTextStyles = {
   skewY: 0
 };
 class Text extends EventEmitter {
+  debug;
+  content;
+  style;
+  effects;
+  measureDom;
+  needsUpdate = true;
+  computedStyle = { ...defaultTextStyles };
+  paragraphs = [];
+  lineBox = new modernPath2d.BoundingBox();
+  rawGlyphBox = new modernPath2d.BoundingBox();
+  glyphBox = new modernPath2d.BoundingBox();
+  pathBox = new modernPath2d.BoundingBox();
+  boundingBox = new modernPath2d.BoundingBox();
+  measurer = new Measurer();
+  plugins = /* @__PURE__ */ new Map();
+  fonts;
+  get fontSize() {
+    return this.computedStyle.fontSize;
+  }
+  get isVertical() {
+    return this.computedStyle.writingMode.includes("vertical");
+  }
+  get characters() {
+    return this.paragraphs.flatMap((p) => p.fragments.flatMap((f) => f.characters));
+  }
   constructor(options = {}) {
     super();
-    __publicField(this, "debug");
-    __publicField(this, "content");
-    __publicField(this, "style");
-    __publicField(this, "effects");
-    __publicField(this, "measureDom");
-    __publicField(this, "needsUpdate", true);
-    __publicField(this, "computedStyle", { ...defaultTextStyles });
-    __publicField(this, "paragraphs", []);
-    __publicField(this, "lineBox", new modernPath2d.BoundingBox());
-    __publicField(this, "rawGlyphBox", new modernPath2d.BoundingBox());
-    __publicField(this, "glyphBox", new modernPath2d.BoundingBox());
-    __publicField(this, "pathBox", new modernPath2d.BoundingBox());
-    __publicField(this, "boundingBox", new modernPath2d.BoundingBox());
-    __publicField(this, "measurer", new Measurer());
-    __publicField(this, "plugins", /* @__PURE__ */ new Map());
-    __publicField(this, "fonts");
     this.debug = options.debug ?? false;
     this.content = options.content ?? "";
     this.style = options.style ?? {};
@@ -1571,15 +1556,7 @@ class Text extends EventEmitter {
     this.effects = options.effects;
     this.fonts = options.fonts;
     this.use(listStyle()).use(textDecoration()).use(highlight()).use(render());
-  }
-  get fontSize() {
-    return this.computedStyle.fontSize;
-  }
-  get isVertical() {
-    return this.computedStyle.writingMode.includes("vertical");
-  }
-  get characters() {
-    return this.paragraphs.flatMap((p) => p.fragments.flatMap((f) => f.characters));
+    this.updateParagraphs();
   }
   use(plugin) {
     this.plugins.set(plugin.name, plugin);
@@ -1730,6 +1707,7 @@ class Text extends EventEmitter {
       this[key] = result[key];
     }
     this.emit("update", { text: this });
+    this.needsUpdate = false;
     return this;
   }
   render(options) {
@@ -1762,11 +1740,23 @@ class Text extends EventEmitter {
 }
 
 function measureText(options) {
-  return new Text(options).measure();
+  const text = new Text(options);
+  if (options.load) {
+    return text.load().then(() => {
+      return text.measure();
+    });
+  }
+  return text.measure();
 }
 
 function renderText(options) {
-  new Text(options).render(options);
+  const text = new Text(options);
+  if (options.load) {
+    return text.load().then(() => {
+      return text.render(options);
+    });
+  }
+  return text.render(options);
 }
 
 exports.Character = Character;
@@ -1778,6 +1768,7 @@ exports.defaultTextStyles = defaultTextStyles;
 exports.definePlugin = definePlugin;
 exports.drawPath = drawPath;
 exports.filterEmpty = filterEmpty;
+exports.getHighlightStyle = getHighlightStyle;
 exports.getTransform2D = getTransform2D;
 exports.hexToRgb = hexToRgb;
 exports.highlight = highlight;

package/dist/index.d.cts

@@ -252,7 +252,24 @@ interface TextLineStyle {
     listStyleSize: ListStyleSize;
     listStylePosition: ListStylePosition;
 }
-interface TextInlineStyle {
+interface HighlightStyle {
+    image: HighlightImage;
+    referImage: HighlightReferImage;
+    colormap: HighlightColormap;
+    line: HighlightLine;
+    size: HighlightSize;
+    thickness: HighlightThickness;
+}
+interface TextHighlightStyle {
+    highlight?: Partial<HighlightStyle>;
+    highlightImage?: HighlightImage;
+    highlightReferImage?: HighlightReferImage;
+    highlightColormap?: HighlightColormap;
+    highlightLine?: HighlightLine;
+    highlightSize?: HighlightSize;
+    highlightThickness?: HighlightThickness;
+}
+interface TextInlineStyle extends TextHighlightStyle {
     verticalAlign: VerticalAlign;
     letterSpacing: number;
     fontSize: number;
@@ -263,12 +280,6 @@ interface TextInlineStyle {
     textTransform: TextTransform;
     textOrientation: TextOrientation;
     textDecoration: TextDecorationLine;
-    highlightImage: HighlightImage;
-    highlightReferImage: HighlightReferImage;
-    highlightColormap: HighlightColormap;
-    highlightLine: HighlightLine;
-    highlightSize: HighlightSize;
-    highlightThickness: HighlightThickness;
 }
 interface TextDrawStyle {
     color: string | CanvasGradient | CanvasPattern;
@@ -349,10 +360,22 @@ declare function uploadColors(ctx: CanvasRenderingContext2D, text: Text$1): void
 
 declare function definePlugin(options: TextPlugin): TextPlugin;
 
-declare function measureText(options: TextOptions): MeasureResult;
+declare function measureText(options: TextOptions & {
+    load: true;
+}): Promise<MeasureResult>;
+declare function measureText(options: TextOptions & {
+    load?: false;
+}): MeasureResult;
 
-declare function renderText(options: TextOptions & TextRenderOptions): void;
+type RenderTextOptions = TextOptions & TextRenderOptions;
+declare function renderText(options: RenderTextOptions & {
+    load: true;
+}): Promise<void>;
+declare function renderText(options: RenderTextOptions & {
+    load?: false;
+}): void;
 
+declare function getHighlightStyle(style: TextStyle): HighlightStyle;
 declare function highlight(): TextPlugin;
 
 declare function listStyle(): TextPlugin;
@@ -375,4 +398,4 @@ declare function hexToRgb(hex: string): string | null;
 declare function filterEmpty(val: Record<string, any> | undefined): Record<string, any> | undefined;
 declare function needsFetch(source: string): boolean;
 
-export { Character, type DrawShapePathsOptions, type FontKerning, type FontStyle, type FontWeight, Fragment, type FragmentContent, type HighlightColormap, type HighlightImage, type HighlightLine, type HighlightReferImage, type HighlightSize, type HighlightThickness, type LinearGradient, type ListStyleColormap, type ListStyleImage, type ListStylePosition, type ListStyleSize, type ListStyleType, type MeasureDomResult, type MeasureResult, type MeasuredCharacter, type MeasuredFragment, type MeasuredParagraph, Measurer, Paragraph, type ParagraphContent, type Sizeable, Text$1 as Text, type TextAlign, type TextContent, type TextDecorationLine, type TextDrawStyle, type TextEventMap, type TextInlineStyle, type TextLineStyle, type TextOptions, type TextOrientation, type TextPlugin, type TextRenderOptions, type TextStyle, type TextTransform, type TextWrap, type VerticalAlign, type WritingMode, defaultTextStyles, definePlugin, drawPath, filterEmpty, getTransform2D, hexToRgb, highlight, isEqualObject, isEqualValue, isNone, listStyle, measureText, needsFetch, parseColor, parseColormap, parseValueNumber, render, renderText, setupView, textDecoration, uploadColor, uploadColors };
+export { Character, type DrawShapePathsOptions, type FontKerning, type FontStyle, type FontWeight, Fragment, type FragmentContent, type HighlightColormap, type HighlightImage, type HighlightLine, type HighlightReferImage, type HighlightSize, type HighlightStyle, type HighlightThickness, type LinearGradient, type ListStyleColormap, type ListStyleImage, type ListStylePosition, type ListStyleSize, type ListStyleType, type MeasureDomResult, type MeasureResult, type MeasuredCharacter, type MeasuredFragment, type MeasuredParagraph, Measurer, Paragraph, type ParagraphContent, type RenderTextOptions, type Sizeable, Text$1 as Text, type TextAlign, type TextContent, type TextDecorationLine, type TextDrawStyle, type TextEventMap, type TextHighlightStyle, type TextInlineStyle, type TextLineStyle, type TextOptions, type TextOrientation, type TextPlugin, type TextRenderOptions, type TextStyle, type TextTransform, type TextWrap, type VerticalAlign, type WritingMode, defaultTextStyles, definePlugin, drawPath, filterEmpty, getHighlightStyle, getTransform2D, hexToRgb, highlight, isEqualObject, isEqualValue, isNone, listStyle, measureText, needsFetch, parseColor, parseColormap, parseValueNumber, render, renderText, setupView, textDecoration, uploadColor, uploadColors };

package/dist/index.d.mts

@@ -252,7 +252,24 @@ interface TextLineStyle {
     listStyleSize: ListStyleSize;
     listStylePosition: ListStylePosition;
 }
-interface TextInlineStyle {
+interface HighlightStyle {
+    image: HighlightImage;
+    referImage: HighlightReferImage;
+    colormap: HighlightColormap;
+    line: HighlightLine;
+    size: HighlightSize;
+    thickness: HighlightThickness;
+}
+interface TextHighlightStyle {
+    highlight?: Partial<HighlightStyle>;
+    highlightImage?: HighlightImage;
+    highlightReferImage?: HighlightReferImage;
+    highlightColormap?: HighlightColormap;
+    highlightLine?: HighlightLine;
+    highlightSize?: HighlightSize;
+    highlightThickness?: HighlightThickness;
+}
+interface TextInlineStyle extends TextHighlightStyle {
     verticalAlign: VerticalAlign;
     letterSpacing: number;
     fontSize: number;
@@ -263,12 +280,6 @@ interface TextInlineStyle {
     textTransform: TextTransform;
     textOrientation: TextOrientation;
     textDecoration: TextDecorationLine;
-    highlightImage: HighlightImage;
-    highlightReferImage: HighlightReferImage;
-    highlightColormap: HighlightColormap;
-    highlightLine: HighlightLine;
-    highlightSize: HighlightSize;
-    highlightThickness: HighlightThickness;
 }
 interface TextDrawStyle {
     color: string | CanvasGradient | CanvasPattern;
@@ -349,10 +360,22 @@ declare function uploadColors(ctx: CanvasRenderingContext2D, text: Text$1): void
 
 declare function definePlugin(options: TextPlugin): TextPlugin;
 
-declare function measureText(options: TextOptions): MeasureResult;
+declare function measureText(options: TextOptions & {
+    load: true;
+}): Promise<MeasureResult>;
+declare function measureText(options: TextOptions & {
+    load?: false;
+}): MeasureResult;
 
-declare function renderText(options: TextOptions & TextRenderOptions): void;
+type RenderTextOptions = TextOptions & TextRenderOptions;
+declare function renderText(options: RenderTextOptions & {
+    load: true;
+}): Promise<void>;
+declare function renderText(options: RenderTextOptions & {
+    load?: false;
+}): void;
 
+declare function getHighlightStyle(style: TextStyle): HighlightStyle;
 declare function highlight(): TextPlugin;
 
 declare function listStyle(): TextPlugin;
@@ -375,4 +398,4 @@ declare function hexToRgb(hex: string): string | null;
 declare function filterEmpty(val: Record<string, any> | undefined): Record<string, any> | undefined;
 declare function needsFetch(source: string): boolean;
 
-export { Character, type DrawShapePathsOptions, type FontKerning, type FontStyle, type FontWeight, Fragment, type FragmentContent, type HighlightColormap, type HighlightImage, type HighlightLine, type HighlightReferImage, type HighlightSize, type HighlightThickness, type LinearGradient, type ListStyleColormap, type ListStyleImage, type ListStylePosition, type ListStyleSize, type ListStyleType, type MeasureDomResult, type MeasureResult, type MeasuredCharacter, type MeasuredFragment, type MeasuredParagraph, Measurer, Paragraph, type ParagraphContent, type Sizeable, Text$1 as Text, type TextAlign, type TextContent, type TextDecorationLine, type TextDrawStyle, type TextEventMap, type TextInlineStyle, type TextLineStyle, type TextOptions, type TextOrientation, type TextPlugin, type TextRenderOptions, type TextStyle, type TextTransform, type TextWrap, type VerticalAlign, type WritingMode, defaultTextStyles, definePlugin, drawPath, filterEmpty, getTransform2D, hexToRgb, highlight, isEqualObject, isEqualValue, isNone, listStyle, measureText, needsFetch, parseColor, parseColormap, parseValueNumber, render, renderText, setupView, textDecoration, uploadColor, uploadColors };
+export { Character, type DrawShapePathsOptions, type FontKerning, type FontStyle, type FontWeight, Fragment, type FragmentContent, type HighlightColormap, type HighlightImage, type HighlightLine, type HighlightReferImage, type HighlightSize, type HighlightStyle, type HighlightThickness, type LinearGradient, type ListStyleColormap, type ListStyleImage, type ListStylePosition, type ListStyleSize, type ListStyleType, type MeasureDomResult, type MeasureResult, type MeasuredCharacter, type MeasuredFragment, type MeasuredParagraph, Measurer, Paragraph, type ParagraphContent, type RenderTextOptions, type Sizeable, Text$1 as Text, type TextAlign, type TextContent, type TextDecorationLine, type TextDrawStyle, type TextEventMap, type TextHighlightStyle, type TextInlineStyle, type TextLineStyle, type TextOptions, type TextOrientation, type TextPlugin, type TextRenderOptions, type TextStyle, type TextTransform, type TextWrap, type VerticalAlign, type WritingMode, defaultTextStyles, definePlugin, drawPath, filterEmpty, getHighlightStyle, getTransform2D, hexToRgb, highlight, isEqualObject, isEqualValue, isNone, listStyle, measureText, needsFetch, parseColor, parseColormap, parseValueNumber, render, renderText, setupView, textDecoration, uploadColor, uploadColors };