@glissade/lottie 0.51.0 → 0.52.0

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _glissade_scene0 from "@glissade/scene";
-import { Node, SceneModule } from "@glissade/scene";
+import { Node, SceneModule, TextMeasurer } from "@glissade/scene";
 import { Paint, PathContour, PathValue, Timeline, Vec2 } from "@glissade/core";
 
 //#region src/spec.d.ts
@@ -310,6 +310,16 @@ interface ExportOptions {
   fps?: number;
   /** Sink for scope-out / degrade warnings; default `console.warn`. */
   onWarn?: (message: string) => void;
+  /**
+   * Real text measurer (a backend's — e.g. the Skia measurer). When present, a
+   * width-wrapped Text node has its wrapped lines BAKED into the Lottie text
+   * document `t` (joined by '\n') so the round-trip reproduces glissade's line
+   * breaks — the importer copies `t` verbatim and drops the wrap `width`, so
+   * without the bake wrapped text collapses onto one line. Absent, the raw
+   * string passes through unchanged (the estimating measurer's wrap points
+   * wouldn't match a faithful render, so we don't bake with it).
+   */
+  measurer?: TextMeasurer;
 }
 /** Convert a SceneModule to a Lottie document. Pure over (scene, timeline). */
 declare function exportLottie(mod: SceneModule, opts: ExportOptions): LottieDocument;

package/dist/index.js

@@ -1,4 +1,4 @@
-import { Circle, Group, ImageNode, Path, Rect, Text, createScene } from "@glissade/scene";
+import { Circle, Group, ImageNode, Path, Rect, Text, breakLines, createScene } from "@glissade/scene";
 import { compileTimeline, cubicBezier, formatColor, parseColor, sampleTrack, track } from "@glissade/core";
 import "@glissade/core/expr";
 //#region src/spec.ts
@@ -1705,6 +1705,7 @@ const IDENTITY_OPACITY = {
 /** Convert a SceneModule to a Lottie document. Pure over (scene, timeline). */
 function exportLottie(mod, opts) {
 	const scene = mod.createScene();
+	if (opts.measurer) scene.setTextMeasurer(opts.measurer);
 	const fr = opts.fps ?? mod.timeline.fps ?? 60;
 	const warn = opts.onWarn ?? ((m) => console.warn(`gs export: ${m}`));
 	const compiled = compileTimeline(mod.timeline);
@@ -1731,7 +1732,8 @@ function exportLottie(mod, opts) {
 		warn,
 		layers: [],
 		ind: 0,
-		fonts: /* @__PURE__ */ new Map()
+		fonts: /* @__PURE__ */ new Map(),
+		measurer: opts.measurer
 	};
 	walkChildren(ctx, scene.root.children, void 0, byNode, IDENTITY_OPACITY);
 	const fonts = [...ctx.fonts.values()];
@@ -2056,13 +2058,30 @@ function registerFont(ctx, node) {
 function alignToJustification(align) {
 	return align === "left" ? 0 : align === "right" ? 1 : 2;
 }
+/**
+* The FontSpec at `t` for the wrap measurement, mirroring `Text.fontSpec()` but
+* with the SAMPLED size so animated `fontSize` re-wraps per frame. Weight, style,
+* static variable-font axes, and letter-spacing all feed `measureText` (they move
+* wrap points), so they must be present to match the reference render's breaks.
+*/
+function wrapFontSpec(node, size) {
+	return {
+		family: node.fontFamily,
+		size,
+		weight: node.fontWeight,
+		...node.fontStyle === "italic" ? { style: "italic" } : {},
+		...node.fontVariationSettings !== void 0 ? { fontVariationSettings: node.fontVariationSettings } : {},
+		...node.letterSpacing !== void 0 ? { letterSpacing: node.letterSpacing } : {}
+	};
+}
 /** The text document at time `t`, sampling the animatable text/fill/fontSize props. */
-function textDocAt(node, fName, tracks, t) {
-	const text = sampleStr(tracks, "text", node.text(), t);
+function textDocAt(ctx, node, fName, tracks, t) {
+	const rawText = sampleStr(tracks, "text", node.text(), t);
 	const fill = sampleColor(tracks, "fill", node.fill(), t);
 	const size = sampleNum(tracks, "fontSize", node.fontSize(), t);
+	const width = sampleNum(tracks, "width", node.width(), t);
 	return {
-		t: text,
+		t: width > 0 && ctx.measurer !== void 0 ? breakLines(rawText, wrapFontSpec(node, size), width, ctx.measurer).join("\n") : rawText,
 		f: fName,
 		s: size,
 		fc: colorToLottie(fill),
@@ -2096,16 +2115,17 @@ function buildTextDocKeyframes(ctx, node, fName, tracks) {
 		"fill",
 		"fontSize"
 	];
-	if (!docProps.some((p) => tracks.has(p))) return [{
+	const streamProps = ctx.measurer !== void 0 && tracks.has("width") ? [...docProps, "width"] : docProps;
+	if (!streamProps.some((p) => tracks.has(p))) return [{
 		t: ctx.ip,
-		s: textDocAt(node, fName, tracks, ctx.ip / ctx.fr)
+		s: textDocAt(ctx, node, fName, tracks, ctx.ip / ctx.fr)
 	}];
-	ctx.warn(`${describe(node)}: animated text/fill/fontSize is sampled at ${ctx.fr} fps into stepped text documents (not smoothly interpolated)`);
-	const [f0, f1] = frameSpan(ctx, docProps.map((p) => tracks.get(p)));
+	if (docProps.some((p) => tracks.has(p))) ctx.warn(`${describe(node)}: animated text/fill/fontSize is sampled at ${ctx.fr} fps into stepped text documents (not smoothly interpolated)`);
+	const [f0, f1] = frameSpan(ctx, streamProps.map((p) => tracks.get(p)));
 	const keys = [];
 	let prev;
 	for (let f = f0; f <= f1; f++) {
-		const s = textDocAt(node, fName, tracks, f / ctx.fr);
+		const s = textDocAt(ctx, node, fName, tracks, f / ctx.fr);
 		const sig = JSON.stringify(s);
 		if (sig === prev) continue;
 		keys.push({
@@ -2122,7 +2142,7 @@ function warnTextUnsupported(ctx, node, tracks) {
 	if (tracks.has("revealFraction") || !Number.isNaN(node.revealFraction())) ctx.warn(`${describe(node)}: 'revealFraction' is not exported — dropped, full text shown`);
 	if (tracks.has("fontAxes") || Object.keys(node.fontAxes()).length > 0 || node.fontVariationSettings !== void 0) ctx.warn(`${describe(node)}: variable-font axes (fontAxes/fontVariationSettings) have no Lottie text-document field — dropped`);
 	if (node.box !== void 0) ctx.warn(`${describe(node)}: box valign is approximated as baseline-anchored (no Lottie ink-box anchor) — vertical placement may shift`);
-	if (tracks.has("width") || node.width() > 0) ctx.warn(`${describe(node)}: wrap 'width' relies on the player's own line reflow — wrapping may diverge from glissade's`);
+	if (ctx.measurer === void 0 && (tracks.has("width") || node.width() > 0)) ctx.warn(`${describe(node)}: wrap 'width' relies on the player's own line reflow — wrapping may diverge from glissade's`);
 }
 function buildTextLayer(ctx, node, ind, parentInd, tracks, opacity) {
 	const fName = registerFont(ctx, node);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glissade/lottie",
-  "version": "0.51.0",
+  "version": "0.52.0",
   "description": "glissade Lottie import (S1 MVP): pure .json (Lottie/bodymovin) → node specs + a v1 Timeline. Fail-fast feature audit; no DOM/Node dependencies.",
   "license": "Apache-2.0",
   "engines": {
@@ -18,11 +18,11 @@
     "dist"
   ],
   "dependencies": {
-    "@glissade/core": "0.51.0",
-    "@glissade/scene": "0.51.0"
+    "@glissade/core": "0.52.0",
+    "@glissade/scene": "0.52.0"
   },
   "devDependencies": {
-    "@glissade/backend-skia": "0.51.0"
+    "@glissade/backend-skia": "0.52.0"
   },
   "repository": {
     "type": "git",