@meframe/core 0.5.5 → 0.5.7

package/dist/stages/compose/text-utils/text-wrapper.js

@@ -16,129 +16,54 @@ function findAllBreakPoints(text) {
   breakPoints.push(chars.length);
   return breakPoints;
 }
-function evaluateBalance(lines, ctx, fontSize, fontFamily, fontWeight) {
-  if (lines.length <= 1) return 0;
-  const lengths = lines.map(
-    (line) => measureTextWidth(ctx, line, fontSize, fontFamily, fontWeight)
-  );
-  const avgLength = lengths.reduce((a, b) => a + b, 0) / lengths.length;
-  return lengths.reduce((sum, len) => sum + Math.abs(len - avgLength), 0);
-}
-function tryBreakPointsForMultipleLines(ctx, text, start, remainingLines, currentLines, maxWidth, fontSize, fontFamily, fontWeight, breakPoints) {
-  let bestLines = [];
-  let bestBalance = Infinity;
-  if (remainingLines === 1) {
-    const lastLine = text.slice(start).trim();
-    const lastLineWidth = measureTextWidth(ctx, lastLine, fontSize, fontFamily, fontWeight);
-    if (lastLineWidth <= maxWidth) {
-      const allLines = [...currentLines, lastLine];
-      const balance = evaluateBalance(allLines, ctx, fontSize, fontFamily, fontWeight);
-      if (balance < bestBalance) {
-        bestBalance = balance;
-        bestLines = allLines;
-      }
-    } else {
-      const words = lastLine.split(/\s+/);
-      let currentLine = "";
-      let tempLines = [...currentLines];
-      for (const word of words) {
-        const testLine = currentLine ? `${currentLine} ${word}` : word;
-        const lineWidth = measureTextWidth(ctx, testLine, fontSize, fontFamily, fontWeight);
-        if (lineWidth <= maxWidth) {
-          currentLine = testLine;
-        } else {
-          if (currentLine) {
-            tempLines.push(currentLine);
-            currentLine = word;
-          } else {
-            tempLines.push(word);
-            currentLine = "";
-          }
-        }
-      }
-      if (currentLine) {
-        tempLines.push(currentLine);
-      }
-      const balance = evaluateBalance(tempLines, ctx, fontSize, fontFamily, fontWeight);
-      if (balance < bestBalance) {
-        bestBalance = balance;
-        bestLines = tempLines;
-      }
-    }
-    return { bestLines, bestBalance };
-  }
-  let foundValidBreak = false;
-  for (let i = 0; i < breakPoints.length; i++) {
+function greedyWrap(ctx, text, maxWidth, fontSize, fontFamily, fontWeight) {
+  const breakPoints = findAllBreakPoints(text);
+  const lines = [];
+  let current = "";
+  let prev = breakPoints[0];
+  for (let i = 1; i < breakPoints.length; i++) {
     const bp = breakPoints[i];
-    if (bp <= start || bp >= text.length) continue;
-    const line = text.slice(start, bp).trim();
-    const lineWidth = measureTextWidth(ctx, line, fontSize, fontFamily, fontWeight);
-    if (lineWidth <= maxWidth) {
-      foundValidBreak = true;
-      const result = tryBreakPointsForMultipleLines(
-        ctx,
-        text,
-        bp,
-        remainingLines - 1,
-        [...currentLines, line],
-        maxWidth,
-        fontSize,
-        fontFamily,
-        fontWeight,
-        breakPoints
-      );
-      if (result.bestBalance < bestBalance) {
-        bestBalance = result.bestBalance;
-        bestLines = result.bestLines;
-      }
+    if (bp <= prev) continue;
+    const segment = text.slice(prev, bp);
+    const candidate = current + segment;
+    const candidateWidth = measureTextWidth(ctx, candidate, fontSize, fontFamily, fontWeight);
+    if (candidateWidth <= maxWidth || current === "") {
+      current = candidate;
+    } else {
+      lines.push(current.trim());
+      current = segment;
     }
+    prev = bp;
   }
-  if (!foundValidBreak) {
-    const textPortion = text.slice(start);
-    const words = textPortion.split(/\s+/);
-    let currentLine = "";
-    let tempLines = [...currentLines];
-    for (const word of words) {
-      const testLine = currentLine ? `${currentLine} ${word}` : word;
-      const lineWidth = measureTextWidth(ctx, testLine, fontSize, fontFamily, fontWeight);
-      if (lineWidth <= maxWidth) {
-        currentLine = testLine;
-      } else {
-        if (currentLine) {
-          tempLines.push(currentLine);
-          currentLine = word;
-        } else {
-          tempLines.push(word);
-        }
-      }
-    }
-    if (currentLine) {
-      tempLines.push(currentLine);
-    }
-    bestLines = tempLines;
+  if (current.trim()) {
+    lines.push(current.trim());
   }
-  return { bestLines, bestBalance };
+  fixTailOrphan(lines, ctx, maxWidth, fontSize, fontFamily, fontWeight);
+  return lines.length > 0 ? lines : [text];
+}
+function fixTailOrphan(lines, ctx, maxWidth, fontSize, fontFamily, fontWeight) {
+  if (lines.length < 2) return;
+  const last = lines[lines.length - 1];
+  const lastWords = last.split(/\s+/).filter(Boolean);
+  if (lastWords.length > 1) return;
+  const prevLine = lines[lines.length - 2];
+  const prevWords = prevLine.split(/\s+/).filter(Boolean);
+  if (prevWords.length < 2) return;
+  const moved = prevWords.pop();
+  const newPrev = prevWords.join(" ");
+  const newLast = `${moved} ${last}`.trim();
+  const newPrevWidth = measureTextWidth(ctx, newPrev, fontSize, fontFamily, fontWeight);
+  const newLastWidth = measureTextWidth(ctx, newLast, fontSize, fontFamily, fontWeight);
+  if (newPrevWidth > maxWidth || newLastWidth > maxWidth) return;
+  lines[lines.length - 2] = newPrev;
+  lines[lines.length - 1] = newLast;
 }
 function wrapText(ctx, text, maxWidth, fontSize, fontFamily, fontWeight = 400) {
   const textWidth = measureTextWidth(ctx, text, fontSize, fontFamily, fontWeight);
   if (textWidth <= maxWidth) {
     return [text];
   }
-  const estimatedLines = Math.ceil(textWidth / maxWidth);
-  const breakPoints = findAllBreakPoints(text);
-  const { bestLines } = tryBreakPointsForMultipleLines(
-    ctx,
-    text,
-    0,
-    estimatedLines,
-    [],
-    maxWidth,
-    fontSize,
-    fontFamily,
-    fontWeight,
-    breakPoints
-  );
-  return bestLines.length > 0 ? bestLines : [text];
+  return greedyWrap(ctx, text, maxWidth, fontSize, fontFamily, fontWeight);
 }
 function formLinesWithWords(ctx, words, maxWidth, fontSize, needsSpace, fontFamily, fontWeight = 400) {
   const result = [];

package/dist/stages/compose/text-utils/text-wrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"text-wrapper.js","sources":["../../../../src/stages/compose/text-utils/text-wrapper.ts"],"sourcesContent":["import { measureTextWidth } from './text-metrics';\n\nfunction findAllBreakPoints(text: string): number[] {\n  const breakPoints = [0];\n  const chars = Array.from(text);\n\n  for (let i = 1; i < chars.length - 1; i++) {\n    if (/[、。！？，,!?；：]/.test(chars[i]!)) {\n      breakPoints.push(i + 1);\n    } else if (\n      /[\\u3040-\\u309F\\u30A0-\\u30FF\\u4E00-\\u9FAF]/.test(chars[i]!) &&\n      /[\\u3040-\\u309F\\u30A0-\\u30FF\\u4E00-\\u9FAF]/.test(chars[i + 1]!)\n    ) {\n      breakPoints.push(i + 1);\n    } else if (/[\\s\\-–—,.!?;:]/.test(chars[i]!)) {\n      breakPoints.push(i + 1);\n    } else if (/\\s/.test(chars[i]!) && /[a-zA-Z]/.test(chars[i + 1]!)) {\n      breakPoints.push(i + 1);\n    }\n  }\n\n  breakPoints.push(chars.length);\n  return breakPoints;\n}\n\nfunction evaluateBalance(\n  lines: string[],\n  ctx: OffscreenCanvasRenderingContext2D | CanvasRenderingContext2D,\n  fontSize: number,\n  fontFamily: string,\n  fontWeight: string | number\n): number {\n  if (lines.length <= 1) return 0;\n  const lengths = lines.map((line) =>\n    measureTextWidth(ctx, line, fontSize, fontFamily, fontWeight)\n  );\n  const avgLength = lengths.reduce((a, b) => a + b, 0) / lengths.length;\n  return lengths.reduce((sum, len) => sum + Math.abs(len - avgLength), 0);\n}\n\nfunction tryBreakPointsForMultipleLines(\n  ctx: OffscreenCanvasRenderingContext2D | CanvasRenderingContext2D,\n  text: string,\n  start: number,\n  remainingLines: number,\n  currentLines: string[],\n  maxWidth: number,\n  fontSize: number,\n  fontFamily: string,\n  fontWeight: string | number,\n  breakPoints: number[]\n): {\n  bestLines: string[];\n  bestBalance: number;\n} {\n  let bestLines: string[] = [];\n  let bestBalance = Infinity;\n\n  if (remainingLines === 1) {\n    const lastLine = text.slice(start).trim();\n    const lastLineWidth = measureTextWidth(ctx, lastLine, fontSize, fontFamily, fontWeight);\n\n    if (lastLineWidth <= maxWidth) {\n      const allLines = [...currentLines, lastLine];\n      const balance = evaluateBalance(allLines, ctx, fontSize, fontFamily, fontWeight);\n\n      if (balance < bestBalance) {\n        bestBalance = balance;\n        bestLines = allLines;\n      }\n    } else {\n      const words = lastLine.split(/\\s+/);\n      let currentLine = '';\n      let tempLines = [...currentLines];\n\n      for (const word of words) {\n        const testLine = currentLine ? `${currentLine} ${word}` : word;\n        const lineWidth = measureTextWidth(ctx, testLine, fontSize, fontFamily, fontWeight);\n\n        if (lineWidth <= maxWidth) {\n          currentLine = testLine;\n        } else {\n          if (currentLine) {\n            tempLines.push(currentLine);\n            currentLine = word;\n          } else {\n            tempLines.push(word);\n            currentLine = '';\n          }\n        }\n      }\n\n      if (currentLine) {\n        tempLines.push(currentLine);\n      }\n\n      const balance = evaluateBalance(tempLines, ctx, fontSize, fontFamily, fontWeight);\n      if (balance < bestBalance) {\n        bestBalance = balance;\n        bestLines = tempLines;\n      }\n    }\n    return { bestLines, bestBalance };\n  }\n\n  let foundValidBreak = false;\n\n  for (let i = 0; i < breakPoints.length; i++) {\n    const bp = breakPoints[i]!;\n    if (bp <= start || bp >= text.length) continue;\n\n    const line = text.slice(start, bp).trim();\n    const lineWidth = measureTextWidth(ctx, line, fontSize, fontFamily, fontWeight);\n\n    if (lineWidth <= maxWidth) {\n      foundValidBreak = true;\n      const result = tryBreakPointsForMultipleLines(\n        ctx,\n        text,\n        bp,\n        remainingLines - 1,\n        [...currentLines, line],\n        maxWidth,\n        fontSize,\n        fontFamily,\n        fontWeight,\n        breakPoints\n      );\n      if (result.bestBalance < bestBalance) {\n        bestBalance = result.bestBalance;\n        bestLines = result.bestLines;\n      }\n    }\n  }\n\n  if (!foundValidBreak) {\n    const textPortion = text.slice(start);\n    const words = textPortion.split(/\\s+/);\n    let currentLine = '';\n    let tempLines = [...currentLines];\n\n    for (const word of words) {\n      const testLine = currentLine ? `${currentLine} ${word}` : word;\n      const lineWidth = measureTextWidth(ctx, testLine, fontSize, fontFamily, fontWeight);\n\n      if (lineWidth <= maxWidth) {\n        currentLine = testLine;\n      } else {\n        if (currentLine) {\n          tempLines.push(currentLine);\n          currentLine = word;\n        } else {\n          tempLines.push(word);\n        }\n      }\n    }\n\n    if (currentLine) {\n      tempLines.push(currentLine);\n    }\n\n    bestLines = tempLines;\n  }\n\n  return { bestLines, bestBalance };\n}\n\nexport function wrapText(\n  ctx: OffscreenCanvasRenderingContext2D | CanvasRenderingContext2D,\n  text: string,\n  maxWidth: number,\n  fontSize: number,\n  fontFamily: string,\n  fontWeight: string | number = 400\n): string[] {\n  const textWidth = measureTextWidth(ctx, text, fontSize, fontFamily, fontWeight);\n  if (textWidth <= maxWidth) {\n    return [text];\n  }\n\n  const estimatedLines = Math.ceil(textWidth / maxWidth);\n  const breakPoints = findAllBreakPoints(text);\n\n  const { bestLines } = tryBreakPointsForMultipleLines(\n    ctx,\n    text,\n    0,\n    estimatedLines,\n    [],\n    maxWidth,\n    fontSize,\n    fontFamily,\n    fontWeight,\n    breakPoints\n  );\n\n  return bestLines.length > 0 ? bestLines : [text];\n}\n\nexport function formLinesWithWords(\n  ctx: OffscreenCanvasRenderingContext2D | CanvasRenderingContext2D,\n  words: string[],\n  maxWidth: number,\n  fontSize: number,\n  needsSpace: boolean,\n  fontFamily: string,\n  fontWeight: string | number = 400\n): string[] {\n  const result: string[] = [];\n  let accumulatedWidth = 0;\n  const spaceWidth = measureTextWidth(ctx, ' ', fontSize, fontFamily, fontWeight);\n  let currentLine = '';\n\n  for (const word of words) {\n    let wordWidth = measureTextWidth(ctx, word, fontSize, fontFamily, fontWeight);\n    if (needsSpace) {\n      wordWidth += spaceWidth;\n    }\n    if (wordWidth + accumulatedWidth <= maxWidth) {\n      currentLine += word + (needsSpace ? ' ' : '');\n      accumulatedWidth += wordWidth;\n    } else {\n      if (currentLine) {\n        result.push(currentLine);\n      }\n      currentLine = word + (needsSpace ? ' ' : '');\n      accumulatedWidth = wordWidth;\n    }\n  }\n  if (currentLine !== '') {\n    result.push(currentLine);\n  }\n  return result;\n}\n\nexport function formEvenLinesWithWords(\n  ctx: OffscreenCanvasRenderingContext2D | CanvasRenderingContext2D,\n  words: string[],\n  maxWidth: number,\n  fontSize: number,\n  needsSpace: boolean,\n  fontFamily: string,\n  fontWeight: string | number = 400\n): string[] {\n  let minWidth = maxWidth / 2;\n  for (const word of words) {\n    const wordWidth = measureTextWidth(ctx, word, fontSize, fontFamily, fontWeight);\n    if (wordWidth > minWidth) {\n      minWidth = wordWidth;\n    }\n  }\n\n  const leastLineNum = formLinesWithWords(\n    ctx,\n    words,\n    maxWidth,\n    fontSize,\n    needsSpace,\n    fontFamily,\n    fontWeight\n  ).length;\n\n  let bestDelta = maxWidth;\n  let bestWidth = minWidth;\n  for (let width = maxWidth; width >= minWidth; width -= 1) {\n    const lines = formLinesWithWords(\n      ctx,\n      words,\n      width,\n      fontSize,\n      needsSpace,\n      fontFamily,\n      fontWeight\n    );\n    if (lines.length > leastLineNum) {\n      break;\n    }\n    let minLineWidth = Infinity;\n    let maxLineWidth = 0;\n    for (const line of lines) {\n      const lineWidth = measureTextWidth(ctx, line, fontSize, fontFamily, fontWeight);\n      if (lineWidth < minLineWidth) {\n        minLineWidth = lineWidth;\n      }\n      if (lineWidth > maxLineWidth) {\n        maxLineWidth = lineWidth;\n      }\n    }\n    const delta = maxLineWidth - minLineWidth;\n    if (delta < bestDelta) {\n      bestDelta = delta;\n      bestWidth = width;\n    }\n  }\n\n  return formLinesWithWords(ctx, words, bestWidth, fontSize, needsSpace, fontFamily, fontWeight);\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"text-wrapper.js","sources":["../../../../src/stages/compose/text-utils/text-wrapper.ts"],"sourcesContent":["import { measureTextWidth } from './text-metrics';\n\nfunction findAllBreakPoints(text: string): number[] {\n  const breakPoints = [0];\n  const chars = Array.from(text);\n\n  for (let i = 1; i < chars.length - 1; i++) {\n    if (/[、。！？，,!?；：]/.test(chars[i]!)) {\n      breakPoints.push(i + 1);\n    } else if (\n      /[\\u3040-\\u309F\\u30A0-\\u30FF\\u4E00-\\u9FAF]/.test(chars[i]!) &&\n      /[\\u3040-\\u309F\\u30A0-\\u30FF\\u4E00-\\u9FAF]/.test(chars[i + 1]!)\n    ) {\n      breakPoints.push(i + 1);\n    } else if (/[\\s\\-–—,.!?;:]/.test(chars[i]!)) {\n      breakPoints.push(i + 1);\n    } else if (/\\s/.test(chars[i]!) && /[a-zA-Z]/.test(chars[i + 1]!)) {\n      breakPoints.push(i + 1);\n    }\n  }\n\n  breakPoints.push(chars.length);\n  return breakPoints;\n}\n\n// 线性贪心折行：从左到右把合法片段往当前行塞，塞不下就换行。\n// 复杂度 O(B)（B = 断点数），替代原 O(B^N) 的递归回溯。\n// 视觉缺陷：最后一行可能只剩一个词（\"孤儿\"），由 fixTailOrphan 修复。\nfunction greedyWrap(\n  ctx: OffscreenCanvasRenderingContext2D | CanvasRenderingContext2D,\n  text: string,\n  maxWidth: number,\n  fontSize: number,\n  fontFamily: string,\n  fontWeight: string | number\n): string[] {\n  const breakPoints = findAllBreakPoints(text);\n  const lines: string[] = [];\n  let current = '';\n  let prev = breakPoints[0]!;\n\n  for (let i = 1; i < breakPoints.length; i++) {\n    const bp = breakPoints[i]!;\n    if (bp <= prev) continue;\n\n    const segment = text.slice(prev, bp);\n    const candidate = current + segment;\n    const candidateWidth = measureTextWidth(ctx, candidate, fontSize, fontFamily, fontWeight);\n\n    // 能塞下就并入当前行；current === '' 兜底：单个 segment 已经超宽时也强制保留，\n    // 避免死循环。这种超宽 segment（如超长无空格英文单词）由调用方处理或自然溢出。\n    if (candidateWidth <= maxWidth || current === '') {\n      current = candidate;\n    } else {\n      lines.push(current.trim());\n      current = segment;\n    }\n    prev = bp;\n  }\n\n  if (current.trim()) {\n    lines.push(current.trim());\n  }\n\n  fixTailOrphan(lines, ctx, maxWidth, fontSize, fontFamily, fontWeight);\n\n  return lines.length > 0 ? lines : [text];\n}\n\n// 尾行孤儿修正：贪心结束后若最后一行只剩 1 个词，\n// 从倒数第二行末尾挪 1 个词到最后一行，仅当移动后两行都不超宽时才接受。\n// 视觉上避免出现 \"断头\" 的最后一行。原地修改 lines。\nfunction fixTailOrphan(\n  lines: string[],\n  ctx: OffscreenCanvasRenderingContext2D | CanvasRenderingContext2D,\n  maxWidth: number,\n  fontSize: number,\n  fontFamily: string,\n  fontWeight: string | number\n): void {\n  if (lines.length < 2) return;\n\n  const last = lines[lines.length - 1]!;\n  const lastWords = last.split(/\\s+/).filter(Boolean);\n  if (lastWords.length > 1) return;\n\n  const prevLine = lines[lines.length - 2]!;\n  const prevWords = prevLine.split(/\\s+/).filter(Boolean);\n  if (prevWords.length < 2) return;\n\n  const moved = prevWords.pop()!;\n  const newPrev = prevWords.join(' ');\n  const newLast = `${moved} ${last}`.trim();\n\n  // 移动后必须两行都不超宽，否则放弃修正、保留原贪心结果\n  const newPrevWidth = measureTextWidth(ctx, newPrev, fontSize, fontFamily, fontWeight);\n  const newLastWidth = measureTextWidth(ctx, newLast, fontSize, fontFamily, fontWeight);\n  if (newPrevWidth > maxWidth || newLastWidth > maxWidth) return;\n\n  lines[lines.length - 2] = newPrev;\n  lines[lines.length - 1] = newLast;\n}\n\nexport function wrapText(\n  ctx: OffscreenCanvasRenderingContext2D | CanvasRenderingContext2D,\n  text: string,\n  maxWidth: number,\n  fontSize: number,\n  fontFamily: string,\n  fontWeight: string | number = 400\n): string[] {\n  // 整段不超宽直接单行返回（最常见的快路径）\n  const textWidth = measureTextWidth(ctx, text, fontSize, fontFamily, fontWeight);\n  if (textWidth <= maxWidth) {\n    return [text];\n  }\n\n  return greedyWrap(ctx, text, maxWidth, fontSize, fontFamily, fontWeight);\n}\n\nexport function formLinesWithWords(\n  ctx: OffscreenCanvasRenderingContext2D | CanvasRenderingContext2D,\n  words: string[],\n  maxWidth: number,\n  fontSize: number,\n  needsSpace: boolean,\n  fontFamily: string,\n  fontWeight: string | number = 400\n): string[] {\n  const result: string[] = [];\n  let accumulatedWidth = 0;\n  const spaceWidth = measureTextWidth(ctx, ' ', fontSize, fontFamily, fontWeight);\n  let currentLine = '';\n\n  for (const word of words) {\n    let wordWidth = measureTextWidth(ctx, word, fontSize, fontFamily, fontWeight);\n    if (needsSpace) {\n      wordWidth += spaceWidth;\n    }\n    if (wordWidth + accumulatedWidth <= maxWidth) {\n      currentLine += word + (needsSpace ? ' ' : '');\n      accumulatedWidth += wordWidth;\n    } else {\n      if (currentLine) {\n        result.push(currentLine);\n      }\n      currentLine = word + (needsSpace ? ' ' : '');\n      accumulatedWidth = wordWidth;\n    }\n  }\n  if (currentLine !== '') {\n    result.push(currentLine);\n  }\n  return result;\n}\n\nexport function formEvenLinesWithWords(\n  ctx: OffscreenCanvasRenderingContext2D | CanvasRenderingContext2D,\n  words: string[],\n  maxWidth: number,\n  fontSize: number,\n  needsSpace: boolean,\n  fontFamily: string,\n  fontWeight: string | number = 400\n): string[] {\n  let minWidth = maxWidth / 2;\n  for (const word of words) {\n    const wordWidth = measureTextWidth(ctx, word, fontSize, fontFamily, fontWeight);\n    if (wordWidth > minWidth) {\n      minWidth = wordWidth;\n    }\n  }\n\n  const leastLineNum = formLinesWithWords(\n    ctx,\n    words,\n    maxWidth,\n    fontSize,\n    needsSpace,\n    fontFamily,\n    fontWeight\n  ).length;\n\n  let bestDelta = maxWidth;\n  let bestWidth = minWidth;\n  for (let width = maxWidth; width >= minWidth; width -= 1) {\n    const lines = formLinesWithWords(\n      ctx,\n      words,\n      width,\n      fontSize,\n      needsSpace,\n      fontFamily,\n      fontWeight\n    );\n    if (lines.length > leastLineNum) {\n      break;\n    }\n    let minLineWidth = Infinity;\n    let maxLineWidth = 0;\n    for (const line of lines) {\n      const lineWidth = measureTextWidth(ctx, line, fontSize, fontFamily, fontWeight);\n      if (lineWidth < minLineWidth) {\n        minLineWidth = lineWidth;\n      }\n      if (lineWidth > maxLineWidth) {\n        maxLineWidth = lineWidth;\n      }\n    }\n    const delta = maxLineWidth - minLineWidth;\n    if (delta < bestDelta) {\n      bestDelta = delta;\n      bestWidth = width;\n    }\n  }\n\n  return formLinesWithWords(ctx, words, bestWidth, fontSize, needsSpace, fontFamily, fontWeight);\n}\n"],"names":[],"mappings":"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"}

package/dist/stages/mux/MP4Muxer.js

@@ -1,4 +1,4 @@
-import { StreamTarget, ArrayBufferTarget, Muxer } from "../../medeo-fe/node_modules/.pnpm/mp4-muxer@5.2.2/node_modules/mp4-muxer/build/mp4-muxer.js";
+import { StreamTarget, ArrayBufferTarget, Muxer } from "../../node_modules/.pnpm/mp4-muxer@5.2.2/node_modules/mp4-muxer/build/mp4-muxer.js";
 import { checkBrowserCompatibility } from "../../utils/platform-utils.js";
 class MP4Muxer {
   muxer;

package/dist/utils/mp4box.js

@@ -1,4 +1,4 @@
-import * as mp4box_all from "../medeo-fe/node_modules/.pnpm/mp4box@0.5.4/node_modules/mp4box/dist/mp4box.all.js";
+import * as mp4box_all from "../node_modules/.pnpm/mp4box@0.5.4/node_modules/mp4box/dist/mp4box.all.js";
 const lib = mp4box_all;
 const MP4Box = lib.default && typeof lib.default.createFile === "function" ? lib.default : lib;
 if (typeof MP4Box.createFile !== "function") {
@@ -11,7 +11,6 @@ if (typeof MP4Box.createFile !== "function") {
   );
 }
 export {
-  MP4Box,
-  MP4Box as default
+  MP4Box
 };
 //# sourceMappingURL=mp4box.js.map

package/dist/workers/stages/export/{export.worker.C9m51RNP.js → export.worker.p7X_YtxQ.js}

@@ -558,129 +558,54 @@ function findAllBreakPoints(text) {
   breakPoints.push(chars.length);
   return breakPoints;
 }
-function evaluateBalance(lines, ctx, fontSize, fontFamily, fontWeight) {
-  if (lines.length <= 1) return 0;
-  const lengths = lines.map(
-    (line) => measureTextWidth(ctx, line, fontSize, fontFamily, fontWeight)
-  );
-  const avgLength = lengths.reduce((a, b) => a + b, 0) / lengths.length;
-  return lengths.reduce((sum, len) => sum + Math.abs(len - avgLength), 0);
-}
-function tryBreakPointsForMultipleLines(ctx, text, start, remainingLines, currentLines, maxWidth, fontSize, fontFamily, fontWeight, breakPoints) {
-  let bestLines = [];
-  let bestBalance = Infinity;
-  if (remainingLines === 1) {
-    const lastLine = text.slice(start).trim();
-    const lastLineWidth = measureTextWidth(ctx, lastLine, fontSize, fontFamily, fontWeight);
-    if (lastLineWidth <= maxWidth) {
-      const allLines = [...currentLines, lastLine];
-      const balance = evaluateBalance(allLines, ctx, fontSize, fontFamily, fontWeight);
-      if (balance < bestBalance) {
-        bestBalance = balance;
-        bestLines = allLines;
-      }
-    } else {
-      const words = lastLine.split(/\s+/);
-      let currentLine = "";
-      let tempLines = [...currentLines];
-      for (const word of words) {
-        const testLine = currentLine ? `${currentLine} ${word}` : word;
-        const lineWidth = measureTextWidth(ctx, testLine, fontSize, fontFamily, fontWeight);
-        if (lineWidth <= maxWidth) {
-          currentLine = testLine;
-        } else {
-          if (currentLine) {
-            tempLines.push(currentLine);
-            currentLine = word;
-          } else {
-            tempLines.push(word);
-            currentLine = "";
-          }
-        }
-      }
-      if (currentLine) {
-        tempLines.push(currentLine);
-      }
-      const balance = evaluateBalance(tempLines, ctx, fontSize, fontFamily, fontWeight);
-      if (balance < bestBalance) {
-        bestBalance = balance;
-        bestLines = tempLines;
-      }
-    }
-    return { bestLines, bestBalance };
-  }
-  let foundValidBreak = false;
-  for (let i = 0; i < breakPoints.length; i++) {
+function greedyWrap(ctx, text, maxWidth, fontSize, fontFamily, fontWeight) {
+  const breakPoints = findAllBreakPoints(text);
+  const lines = [];
+  let current = "";
+  let prev = breakPoints[0];
+  for (let i = 1; i < breakPoints.length; i++) {
     const bp = breakPoints[i];
-    if (bp <= start || bp >= text.length) continue;
-    const line = text.slice(start, bp).trim();
-    const lineWidth = measureTextWidth(ctx, line, fontSize, fontFamily, fontWeight);
-    if (lineWidth <= maxWidth) {
-      foundValidBreak = true;
-      const result = tryBreakPointsForMultipleLines(
-        ctx,
-        text,
-        bp,
-        remainingLines - 1,
-        [...currentLines, line],
-        maxWidth,
-        fontSize,
-        fontFamily,
-        fontWeight,
-        breakPoints
-      );
-      if (result.bestBalance < bestBalance) {
-        bestBalance = result.bestBalance;
-        bestLines = result.bestLines;
-      }
-    }
-  }
-  if (!foundValidBreak) {
-    const textPortion = text.slice(start);
-    const words = textPortion.split(/\s+/);
-    let currentLine = "";
-    let tempLines = [...currentLines];
-    for (const word of words) {
-      const testLine = currentLine ? `${currentLine} ${word}` : word;
-      const lineWidth = measureTextWidth(ctx, testLine, fontSize, fontFamily, fontWeight);
-      if (lineWidth <= maxWidth) {
-        currentLine = testLine;
-      } else {
-        if (currentLine) {
-          tempLines.push(currentLine);
-          currentLine = word;
-        } else {
-          tempLines.push(word);
-        }
-      }
-    }
-    if (currentLine) {
-      tempLines.push(currentLine);
-    }
-    bestLines = tempLines;
-  }
-  return { bestLines, bestBalance };
+    if (bp <= prev) continue;
+    const segment = text.slice(prev, bp);
+    const candidate = current + segment;
+    const candidateWidth = measureTextWidth(ctx, candidate, fontSize, fontFamily, fontWeight);
+    if (candidateWidth <= maxWidth || current === "") {
+      current = candidate;
+    } else {
+      lines.push(current.trim());
+      current = segment;
+    }
+    prev = bp;
+  }
+  if (current.trim()) {
+    lines.push(current.trim());
+  }
+  fixTailOrphan(lines, ctx, maxWidth, fontSize, fontFamily, fontWeight);
+  return lines.length > 0 ? lines : [text];
+}
+function fixTailOrphan(lines, ctx, maxWidth, fontSize, fontFamily, fontWeight) {
+  if (lines.length < 2) return;
+  const last = lines[lines.length - 1];
+  const lastWords = last.split(/\s+/).filter(Boolean);
+  if (lastWords.length > 1) return;
+  const prevLine = lines[lines.length - 2];
+  const prevWords = prevLine.split(/\s+/).filter(Boolean);
+  if (prevWords.length < 2) return;
+  const moved = prevWords.pop();
+  const newPrev = prevWords.join(" ");
+  const newLast = `${moved} ${last}`.trim();
+  const newPrevWidth = measureTextWidth(ctx, newPrev, fontSize, fontFamily, fontWeight);
+  const newLastWidth = measureTextWidth(ctx, newLast, fontSize, fontFamily, fontWeight);
+  if (newPrevWidth > maxWidth || newLastWidth > maxWidth) return;
+  lines[lines.length - 2] = newPrev;
+  lines[lines.length - 1] = newLast;
 }
 function wrapText(ctx, text, maxWidth, fontSize, fontFamily, fontWeight = 400) {
   const textWidth = measureTextWidth(ctx, text, fontSize, fontFamily, fontWeight);
   if (textWidth <= maxWidth) {
     return [text];
   }
-  const estimatedLines = Math.ceil(textWidth / maxWidth);
-  const breakPoints = findAllBreakPoints(text);
-  const { bestLines } = tryBreakPointsForMultipleLines(
-    ctx,
-    text,
-    0,
-    estimatedLines,
-    [],
-    maxWidth,
-    fontSize,
-    fontFamily,
-    fontWeight,
-    breakPoints
-  );
-  return bestLines.length > 0 ? bestLines : [text];
+  return greedyWrap(ctx, text, maxWidth, fontSize, fontFamily, fontWeight);
 }
 function formLinesWithWords(ctx, words, maxWidth, fontSize, needsSpace, fontFamily, fontWeight = 400) {
   const result = [];
@@ -1048,6 +973,34 @@ function charProgress(relativeFrame, fps, charIndex, staggerMs, durationMs) {
   const raw = (tMs - startMs) / durationMs;
   return easeOutExpo(Math.min(1, raw));
 }
+const charSlotsCache = /* @__PURE__ */ new Map();
+const staggerFinalRasterCache = /* @__PURE__ */ new Map();
+function layoutCacheKey(layer, canvasWidth, canvasHeight) {
+  const ts = layer.fontConfig?.textStyle;
+  return [
+    layer.id,
+    layer.text,
+    layer.letterCase ?? "",
+    canvasWidth,
+    canvasHeight,
+    ts?.fontSize,
+    ts?.fontFamily,
+    ts?.fontWeight,
+    ts?.lineHeight,
+    JSON.stringify(layer.fontConfig?.globalPosition ?? null)
+  ].join("");
+}
+function staggerRasterKey(layer, canvasWidth, canvasHeight, preset) {
+  return `${layoutCacheKey(layer, canvasWidth, canvasHeight)}${preset}`;
+}
+function staggerEntranceEndMs(slotCount, preset) {
+  if (slotCount <= 0) return 0;
+  const lastIndex = slotCount - 1;
+  if (preset === "typewriter") {
+    return lastIndex * DEFAULT_STAGGER_MS + DEFAULT_STAGGER_MS;
+  }
+  return lastIndex * DEFAULT_STAGGER_MS + DEFAULT_DURATION_MS;
+}
 function buildCharSlots(ctx, layer, canvasWidth, canvasHeight) {
   const fontConfig = layer.fontConfig?.textStyle;
   if (!fontConfig) return null;
@@ -1060,8 +1013,8 @@ function buildCharSlots(ctx, layer, canvasWidth, canvasHeight) {
   let lines;
   if (layer.wordTimings && layer.wordTimings.length > 0) {
     const needsSpace = needsSpaceBetweenWords(layer.localeCode || "en-US", text);
-    const words = text.split(needsSpace ? /\s+/ : "");
-    lines = formEvenLinesWithWords(
+    const words = needsSpace ? text.split(/\s+/) : Array.from(text);
+    lines = getCachedEvenLinesWithWords(
       ctx,
       words,
       maxWidth,
@@ -1071,7 +1024,7 @@ function buildCharSlots(ctx, layer, canvasWidth, canvasHeight) {
       fontWeight
     );
   } else {
-    lines = wrapText(ctx, text, maxWidth, fontSize, fontFamily, fontWeight);
+    lines = getCachedWrapText(ctx, text, maxWidth, fontSize, fontFamily, fontWeight);
   }
   const totalHeight = lines.length * fontSize * lineHeight;
   const startY = calculateYPosition$3(canvasHeight, totalHeight, layer.fontConfig?.globalPosition);
@@ -1099,9 +1052,19 @@ function buildCharSlots(ctx, layer, canvasWidth, canvasHeight) {
   ctx.restore();
   return { slots, fontSize, lineHeight };
 }
-function renderCaptionStaggerEntrance(ctx, layer, canvasWidth, canvasHeight, relativeFrame, fps, preset) {
+function getCachedCharSlots(ctx, layer, canvasWidth, canvasHeight) {
+  const key = layoutCacheKey(layer, canvasWidth, canvasHeight);
+  const cached = charSlotsCache.get(key);
+  if (cached) {
+    return cached;
+  }
   const built = buildCharSlots(ctx, layer, canvasWidth, canvasHeight);
-  if (!built) return;
+  if (built) {
+    charSlotsCache.set(key, built);
+  }
+  return built;
+}
+function drawStaggerEntranceFrame(ctx, layer, built, relativeFrame, fps, preset) {
   const { slots, fontSize } = built;
   const fontConfig = layer.fontConfig.textStyle;
   const fontFamily = fontConfig.fontFamily;
@@ -1193,6 +1156,37 @@ function renderCaptionStaggerEntrance(ctx, layer, canvasWidth, canvasHeight, rel
   }
   ctx.restore();
 }
+function clearCaptionStaggerCache() {
+  charSlotsCache.clear();
+  for (const bitmap of staggerFinalRasterCache.values()) {
+    bitmap.close();
+  }
+  staggerFinalRasterCache.clear();
+}
+function renderCaptionStaggerEntrance(ctx, layer, canvasWidth, canvasHeight, relativeFrame, fps, preset) {
+  const built = getCachedCharSlots(ctx, layer, canvasWidth, canvasHeight);
+  if (!built) return;
+  const endMs = staggerEntranceEndMs(built.slots.length, preset);
+  const endFrame = Math.ceil(endMs / 1e3 * fps);
+  if (relativeFrame >= endFrame) {
+    const rasterKey = staggerRasterKey(layer, canvasWidth, canvasHeight, preset);
+    let bitmap = staggerFinalRasterCache.get(rasterKey);
+    if (!bitmap) {
+      const offscreen = new OffscreenCanvas(canvasWidth, canvasHeight);
+      const offCtx = offscreen.getContext("2d");
+      if (!offCtx) {
+        drawStaggerEntranceFrame(ctx, layer, built, endFrame, fps, preset);
+        return;
+      }
+      drawStaggerEntranceFrame(offCtx, layer, built, endFrame, fps, preset);
+      bitmap = offscreen.transferToImageBitmap();
+      staggerFinalRasterCache.set(rasterKey, bitmap);
+    }
+    ctx.drawImage(bitmap, 0, 0);
+    return;
+  }
+  drawStaggerEntranceFrame(ctx, layer, built, relativeFrame, fps, preset);
+}
 function usToFrame$2(us, fps) {
   return Math.floor(us / (1e6 / fps));
 }
@@ -2394,6 +2388,7 @@ class VideoComposer {
         flush: async () => {
           this.filterProcessor.clearCache();
           clearTextLayoutCache();
+          clearCaptionStaggerCache();
         }
       },
       {
@@ -3550,4 +3545,4 @@ const export_worker = null;
 export {
   export_worker as default
 };
-//# sourceMappingURL=export.worker.C9m51RNP.js.map
+//# sourceMappingURL=export.worker.p7X_YtxQ.js.map