foliko 1.1.6 → 1.1.8

package/.agent/plugins/poster-plugin/src/elements/richText.js

@@ -1,9 +1,15 @@
 /**
- * 富文本组件 - 支持旋转和多种文本样式
+ * 富文本组件 - 使用 @napi-rs/canvas 原生字体 API
+ * 支持自动换行
  */
 
 const paper = require('paper')
-const { validateFont, getDefaultFont, getRegisteredFonts } = require('../fonts')
+const {
+  validateFont,
+  getDefaultFontFamily,
+  getFontFallbackChain,
+  isEmojiFont
+} = require('../fonts')
 
 /**
  * 检测文本是否包含 emoji
@@ -11,138 +17,199 @@ const { validateFont, getDefaultFont, getRegisteredFonts } = require('../fonts')
 function containsEmoji(text) {
   if (!text || typeof text !== 'string') return false
   const emojiRanges = [
-    /\u{1F600}-\u{1F64F}/u, /\u{1F300}-\u{1F5FF}/u, /\u{1F680}-\u{1F6FF}/u,
-    /\u{1F700}-\u{1F77F}/u, /\u{1F780}-\u{1F7FF}/u, /\u{1F800}-\u{1F8FF}/u,
-    /\u{1F900}-\u{1F9FF}/u, /\u{1FA00}-\u{1FA6F}/u, /\u{1FA70}-\u{1FAFF}/u,
-    /\u{2600}-\u{26FF}/u, /\u{2700}-\u{27BF}/u,
+    /\u{1F600}-\u{1F64F}/u,
+    /\u{1F300}-\u{1F5FF}/u,
+    /\u{1F680}-\u{1F6FF}/u,
+    /\u{1F700}-\u{1F77F}/u,
+    /\u{1F780}-\u{1F7FF}/u,
+    /\u{1F800}-\u{1F8FF}/u,
+    /\u{1F900}-\u{1F9FF}/u,
+    /\u{1FA00}-\u{1FA6F}/u,
+    /\u{1FA70}-\u{1FAFF}/u,
+    /\u2600-\u26FF/u,
+    /\u2700-\u27BF/u,
   ]
   for (const range of emojiRanges) {
     if (range.test(text)) return true
   }
-  return /[\u{1F300}-\u{1F9FF}]/u.test(text)
+  return false
 }
 
 /**
- * 获取适合的字体（考虑 emoji）
+ * 检测文本是否包含中文
+ */
+function containsChinese(text) {
+  if (!text || typeof text !== 'string') return false
+  return /[\u4e00-\u9fff]/.test(text)
+}
+
+/**
+ * 获取适合的字体
  */
 function getFontForText(requestedFont, text) {
-  const baseFont = validateFont(requestedFont) || getDefaultFont()
-  if (containsEmoji(text)) {
-    const registeredFonts = getRegisteredFonts()
-    const emojiFont = registeredFonts.find(f => {
-      if (!f) return false
-      const lower = f.toLowerCase()
-      return lower.includes('color emoji') || lower.includes('noto emoji') ||
-             lower.includes('segoe ui emoji') || lower.includes('symbola') || lower.includes('emoji')
-    })
-    if (emojiFont) return emojiFont
+  const baseFont = validateFont(requestedFont) || getDefaultFontFamily()
+  const chain = getFontFallbackChain(requestedFont || baseFont, text)
+
+  if (chain.length === 1) {
+    return chain[0]
   }
-  return baseFont
+
+  return chain.join(', ')
+}
+
+/**
+ * 手动实现文本自动换行
+ */
+function wrapText(text, maxWidth, fontSize, font) {
+  if (!maxWidth || maxWidth <= 0) return [text]
+
+  const tempText = new paper.PointText({
+    fontSize,
+    fontFamily: font,
+  })
+
+  const lines = []
+  const paragraphs = text.split('\n')
+
+  for (const paragraph of paragraphs) {
+    let currentLine = ''
+
+    // 简单字符分割
+    const chars = [...paragraph]
+
+    for (const char of chars) {
+      const testLine = currentLine + char
+      tempText.content = testLine
+      const testWidth = tempText.bounds.width
+
+      if (testWidth > maxWidth && currentLine.length > 0) {
+        lines.push(currentLine)
+        currentLine = char
+      } else {
+        currentLine = testLine
+      }
+    }
+
+    if (currentLine.length > 0) {
+      lines.push(currentLine)
+    }
+  }
+
+  tempText.remove()
+  return lines
 }
 
 /**
  * 添加富文本
- * @param {paper.Project} project - Paper.js 项目
- * @param {Object} args - 参数
- * @returns {Object} 结果
  */
 function addRichText(project, args) {
   const {
-    // 位置和尺寸
     x = 0,
     y = 0,
-    width,           // 文本区域宽度（用于自动换行）
+    width,
 
-    // 文本内容
     text = '',
 
-    // 字体样式
     fontSize = 48,
     fontFamily,
-    fontWeight,       // normal, bold, 100-900
-    fontStyle,       // normal, italic, oblique
+    fontWeight,
+    fontStyle,
     italic = false,
     bold = false,
 
-    // 文字装饰
     underline = false,
     strikethrough = false,
 
-    // 颜色
     color = '#ffffff',
-    backgroundColor,  // 文字背景色
-    gradient,        // { colors: ['#fff', '#000'], direction: 0 }
+    backgroundColor,
+    gradient,
 
-    // 描边
     strokeColor,
     strokeWidth = 1,
 
-    // 阴影
-    shadow,          // { color: '#000', blur: 5, offsetX: 2, offsetY: 2 }
+    shadow,
 
-    // 间距
     letterSpacing = 0,
-    lineSpacing = 0, // 行间距增量
-    lineHeight,      // 行高
+    lineSpacing = 0,
+    lineHeight,
 
-    // 对齐
-    align = 'left',  // left, center, right, justify
+    align = 'left',
 
-    // 变换
-    rotation = 0,    // 旋转角度（度）
+    rotation = 0,
     scale,
 
-    // 透明度
     opacity = 1,
 
-    // 换行
-    wrap = true,     // 是否自动换行
+    wrap = true,
   } = args
 
   const font = getFontForText(fontFamily, text)
   const effectiveFontWeight = bold ? 'bold' : (fontWeight || 'normal')
   const effectiveFontStyle = italic ? 'italic' : (fontStyle || 'normal')
 
-  // 创建文本项
-  const textItem = new paper.PointText({
-    point: [x, y + fontSize],
-    content: text,
-    fontSize,
-    fontFamily: font,
-    fontWeight: effectiveFontWeight,
-    fontStyle: effectiveFontStyle,
-    fillColor: new paper.Color(color),
-    justification: align,
-  })
+  const actualLineHeight = lineHeight || (fontSize + lineSpacing)
 
-  // 字母间距
-  if (letterSpacing !== 0) {
-    textItem.letterSpacing = letterSpacing
+  // 文本换行
+  let textLines = [text]
+  if (wrap && width && width > 0) {
+    textLines = wrapText(text, width - 10, fontSize, font)
   }
 
-  // 行高
-  if (lineHeight) {
-    textItem.leading = lineHeight
-  } else if (lineSpacing !== 0) {
-    textItem.leading = fontSize + lineSpacing
-  }
+  // 创建组
+  const group = new paper.Group()
 
-  // 下划线和删除线 - 使用字符样式
-  if (underline || strikethrough) {
-    textItem.decorations = []
-    if (underline) textItem.decorations.push('underline')
-    if (strikethrough) textItem.decorations.push('strikethrough')
-  }
+  // 逐行创建文本
+  textLines.forEach((lineText, index) => {
+    const lineY = y + fontSize + index * actualLineHeight
+
+    const textItem = new paper.PointText({
+      point: [x, lineY],
+      content: lineText,
+      fontSize,
+      fontFamily: font,
+      fontWeight: effectiveFontWeight,
+      fontStyle: effectiveFontStyle,
+      fillColor: new paper.Color(color),
+      justification: align,
+    })
+
+    if (letterSpacing !== 0) {
+      textItem.letterSpacing = letterSpacing
+    }
+
+    if (underline || strikethrough) {
+      textItem.decorations = []
+      if (underline) textItem.decorations.push('underline')
+      if (strikethrough) textItem.decorations.push('strikethrough')
+    }
+
+    if (strokeColor) {
+      textItem.strokeColor = new paper.Color(strokeColor)
+      textItem.strokeWidth = strokeWidth
+    }
+
+    if (shadow) {
+      textItem.shadowColor = new paper.Color(shadow.color || '#000000')
+      textItem.shadowBlur = shadow.blur || 5
+      textItem.shadowOffset = new paper.Point(shadow.offsetX || 2, shadow.offsetY || 2)
+    }
+
+    if (opacity !== 1) {
+      textItem.opacity = opacity
+    }
+
+    group.addChild(textItem)
+  })
 
   // 渐变填充
   if (gradient && gradient.colors && gradient.colors.length > 0) {
     const colors = gradient.colors.map(c => new paper.Color(c))
-    const bounds = textItem.bounds
+    const bounds = group.bounds
+
     if (gradient.direction !== undefined) {
-      // 自定义方向
       const angle = gradient.direction * Math.PI / 180
       const diagonal = Math.sqrt(bounds.width ** 2 + bounds.height ** 2)
-      textItem.fillColor = new paper.Color({
+      group.fillColor = new paper.Color({
         gradient: { stops: colors },
         origin: new paper.Point(
           bounds.center.x - Math.cos(angle) * diagonal / 2,
@@ -154,75 +221,61 @@ function addRichText(project, args) {
         ),
       })
     } else {
-      // 水平渐变
-      textItem.fillColor = new paper.Color({
+      group.fillColor = new paper.Color({
         gradient: { stops: colors },
         origin: bounds.topLeft,
         destination: bounds.topRight,
       })
     }
+
+    group.children.forEach(child => {
+      if (child.fillColor) {
+        child.fillColor = null
+      }
+    })
   }
 
-  // 背景色 - 创建背景矩形
+  // 背景色
   let bgRect = null
   if (backgroundColor) {
     const padding = 10
     bgRect = new paper.Path.Rectangle({
-      point: [textItem.bounds.left - padding, textItem.bounds.top - padding],
-      size: [textItem.bounds.width + padding * 2, textItem.bounds.height + padding * 2],
+      point: [group.bounds.left - padding, group.bounds.top - padding],
+      size: [group.bounds.width + padding * 2, group.bounds.height + padding * 2],
       fillColor: new paper.Color(backgroundColor),
       radius: 4,
     })
     bgRect.sendToBack()
   }
 
-  // 描边
-  if (strokeColor) {
-    textItem.strokeColor = new paper.Color(strokeColor)
-    textItem.strokeWidth = strokeWidth
-  }
-
-  // 阴影
-  if (shadow) {
-    textItem.shadowColor = new paper.Color(shadow.color || '#000000')
-    textItem.shadowBlur = shadow.blur || 5
-    textItem.shadowOffset = new paper.Point(shadow.offsetX || 2, shadow.offsetY || 2)
-  }
-
-  // 透明度
-  if (opacity !== 1) {
-    textItem.opacity = opacity
-    if (bgRect) bgRect.opacity = opacity
-  }
-
   // 旋转
   if (rotation !== 0) {
-    textItem.rotate(rotation, new paper.Point(x, y + fontSize))
+    group.rotate(rotation, new paper.Point(x, y + fontSize))
     if (bgRect) bgRect.rotate(rotation, bgRect.bounds.center)
   }
 
   // 缩放
   if (scale !== undefined) {
     if (typeof scale === 'number') {
-      textItem.scale(scale, scale, new paper.Point(x, y + fontSize))
+      group.scale(scale, scale, new paper.Point(x, y + fontSize))
       if (bgRect) bgRect.scale(scale, scale, bgRect.bounds.center)
-    } else if (typeof scale === 'object' && (scale.x !== undefined || scale.y !== undefined)) {
+    } else if (typeof scale === 'object') {
       const sx = scale.x || 1
       const sy = scale.y || sx
-      textItem.scale(sx, sy, new paper.Point(x, y + fontSize))
+      group.scale(sx, sy, new paper.Point(x, y + fontSize))
       if (bgRect) bgRect.scale(sx, sy, bgRect.bounds.center)
     }
   }
 
   return {
     success: true,
-    id: textItem.id,
+    id: group.id,
     type: 'richText',
     bounds: {
-      x: textItem.bounds.x,
-      y: textItem.bounds.y,
-      width: textItem.bounds.width,
-      height: textItem.bounds.height,
+      x: group.bounds.x,
+      y: group.bounds.y,
+      width: group.bounds.width,
+      height: group.bounds.height,
     }
   }
 }

package/.agent/plugins/poster-plugin/src/elements/text.js

@@ -1,17 +1,23 @@
 /**
- * 文字元素
+ * 文字元素 - 使用 @napi-rs/canvas 原生字体 API
  */
 
 const paper = require('paper')
-const { validateFont, getDefaultFont, getRegisteredFonts } = require('../fonts')
+const {
+  validateFont,
+  getDefaultFontFamily,
+  getFontFallbackChain,
+  matchFont,
+  isEmojiFont
+} = require('../fonts')
 
 /**
  * 检测文本是否包含 emoji
  */
 function containsEmoji(text) {
   if (!text || typeof text !== 'string') return false
-  
-  // Emoji Unicode 范围
+
+  // 使用 Unicode 属性转义检测 emoji
   const emojiRanges = [
     /\u{1F600}-\u{1F64F}/u, // 表情符号
     /\u{1F300}-\u{1F5FF}/u, // 符号和图片
@@ -22,56 +28,43 @@ function containsEmoji(text) {
     /\u{1F900}-\u{1F9FF}/u, // 表情符号补充
     /\u{1FA00}-\u{1FA6F}/u, // 棋牌符号
     /\u{1FA70}-\u{1FAFF}/u, // 装饰符号
-    /\u{2600}-\u{26FF}/u,   // 杂项符号
-    /\u{2700}-\u{27BF}/u,   // 装饰符号
-    /[\u{1F000}-\u{1F02F}]/u, // 麻将牌
+    /\u2600-\u26FF/u,       // 杂项符号
+    /\u2700-\u27BF/u,       // 装饰符号
   ]
 
   for (const range of emojiRanges) {
-    if (range.test(text)) {
-      return true
-    }
+    if (range.test(text)) return true
   }
 
-  // 简单检测：包含常见 emoji 字符
-  const simpleEmoji = /[\u{1F300}-\u{1F9FF}]/u
-  return simpleEmoji.test(text)
+  return false
 }
 
 /**
- * 获取适合的字体（考虑 emoji）
+ * 检测文本是否包含中文
+ */
+function containsChinese(text) {
+  if (!text || typeof text !== 'string') return false
+  return /[\u4e00-\u9fff]/.test(text)
+}
+
+/**
+ * 获取适合的字体（考虑 emoji 和中文）
  */
 function getFontForText(requestedFont, text) {
-  const baseFont = validateFont(requestedFont) || getDefaultFont()
-
-  // 如果文本包含 emoji，尝试使用支持 emoji 的字体
-  if (containsEmoji(text)) {
-    const registeredFonts = getRegisteredFonts()
-
-    // 优先查找专门的 emoji 字体（多种命名方式）
-    const emojiFont = registeredFonts.find(f => {
-      if (!f) return false
-      const lower = f.toLowerCase()
-      return (
-        lower.includes('color emoji') ||      // Noto Color Emoji, Apple Color Emoji
-        lower.includes('noto emoji') ||       // Noto Emoji
-        lower.includes('segoe ui emoji') ||    // Windows Segoe UI Emoji
-        lower.includes('segoe ui symbol') ||  // Windows Segoe UI Symbol
-        lower.includes('segui') ||            // Windows Segoe UI 开头
-        lower.includes('symbola') ||           // Symbola
-        lower.includes('emoji')                // 任何包含 emoji 的字体
-      )
-    })
-
-    if (emojiFont) {
-      console.log(`[poster] 检测到 emoji，使用字体: ${emojiFont}`)
-      return emojiFont
-    } else {
-      console.log(`[poster] 检测到 emoji，但未找到专用 emoji 字体，已注册字体: ${registeredFonts.join(', ')}`)
-    }
+  // 获取验证后的字体
+  const baseFont = validateFont(requestedFont) || getDefaultFontFamily()
+
+  // 获取字体 fallback 链
+  const chain = getFontFallbackChain(requestedFont || baseFont, text)
+
+  // 对于 @napi-rs/canvas，逗号分隔的字体链应该能正常工作
+  // 如果只有一个字体，就直接返回
+  if (chain.length === 1) {
+    return chain[0]
   }
 
-  return baseFont
+  // 返回字体链（逗号分隔）
+  return chain.join(', ')
 }
 
 /**
@@ -81,13 +74,17 @@ function addText(project, args) {
   const {
     text,
     x, y,
-    fontSize, fontFamily, color,
+    fontSize,
+    fontFamily,
+    color,
     align,
     shadow,
   } = args
 
+  // 获取适合的字体
   const font = getFontForText(fontFamily, text)
 
+  // 创建文本元素
   const textItem = new paper.PointText({
     point: [x, y],
     content: text,
@@ -97,13 +94,19 @@ function addText(project, args) {
     justification: align || 'left',
   })
 
+  // 添加阴影
   if (shadow) {
-    textItem.shadowColor = new paper.Color(shadow.color)
+    textItem.shadowColor = new paper.Color(shadow.color || '#000000')
     textItem.shadowBlur = shadow.blur || 5
     textItem.shadowOffset = new paper.Point(shadow.offsetX || 2, shadow.offsetY || 2)
   }
 
-  return { success: true, id: textItem.id, type: 'text' }
+  return {
+    success: true,
+    id: textItem.id,
+    type: 'text',
+    font: font
+  }
 }
 
 module.exports = addText