@vvfx/svg2ir 0.0.1-beta.11 → 0.0.1-beta.12

package/dist/node.js

@@ -3,7 +3,7 @@
  * Description: SVG to Animation IR and Galacean Effects conversion engine
  * Author: Ant Group CO., Ltd.
  * Contributors: 鳞息
- * Version: v0.0.1-beta.11
+ * Version: v0.0.1-beta.12
  */
 
 'use strict';
@@ -4199,7 +4199,7 @@ function distPointToSegment(p, a, b) {
         return transformVector(gChain, t);
     });
     return {
-        mode: "add",
+        mode: 'add',
         path: {
             points: pts,
             inTangents: inTangents,
@@ -6126,12 +6126,16 @@ function applyClipMask(es, el, layer, clipMasks) {
     }
     if (isClip) {
         return _extends({}, layer, {
-            mask: baseMask
+            masks: [
+                baseMask
+            ]
         });
     }
     var rebased = rebaseMaskToLocal(baseMask, layer);
     return rebased ? _extends({}, layer, {
-        mask: rebased
+        masks: [
+            rebased
+        ]
     }) : layer;
 }
 /** 将 SVG 绝对 mask 点转换为 image 的 asset-local 坐标。 */ function rebaseMaskToLocal(mask, layer) {
@@ -6169,7 +6173,7 @@ function applyClipMask(es, el, layer, clipMasks) {
                 outTangents: mask.path.outTangents,
                 closed: mask.path.closed
             },
-            mode: "add"
+            mode: 'add'
         };
     }
     // shape 没有 asset 尺寸，mask 需要转换到以 layer anchor 为基准的 element-local 空间。
@@ -6199,7 +6203,7 @@ function applyClipMask(es, el, layer, clipMasks) {
             outTangents: mask.path.outTangents,
             closed: mask.path.closed
         },
-        mode: "add"
+        mode: 'add'
     };
 }
 /** shape layer 的 element-local bbox(以 layer.transform.anchor=localCenter 为原点)。
@@ -7168,7 +7172,7 @@ function createSVGConversionSession(es, options) {
     };
     var withGroupParent = function withGroupParent(layer, element) {
         var parentIndex = nearestMaskedGroupAncestor(element);
-        if (parentIndex == null || layer.mask != null) {
+        if (parentIndex == null) {
             return layer;
         }
         return _extends({}, layer, {
@@ -7523,7 +7527,9 @@ function convertGroupElement(element, context) {
                 value: 1
             }
         },
-        mask: groupMask
+        masks: [
+            groupMask
+        ]
     };
     context.appendLayer(nullLayer, element, false);
     context.groupMaskGNodeToIndex.set(element.node, layerIndex);
@@ -12752,21 +12758,36 @@ function transformBoxCorners(matrix, box) {
         transformPoint(matrix, box[0], box[3])
     ];
 }
-function mapPointsToBBox(points) {
+function mapPointsToBBox(points, roundCoordinates) {
+    if (roundCoordinates === void 0) roundCoordinates = true;
     var _Math, _Math1, _Math2, _Math3;
-    return [
-        roundPixel((_Math = Math).min.apply(_Math, [].concat(points.map(function(point) {
+    var bbox = [
+        (_Math = Math).min.apply(_Math, [].concat(points.map(function(point) {
             return point[0];
-        })))),
-        roundPixel((_Math1 = Math).min.apply(_Math1, [].concat(points.map(function(point) {
+        }))),
+        (_Math1 = Math).min.apply(_Math1, [].concat(points.map(function(point) {
             return point[1];
-        })))),
-        roundPixel((_Math2 = Math).max.apply(_Math2, [].concat(points.map(function(point) {
+        }))),
+        (_Math2 = Math).max.apply(_Math2, [].concat(points.map(function(point) {
             return point[0];
-        })))),
-        roundPixel((_Math3 = Math).max.apply(_Math3, [].concat(points.map(function(point) {
+        }))),
+        (_Math3 = Math).max.apply(_Math3, [].concat(points.map(function(point) {
             return point[1];
-        }))))
+        })))
+    ];
+    if (bbox.some(function(value) {
+        return !Number.isFinite(value);
+    })) {
+        throwInvalidLayerData('Non-finite pixel geometry.');
+    }
+    if (!roundCoordinates) {
+        return bbox;
+    }
+    return [
+        roundPixel(bbox[0]),
+        roundPixel(bbox[1]),
+        roundPixel(bbox[2]),
+        roundPixel(bbox[3])
     ];
 }
 function roundPixel(value) {
@@ -12974,7 +12995,7 @@ function parseTextRuns(layer, font, preserved) {
     return spans.filter(function(span) {
         return span.text !== '' || span.newLine;
     }).map(function(span) {
-        var fontSize = span.fontSize == null || span.fontSize === '' ? base.fontSize : Number.parseInt(span.fontSize, 10);
+        var fontSize = span.fontSize == null || span.fontSize === '' ? base.fontSize : Number.parseFloat(span.fontSize);
         if (!Number.isFinite(fontSize) || fontSize <= 0) {
             throwInvalidLayerData('Invalid text fragment font size.');
         }
@@ -13003,7 +13024,7 @@ function mapTextColor(color) {
     };
 }
 
-function buildTextRunLayout(runs, family, spacing, content, size, conversionOptions, warnings, id, segmented) {
+function buildTextRunLayout(runs, family, spacing, content, size, conversionOptions, warnings, id, segmented, renderScale) {
     var _loop = function() {
         var run = _step.value;
         run.text.split('\n').forEach(function(text, index) {
@@ -13018,6 +13039,10 @@ function buildTextRunLayout(runs, family, spacing, content, size, conversionOpti
         });
     };
     if (segmented === void 0) segmented = false;
+    if (renderScale === void 0) renderScale = [
+        1,
+        1
+    ];
     var _Math;
     var rows = [
         []
@@ -13030,7 +13055,7 @@ function buildTextRunLayout(runs, family, spacing, content, size, conversionOpti
     }).map(function(row) {
         var _Math, _Math1;
         var parts = row.map(function(run) {
-            // 分段文字使用统一参考字号度量字宽和字体边界，再按片段字号缩放。
+            // 基线沿用参考字号指标，字宽按实际输出字号单独测量。
             var measurementSize = segmented ? 10 : run.fontSize;
             var scale = run.fontSize / measurementSize;
             var weight = run.bold ? 'bold' : 'normal';
@@ -13038,29 +13063,36 @@ function buildTextRunLayout(runs, family, spacing, content, size, conversionOpti
             var font = buildCanvasFontDesc(measurementSize, family, weight, style);
             var metrics = conversionOptions.measureText == null ? void 0 : conversionOptions.measureText.call(conversionOptions, font, segmented ? 'x' : run.text);
             var characters = Array.from(run.text);
-            var chunks = segmented ? characters : [
-                run.text
-            ];
-            var advance = 0;
-            for(var _iterator = _create_for_of_iterator_helper_loose(chunks), _step; !(_step = _iterator()).done;){
-                var chunk = _step.value;
-                var width = segmented ? conversionOptions.measureText == null ? void 0 : conversionOptions.measureText.call(conversionOptions, font, chunk).width : metrics == null ? void 0 : metrics.width;
-                var valid = width != null && Number.isFinite(width) && width >= 0;
-                estimated || (estimated = !valid);
-                advance += valid ? width : estimateTextWidth(chunk, measurementSize, 0, undefined, family, weight, style);
-            }
-            var characterCount = characters.length;
-            var width1 = advance * scale + Math.max(0, characterCount - 1) * spacing;
+            // 片段协议不输出额外字重和斜体，测宽使用同样的普通样式。
+            var widthFontSize = run.fontSize * renderScale[1];
+            var widthFont = buildCanvasFontDesc(widthFontSize, family, 'normal', 'normal');
+            var measureWidth = function measureWidth(text) {
+                var width = conversionOptions.measureText == null ? void 0 : conversionOptions.measureText.call(conversionOptions, widthFont, text).width;
+                if (width != null && Number.isFinite(width) && width >= 0) {
+                    return width;
+                }
+                estimated = true;
+                return estimateTextWidth(text, widthFontSize, 0, undefined, family, 'normal', 'normal');
+            };
+            // 字距和字宽交替累加，保持与 Artis 逐字测宽的计算顺序一致。
+            var renderedWidth = 0;
+            characters.forEach(function(character, index) {
+                if (index > 0) {
+                    renderedWidth += spacing * renderScale[0];
+                }
+                renderedWidth += measureWidth(character);
+            });
+            var width = renderedWidth / renderScale[0];
             var fallback = resolveFontMetrics(undefined, family, weight, style, run.fontSize);
             var ascent = (metrics == null ? void 0 : metrics.fontBoundingBoxAscent) == null ? fallback.asc : metrics.fontBoundingBoxAscent * scale;
             var descent = (metrics == null ? void 0 : metrics.fontBoundingBoxDescent) == null ? fallback.desc : metrics.fontBoundingBoxDescent * scale;
             estimated || (estimated = (metrics == null ? void 0 : metrics.fontBoundingBoxAscent) == null || metrics.fontBoundingBoxDescent == null);
-            if (!Number.isFinite(width1) || width1 < 0 || !Number.isFinite(ascent) || !Number.isFinite(descent)) {
+            if (!Number.isFinite(width) || width < 0 || !Number.isFinite(ascent) || !Number.isFinite(descent)) {
                 throwInvalidLayerData('Text measurement returned invalid metrics.');
             }
             return {
                 run: run,
-                width: width1,
+                width: width,
                 ascent: ascent,
                 descent: descent
             };
@@ -13173,7 +13205,10 @@ function convertIRTextLayer(layer, state, session, id) {
     var positioned = buildTextRunLayout(runs, font.family, layer.content.letterSpacing, layer.content, [
         bounds.width,
         height
-    ], options, warnings, id, preserved != null);
+    ], options, warnings, id, preserved != null, [
+        scaleX,
+        scaleY
+    ]);
     if (positioned.length === 0) {
         return undefined;
     }
@@ -13187,26 +13222,25 @@ function convertIRTextLayer(layer, state, session, id) {
             part.box[3] + centerY
         ]);
     });
-    var bbox = mapPointsToBBox(polygons.flat());
-    var rotation = roundPixel(Math.atan2(matrix.b, matrix.a) * 180 / Math.PI);
+    var bbox = mapPointsToBBox(polygons.flat(), false);
+    var rotation = Math.atan2(matrix.b, matrix.a) * 180 / Math.PI;
     var fragments = positioned.map(function(part, index) {
         var polygon = polygons[index].map(function(point) {
             return [
-                roundPixel(point[0] - bbox[0]),
-                roundPixel(point[1] - bbox[1])
+                point[0] - bbox[0],
+                point[1] - bbox[1]
             ];
         });
         return {
             content: part.run.text,
-            bbox: mapPointsToBBox(polygon),
+            bbox: mapPointsToBBox(polygon, false),
             polygon: polygon,
-            // Keep the authored font-family string, quotes included; consumers resolve families themselves.
-            font_family: font.family,
-            font_size: roundPixel(part.run.fontSize * scaleY),
+            font_family: normalizeFontFamilyName(font.family),
+            font_size: part.run.fontSize * scaleY,
             color: part.run.color,
-            letter_spacing: roundPixel(layer.content.letterSpacing * scaleX),
+            letter_spacing: layer.content.letterSpacing * scaleX,
             direction: 'horizontal',
-            rotation: rotation
+            rotation: rotation === 0 ? 0 : rotation
         };
     });
     return {
@@ -13281,6 +13315,7 @@ function createLayerConverterRegistry(session) {
 }
 
 function resolveIRVisualState(layer, session) {
+    var _layer_masks;
     if (!layer.visible) {
         return undefined;
     }
@@ -13288,7 +13323,9 @@ function resolveIRVisualState(layer, session) {
     if (!state.visible || state.opacity <= 0) {
         return undefined;
     }
-    var unsupportedMask = layer.mask != null && (layer.type !== 'image' || !maskCoversImage(layer.mask, layer.localBounds));
+    var unsupportedMask = ((_layer_masks = layer.masks) != null ? _layer_masks : []).some(function(mask) {
+        return layer.type !== 'image' || !maskCoversImage(mask, layer.localBounds);
+    });
     if (unsupportedMask || layer.matte != null) {
         throwUnsupportedLayerFeature('Mask or clipping is not supported by the flat layer protocol.');
     }
@@ -13356,8 +13393,9 @@ function assembleSVGStaticLayers(scene, options, warnings, preservedData, source
 }
 /** Replace baked sources, combine native and raster layers in painter order, then report final diagnostics. */ function assembleSVGLayers(input) {
     var _warnings, _ordered;
-    var scene = input.scene, options = input.options, preservedData = input.preservedData, layerSources = input.layerSources, warningSources = input.warningSources, baking = input.baking;
-    var warnings = input.warnings.filter(function(warning) {
+    var _input_context = input.context, scene = _input_context.ir, contextWarnings = _input_context.warnings, preservedData = _input_context.preservedData, layerSources = _input_context.layerSources, warningSources = _input_context.warningSources;
+    var options = input.options, baking = input.baking;
+    var warnings = contextWarnings.filter(function(warning) {
         return !baking.resolvesWarning(warning, warningSources.get(warning));
     });
     var composition = adapter.getIRSceneEntryComposition(scene);
@@ -14603,13 +14641,17 @@ var animatedTags = new Set([
     };
 }
 
-function convertSVGToLayers(source, options, loadImage, preservedData, rasterScale) {
-    if (rasterScale === void 0) rasterScale = 2;
-    return _async_to_generator(function() {
-        var layerSources, warningSources, collected, stripped, staticSource, parsed, composition, baking, assembled, _tmp, _tmp1;
+function convertSVGToLayers() {
+    return _async_to_generator(function(source, options, preservedData) {
+        var loadImage, _options_rasterScale, rasterScale, conversionOptions, layerSources, warningSources, collected, stripped, staticSource, parsed, context, composition, baking, assembled, _tmp, _tmp1;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
+                    if (options === void 0) options = {};
+                    loadImage = options.loadImage, _options_rasterScale = options.rasterScale, rasterScale = _options_rasterScale === void 0 ? 2 : _options_rasterScale, conversionOptions = _object_without_properties_loose(options, [
+                        "loadImage",
+                        "rasterScale"
+                    ]);
                     layerSources = new Map();
                     warningSources = new Map();
                     collected = {
@@ -14620,36 +14662,40 @@ function convertSVGToLayers(source, options, loadImage, preservedData, rasterSca
                     stripped = stripLayerAnimation(source);
                     staticSource = stripped.source;
                     // Preserve original layer IDs while gathering the source identities required by baking and assembly.
-                    parsed = parseSVGToIRWithPreservedData(staticSource, _extends({}, options, {
+                    parsed = parseSVGToIRWithPreservedData(staticSource, _extends({}, conversionOptions, {
                         strict: false,
                         onWarning: undefined
                     }), _extends({}, collected, {
                         layerSourceCollector: layerSources,
                         warningSourceCollector: warningSources
                     }));
+                    context = {
+                        source: staticSource,
+                        ir: parsed.ir,
+                        warnings: parsed.warnings,
+                        preservedData: preservedData != null ? preservedData : collected,
+                        layerSources: layerSources,
+                        warningSources: warningSources
+                    };
                     if (stripped.removed > 0) {
-                        collectLayerWarning(parsed.warnings, _extends({}, options, {
+                        collectLayerWarning(context.warnings, _extends({}, conversionOptions, {
                             strict: false,
                             onWarning: undefined
                         }), SVG2IR_WARNING_CODES.LAYERS_ANIMATION_STRIPPED, "" + stripped.removed + " animated element(s) were removed; static layers output does not sample animation.");
                     }
-                    composition = parsed.ir.compositions[0];
+                    composition = context.ir.compositions[0];
                     return [
                         4,
-                        buildBakedLayers(staticSource, [
+                        buildBakedLayers(context.source, [
                             composition.width,
                             composition.height
-                        ], options, rasterScale)
+                        ], conversionOptions, rasterScale)
                     ];
                 case 1:
                     baking = _state.sent();
                     assembled = assembleSVGLayers({
-                        scene: parsed.ir,
-                        options: options,
-                        warnings: parsed.warnings,
-                        preservedData: preservedData != null ? preservedData : collected,
-                        layerSources: layerSources,
-                        warningSources: warningSources,
+                        context: context,
+                        options: conversionOptions,
                         baking: baking
                     });
                     _tmp = [
@@ -14670,7 +14716,7 @@ function convertSVGToLayers(source, options, loadImage, preservedData, rasterSca
                     ];
             }
         });
-    })();
+    }).apply(this, arguments);
 }
 
 /**
@@ -14695,7 +14741,8 @@ function convertSVGToLayers(source, options, loadImage, preservedData, rasterSca
     JSONSceneVersion["3_4"] = "3.4";
     JSONSceneVersion["3_5"] = "3.5";
     JSONSceneVersion["3_6"] = "3.6";
-    JSONSceneVersion["LATEST"] = "3.6";
+    JSONSceneVersion["3_7"] = "3.7";
+    JSONSceneVersion["LATEST"] = "3.7";
 })(JSONSceneVersion || (JSONSceneVersion = {}));
 
 /*********************************************/ /*               元素属性参数类型               */ /*********************************************/ /**
@@ -15010,10 +15057,12 @@ var CameraClipMode;
      * 直线
      */ ValueType[ValueType["LINE"] = 5] = "LINE";
     /**
-     * 曲线
+     * 曲线（Hermite 曲线）
+     * @deprecated 使用 BEZIER_CURVE 替代，此类型仅用于旧数据迁移兼容
      */ ValueType[ValueType["CURVE"] = 6] = "CURVE";
     /**
      * 贝塞尔路径
+     * @deprecated 使用 BEZIER_CURVE_PATH 替代，此类型仅用于旧数据迁移兼容
      */ ValueType[ValueType["BEZIER_PATH"] = 7] = "BEZIER_PATH";
     /**
      * 颜色
@@ -15450,6 +15499,7 @@ var DataType;
     DataType["AnimationGraphAsset"] = "AnimationGraphAsset";
     DataType["CompositionComponent"] = "CompositionComponent";
     DataType["FFDComponent"] = "FFDComponent";
+    DataType["FrameComponent"] = "FrameComponent";
     DataType["Animator"] = "Animator";
     // Non-EffectObject
     DataType["TimelineClip"] = "TimelineClip";
@@ -17074,7 +17124,8 @@ function asRecordArray(value) {
 }
 
 /** 从已解析的 IR 和 SVG 保留数据生成 GE 场景。 */ function assembleSVGGE(parsed, options, preservedData) {
-    var ir = parsed.ir, warnings = parsed.warnings;
+    var ir = parsed.ir;
+    var warnings = [].concat(parsed.warnings);
     var fonts = (options != null ? options : {}).fonts;
     var irForGE = expandIRHoldTransitions(ir);
     if ((preservedData == null ? void 0 : preservedData.shapeAnimationsByLayerId) != null) {
@@ -17182,38 +17233,19 @@ function cleanFontName(raw) {
     return value;
 }
 
-/** SVG→GE 显式入口。传入 preservedData 时应用 SVG 专属后处理。 */ function convertSVGToGE(source, options, preservedData) {
+function convertSVGToGE(sourceOrContext, options, preservedData) {
     var _ref = options != null ? options : {}; _ref.fonts; var parserOptions = _object_without_properties_loose(_ref, [
         "fonts"
     ]);
-    var parsed = parseSVGToIRWithPreservedData(source, parserOptions);
-    return assembleSVGGE(parsed, options, preservedData);
-}
-
-function convertSVG(source, options, preservedData) {
-    var _ref = options != null ? options : {}, _ref_outputFormat = _ref.outputFormat, outputFormat = _ref_outputFormat === void 0 ? 'ge' : _ref_outputFormat;
-    if (outputFormat !== 'ge' && outputFormat !== 'layers') {
-        throw new TypeError('[svg2ir] outputFormat must be ge or layers.');
-    }
-    if ((options == null ? void 0 : options.outputFormat) === 'layers') {
-        options.outputFormat; var loadImage = options.loadImage, rasterScale = options.rasterScale, parserOptions = _object_without_properties_loose(options, [
-            "outputFormat",
-            "loadImage",
-            "rasterScale"
-        ]);
-        return convertSVGToLayers(source, parserOptions, loadImage, preservedData, rasterScale);
-    }
-    var _ref1 = options != null ? options : {}; _ref1.outputFormat; var geOptions = _object_without_properties_loose(_ref1, [
-        "outputFormat"
-    ]);
-    return convertSVGToGE(source, geOptions, preservedData);
+    var context = typeof sourceOrContext === 'string' ? parseSVGToIRWithPreservedData(sourceOrContext, parserOptions) : sourceOrContext;
+    return assembleSVGGE(context, options, preservedData != null ? preservedData : typeof sourceOrContext === 'string' ? undefined : sourceOrContext.preservedData);
 }
 
 setEditableSVGConstructor(resolveEditableSVGConstructor(editableSVGNodeModule));
 
-exports.convertSVG = convertSVG;
 exports.convertSVGToGE = convertSVGToGE;
 exports.convertSVGToIR = convertSVGToIR;
+exports.convertSVGToLayers = convertSVGToLayers;
 exports.inferNumericWeightFromFamily = inferNumericWeightFromFamily;
 exports.splitSVG = splitSVG;
 //# sourceMappingURL=node.js.map