modern-text 1.2.2 → 1.3.0

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { Path2D, BoundingBox, setCanvasContext, Matrix3, Path2DSet, svgToDOM, svgToPath2DSet, Vector2 } from 'modern-path2d';
+import { Path2D, BoundingBox, setCanvasContext, Path2DSet, Matrix3, svgToDOM, svgToPath2DSet, Vector2 } from 'modern-path2d';
 import { getDefaultStyle } from 'modern-idoc';
 import { fonts } from 'modern-font';
 
@@ -61,6 +61,8 @@ function drawPath(options) {
     fill: options.color ?? pathStyle.fill,
     stroke: options.textStrokeColor ?? pathStyle.stroke,
     strokeWidth: options.textStrokeWidth ? options.textStrokeWidth * fontSize : pathStyle.strokeWidth,
+    strokeLinecap: "round",
+    strokeLinejoin: "round",
     shadowOffsetX: (options.shadowOffsetX ?? 0) * fontSize,
     shadowOffsetY: (options.shadowOffsetY ?? 0) * fontSize,
     shadowBlur: (options.shadowBlur ?? 0) * fontSize,
@@ -251,7 +253,7 @@ class Character {
       if (Math.abs(advanceWidth - advanceHeight) > 0.1) {
         y -= (ascender - typoAscender) / (ascender + Math.abs(descender)) * advanceHeight;
       }
-      glyphIndex = undefined;
+      glyphIndex = void 0;
     }
     if (isVertical && !set1.has(content) && (content.codePointAt(0) <= 256 || set2.has(content))) {
       path.addCommands(
@@ -272,12 +274,12 @@ class Character {
           isVertical ? {
             x: point.x,
             y: top - (advanceHeight - advanceWidth) / 2 + baseline
-          } : undefined
+          } : void 0
         );
       }
       path.rotate(90, point);
     } else {
-      if (glyphIndex !== undefined) {
+      if (glyphIndex !== void 0) {
         path.addCommands(
           sfnt.glyphs.get(glyphIndex).getPathCommands(x, y, style.fontSize)
         );
@@ -287,7 +289,7 @@ class Character {
             isVertical ? {
               x: x + advanceWidth / 2,
               y: top + typoAscender / (ascender + Math.abs(descender)) * advanceHeight
-            } : undefined
+            } : void 0
           );
         }
       } else {
@@ -295,7 +297,7 @@ class Character {
         if (needsItalic) {
           this._italic(
             path,
-            isVertical ? { x: x + advanceHeight / 2, y } : undefined
+            isVertical ? { x: x + advanceHeight / 2, y } : void 0
           );
         }
       }
@@ -323,13 +325,13 @@ class Character {
     if (this.path.curves[0]?.curves.length) {
       return this.path.getMinMax(min, max, withStyle);
     } else {
-      return undefined;
+      return void 0;
     }
   }
   getGlyphBoundingBox(withStyle) {
-    const minMax = this.getGlyphMinMax(undefined, undefined, withStyle);
+    const minMax = this.getGlyphMinMax(void 0, void 0, withStyle);
     if (!minMax) {
-      return undefined;
+      return void 0;
     }
     const { min, max } = minMax;
     return new BoundingBox(min.x, min.y, max.x - min.x, max.y - min.y);
@@ -443,7 +445,7 @@ function filterEmpty(val) {
     return val;
   const res = {};
   for (const key in val) {
-    if (val[key] !== "" && val[key] !== undefined) {
+    if (val[key] !== "" && val[key] !== void 0) {
       res[key] = val[key];
     }
   }
@@ -587,7 +589,7 @@ class Measurer {
     const isFlex = Boolean(style.justifyContent || style.alignItems);
     Object.assign(dom.style, {
       boxSizing: "border-box",
-      display: isFlex ? "inline-flex" : undefined,
+      display: isFlex ? "inline-flex" : void 0,
       width: "max-content",
       height: "max-content",
       whiteSpace: "pre-wrap",
@@ -602,8 +604,8 @@ class Measurer {
       listStyleType: "inherit",
       padding: "0",
       margin: "0",
-      width: isFlex && isHorizontal ? "100%" : undefined,
-      height: isFlex && !isHorizontal ? "100%" : undefined
+      width: isFlex && isHorizontal ? "100%" : void 0,
+      height: isFlex && !isHorizontal ? "100%" : void 0
     });
     paragraphs.forEach((paragraph) => {
       const li = document.createElement("li");
@@ -656,7 +658,7 @@ class Measurer {
           width: rect.width
         };
       }
-      return undefined;
+      return void 0;
     }).filter(Boolean);
   }
   measureDom(dom) {
@@ -869,6 +871,13 @@ class EventEmitter {
   }
 }
 
+function background() {
+  return {
+    name: "background"
+    // TODO
+  };
+}
+
 function getHighlightStyle(style) {
   const {
     highlight: highlight2,
@@ -1240,6 +1249,13 @@ function listStyle() {
   });
 }
 
+function outline() {
+  return {
+    name: "outline"
+    // TODO
+  };
+}
+
 const tempV1 = new Vector2();
 const tempM1 = new Matrix3();
 const tempM2 = new Matrix3();
@@ -1274,7 +1290,7 @@ function render() {
           boxes.push(aabb);
         });
       });
-      return boxes.length ? BoundingBox.from(...boxes) : undefined;
+      return boxes.length ? BoundingBox.from(...boxes) : void 0;
     },
     render: (ctx, text) => {
       const { paragraphs, glyphBox, effects, style } = text;
@@ -1396,7 +1412,7 @@ function textDecoration() {
           }
           prevStyle = style;
         } else {
-          prevStyle = undefined;
+          prevStyle = void 0;
         }
       });
       groups.forEach((group2) => {
@@ -1520,7 +1536,7 @@ class Text extends EventEmitter {
     this.measureDom = options.measureDom;
     this.effects = options.effects;
     this.fonts = options.fonts;
-    this.use(listStyle()).use(textDecoration()).use(highlight()).use(render());
+    this.use(background()).use(outline()).use(listStyle()).use(textDecoration()).use(highlight()).use(render());
     this.updateParagraphs();
   }
   use(plugin) {
@@ -1562,7 +1578,7 @@ class Text extends EventEmitter {
               paragraph.addFragment(f);
             } else {
               const { content: content2, ...fStyle } = f;
-              if (content2 !== undefined) {
+              if (content2 !== void 0) {
                 paragraph.addFragment(content2, fStyle);
               }
             }
@@ -1573,14 +1589,14 @@ class Text extends EventEmitter {
           const paragraph = new Paragraph(pStyle, style);
           fragments.forEach((f) => {
             const { content: content2, ...fStyle } = f;
-            if (content2 !== undefined) {
+            if (content2 !== void 0) {
               paragraph.addFragment(content2, fStyle);
             }
           });
           paragraphs.push(paragraph);
         } else if ("content" in p) {
           const { content: pData, ...pStyle } = p;
-          if (pData !== undefined) {
+          if (pData !== void 0) {
             const paragraph = new Paragraph(pStyle, style);
             paragraph.addFragment(pData);
             paragraphs.push(paragraph);
@@ -1724,4 +1740,4 @@ function renderText(options, load) {
   return text.render(options);
 }
 
-export { Character, Fragment, Measurer, Paragraph, Text, definePlugin, drawPath, filterEmpty, getHighlightStyle, getTransform2D, hexToRgb, highlight, isEqualObject, isEqualValue, isNone, listStyle, measureText, needsFetch, parseColor, parseColormap, parseValueNumber, render, renderText, setupView, textDecoration, textDefaultStyle, uploadColor, uploadColors };
+export { Character, Fragment, Measurer, Paragraph, Text, background, definePlugin, drawPath, filterEmpty, getHighlightStyle, getTransform2D, hexToRgb, highlight, isEqualObject, isEqualValue, isNone, listStyle, measureText, needsFetch, outline, parseColor, parseColormap, parseValueNumber, render, renderText, setupView, textDecoration, textDefaultStyle, uploadColor, uploadColors };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modern-text",
   "type": "module",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "packageManager": "pnpm@9.15.1",
   "description": "Measure and render text in a way that describes the DOM.",
   "author": "wxm",
@@ -58,21 +58,21 @@
   },
   "dependencies": {
     "modern-font": "^0.4.0",
-    "modern-idoc": "^0.1.5",
-    "modern-path2d": "^1.2.6"
+    "modern-idoc": "^0.2.10",
+    "modern-path2d": "^1.2.10"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^3.12.2",
-    "@types/node": "^22.10.5",
-    "bumpp": "^9.9.3",
+    "@antfu/eslint-config": "^4.8.1",
+    "@types/node": "^22.13.10",
+    "bumpp": "^10.0.3",
     "conventional-changelog-cli": "^5.0.0",
-    "eslint": "^9.17.0",
-    "lint-staged": "^15.3.0",
+    "eslint": "^9.22.0",
+    "lint-staged": "^15.4.3",
     "simple-git-hooks": "^2.11.1",
-    "typescript": "^5.7.3",
-    "unbuild": "^3.2.0",
-    "vite": "^6.0.7",
-    "vitest": "^2.1.8"
+    "typescript": "^5.8.2",
+    "unbuild": "^3.5.0",
+    "vite": "^6.2.1",
+    "vitest": "^3.0.8"
   },
   "simple-git-hooks": {
     "pre-commit": "pnpm lint-staged"