@vvfx/dsl-ir 0.0.1-beta.10 → 0.0.1-beta.12

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Editable DSL and Animation IR bidirectional converter
  * Author: Ant Group CO., Ltd.
  * Contributors: 澄弈
- * Version: v0.0.1-beta.10
+ * Version: v0.0.1-beta.12
  */
 
 'use strict';
@@ -311,6 +311,7 @@ var DSL_CODE_LABELS = {
     R002: '缺少 meta',
     R003: '缺少 layers',
     R004: 'layers 不是数组',
+    R005: 'meta 不是对象',
     M001: 'meta 必填字段缺失',
     M002a: 'meta.name 类型错误',
     M002b: 'meta.duration 类型错误',
@@ -398,7 +399,7 @@ var DSL_CODE_LABELS = {
     A011: '文字层缺 text 块',
     A012: 'text 非对象',
     A013: 'text.content 缺失/非字符串',
-    A014: 'text.size 缺失/非数值',
+    A014: 'text.size 缺失/非法',
     A015: 'text.color 缺失/非字符串',
     A016: '图片层有不必要的 text',
     A017: '文字层有不必要的 asset',
@@ -411,6 +412,7 @@ var DSL_CODE_LABELS = {
     A024: '非粒子层有不必要的 particle 块',
     A025: '粒子层有不必要的 asset',
     A026: '粒子层有不必要的 text',
+    A027: 'line_height 必须 > 0',
     PT001: 'particle.emission 缺失或不是对象',
     PT002: 'rateOverTime 非法',
     PT003: 'bursts 不是数组',
@@ -821,8 +823,7 @@ var EPSILON = 1e-9;
  * Validate DSL and return the public validation result.
  * Strings are interpreted as raw JSON. File-system paths are intentionally not
  * accepted so the same validator works unchanged in Node.js and browsers.
- */ function validateDSL(dsl, options) {
-    if (options === void 0) options = {};
+ */ function validateDSL(dsl) {
     var coerced = coerceInput(dsl);
     if ('error' in coerced) {
         return createInputErrorResult(coerced.error);
@@ -834,7 +835,7 @@ var EPSILON = 1e-9;
     var warnings = report.issues.filter(function(issue) {
         return issue.severity === 'WARNING';
     }).map(convertToValidationIssue);
-    var hasFailed = errors.length > 0 || options.strict === true && warnings.length > 0;
+    var hasFailed = errors.length > 0;
     return {
         result: hasFailed ? 'fail' : 'pass',
         summary: errors.length + " errors, " + warnings.length + " warnings",
@@ -948,6 +949,8 @@ function checkRoot(dsl, context) {
     }
     if (!hasValue(dsl, 'meta')) {
         addIssue(context, 'ERROR', 'R002', "missing 'meta' object", 'meta');
+    } else if (!isRecord$1(dsl['meta'])) {
+        addIssue(context, 'ERROR', 'R005', 'meta must be an object', 'meta');
     }
     if (!hasValue(dsl, 'layers')) {
         addIssue(context, 'ERROR', 'R003', "missing 'layers' array", 'layers');
@@ -978,20 +981,20 @@ function checkMeta(dsl, context) {
         ],
         [
             'fps',
-            'integer',
-            isIntLike,
+            'number',
+            isNumber,
             'M002c'
         ],
         [
             'width',
-            'integer',
-            isIntLike,
+            'number',
+            isNumber,
             'M002d'
         ],
         [
             'height',
-            'integer',
-            isIntLike,
+            'number',
+            isNumber,
             'M002e'
         ],
         [
@@ -1023,13 +1026,13 @@ function checkMeta(dsl, context) {
     var width = meta['width'];
     var height = meta['height'];
     var duration = meta['duration'];
-    if (isIntLike(fps) && fps <= 0) {
+    if (isNumber(fps) && fps <= 0) {
         addIssue(context, 'ERROR', 'M005', "meta.fps is " + formatNumber(fps) + ", must be > 0", 'meta.fps');
     }
-    if (isIntLike(width) && width <= 0) {
+    if (isNumber(width) && width <= 0) {
         addIssue(context, 'ERROR', 'M006', "meta.width is " + formatNumber(width) + ", must be > 0", 'meta.width');
     }
-    if (isIntLike(height) && height <= 0) {
+    if (isNumber(height) && height <= 0) {
         addIssue(context, 'ERROR', 'M006', "meta.height is " + formatNumber(height) + ", must be > 0", 'meta.height');
     }
     if (isNumber(duration)) {
@@ -1468,8 +1471,8 @@ function checkLayerContent(entry, context) {
                 addIssue(context, 'ERROR', code, "text." + field + " is " + describeValueType(value) + ", expected a string", path + ".text." + field, layerId);
             }
         }
-        if (isNumber(text['size']) && text['size'] < 0) {
-            addIssue(context, 'ERROR', 'A014', "text.size is " + formatNumber(text['size']) + ", expected a number greater than or equal to 0", "" + path + ".text.size", layerId);
+        if (isNumber(text['size']) && text['size'] <= 0) {
+            addIssue(context, 'ERROR', 'A014', "text.size is " + formatNumber(text['size']) + ", expected a number greater than 0", "" + path + ".text.size", layerId);
         }
         if (typeof text['color'] === 'string' && !isValidHexColor(text['color'])) {
             addIssue(context, 'ERROR', 'A015', "text.color " + formatValue(text['color']) + " is not a supported hex color", "" + path + ".text.color", layerId);
@@ -1480,6 +1483,9 @@ function checkLayerContent(entry, context) {
         if (hasValue(text, 'align') && text['align'] !== 'left' && text['align'] !== 'center' && text['align'] !== 'right') {
             addIssue(context, 'ERROR', 'A019', 'text.align must be left, center, or right', "" + path + ".text.align", layerId);
         }
+        if (isNumber(text['line_height']) && text['line_height'] <= 0) {
+            addIssue(context, 'ERROR', 'A027', 'text.line_height must be greater than 0', "" + path + ".text.line_height", layerId);
+        }
         for(var _i1 = 0, _iter1 = [
             'line_height',
             'letter_spacing'
@@ -1654,9 +1660,6 @@ function hasValue(object, key) {
 function isNumber(value) {
     return typeof value === 'number' && Number.isFinite(value);
 }
-function isIntLike(value) {
-    return isNumber(value) && Number.isInteger(value);
-}
 function isAbsoluteResourceUrl(value) {
     try {
         new URL(value);
@@ -1931,10 +1934,16 @@ function convertIRLayersToDSL(baselineComposition, assets, frameRate) {
         var layerPath = "$.compositions[id=" + JSON.stringify(baselineComposition.id) + "].layers[" + layerIndex + "]";
         var convertedLayer = convertIRLayerToDSL(layer, layerId, imageAssetById, fontAssetById, frameRate, layerPath, diagnostics);
         convertedLayer.position = withPositionZ(convertedLayer.position, layerIndex);
-        layerMapping.layers[layerId] = {
-            irCompositionId: baselineComposition.id,
-            irLayerId: layer.id
-        };
+        // Define an own data property even for IDs such as __proto__.
+        Object.defineProperty(layerMapping.layers, layerId, {
+            value: {
+                irCompositionId: baselineComposition.id,
+                irLayerId: layer.id
+            },
+            enumerable: true,
+            writable: true,
+            configurable: true
+        });
         dslLayerByIRId.set(layer.id, convertedLayer);
         collectDiagnostics(layer, layerId, layerPath, diagnostics);
         if (convertedLayer.type === 'null' && isVisualLayerWithoutAsset(layer, convertedLayer.asset)) {
@@ -1956,8 +1965,8 @@ function convertIRLayersToDSL(baselineComposition, assets, frameRate) {
     };
 }
 function convertIRLayerToDSL(layer, layerId, imageAssetById, fontAssetById, frameRate, layerPath, diagnostics) {
-    var _layer_parentId, _layer_name, _layer_name1;
-    var _layer_transform, _layer_transform1, _layer_transform2, _layer_transform3;
+    var _layer_parentId, _layer_name, _layer_name1, _ref;
+    var _layer_transform, _layer_transform1, _layer_transform_anchor, _layer_transform2, _layer_transform3;
     var size = resolveLayerSize(layer);
     var asset = convertIRAssetToDSL(layer, imageAssetById);
     var layerType = mapLayerType$1(layer, asset);
@@ -1965,7 +1974,6 @@ function convertIRLayerToDSL(layer, layerId, imageAssetById, fontAssetById, fram
     var convertedLayer = {
         id: layerId,
         name: (_layer_name = layer.name) != null ? _layer_name : layer.id,
-        type: layerType,
         width: size.width,
         height: size.height,
         description: {
@@ -1978,22 +1986,36 @@ function convertIRLayerToDSL(layer, layerId, imageAssetById, fontAssetById, fram
             layer.time.outFrame / frameRate
         ],
         position: convertIRVec3PropertyToDSL((_layer_transform = layer.transform) == null ? void 0 : _layer_transform.position, TRANSFORM_FALLBACK.position, frameRate, true),
-        rotation: convertIRLayerRotationToDSL(layer, frameRate),
+        rotation: convertIRLayerRotationToDSL(layer, frameRate, layerPath, diagnostics),
         scale: convertIRVec3PropertyToDSL((_layer_transform1 = layer.transform) == null ? void 0 : _layer_transform1.scale, TRANSFORM_FALLBACK.scale, frameRate, false),
-        anchor: convertIRVec3PropertyToDSL((_layer_transform2 = layer.transform) == null ? void 0 : _layer_transform2.anchor, TRANSFORM_FALLBACK.anchor, frameRate, false),
+        anchor: {
+            a: false,
+            value: [].concat((_ref = (_layer_transform2 = layer.transform) == null ? void 0 : (_layer_transform_anchor = _layer_transform2.anchor) == null ? void 0 : _layer_transform_anchor.value) != null ? _ref : TRANSFORM_FALLBACK.anchor)
+        },
         opacity: convertIRNumberPropertyToDSL((_layer_transform3 = layer.transform) == null ? void 0 : _layer_transform3.opacity, TRANSFORM_FALLBACK.opacity, frameRate),
         children: []
     };
     if (layerType === 'layer' && asset != null) {
-        convertedLayer.asset = asset;
+        return _extends({}, convertedLayer, {
+            type: 'layer',
+            asset: asset
+        });
     }
     if (layer.type === 'text') {
-        convertedLayer.text = convertIRTextToDSL(layer, fontAssetById);
+        return _extends({}, convertedLayer, {
+            type: 'text',
+            text: convertIRTextToDSL(layer, fontAssetById)
+        });
     }
     if (layer.type === 'particle') {
-        convertedLayer.particle = convertIRParticleToDSL(layer, frameRate, layerPath, diagnostics);
+        return _extends({}, convertedLayer, {
+            type: 'particle',
+            particle: convertIRParticleToDSL(layer, frameRate, layerPath, diagnostics)
+        });
     }
-    return convertedLayer;
+    return _extends({}, convertedLayer, {
+        type: 'null'
+    });
 }
 function mapLayerType$1(layer, asset) {
     if (layer.type === 'particle') {
@@ -2056,20 +2078,20 @@ function convertIRTextToDSL(layer, fontAssetById) {
         letter_spacing: text.letterSpacing
     });
 }
-function convertIRLayerRotationToDSL(layer, frameRate) {
+function convertIRLayerRotationToDSL(layer, frameRate, path, diagnostics) {
     var _layer_transform;
     var rotation = (_layer_transform = layer.transform) == null ? void 0 : _layer_transform.rotation;
     if (rotation == null) {
         return convertIRVec3PropertyToDSL(undefined, TRANSFORM_FALLBACK.rotation, frameRate, false);
     }
-    return convertIRRotationToDSL(rotation, frameRate);
+    return convertIRRotationToDSL(rotation, frameRate, path, layer.id, diagnostics);
 }
 /**
  * Merge per-axis rotation into the DSL's 3D vector track.
  *
  * Aligned channels retain their shared easing. Independent axes fall back to
  * a union-of-keyframe-times projection.
- */ function convertIRRotationToDSL(rotation, frameRate) {
+ */ function convertIRRotationToDSL(rotation, frameRate, path, layerId, diagnostics) {
     var rotationChannels = [
         rotation.x,
         rotation.y,
@@ -2110,6 +2132,14 @@ function convertIRLayerRotationToDSL(layer, frameRate) {
         });
         return convertIRKeyframesToDSLProperty(keyframes, TRANSFORM_FALLBACK.rotation, frameRate, false);
     }
+    diagnostics.push({
+        code: 'ROTATION_CHANNELS_APPROXIMATED',
+        severity: 'warning',
+        action: 'approximated',
+        path: "" + path + ".transform.rotation",
+        sourceId: layerId,
+        message: 'Independent rotation channels are sampled at their combined keyframe times with linear interpolation; ' + 'the original curves remain in preserved data until rotation is edited.'
+    });
     var keyframeFrameSet = new Set();
     for(var _iterator = _create_for_of_iterator_helper_loose(rotationChannels), _step; !(_step = _iterator()).done;){
         var channel = _step.value;
@@ -2124,15 +2154,21 @@ function convertIRLayerRotationToDSL(layer, frameRate) {
     var sortedFrames = Array.from(keyframeFrameSet).sort(function(leftFrame, rightFrame) {
         return leftFrame - rightFrame;
     });
-    var keyframes1 = sortedFrames.map(function(frame) {
-        return {
+    var keyframes1 = sortedFrames.map(function(frame, index) {
+        return _extends({
             frame: frame,
             value: [
                 readNumberAtFrame(rotation.x, frame, 0),
                 readNumberAtFrame(rotation.y, frame, 0),
                 readNumberAtFrame(rotation.z, frame, 0)
             ]
-        };
+        }, index + 1 < sortedFrames.length && {
+            endValue: [
+                readNumberAtFrame(rotation.x, sortedFrames[index + 1], 0, true),
+                readNumberAtFrame(rotation.y, sortedFrames[index + 1], 0, true),
+                readNumberAtFrame(rotation.z, sortedFrames[index + 1], 0, true)
+            ]
+        });
     });
     return convertIRKeyframesToDSLProperty(keyframes1, TRANSFORM_FALLBACK.rotation, frameRate, false);
 }
@@ -2206,7 +2242,7 @@ function convertIRKeyframesToDSLProperty(keyframes, fallback, frameRate, include
         var _keyframes_;
         return {
             a: false,
-            value: (_ref = (_keyframes_ = keyframes[0]) == null ? void 0 : _keyframes_.value) != null ? _ref : fallback
+            value: structuredClone((_ref = (_keyframes_ = keyframes[0]) == null ? void 0 : _keyframes_.value) != null ? _ref : fallback)
         };
     }
     var animation = [];
@@ -2261,29 +2297,67 @@ function readNumberStatic(property, fallback) {
     }
     return (_property_value = property.value) != null ? _property_value : fallback;
 }
-function readNumberAtFrame(property, frame, fallback) {
-    var _ref;
-    var _property_keyframes;
+function readNumberAtFrame(property, frame, fallback, beforeFrame) {
+    if (beforeFrame === void 0) beforeFrame = false;
     if (property == null) {
         return fallback;
     }
     if (property.type === 'static') {
-        var _property_value;
-        return (_property_value = property.value) != null ? _property_value : fallback;
+        return property.value;
+    }
+    var keyframes = property.keyframes;
+    var first = keyframes[0];
+    if (frame <= first.frame) {
+        return first.value;
+    }
+    for(var index = 0; index < keyframes.length - 1; index++){
+        var _left_outTangent, _right_inTangent, _left_endValue;
+        var left = keyframes[index];
+        var right = keyframes[index + 1];
+        if (frame > right.frame || frame === right.frame && !beforeFrame) {
+            continue;
+        }
+        if (left.hold === true) {
+            return left.value;
+        }
+        var progress = (frame - left.frame) / (right.frame - left.frame);
+        var out = (_left_outTangent = left.outTangent) != null ? _left_outTangent : {
+            x: 0,
+            y: 0
+        };
+        var incoming = (_right_inTangent = right.inTangent) != null ? _right_inTangent : {
+            x: 1,
+            y: 1
+        };
+        // Temporal Bezier X is time, so invert it before evaluating the value curve.
+        var low = 0;
+        var high = 1;
+        for(var iteration = 0; iteration < 40; iteration++){
+            var mid = (low + high) / 2;
+            if (cubicBezier(mid, out.x, incoming.x) < progress) {
+                low = mid;
+            } else {
+                high = mid;
+            }
+        }
+        var eased = out.x === out.y && incoming.x === incoming.y ? progress : cubicBezier((low + high) / 2, out.y, incoming.y);
+        return left.value + (((_left_endValue = left.endValue) != null ? _left_endValue : right.value) - left.value) * eased;
     }
-    var keyframe = (_property_keyframes = property.keyframes) == null ? void 0 : _property_keyframes.find(function(candidate) {
-        return Math.abs(candidate.frame - frame) < EPSILON$1;
-    });
-    return (_ref = keyframe == null ? void 0 : keyframe.value) != null ? _ref : fallback;
+    return keyframes[keyframes.length - 1].value;
+}
+function cubicBezier(time, first, second) {
+    var inverse = 1 - time;
+    return 3 * inverse * inverse * time * first + 3 * inverse * time * time * second + time * time * time;
 }
 function collectDiagnostics(layer, layerId, layerPath, diagnostics) {
-    var _layer_content;
+    var _ref;
+    var _layer_content, _layer_masks;
     var preservedFields = [];
     var unsupportedFeatures = [];
     collectPreservedField(preservedFields, layer.visible === false ? layer.visible : undefined, 'visible');
     collectPreservedField(preservedFields, layer.endBehavior != null && layer.endBehavior !== 'destroy' ? layer.endBehavior : undefined, 'endBehavior');
     collectPreservedField(preservedFields, layer.blendMode, 'blendMode');
-    collectPreservedField(preservedFields, layer.mask, 'mask');
+    collectPreservedField(preservedFields, layer.masks, 'masks');
     collectPreservedField(preservedFields, layer.matte, 'matte');
     collectPreservedField(preservedFields, layer.localBounds != null && layer.localBounds.x !== 0 ? layer.localBounds.x : undefined, 'localBounds.x');
     collectPreservedField(preservedFields, layer.localBounds != null && layer.localBounds.y !== 0 ? layer.localBounds.y : undefined, 'localBounds.y');
@@ -2302,7 +2376,7 @@ function collectDiagnostics(layer, layerId, layerPath, diagnostics) {
     if (layer.type === 'precomp') {
         unsupportedFeatures.push(layer.type);
     }
-    if (layer.mask != null || layer.matte != null) {
+    if (((_ref = (_layer_masks = layer.masks) == null ? void 0 : _layer_masks.length) != null ? _ref : 0) > 0 || layer.matte != null) {
         unsupportedFeatures.push('mask');
     }
     var uniquePreservedFields = Array.from(new Set(preservedFields));
@@ -2491,7 +2565,11 @@ function sanitizeIdPart(value) {
     return value.replace(/[^a-zA-Z0-9_-]/g, '_');
 }
 
-/** Convert Animation IR to editable DSL and retain source-neutral data for the reverse conversion. */ function convertIRToDSL(baselineScene) {
+/**
+ * Project validated IR into editable DSL, diagnostics, and a paired JSON-serializable snapshot.
+ * The input scene is not mutated. Invalid IR throws IRValidationError; an invalid
+ * DSL projection throws DSLValidationError. Shared precompositions remain linked on write-back.
+ */ function convertIRToDSL(baselineScene) {
     animationIr.assertIRScene(baselineScene);
     var baselineSnapshot = structuredClone(baselineScene);
     var result = convertIRSceneEntryToDSL(baselineSnapshot);
@@ -2638,7 +2716,7 @@ function convertDSLCurvesToIRKeyframes(animationCurves, frameRate, convertValue,
         });
         var endKeyframe = _extends({
             frame: secondsToFrames(curve.t[1], frameRate),
-            value: endValue,
+            value: structuredClone(endValue),
             inTangent: {
                 x: curve.easing[2],
                 y: curve.easing[3]
@@ -2933,8 +3011,21 @@ function areParticleBurstsEqual(left, right) {
     });
 }
 
-function updateIRLayer(irLayer, irScene, editedLayer, baselineLayer, dslPath, frameRate, strict, reportWarning, reportChange) {
+function updateIRLayer(irLayer, irScene, editedLayer, baselineLayer, dslPath, frameRate, reportWarning, reportChange, applySupportedEdits) {
+    if (applySupportedEdits === void 0) applySupportedEdits = true;
     var _editedLayer_parent, _baselineLayer_parent;
+    if (editedLayer.type !== baselineLayer.type) {
+        reportUnsupportedLayerEdit(reportWarning, 'LAYER_TYPE_CHANGE_IGNORED', "type change on layer '" + editedLayer.id + "' ('" + baselineLayer.type + "' -> '" + editedLayer.type + "') is ignored.", editedLayer.id, "" + dslPath + ".type");
+    }
+    if (editedLayer.description.self !== baselineLayer.description.self || editedLayer.description.composite !== baselineLayer.description.composite) {
+        reportUnsupportedLayerEdit(reportWarning, 'LAYER_DESCRIPTION_CHANGE_IGNORED', "description change on layer '" + editedLayer.id + "' is not represented in Animation IR and is ignored.", editedLayer.id, "" + dslPath + ".description");
+    }
+    if (((_editedLayer_parent = editedLayer.parent) != null ? _editedLayer_parent : null) !== ((_baselineLayer_parent = baselineLayer.parent) != null ? _baselineLayer_parent : null)) {
+        reportUnsupportedLayerEdit(reportWarning, 'PARENT_CHANGE_IGNORED', "parent change on layer '" + editedLayer.id + "' " + ("('" + baselineLayer.parent + "' -> '" + editedLayer.parent + "') is ignored in this mode."), editedLayer.id, "" + dslPath + ".parent");
+    }
+    if (!applySupportedEdits) {
+        return;
+    }
     if (editedLayer.name !== baselineLayer.name) {
         var previousName = irLayer.name;
         irLayer.name = editedLayer.name;
@@ -2947,15 +3038,6 @@ function updateIRLayer(irLayer, irScene, editedLayer, baselineLayer, dslPath, fr
             newValue: editedLayer.name
         });
     }
-    if (editedLayer.type !== baselineLayer.type) {
-        reportUnsupportedLayerEdit(strict, reportWarning, 'LAYER_TYPE_CHANGE_IGNORED', "type change on layer '" + editedLayer.id + "' ('" + baselineLayer.type + "' -> '" + editedLayer.type + "') is ignored.", editedLayer.id, "" + dslPath + ".type");
-    }
-    if (editedLayer.description.self !== baselineLayer.description.self || editedLayer.description.composite !== baselineLayer.description.composite) {
-        reportUnsupportedLayerEdit(strict, reportWarning, 'LAYER_DESCRIPTION_CHANGE_IGNORED', "description change on layer '" + editedLayer.id + "' is not represented in Animation IR and is ignored.", editedLayer.id, "" + dslPath + ".description");
-    }
-    if (((_editedLayer_parent = editedLayer.parent) != null ? _editedLayer_parent : null) !== ((_baselineLayer_parent = baselineLayer.parent) != null ? _baselineLayer_parent : null)) {
-        reportUnsupportedLayerEdit(strict, reportWarning, 'PARENT_CHANGE_IGNORED', "parent change on layer '" + editedLayer.id + "' " + ("('" + baselineLayer.parent + "' -> '" + editedLayer.parent + "') is ignored in this mode."), editedLayer.id, "" + dslPath + ".parent");
-    }
     updateIRTransform(irLayer, editedLayer, baselineLayer, frameRate, reportChange);
     updateIRTiming(irLayer, editedLayer, baselineLayer, frameRate, reportChange);
     updateIRText(irLayer, irScene, editedLayer, baselineLayer, reportChange);
@@ -2991,11 +3073,8 @@ function updateIRLocalBounds(irLayer, editedLayer, reportChange) {
         newValue: updatedBounds
     });
 }
-function reportUnsupportedLayerEdit(strict, reportWarning, code, message, layerId, path) {
+function reportUnsupportedLayerEdit(reportWarning, code, message, layerId, path) {
     var formattedMessage = "[dsl-ir:preserved-data] " + message;
-    if (strict) {
-        throw new Error(formattedMessage);
-    }
     reportWarning({
         code: code,
         message: formattedMessage,
@@ -3044,17 +3123,19 @@ function updateIRTransform(irLayer, editedLayer, baselineLayer, frameRate, repor
                 var _loop = function() {
                     var keyframe = _step1.value;
                     var _ref, _ref1;
-                    var source = sourcePosition.keyframes.find(function(candidate) {
+                    var sourceIndex = sourcePosition.keyframes.findIndex(function(candidate) {
                         return candidate.frame === keyframe.frame;
                     });
+                    var source = sourcePosition.keyframes[sourceIndex];
                     if (source == null && !constantDepth) {
                         throw new Error('[dsl-ir] Position timing edits on layers with animated source depth are unsupported.');
                     }
                     keyframe.value[2] = (_ref = (_ref1 = source == null ? void 0 : source.value[2]) != null ? _ref1 : depths[0]) != null ? _ref : 0;
                     if (keyframe.endValue != null) {
-                        var _ref2, _ref3, _ref4;
-                        var _this;
-                        keyframe.endValue[2] = (_ref2 = (_ref3 = (_this = (_ref4 = source == null ? void 0 : source.endValue) != null ? _ref4 : source == null ? void 0 : source.value) == null ? void 0 : _this[2]) != null ? _ref3 : depths[0]) != null ? _ref2 : 0;
+                        var _ref2, _ref3, _ref4, _ref5;
+                        var _sourcePosition_keyframes_;
+                        var sourceEnd = (source == null ? void 0 : source.hold) === true ? source.value : (_ref2 = (_ref3 = source == null ? void 0 : source.endValue) != null ? _ref3 : (_sourcePosition_keyframes_ = sourcePosition.keyframes[sourceIndex + 1]) == null ? void 0 : _sourcePosition_keyframes_.value) != null ? _ref2 : source == null ? void 0 : source.value;
+                        keyframe.endValue[2] = (_ref4 = (_ref5 = sourceEnd == null ? void 0 : sourceEnd[2]) != null ? _ref5 : depths[0]) != null ? _ref4 : 0;
                     }
                 };
                 for(var _iterator1 = _create_for_of_iterator_helper_loose(position.keyframes), _step1; !(_step1 = _iterator1()).done;)_loop();
@@ -3143,7 +3224,7 @@ function updateIRText(irLayer, irScene, editedLayer, baselineLayer, reportChange
     if (irLayer.type !== 'text' || editedText == null) {
         return;
     }
-    var normalizedEditedText = normalizeTextPropertiesForIR(editedText, irLayer.content);
+    var normalizedEditedText = normalizeTextPropertiesForIR(editedText);
     var textChanges = baselineText != null ? collectTextPropertyChanges(baselineText, normalizedEditedText) : [];
     if (baselineText != null && textChanges.length === 0) {
         return;
@@ -3154,6 +3235,9 @@ function updateIRText(irLayer, irScene, editedLayer, baselineLayer, reportChange
         return change.field === 'font';
     }) ? ensureSystemFontAsset(irScene.assets, (_normalizedEditedText_font = normalizedEditedText.font) != null ? _normalizedEditedText_font : currentFontAsset.family, currentFontAsset.style, currentFontAsset.weight) : irLayer.content.fontAssetId;
     irLayer.content = buildUpdatedTextData(irLayer.content, normalizedEditedText, fontAssetId);
+    if (baselineText != null && isHexEqual(normalizedEditedText.color, baselineText.color)) {
+        irLayer.content.color = previousText.color;
+    }
     if (baselineText == null) {
         reportChange({
             kind: 'text',
@@ -3177,10 +3261,10 @@ function updateIRText(irLayer, irScene, editedLayer, baselineLayer, reportChange
         }
     }
 }
-function normalizeTextPropertiesForIR(text, currentText) {
-    var currentFontSize = Number.isFinite(currentText.fontSize) && currentText.fontSize > 0 ? currentText.fontSize : 16;
-    var fontSize = Number.isFinite(text.size) && text.size > 0 ? text.size : currentFontSize;
-    var lineHeight = text.line_height != null && Number.isFinite(text.line_height) && text.line_height > 0 ? text.line_height : fontSize;
+function normalizeTextPropertiesForIR(text) {
+    var _text_line_height;
+    var fontSize = text.size;
+    var lineHeight = (_text_line_height = text.line_height) != null ? _text_line_height : fontSize;
     var fontFamily = text.font != null ? normalizeDSLFontFamily(text.font) : undefined;
     return _extends({}, text, {
         size: fontSize,
@@ -3247,11 +3331,27 @@ function updateIRAsset(irLayer, irScene, editedLayer, baselineLayer, reportChang
     }
 }
 function countImageAssetReferences(irScene, assetId) {
-    return irScene.compositions.reduce(function(count, composition) {
-        return count + composition.layers.filter(function(layer) {
-            return layer.type === 'image' && layer.content.assetId === assetId;
-        }).length;
-    }, 0);
+    var count = 0;
+    for(var _iterator = _create_for_of_iterator_helper_loose(irScene.compositions), _step; !(_step = _iterator()).done;){
+        var composition = _step.value;
+        for(var _iterator1 = _create_for_of_iterator_helper_loose(composition.layers), _step1; !(_step1 = _iterator1()).done;){
+            var layer = _step1.value;
+            if (layer.type === 'image' && layer.content.assetId === assetId) {
+                count++;
+            } else if (layer.type === 'shape') {
+                for(var _iterator2 = _create_for_of_iterator_helper_loose(layer.content.shapes), _step2; !(_step2 = _iterator2()).done;){
+                    var shape = _step2.value;
+                    var paints = [].concat(shape.fills, shape.strokes.map(function(stroke) {
+                        return stroke.paint;
+                    }));
+                    count += paints.filter(function(paint) {
+                        return paint.type === 'texture' && paint.assetId === assetId;
+                    }).length;
+                }
+            }
+        }
+    }
+    return count;
 }
 function createAvailableRecombineAssetId(irScene) {
     var existingAssetIdSet = new Set(irScene.assets.map(function(asset) {
@@ -3265,6 +3365,109 @@ function createAvailableRecombineAssetId(irScene) {
     }
 }
 
+var SHARED_FIELDS = [
+    'name',
+    'width',
+    'height',
+    'time_range',
+    'position',
+    'rotation',
+    'scale',
+    'anchor',
+    'opacity',
+    'asset',
+    'text',
+    'particle'
+];
+/** Resolve linked edits before mutating IR; conflicting fields retain their baseline values. */ function resolveSharedPrecompEdits(entries, mapping, reportWarning) {
+    var groups = new Map();
+    for(var _iterator = _create_for_of_iterator_helper_loose(entries), _step; !(_step = _iterator()).done;){
+        var entry = _step.value;
+        var _groups_get;
+        var source = mapping.layers[entry.baseline.id];
+        if ((source == null ? void 0 : source.expandedSource) == null) {
+            continue;
+        }
+        var key = JSON.stringify([
+            source.irCompositionId,
+            source.irLayerId
+        ]);
+        var group = (_groups_get = groups.get(key)) != null ? _groups_get : [];
+        group.push(entry);
+        groups.set(key, group);
+    }
+    for(var _iterator1 = _create_for_of_iterator_helper_loose(groups.values()), _step1; !(_step1 = _iterator1()).done;){
+        var _loop = function() {
+            var field = _step2.value;
+            var changes = group1.filter(function(entry) {
+                var _entry_edited;
+                return ((_entry_edited = entry.edited) == null ? void 0 : _entry_edited[field]) !== undefined && !areSharedValuesEqual(entry.edited[field], entry.baseline[field]);
+            });
+            var first = changes[0];
+            if ((first == null ? void 0 : first.edited) == null) {
+                return "continue";
+            }
+            var value = first.edited[field];
+            var conflict = changes.some(function(entry) {
+                var _entry_edited;
+                return !areSharedValuesEqual((_entry_edited = entry.edited) == null ? void 0 : _entry_edited[field], value);
+            });
+            if (conflict) {
+                reportWarning({
+                    code: 'SHARED_PRECOMP_EDIT_CONFLICT',
+                    path: first.path + "." + field,
+                    layerId: first.baseline.id,
+                    message: "Conflicting '" + field + "' edits on shared precomposition instances were ignored; " + 'the original field is retained.'
+                });
+            }
+            for(var _iterator = _create_for_of_iterator_helper_loose(group1), _step; !(_step = _iterator()).done;){
+                var entry = _step.value;
+                if (entry.edited != null) {
+                    var _obj;
+                    Object.assign(entry.edited, (_obj = {}, _obj[field] = structuredClone(conflict ? entry.baseline[field] : value), _obj));
+                }
+            }
+        };
+        var group1 = _step1.value;
+        if (group1.length < 2) {
+            continue;
+        }
+        var deleted = group1.find(function(entry) {
+            return entry.edited == null;
+        });
+        if (deleted != null) {
+            reportWarning({
+                code: 'SHARED_PRECOMP_LAYER_DELETED',
+                path: deleted.path,
+                layerId: deleted.baseline.id,
+                message: 'Deleting this shared precomposition layer removes it from every instance; deletion takes precedence.'
+            });
+            continue;
+        }
+        for(var _iterator2 = _create_for_of_iterator_helper_loose(SHARED_FIELDS), _step2; !(_step2 = _iterator2()).done;)_loop();
+    }
+}
+function areSharedValuesEqual(left, right) {
+    if (typeof left === 'number' && typeof right === 'number') {
+        return isScalarEqual(left, right);
+    }
+    if (left === right) {
+        return true;
+    }
+    if (Array.isArray(left) && Array.isArray(right)) {
+        return left.length === right.length && left.every(function(value, index) {
+            return areSharedValuesEqual(value, right[index]);
+        });
+    }
+    if (isRecord$1(left) && isRecord$1(right)) {
+        var keys = new Set([].concat(Object.keys(left), Object.keys(right)));
+        return Array.from(keys).every(function(key) {
+            return areSharedValuesEqual(left[key], right[key]);
+        });
+    }
+    return false;
+}
+
 /** Apply edited sibling order without changing parent relationships. */ function updateLayerOrder(updatedIR, editedLayers, irLayerIdByEditedLayer, reportChange, rootDSLParentId) {
     var irLayerById = new Map(updatedIR.layers.map(function(layer) {
         return [
@@ -3433,8 +3636,8 @@ function reorderOwnedEntries(entries, orderedOwners, resolveOwner) {
 
 /** Apply previously validated DSL to a clone of the baseline IR. */ function updateValidatedIRFromDSL(baselineScene, editedDocument, layerMapping, options) {
     var _loop = function() {
-        var _step_value = _step3.value, baselineLayer = _step_value.layer, path = _step_value.path;
-        var _layerMapping_layers_baselineLayer_id;
+        var _step_value = _step4.value, baselineLayer = _step_value.layer, path = _step_value.path;
+        var _layerMapping_layers_baselineLayer_id, _layerMapping_layers_baselineLayer_id1, _layerMapping_layers_baselineLayer_id2;
         var irLayerId = (_layerMapping_layers_baselineLayer_id = layerMapping.layers[baselineLayer.id]) == null ? void 0 : _layerMapping_layers_baselineLayer_id.irLayerId;
         if (irLayerId == null) {
             return "continue";
@@ -3442,11 +3645,15 @@ function reorderOwnedEntries(entries, orderedOwners, resolveOwner) {
         var editedLayer = matchEditedLayer(baselineLayer, path, {
             editedLayerById: editedLayerById,
             editedLayerByPath: editedLayerByPath,
-            matchedEditedLayerSet: matchedEditedLayerSet
+            matchedEditedLayerSet: matchedEditedLayerSet,
+            baselineLayerIds: baselineLayerIds
         });
         if (editedLayer == null) {
-            var _layerMapping_layers_baselineLayer_id1;
-            var expandedSource = (_layerMapping_layers_baselineLayer_id1 = layerMapping.layers[baselineLayer.id]) == null ? void 0 : _layerMapping_layers_baselineLayer_id1.expandedSource;
+            var _layerMapping_layers_baselineLayer_id3;
+            var expandedSource = (_layerMapping_layers_baselineLayer_id3 = layerMapping.layers[baselineLayer.id]) == null ? void 0 : _layerMapping_layers_baselineLayer_id3.expandedSource;
+            if (expandedSource != null && !editedLayerById.has(expandedSource.parentLayerId)) {
+                return "continue";
+            }
             var expandedComposition = expandedSource != null ? compositionById.get(expandedSource.irCompositionId) : undefined;
             if (expandedSource != null && (expandedComposition == null ? void 0 : expandedComposition.layers.some(function(layer) {
                 return layer.id === irLayerId;
@@ -3466,15 +3673,18 @@ function reorderOwnedEntries(entries, orderedOwners, resolveOwner) {
             });
             return "continue";
         }
+        if (((_layerMapping_layers_baselineLayer_id1 = layerMapping.layers[baselineLayer.id]) == null ? void 0 : _layerMapping_layers_baselineLayer_id1.irCompositionId) !== updatedIR.id || ((_layerMapping_layers_baselineLayer_id2 = layerMapping.layers[baselineLayer.id]) == null ? void 0 : _layerMapping_layers_baselineLayer_id2.expandedSource) != null) {
+            return "continue";
+        }
         var irLayer = clonedLayerByIRId.get(irLayerId);
         if (irLayer == null) {
             return "continue";
         }
         matchedEditedLayerSet.add(editedLayer);
         irLayerIdByEditedLayer.set(editedLayer, irLayerId);
-        updateIRLayer(irLayer, updatedScene, editedLayer, baselineLayer, path, targetFrameRate, strict, reportWarning, reportChange);
+        updateIRLayer(irLayer, updatedScene, editedLayer, baselineLayer, path, targetFrameRate, reportWarning, reportChange);
     }, _loop1 = function() {
-        var editedLayer = _step4.value;
+        var editedLayer = _step5.value;
         var _editedPathByLayer_get;
         var _layerMapping_layers_editedLayer_id;
         if (matchedEditedLayerSet.has(editedLayer)) {
@@ -3488,17 +3698,22 @@ function reorderOwnedEntries(entries, orderedOwners, resolveOwner) {
                 return layer.id === mappingEntry.irLayerId;
             }) : undefined;
             if (targetComposition != null && targetLayer != null && (mappingEntry == null ? void 0 : mappingEntry.irLayerId) != null) {
-                var _editedPathByLayer_get1;
-                updateIRLayer(targetLayer, updatedScene, editedLayer, buildExpandedBaselineLayer(editedLayer, expandedSource), (_editedPathByLayer_get1 = editedPathByLayer.get(editedLayer)) != null ? _editedPathByLayer_get1 : '$.layers', targetFrameRate, strict, reportWarning, reportChange);
+                var _deletedExpandedIRLayerIdsByCompositionId_get;
+                var key = JSON.stringify([
+                    targetComposition.id,
+                    mappingEntry.irLayerId
+                ]);
+                if (((_deletedExpandedIRLayerIdsByCompositionId_get = deletedExpandedIRLayerIdsByCompositionId.get(targetComposition.id)) == null ? void 0 : _deletedExpandedIRLayerIdsByCompositionId_get.has(mappingEntry.irLayerId)) !== true) {
+                    var _editedPathByLayer_get1;
+                    updateIRLayer(targetLayer, updatedScene, editedLayer, buildExpandedBaselineLayer(editedLayer, expandedSource), (_editedPathByLayer_get1 = editedPathByLayer.get(editedLayer)) != null ? _editedPathByLayer_get1 : '$.layers', targetComposition.frameRate, reportWarning, reportChange, !updatedExpandedLayerKeys.has(key));
+                    updatedExpandedLayerKeys.add(key);
+                }
                 expandedIRLayerIdByEditedLayer.set(editedLayer, mappingEntry.irLayerId);
                 editedExpandedCompositionById.set(expandedSource.irCompositionId, targetComposition);
             }
             return "continue";
         }
         var message = "[dsl-ir:preserved-data] edited layer '" + editedLayer.id + "' matches no baseline scene layer; new layers are not supported in this mode.";
-        if (strict) {
-            throw new Error(message);
-        }
         reportWarning({
             code: 'INVENTED_LAYER',
             message: message,
@@ -3506,7 +3721,7 @@ function reorderOwnedEntries(entries, orderedOwners, resolveOwner) {
             layerId: editedLayer.id
         });
     }, _loop2 = function() {
-        var _step_value = _step5.value, dslLayerId = _step_value[0], mappingEntry = _step_value[1];
+        var _step_value = _step6.value, dslLayerId = _step_value[0], mappingEntry = _step_value[1];
         var _deletedExpandedIRLayerIdsByCompositionId_get;
         var expandedSource = mappingEntry.expandedSource;
         var irLayerId = mappingEntry.irLayerId;
@@ -3530,7 +3745,6 @@ function reorderOwnedEntries(entries, orderedOwners, resolveOwner) {
         });
     };
     if (options === void 0) options = {};
-    var strict = options.strict === true;
     var reportWarning = createWarningReporter(options.onWarning);
     var reportChange = createChangeReporter(options.onChange);
     var baselineDSLResult = convertIRToDSL(baselineScene);
@@ -3545,13 +3759,33 @@ function reorderOwnedEntries(entries, orderedOwners, resolveOwner) {
         ];
     }));
     var targetFrameRate = editedDSL.meta.fps;
-    // Reframe the clone first; comparisons still use the untouched baseline DSL in seconds.
-    for(var _iterator = _create_for_of_iterator_helper_loose(updatedScene.compositions), _step; !(_step = _iterator()).done;){
-        var composition = _step.value;
-        updateIRFrameRate(composition, targetFrameRate, reportChange, composition.id === updatedIR.id);
+    // Preserve independent source rates unless the document FPS is explicitly edited.
+    if (!isScalarEqual(targetFrameRate, baselineDSL.meta.fps)) {
+        var sourceFrameRates = new Map(baselineScene.compositions.map(function(composition) {
+            return [
+                composition.id,
+                composition.frameRate
+            ];
+        }));
+        for(var _iterator = _create_for_of_iterator_helper_loose(updatedScene.compositions), _step; !(_step = _iterator()).done;){
+            var composition = _step.value;
+            for(var _iterator1 = _create_for_of_iterator_helper_loose(composition.layers), _step1; !(_step1 = _iterator1()).done;){
+                var layer = _step1.value;
+                if (layer.type === 'precomp' && layer.time.sourceStartFrame != null) {
+                    var sourceFrameRate = sourceFrameRates.get(layer.content.compositionId);
+                    if (sourceFrameRate != null && !isScalarEqual(targetFrameRate, sourceFrameRate)) {
+                        layer.time.sourceStartFrame *= targetFrameRate / sourceFrameRate;
+                    }
+                }
+            }
+            updateIRFrameRate(composition, targetFrameRate, reportChange, composition.id === updatedIR.id);
+        }
     }
     updateIRComposition(updatedIR, editedDSL, baselineDSL, targetFrameRate, reportChange);
     var baselineLayers = collectLayersWithPaths(baselineDSL.layers);
+    var baselineLayerIds = new Set(baselineLayers.map(function(entry) {
+        return entry.layer.id;
+    }));
     var editedLayerEntries = collectLayersWithPaths(editedDSL.layers);
     var editedLayers = editedLayerEntries.map(function(entry) {
         return entry.layer;
@@ -3564,22 +3798,22 @@ function reorderOwnedEntries(entries, orderedOwners, resolveOwner) {
     }));
     var editedLayerById = new Map();
     var editedLayerByPath = new Map();
-    for(var _iterator1 = _create_for_of_iterator_helper_loose(editedLayerEntries), _step1; !(_step1 = _iterator1()).done;){
-        var _step_value = _step1.value, layer = _step_value.layer, path = _step_value.path;
-        var previousEntry = editedLayerById.get(layer.id);
+    for(var _iterator2 = _create_for_of_iterator_helper_loose(editedLayerEntries), _step2; !(_step2 = _iterator2()).done;){
+        var _step_value = _step2.value, layer1 = _step_value.layer, path = _step_value.path;
+        var previousEntry = editedLayerById.get(layer1.id);
         if (previousEntry != null) {
-            throw new Error("[dsl-ir:preserved-data] Duplicate layer id '" + layer.id + "'; earlier occurrence at path '" + previousEntry.path + "'.");
+            throw new Error("[dsl-ir:preserved-data] Duplicate layer id '" + layer1.id + "'; earlier occurrence at path '" + previousEntry.path + "'.");
         }
-        editedLayerById.set(layer.id, {
-            layer: layer,
+        editedLayerById.set(layer1.id, {
+            layer: layer1,
             path: path
         });
-        editedLayerByPath.set(path, layer);
+        editedLayerByPath.set(path, layer1);
     }
     var clonedLayerByIRId = new Map();
-    for(var _iterator2 = _create_for_of_iterator_helper_loose(updatedIR.layers), _step2; !(_step2 = _iterator2()).done;){
-        var layer1 = _step2.value;
-        clonedLayerByIRId.set(layer1.id, layer1);
+    for(var _iterator3 = _create_for_of_iterator_helper_loose(updatedIR.layers), _step3; !(_step3 = _iterator3()).done;){
+        var layer2 = _step3.value;
+        clonedLayerByIRId.set(layer2.id, layer2);
     }
     // Track object identity because edited IDs may have changed.
     var matchedEditedLayerSet = new Set();
@@ -3587,14 +3821,35 @@ function reorderOwnedEntries(entries, orderedOwners, resolveOwner) {
     var deletedIRLayerIdSet = new Set();
     var deletedExpandedIRLayerIdsByCompositionId = new Map();
     var semanticallyDeletedExpandedDSLIds = new Set();
-    for(var _iterator3 = _create_for_of_iterator_helper_loose(baselineLayers), _step3; !(_step3 = _iterator3()).done;)_loop();
+    resolveSharedPrecompEdits(baselineLayers.flatMap(function(param) {
+        var layer = param.layer, path = param.path;
+        var _layerMapping_layers_layer_id_expandedSource, _layerMapping_layers_layer_id;
+        var parentId = (_layerMapping_layers_layer_id = layerMapping.layers[layer.id]) == null ? void 0 : (_layerMapping_layers_layer_id_expandedSource = _layerMapping_layers_layer_id.expandedSource) == null ? void 0 : _layerMapping_layers_layer_id_expandedSource.parentLayerId;
+        if (parentId != null && !editedLayerById.has(parentId)) {
+            return [];
+        }
+        return [
+            {
+                baseline: layer,
+                path: path,
+                edited: matchEditedLayer(layer, path, {
+                    editedLayerById: editedLayerById,
+                    editedLayerByPath: editedLayerByPath,
+                    matchedEditedLayerSet: matchedEditedLayerSet,
+                    baselineLayerIds: baselineLayerIds
+                })
+            }
+        ];
+    }), layerMapping, reportWarning);
+    for(var _iterator4 = _create_for_of_iterator_helper_loose(baselineLayers), _step4; !(_step4 = _iterator4()).done;)_loop();
     var expandedIRLayerIdByEditedLayer = new Map();
     var editedExpandedCompositionById = new Map();
-    for(var _iterator4 = _create_for_of_iterator_helper_loose(editedLayers), _step4; !(_step4 = _iterator4()).done;)_loop1();
-    for(var _iterator5 = _create_for_of_iterator_helper_loose(Object.entries(layerMapping.layers)), _step5; !(_step5 = _iterator5()).done;)_loop2();
+    var updatedExpandedLayerKeys = new Set();
+    for(var _iterator5 = _create_for_of_iterator_helper_loose(editedLayers), _step5; !(_step5 = _iterator5()).done;)_loop1();
+    for(var _iterator6 = _create_for_of_iterator_helper_loose(Object.entries(layerMapping.layers)), _step6; !(_step6 = _iterator6()).done;)_loop2();
     removeIRLayers(updatedIR, deletedIRLayerIdSet, reportChange);
-    for(var _iterator6 = _create_for_of_iterator_helper_loose(deletedExpandedIRLayerIdsByCompositionId), _step6; !(_step6 = _iterator6()).done;){
-        var _step_value1 = _step6.value, compositionId = _step_value1[0], deletedLayerIds = _step_value1[1];
+    for(var _iterator7 = _create_for_of_iterator_helper_loose(deletedExpandedIRLayerIdsByCompositionId), _step7; !(_step7 = _iterator7()).done;){
+        var _step_value1 = _step7.value, compositionId = _step_value1[0], deletedLayerIds = _step_value1[1];
         var composition1 = compositionById.get(compositionId);
         if (composition1 != null) {
             removeIRLayers(composition1, deletedLayerIds, reportChange);
@@ -3611,9 +3866,8 @@ function buildExpandedBaselineLayer(editedLayer, expandedSource) {
     if (baseline == null || transform == null) {
         return structuredClone(editedLayer);
     }
-    return _extends({}, structuredClone(editedLayer), {
+    var restored = _extends({}, structuredClone(editedLayer), {
         name: baseline.name,
-        type: baseline.type,
         width: baseline.width,
         height: baseline.height,
         description: structuredClone(baseline.description),
@@ -3631,6 +3885,30 @@ function buildExpandedBaselineLayer(editedLayer, expandedSource) {
     }, baseline.particle != null && {
         particle: structuredClone(baseline.particle)
     });
+    if (baseline.type === 'text' && baseline.text != null) {
+        return _extends({}, restored, {
+            type: 'text',
+            text: structuredClone(baseline.text)
+        });
+    }
+    if (baseline.type === 'particle' && baseline.particle != null) {
+        return _extends({}, restored, {
+            type: 'particle',
+            particle: structuredClone(baseline.particle)
+        });
+    }
+    if (baseline.type === 'layer' && baseline.asset != null) {
+        return _extends({}, restored, {
+            type: 'layer',
+            asset: structuredClone(baseline.asset)
+        });
+    }
+    if (baseline.type === 'null') {
+        return _extends({}, restored, {
+            type: 'null'
+        });
+    }
+    throw new TypeError('[dsl-ir:preserved-data] Expanded baseline layer is missing its required content.');
 }
 function updateExpandedCompositionLayerOrder(layers, compositionById, layerMapping, irLayerIdByEditedLayer, reportChange) {
     for(var _iterator = _create_for_of_iterator_helper_loose(layers), _step; !(_step = _iterator()).done;){
@@ -3657,7 +3935,7 @@ function matchEditedLayer(baselineLayer, path, context) {
         return layerById;
     }
     var layerByPath = context.editedLayerByPath.get(path);
-    if (layerByPath != null && !context.matchedEditedLayerSet.has(layerByPath) && layerByPath.name === baselineLayer.name) {
+    if (layerByPath != null && !context.matchedEditedLayerSet.has(layerByPath) && !context.baselineLayerIds.has(layerByPath.id) && layerByPath.name === baselineLayer.name) {
         return layerByPath;
     }
     return undefined;
@@ -3764,9 +4042,6 @@ function removeIRLayers(updatedIR, deletedIRLayerIdSet, reportChange) {
         var _layer_transform, _layer_transform1, _layer_transform_rotation, _layer_transform2, _layer_transform_rotation1, _layer_transform3, _layer_transform_rotation2, _layer_transform4, _layer_transform5;
         layer.time.inFrame *= frameRateScale;
         layer.time.outFrame *= frameRateScale;
-        if (layer.type === 'precomp' && layer.time.sourceStartFrame != null) {
-            layer.time.sourceStartFrame *= frameRateScale;
-        }
         reframeAnimatedProperty((_layer_transform = layer.transform) == null ? void 0 : _layer_transform.position, frameRateScale);
         reframeAnimatedProperty((_layer_transform1 = layer.transform) == null ? void 0 : _layer_transform1.scale, frameRateScale);
         reframeAnimatedProperty((_layer_transform2 = layer.transform) == null ? void 0 : (_layer_transform_rotation = _layer_transform2.rotation) == null ? void 0 : _layer_transform_rotation.x, frameRateScale);
@@ -4135,31 +4410,405 @@ function convertLayerTime(layer, compositionDurationSeconds, frameRate) {
     };
 }
 function convertTextData(text, fontAssets) {
-    var _text_align;
+    var _text_line_height, _text_align;
     var fontFamily = normalizeDSLFontFamily(text.font);
     // DSL text cannot express style or weight, so new IR fonts use the canonical normal/400 defaults.
     var fontAssetId = ensureSystemFontAsset(fontAssets, fontFamily, 'normal', 400);
-    var fontSize = Number.isFinite(text.size) && text.size > 0 ? text.size : 16;
+    var fontSize = text.size;
     return {
         text: text.content,
         fontAssetId: fontAssetId,
         fontSize: fontSize,
         color: hexToIRColor(text.color !== '' ? text.color : '#000000'),
         letterSpacing: resolveFiniteNumber(text.letter_spacing, 0),
-        lineHeight: text.line_height != null && Number.isFinite(text.line_height) && text.line_height > 0 ? text.line_height : fontSize,
+        lineHeight: (_text_line_height = text.line_height) != null ? _text_line_height : fontSize,
         textAlign: (_text_align = text.align) != null ? _text_align : 'left'
     };
 }
 
-/** Convert an editable DSL composition into a shared Animation IR scene. */ function convertDSLToIR(composition, options) {
-    if (options === void 0) options = {};
-    var validationResult = validateDSL(composition, {
-        strict: options.strict
+/** Source bindings distinguish target layout from edits to source-local emitter transforms. */ function convertDSLWithParticleSources(document, options) {
+    var _loop = function() {
+        var _step_value = _step2.value, sourceIndex = _step_value[0], source = _step_value[1];
+        var _result_scene_assets, _result_diagnostics;
+        animationIr.assertIRScene(source.preservedData.baselineScene);
+        var sourceDSL = convertIRToDSL(source.preservedData.baselineScene).dsl;
+        var sourceLayerById = new Map(flattenLayers(sourceDSL.layers).map(function(layer) {
+            return [
+                layer.id,
+                layer
+            ];
+        }));
+        var targets = Object.keys(source.layers).map(function(id) {
+            var layer = targetById.get(id);
+            if (layer == null) {
+                throw new TypeError("[dsl-ir:sources] Missing target layer '" + id + "'.");
+            }
+            return layer;
+        });
+        var target = targets[0];
+        if (targets.some(function(layer) {
+            return layer.width !== target.width || layer.height !== target.height || JSON.stringify(layer.position) !== JSON.stringify(target.position);
+        })) {
+            throw new TypeError('[dsl-ir:sources] A shared source instance requires one target region and stacking rank.');
+        }
+        var selectedIds = new Set();
+        var sourceCompositionId = void 0;
+        for(var _iterator = _create_for_of_iterator_helper_loose(targets), _step; !(_step = _iterator()).done;){
+            var edited = _step.value;
+            var sourceId = source.layers[edited.id];
+            var baselineLayer = sourceLayerById.get(sourceId);
+            var mapping = source.preservedData.layerMapping.layers[sourceId];
+            if (edited.type !== 'particle' || (baselineLayer == null ? void 0 : baselineLayer.type) !== 'particle' || mapping == null || mapping.expandedSource != null || selectedIds.has(mapping.irLayerId) || sourceCompositionId != null && sourceCompositionId !== mapping.irCompositionId) {
+                throw new TypeError("[dsl-ir:sources] '" + sourceId + "' must identify a distinct source particle layer.");
+            }
+            sourceCompositionId = mapping.irCompositionId;
+            selectedIds.add(mapping.irLayerId);
+            baselineLayer.name = edited.name;
+            baselineLayer.particle = structuredClone(edited.particle);
+            for(var _i = 0, _iter = [
+                'rotation',
+                'scale',
+                'anchor',
+                'opacity',
+                'time_range'
+            ]; _i < _iter.length; _i++){
+                var field = _iter[_i];
+                if (edited[field] !== undefined) {
+                    var _obj;
+                    Object.assign(baselineLayer, (_obj = {}, _obj[field] = structuredClone(edited[field]), _obj));
+                }
+            }
+            if (edited.time_range == null) {
+                var current = baselineLayer;
+                while(current != null){
+                    if (current.time_range != null) {
+                        current.time_range[1] = Math.max(current.time_range[1], document.meta.duration);
+                    }
+                    current = current.parent == null ? undefined : sourceLayerById.get(current.parent);
+                }
+            }
+        }
+        var converted = convertDSLToIRWithPreservedData(sourceDSL, source.preservedData, options);
+        var composition = converted.scene.compositions.find(function(value) {
+            return value.id === sourceCompositionId;
+        });
+        if (composition == null || composition.layers.some(function(layer) {
+            return layer.type === 'precomp';
+        })) {
+            throw new TypeError('[dsl-ir:sources] Particle sources must have a self-contained composition.');
+        }
+        var originalParticles = composition.layers.filter(function(layer) {
+            return layer.type === 'particle';
+        });
+        if (selectedIds.size !== 1 && selectedIds.size !== originalParticles.length) {
+            throw new TypeError('[dsl-ir:sources] Bind either one particle system or the complete source group.');
+        }
+        composition.layers = selectSourceLayers(composition, selectedIds);
+        var duration = Math.max(document.meta.duration, (composition.outPoint - composition.inPoint) / composition.frameRate);
+        composition.outPoint = composition.inPoint + duration * composition.frameRate;
+        host.outPoint = Math.max(host.outPoint, host.inPoint + duration * host.frameRate);
+        var instanceScene = _extends({}, converted.scene, {
+            entryCompositionId: composition.id,
+            compositions: [
+                composition
+            ]
+        });
+        var idMap = namespaceSourceScene(instanceScene, source.preservedData.baselineScene);
+        var wrapper = buildSourceInstance(target, host, composition, source.authoringBounds);
+        ranks.set(wrapper.id, {
+            rank: getLayerStackingOrder(target),
+            tie: target.id
+        });
+        host.layers.push(wrapper);
+        result.scene.compositions.push(composition);
+        (_result_scene_assets = result.scene.assets).push.apply(_result_scene_assets, [].concat(instanceScene.assets));
+        (_result_diagnostics = result.diagnostics).push.apply(_result_diagnostics, [].concat(converted.diagnostics));
+        result.sourceInstances.push({
+            sourceIndex: sourceIndex,
+            idMap: idMap
+        });
+    }, _loop1 = function() {
+        var layer = _step3.value;
+        if (layer.type === 'precomp' && ranks.get(layer.id) != null && !hostRoots.includes(layer)) {
+            layer.time.outFrame = host.outPoint;
+            var source = result.scene.compositions.find(function(value) {
+                return value.id === layer.content.compositionId;
+            });
+            if (source != null) {
+                source.outPoint = source.inPoint + (host.outPoint - host.inPoint) / host.frameRate * source.frameRate;
+            }
+        }
+    };
+    var _result_scene_assets;
+    var _options_particleSources;
+    var _options_preservedData;
+    var sources = (_options_particleSources = options.particleSources) != null ? _options_particleSources : [];
+    var claimedIds = new Set();
+    var targetById = new Map(document.layers.map(function(layer) {
+        return [
+            layer.id,
+            layer
+        ];
+    }));
+    for(var _iterator = _create_for_of_iterator_helper_loose(sources), _step; !(_step = _iterator()).done;){
+        var source = _step.value;
+        if (Object.keys(source.layers).length === 0) {
+            throw new TypeError('[dsl-ir:sources] A particle source must bind at least one target layer.');
+        }
+        for(var _iterator1 = _create_for_of_iterator_helper_loose(Object.keys(source.layers)), _step1; !(_step1 = _iterator1()).done;){
+            var id = _step1.value;
+            var _ref;
+            var _layer_children;
+            var layer = targetById.get(id);
+            if (claimedIds.has(id) || (layer == null ? void 0 : layer.type) !== 'particle' || layer.parent != null || ((_ref = (_layer_children = layer.children) == null ? void 0 : _layer_children.length) != null ? _ref : 0) !== 0 || layer.position.a) {
+                throw new TypeError("[dsl-ir:sources] '" + id + "' must bind one root particle leaf with a static position.");
+            }
+            claimedIds.add(id);
+        }
+    }
+    if (flattenLayers(document.layers).some(function(layer) {
+        return layer.parent != null && claimedIds.has(layer.parent);
+    })) {
+        throw new TypeError('[dsl-ir:sources] A bound target must remain a root particle leaf.');
+    }
+    var ordinaryDSL = _extends({}, document, {
+        layers: document.layers.filter(function(layer) {
+            return !claimedIds.has(layer.id);
+        })
+    });
+    var imageAssets = [];
+    var fontAssets = [];
+    var result = options.preservedData != null ? convertDSLToIRWithPreservedData(ordinaryDSL, options.preservedData, options) : {
+        scene: adapter.createIRScene(assembleIRComposition(ordinaryDSL, convertDSLLayersToIR(ordinaryDSL, imageAssets, fontAssets))),
+        diagnostics: []
+    };
+    (_result_scene_assets = result.scene.assets).push.apply(_result_scene_assets, [].concat(imageAssets, fontAssets));
+    var host = adapter.getIRSceneEntryComposition(result.scene);
+    var ordinaryMapping = (_options_preservedData = options.preservedData) == null ? void 0 : _options_preservedData.layerMapping.layers;
+    var ordinaryRoots = ordinaryDSL.layers.filter(function(layer) {
+        return layer.parent == null;
+    }).sort(compareLayers);
+    var hostRoots = host.layers.filter(function(layer) {
+        return layer.parentId == null;
+    });
+    var ranks = new Map();
+    ordinaryRoots.forEach(function(layer, index) {
+        var _ordinaryMapping_layer_id, _hostRoots_index;
+        var id = ordinaryMapping != null ? (_ordinaryMapping_layer_id = ordinaryMapping[layer.id]) == null ? void 0 : _ordinaryMapping_layer_id.irLayerId : (_hostRoots_index = hostRoots[index]) == null ? void 0 : _hostRoots_index.id;
+        if (id != null) {
+            ranks.set(id, {
+                rank: getLayerStackingOrder(layer),
+                tie: layer.id
+            });
+        }
+    });
+    result.sourceInstances = [];
+    for(var _iterator2 = _create_for_of_iterator_helper_loose(sources.entries()), _step2; !(_step2 = _iterator2()).done;)_loop();
+    for(var _iterator3 = _create_for_of_iterator_helper_loose(host.layers), _step3; !(_step3 = _iterator3()).done;)_loop1();
+    var children = new Map();
+    for(var _iterator4 = _create_for_of_iterator_helper_loose(host.layers), _step4; !(_step4 = _iterator4()).done;){
+        var layer1 = _step4.value;
+        if (layer1.parentId != null) {
+            var _children_get;
+            var group = (_children_get = children.get(layer1.parentId)) != null ? _children_get : [];
+            group.push(layer1);
+            children.set(layer1.parentId, group);
+        }
+    }
+    var ordered = [];
+    var append = function append1(layer) {
+        var _children_get;
+        ordered.push(layer);
+        (_children_get = children.get(layer.id)) == null ? void 0 : _children_get.forEach(append);
+    };
+    host.layers.filter(function(layer) {
+        return layer.parentId == null;
+    }).sort(function(leftLayer, rightLayer) {
+        var _ref, _ref1, _ref2, _ref3;
+        var left = ranks.get(leftLayer.id);
+        var right = ranks.get(rightLayer.id);
+        return ((_ref = left == null ? void 0 : left.rank) != null ? _ref : 0) - ((_ref1 = right == null ? void 0 : right.rank) != null ? _ref1 : 0) || (options.preservedData != null ? 0 : ((_ref2 = left == null ? void 0 : left.tie) != null ? _ref2 : leftLayer.id).localeCompare((_ref3 = right == null ? void 0 : right.tie) != null ? _ref3 : rightLayer.id));
+    }).forEach(append);
+    host.layers = ordered;
+    animationIr.assertIRScene(result.scene);
+    return result;
+}
+function compareLayers(left, right) {
+    return getLayerStackingOrder(left) - getLayerStackingOrder(right) || left.id.localeCompare(right.id);
+}
+function flattenLayers(layers) {
+    return layers.flatMap(function(layer) {
+        var _layer_children;
+        return [].concat([
+            layer
+        ], flattenLayers((_layer_children = layer.children) != null ? _layer_children : []));
+    });
+}
+function selectSourceLayers(composition, selected) {
+    var _composition_layers_find;
+    var byId = new Map(composition.layers.map(function(layer) {
+        return [
+            layer.id,
+            layer
+        ];
+    }));
+    var firstParticleId = (_composition_layers_find = composition.layers.find(function(layer) {
+        return layer.type === 'particle';
+    })) == null ? void 0 : _composition_layers_find.id;
+    var owned = new Set();
+    var retained = new Set();
+    for(var _iterator = _create_for_of_iterator_helper_loose(composition.layers), _step; !(_step = _iterator()).done;){
+        var layer = _step.value;
+        var _ref;
+        var _ancestors_find;
+        var ancestors = [];
+        var current = layer;
+        while(current != null){
+            ancestors.push(current);
+            current = current.parentId == null ? undefined : byId.get(current.parentId);
+        }
+        var owner = (_ref = (_ancestors_find = ancestors.find(function(value) {
+            return value.type === 'particle';
+        })) == null ? void 0 : _ancestors_find.id) != null ? _ref : firstParticleId;
+        if (owner != null && selected.has(owner)) {
+            owned.add(layer.id);
+            ancestors.forEach(function(value) {
+                return retained.add(value.id);
+            });
+        }
+    }
+    return composition.layers.filter(function(layer) {
+        return retained.has(layer.id);
+    }).map(function(layer) {
+        return owned.has(layer.id) ? layer : {
+            id: layer.id,
+            name: layer.name,
+            type: 'null',
+            time: layer.time,
+            visible: layer.visible,
+            parentId: layer.parentId,
+            transform: layer.transform
+        };
     });
+}
+function namespaceSourceScene(scene, baseline) {
+    var ids = [].concat(baseline.assets.map(function(asset) {
+        return asset.id;
+    }), baseline.compositions.flatMap(function(composition) {
+        return [].concat([
+            composition.id
+        ], composition.layers.map(function(layer) {
+            return layer.id;
+        }));
+    }), scene.assets.map(function(asset) {
+        return asset.id;
+    }));
+    var idMap = Object.fromEntries(ids.map(function(id) {
+        return [
+            id,
+            createId()
+        ];
+    }));
+    var fields = new Set([
+        'id',
+        'entryCompositionId',
+        'compositionId',
+        'parentId',
+        'assetId',
+        'fontAssetId',
+        'sourceLayerId'
+    ]);
+    var remap = function remap1(value) {
+        if (Array.isArray(value)) {
+            value.forEach(remap);
+        } else if (value != null && (typeof value === "undefined" ? "undefined" : _type_of(value)) === 'object') {
+            for(var _iterator = _create_for_of_iterator_helper_loose(Object.entries(value)), _step; !(_step = _iterator()).done;){
+                var _step_value = _step.value, key = _step_value[0], entry = _step_value[1];
+                if (fields.has(key) && typeof entry === 'string' && idMap[entry] != null) {
+                    var _obj;
+                    Object.assign(value, (_obj = {}, _obj[key] = idMap[entry], _obj));
+                } else {
+                    remap(entry);
+                }
+            }
+        }
+    };
+    remap(scene);
+    return idMap;
+}
+function buildSourceInstance(target, host, source, authoringBounds) {
+    var _ref = authoringBounds != null ? authoringBounds : [
+        0,
+        0,
+        source.width,
+        source.height
+    ], left = _ref[0], top = _ref[1], width = _ref[2], height = _ref[3];
+    var position = target.position.a ? undefined : target.position.value;
+    if (!Array.isArray(position) || position.length !== 3 || target.width <= 0 || target.height <= 0 || ![
+        left,
+        top,
+        width,
+        height
+    ].every(Number.isFinite) || left < 0 || top < 0 || width <= 0 || height <= 0 || left + width > source.width || top + height > source.height) {
+        throw new TypeError('[dsl-ir:sources] Invalid source bounds or target region.');
+    }
+    var scale = Math.min(target.width / width, target.height / height);
+    return {
+        id: createId(),
+        name: target.name,
+        type: 'precomp',
+        visible: true,
+        time: {
+            inFrame: host.inPoint,
+            outFrame: host.outPoint,
+            sourceStartFrame: source.inPoint
+        },
+        content: {
+            compositionId: source.id,
+            clipToBounds: false,
+            endBehavior: animationIr.IREndBehavior.Freeze
+        },
+        transform: {
+            position: {
+                type: 'static',
+                value: [
+                    position[0] - (left + width / 2 - source.width / 2) * scale,
+                    position[1] - (top + height / 2 - source.height / 2) * scale,
+                    0
+                ]
+            },
+            scale: {
+                type: 'static',
+                value: [
+                    scale,
+                    scale,
+                    1
+                ]
+            }
+        }
+    };
+}
+
+/**
+ * Convert DSL into a new IR scene, or apply edits to its paired preserved snapshot.
+ * Inputs are not mutated. Recoverable unsupported edits produce diagnostics.
+ * Invalid DSL throws DSLValidationError; IR validation, invalid sidecars, unsafe
+ * depth edits, and caller callbacks may throw other errors.
+ */ function convertDSLToIR(composition, options) {
+    if (options === void 0) options = {};
+    var _ref;
+    var _options_particleSources;
+    var validationResult = validateDSL(composition);
     if (validationResult.result === 'fail') {
         throw DSLValidationError.fromValidationResult(validationResult);
     }
     var diagnostics = reportDSLValidationWarnings(validationResult.warnings, options);
+    if (((_ref = (_options_particleSources = options.particleSources) == null ? void 0 : _options_particleSources.length) != null ? _ref : 0) > 0) {
+        var result = convertDSLWithParticleSources(composition, options);
+        return _extends({}, result, {
+            diagnostics: [].concat(diagnostics, result.diagnostics)
+        });
+    }
     if (options.preservedData != null) {
         var preservedResult = convertDSLToIRWithPreservedData(composition, options.preservedData, options);
         animationIr.assertIRScene(preservedResult.scene);
@@ -4202,7 +4851,13 @@ function reportDSLValidationWarnings(warnings, options) {
     });
 }
 
-function parseParticleShape(value) {
+/**
+ * Project a GE-style emitter shape (numeric type 0..9) into read-only DSL context.
+ * Shape names come from the type tag; missing arcMode defaults to 0. Other numeric
+ * fields retain source units. Unsupported types or invalid required fields return
+ * undefined; invalid optional fields are omitted. Direction expressions are cloned,
+ * so their payloads must be structured-cloneable. No geometry is written into IR.
+ */ function parseParticleShape(value) {
     if (!isRecord(value) || !isIntegerInRange(value['type'], 0, 9)) {
         return undefined;
     }
@@ -4417,6 +5072,7 @@ function isRecord(value) {
 }
 
 exports.DSLValidationError = DSLValidationError;
+exports.ValueType = ValueType;
 exports.convertDSLToIR = convertDSLToIR;
 exports.convertIRToDSL = convertIRToDSL;
 exports.parseParticleShape = parseParticleShape;