ooxml-core 1.9.0 → 1.10.0

package/dist/pptx/index.cjs

@@ -1010,6 +1010,7 @@ var init_presentation_field_keys = __esm({
       modernCommentAuthors: true,
       conformance: true,
       embedTrueTypeFonts: true,
+      firstSlideNumber: true,
       defaultTextStyle: true
     };
     exports.PRESENTATION_FIELD_NAMES = Object.keys(exports.PRESENTATION_FIELD_KEYS);
@@ -1537,6 +1538,32 @@ function inheritCustomGeometryCommandOrder(target, ...sources) {
     }
   }
 }
+function pathListPaths(pathLst) {
+  if (!pathLst || typeof pathLst !== "object") {
+    return [];
+  }
+  return ensureArrayLocal(childByLocalName(pathLst, "path")).filter(
+    (path2) => Boolean(path2) && typeof path2 === "object"
+  );
+}
+function readPathListCommandOrder(pathLst) {
+  const orders = pathListPaths(pathLst).map((path2) => [...commandOrder.get(path2) ?? []]);
+  return orders.some((order) => order.length > 0) ? orders : void 0;
+}
+function restorePathListCommandOrder(pathLst, orders) {
+  if (!orders || orders.length === 0) {
+    return;
+  }
+  pathListPaths(pathLst).forEach((path2, index) => {
+    const order = orders[index];
+    if (!order || order.length === 0 || commandOrder.has(path2)) {
+      return;
+    }
+    if (orderSignature([...order]) === pathSignature(path2)) {
+      commandOrder.set(path2, [...order]);
+    }
+  });
+}
 function orderedXmlKey(baseName, order) {
   return `${baseName}${ORDER_SUFFIX}${order}`;
 }
@@ -4928,7 +4955,7 @@ function rootRelsXml() {
   <Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" Target="docProps/app.xml"/>
 </Relationships>`;
 }
-function presentationXml(width, height, slideCount) {
+function presentationXml(width, height, slideCount, firstSlideNumber) {
   const slideIdBase = 256;
   const slideRIdBase = 6;
   const sldIdLst = slideCount > 0 ? `  <p:sldIdLst>
@@ -4937,6 +4964,7 @@ ${Array.from(
     (_, i2) => `    <p:sldId id="${slideIdBase + i2}" r:id="rId${slideRIdBase + i2}"/>`
   ).join("\n")}
   </p:sldIdLst>` : "";
+  const firstSlideNum = firstSlideNumber === void 0 ? "" : ` firstSlideNum="${Math.trunc(firstSlideNumber)}"`;
   return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <p:presentation xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"
   xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
@@ -4944,7 +4972,7 @@ ${Array.from(
   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
   xmlns:p14="http://schemas.microsoft.com/office/powerpoint/2010/main"
   xmlns:p15="http://schemas.microsoft.com/office/powerpoint/2012/main"
-  saveSubsetFonts="1">
+  saveSubsetFonts="1"${firstSlideNum}>
   <p:sldMasterIdLst>
     <p:sldMasterId id="2147483648" r:id="rId1"/>
   </p:sldMasterIdLst>
@@ -5181,7 +5209,10 @@ async function buildBlankPresentationArchive(options) {
   const zip = new JSZip17__default.default();
   zip.file("[Content_Types].xml", contentTypesXml(layoutCount, initialSlideCount));
   zip.file("_rels/.rels", rootRelsXml());
-  zip.file("ppt/presentation.xml", presentationXml(width, height, initialSlideCount));
+  zip.file(
+    "ppt/presentation.xml",
+    presentationXml(width, height, initialSlideCount, options?.firstSlideNumber)
+  );
   zip.file("ppt/_rels/presentation.xml.rels", presentationRelsXml(layoutCount, initialSlideCount));
   zip.file("ppt/slideMasters/slideMaster1.xml", slideMasterXml(layoutCount));
   zip.file("ppt/slideMasters/_rels/slideMaster1.xml.rels", slideMasterRelsXml(layoutCount));
@@ -69823,6 +69854,7 @@ var init_custom_geometry_parser = __esm({
 // pptx/core/geometry/custom-geometry-live-eval.ts
 function pathNodesOf(rawData) {
   const pathLst = rawData?.pathLstXml;
+  restorePathListCommandOrder(pathLst, rawData?.pathCommandOrder);
   return ensureArrayValue(pathLst?.["a:path"]);
 }
 function evaluateCustomGeometryPathData(rawData, pathWidth, pathHeight, overrides28) {
@@ -69871,6 +69903,7 @@ var init_custom_geometry_live_eval = __esm({
   "pptx/core/geometry/custom-geometry-live-eval.ts"() {
     init_utils();
     init_custom_geometry();
+    init_custom_geometry_command_order();
     init_custom_geometry_guides();
     init_custom_geometry_parser();
     init_guide_formula_paths();
@@ -78563,7 +78596,7 @@ function parseShapeLockNode(node, spec) {
     return void 0;
   }
   const locks = {};
-  let hasAny = false;
+  let hasAny2 = false;
   for (const prop of spec.permitted) {
     const raw = node[LOCK_ATTRIBUTE[prop]];
     if (raw === void 0) {
@@ -78571,9 +78604,9 @@ function parseShapeLockNode(node, spec) {
     }
     const value = String(raw).trim().toLowerCase();
     locks[prop] = value === "1" || value === "true";
-    hasAny = true;
+    hasAny2 = true;
   }
-  return hasAny ? locks : void 0;
+  return hasAny2 ? locks : void 0;
 }
 var LOCK_ATTRIBUTE, MODELLED_ATTRIBUTES, CARRIED_WHEN_UNSET;
 var init_shape_lock_node = __esm({
@@ -79440,6 +79473,7 @@ var init_PptxLoadDataBuilder = __esm({
       modernCommentAuthors;
       conformance;
       embedTrueTypeFonts;
+      firstSlideNumber;
       defaultTextStyle;
       withDimensions(width, height, widthEmu, heightEmu) {
         this.width = width;
@@ -79609,6 +79643,10 @@ var init_PptxLoadDataBuilder = __esm({
         this.embedTrueTypeFonts = embedTrueTypeFonts;
         return this;
       }
+      withFirstSlideNumber(firstSlideNumber) {
+        this.firstSlideNumber = firstSlideNumber;
+        return this;
+      }
       withDefaultTextStyle(defaultTextStyle) {
         this.defaultTextStyle = defaultTextStyle;
         return this;
@@ -79660,6 +79698,7 @@ var init_PptxLoadDataBuilder = __esm({
           modernCommentAuthors: this.modernCommentAuthors,
           conformance: this.conformance,
           embedTrueTypeFonts: this.embedTrueTypeFonts,
+          firstSlideNumber: this.firstSlideNumber,
           defaultTextStyle: this.defaultTextStyle
         };
       }
@@ -83715,6 +83754,371 @@ var init_native_animation_media_duration = __esm({
   }
 });
 
+// pptx/core/services/editor-animation-entry.ts
+function hasAuthoredAnimationEffect(entry2) {
+  return Boolean(
+    [entry2.entrance, entry2.exit, entry2.emphasis].some((preset2) => preset2 && preset2 !== "none") || entry2.motionPath
+  );
+}
+function hasAnimation(animations, elementId) {
+  const entry2 = animationFor(animations, elementId);
+  return Boolean(entry2 && (entry2.entrance || entry2.exit || entry2.emphasis || entry2.motionPath));
+}
+function animationFor(slideAnimations, elementId) {
+  return slideAnimations.find((a) => a.elementId === elementId);
+}
+function upsert(anims, elementId, updater) {
+  const idx = anims.findIndex((a) => a.elementId === elementId);
+  if (idx >= 0) {
+    const updated2 = updater({ ...anims[idx] });
+    if (updated2 === null) {
+      return anims.filter((a) => a.elementId !== elementId);
+    }
+    return anims.map((a, i2) => i2 === idx ? updated2 : a);
+  }
+  const created = {
+    elementId,
+    durationMs: exports.DEFAULT_ANIMATION_DURATION_MS,
+    order: anims.length,
+    trigger: exports.DEFAULT_ANIMATION_TRIGGER
+  };
+  const updated = updater(created);
+  if (updated === null) {
+    return [...anims];
+  }
+  return [...anims, updated];
+}
+exports.DEFAULT_ANIMATION_DURATION_MS = void 0; exports.DEFAULT_ANIMATION_TRIGGER = void 0;
+var init_editor_animation_entry = __esm({
+  "pptx/core/services/editor-animation-entry.ts"() {
+    exports.DEFAULT_ANIMATION_DURATION_MS = 500;
+    exports.DEFAULT_ANIMATION_TRIGGER = "onClick";
+  }
+});
+
+// pptx/core/services/native-animation-after-effect.ts
+function hasAfterEffectFlag(cTn) {
+  const raw = cTn?.["@_afterEffect"];
+  return raw === "1" || raw === "true";
+}
+function extractSrgbHex(colorContainer) {
+  const srgb = colorContainer?.["a:srgbClr"];
+  const val = srgb?.["@_val"];
+  return val !== void 0 ? `#${String(val).toUpperCase()}` : void 0;
+}
+function findDimBehaviour(subTnLst) {
+  for (const node of ensureArray11(subTnLst["p:animClr"])) {
+    const cBhvr = node["p:cBhvr"];
+    if (extractAttrNameFromCBhvr(cBhvr) !== "ppt_c") {
+      continue;
+    }
+    if (!hasAfterEffectFlag(cBhvr?.["p:cTn"])) {
+      continue;
+    }
+    const toNode = node["p:to"];
+    const color2 = extractSrgbHex(toNode);
+    if (color2) {
+      return { action: "dimToColor", color: color2 };
+    }
+    const colorRef = themeColorRefFromSchemeClr(toNode?.["a:schemeClr"]);
+    return colorRef ? { action: "dimToColor", colorRef } : { action: "dimToColor" };
+  }
+  return void 0;
+}
+function findHideBehaviour(subTnLst) {
+  for (const node of ensureArray11(subTnLst["p:set"])) {
+    const cBhvr = node["p:cBhvr"];
+    if (extractAttrNameFromCBhvr(cBhvr) !== "style.visibility") {
+      continue;
+    }
+    const innerCTn = cBhvr?.["p:cTn"];
+    if (!hasAfterEffectFlag(innerCTn)) {
+      continue;
+    }
+    const toNode = node["p:to"];
+    const strVal = toNode?.["p:strVal"]?.["@_val"];
+    if (String(strVal ?? "").toLowerCase() !== "hidden") {
+      continue;
+    }
+    const action = innerCTn?.["@_masterRel"] === "sameClick" ? "hideAfterAnimation" : "hideOnNextClick";
+    return { action };
+  }
+  return void 0;
+}
+function extractAfterAnimationFromSubTnLst(cTn) {
+  const subTnLst = cTn["p:subTnLst"];
+  if (!subTnLst) {
+    return void 0;
+  }
+  return findDimBehaviour(subTnLst) ?? findHideBehaviour(subTnLst);
+}
+var init_native_animation_after_effect = __esm({
+  "pptx/core/services/native-animation-after-effect.ts"() {
+    init_theme_color_ref();
+    init_native_animation_attr_name();
+    init_native_animation_helpers();
+  }
+});
+
+// pptx/core/services/animation-after-effect-write.ts
+function assertAfterAnimationClearSupported(effectCTn) {
+  const shapeIds = /* @__PURE__ */ new Set();
+  const checkTarget = (value) => {
+    if (Array.isArray(value)) {
+      value.forEach(checkTarget);
+      return;
+    }
+    if (!isXmlObject5(value)) return;
+    const shapeTarget = value["p:spTgt"];
+    if (isXmlObject5(shapeTarget) && shapeTarget["@_spid"] !== void 0)
+      shapeIds.add(String(shapeTarget["@_spid"]));
+    if ([
+      "p:bg",
+      "p:txEl",
+      "p:subSp",
+      "p:graphicEl",
+      "p:oleChartEl",
+      "p:sndTgt",
+      "p:inkTgt",
+      "p:sldTgt"
+    ].some((key2) => value[key2] !== void 0))
+      throw new Error("Clearing after-animation supports whole-shape targets only");
+    Object.values(value).forEach(checkTarget);
+  };
+  checkTarget(effectCTn["p:childTnLst"]);
+  if (shapeIds.size > 1)
+    throw new Error("Editing after-animation supports a single whole-shape target only");
+  const sub = effectCTn["p:subTnLst"];
+  if (!isXmlObject5(sub)) return;
+  const countAfterFlags = (value) => {
+    if (Array.isArray(value))
+      return value.reduce((count, child30) => count + countAfterFlags(child30), 0);
+    if (!isXmlObject5(value)) return 0;
+    return Object.entries(value).reduce(
+      (count, [key2, child30]) => count + (key2 === "@_afterEffect" && ["1", "true"].includes(String(child30)) ? 1 : countAfterFlags(child30)),
+      0
+    );
+  };
+  for (const [key2, value] of Object.entries(sub)) {
+    for (const node of ensureArray11(value)) {
+      const flags = countAfterFlags(node);
+      if (!flags) continue;
+      if (flags !== 1 || !extractAfterAnimationFromSubTnLst({ "p:subTnLst": { [key2]: node } }))
+        throw new Error("Cannot clear an unsupported native after-animation behavior");
+      checkTarget(node);
+    }
+  }
+  if (shapeIds.size > 1)
+    throw new Error("Editing after-animation supports a single whole-shape target only");
+}
+function clearAfterAnimationBehavior(effectCTn) {
+  const sub = effectCTn["p:subTnLst"];
+  if (!isXmlObject5(sub)) return;
+  for (const key2 of Object.keys(sub)) {
+    const nodes = ensureArray11(sub[key2]);
+    const remaining = nodes.filter(
+      (node) => !extractAfterAnimationFromSubTnLst({ "p:subTnLst": { [key2]: node } })
+    );
+    if (remaining.length === nodes.length) continue;
+    if (remaining.length === 0) delete sub[key2];
+    else sub[key2] = remaining.length === 1 ? remaining[0] : remaining;
+  }
+  if (Object.keys(sub).length === 0) delete effectCTn["p:subTnLst"];
+}
+function applyAfterAnimationBehavior(effectCTn, anim, shapeId) {
+  if (anim.afterAnimation === void 0) return;
+  if (anim.afterAnimation === "none") {
+    assertAfterAnimationClearSupported(effectCTn);
+    clearAfterAnimationBehavior(effectCTn);
+    return;
+  }
+  assertAfterAnimationClearSupported(effectCTn);
+  clearAfterAnimationBehavior(effectCTn);
+  delete effectCTn["@_afterEffect"];
+  if (anim.afterAnimation === "dimToColor" && anim.afterAnimationColor) {
+    appendAfterAnimationBehavior(effectCTn, buildDimSubTnLst(shapeId, anim.afterAnimationColor));
+    return;
+  }
+  if (anim.afterAnimation === "hideAfterAnimation") {
+    const entranceId = effectCTn["@_id"] !== void 0 ? String(effectCTn["@_id"]) : "0";
+    appendAfterAnimationBehavior(effectCTn, buildHideSubTnLst(shapeId, "sameClick", entranceId));
+    return;
+  }
+  if (anim.afterAnimation === "hideOnNextClick") {
+    appendAfterAnimationBehavior(effectCTn, buildHideSubTnLst(shapeId, "nextClick"));
+  }
+}
+function appendAfterAnimationBehavior(effect, addition) {
+  const sub = isXmlObject5(effect["p:subTnLst"]) ? effect["p:subTnLst"] : {};
+  for (const [key2, value] of Object.entries(addition)) {
+    const nodes = [...ensureArray11(sub[key2]), ...ensureArray11(value)];
+    sub[key2] = nodes.length === 1 ? nodes[0] : nodes;
+  }
+  effect["p:subTnLst"] = sub;
+}
+function buildDimSubTnLst(shapeId, colorHex) {
+  const hex3 = colorHex.replace(/^#/u, "").toUpperCase();
+  return {
+    "p:animClr": {
+      "@_clrSpc": "rgb",
+      "@_dir": "cw",
+      "p:cBhvr": {
+        "@_override": "childStyle",
+        "p:cTn": {
+          "@_dur": "1",
+          "@_fill": "hold",
+          "@_display": "0",
+          "@_masterRel": "nextClick",
+          "@_afterEffect": "1"
+        },
+        "p:tgtEl": { "p:spTgt": { "@_spid": shapeId } },
+        "p:attrNameLst": { "p:attrName": "ppt_c" }
+      },
+      "p:to": { "a:srgbClr": { "@_val": hex3 } }
+    }
+  };
+}
+function buildHideSubTnLst(shapeId, masterRel, entranceId) {
+  const cTn = {
+    "@_dur": "1",
+    "@_fill": "hold",
+    "@_display": "0",
+    "@_masterRel": masterRel,
+    "@_afterEffect": "1"
+  };
+  if (masterRel === "sameClick") {
+    cTn["p:stCondLst"] = {
+      "p:cond": {
+        "@_evt": "end",
+        "@_delay": "0",
+        "p:tn": { "@_val": entranceId ?? "0" }
+      }
+    };
+  }
+  return {
+    "p:set": {
+      "p:cBhvr": {
+        "@_override": "childStyle",
+        "p:cTn": cTn,
+        "p:tgtEl": { "p:spTgt": { "@_spid": shapeId } },
+        "p:attrNameLst": { "p:attrName": "style.visibility" }
+      },
+      "p:to": { "p:strVal": { "@_val": "hidden" } }
+    }
+  };
+}
+var init_animation_after_effect_write = __esm({
+  "pptx/core/services/animation-after-effect-write.ts"() {
+    init_native_animation_after_effect();
+    init_native_animation_helpers();
+  }
+});
+
+// pptx/core/services/editor-animation-after-effect.ts
+function setAfterAnimation(anims, elementId, action) {
+  return upsert(anims, elementId, (cur) => {
+    const value = action;
+    return {
+      ...cur,
+      afterAnimation: value,
+      afterAnimationColor: value === "dimToColor" ? cur.afterAnimationColor ?? exports.DEFAULT_AFTER_ANIMATION_DIM_COLOR : void 0
+    };
+  });
+}
+function setAfterAnimationColor(anims, elementId, color2) {
+  const entry2 = animationFor(anims, elementId);
+  if (!entry2 || (entry2.afterAnimation ?? entry2.nativeAfterAnimation) !== "dimToColor") {
+    return [...anims];
+  }
+  return upsert(anims, elementId, (cur) => ({
+    ...cur,
+    afterAnimation: "dimToColor",
+    afterAnimationColor: color2
+  }));
+}
+function getAfterAnimation(slideAnimations, elementId) {
+  const entry2 = animationFor(slideAnimations, elementId);
+  return entry2?.afterAnimation ?? entry2?.nativeAfterAnimation ?? "none";
+}
+function getAfterAnimationState(entry2) {
+  const action = entry2?.afterAnimation ?? entry2?.nativeAfterAnimation ?? "none";
+  return {
+    action,
+    color: action === "dimToColor" ? entry2?.afterAnimationColor ?? entry2?.nativeAfterAnimationColor : void 0,
+    showColor: entry2?.afterAnimation !== void 0 || /^#[0-9a-f]{6}$/iu.test(entry2?.nativeAfterAnimationColor ?? "")
+  };
+}
+function isNativeAfterAnimationOnly(entry2) {
+  return Boolean(
+    entry2?.nativeAfterAnimation && !entry2.entrance && !entry2.exit && !entry2.emphasis && !entry2.motionPath
+  );
+}
+function mergeNativeAfterAnimationIntoEditorAnimations(nativeAnimations, animations, rawTiming) {
+  for (const native of nativeAnimations ?? []) {
+    const existing = native.targetId ? animationFor(animations, native.targetId) : void 0;
+    const action = native.afterAnimationAction ?? (existing?.afterAnimation !== void 0 ? "none" : void 0);
+    if ((nativeAnimations ?? []).filter(
+      (other) => other.targetId === native.targetId && ["entr", "emph"].includes(other.presetClass ?? "")
+    ).length !== 1)
+      continue;
+    if (!native.targetId || !action || !["entr", "emph"].includes(native.presetClass ?? "") || native.textTarget)
+      continue;
+    if (native.target && (native.target.type !== "shape" || native.target.backgroundOnly || native.target.subShapeId || native.target.graphicElement || native.target.oleChartElement))
+      continue;
+    try {
+      if (rawTiming && native.target?.type === "shape" && indexEffectNodes(rawTiming).filter(
+        (ref) => ref.spid === (native.target?.type === "shape" ? native.target.shapeId : void 0) && ["entr", "emph"].includes(ref.presetClass)
+      ).length !== 1)
+        continue;
+      const effect = rawTiming ? indexEffectNodes(rawTiming).find(
+        (ref) => String(ref.cTn["@_id"]) === String(native.nodeId) && native.target?.type === "shape" && ref.spid === native.target.shapeId
+      ) : void 0;
+      if (rawTiming && !effect) continue;
+      assertAfterAnimationClearSupported(
+        effect?.cTn ?? { "p:subTnLst": native.cTnAttributes?.["p:subTnLst"] }
+      );
+    } catch {
+      continue;
+    }
+    let entry2 = animationFor(animations, native.targetId);
+    if (!entry2) {
+      entry2 = { elementId: native.targetId };
+      animations.push(entry2);
+    }
+    if (entry2.nativeAfterAnimation !== void 0) continue;
+    entry2.nativeAfterAnimation = action;
+    entry2.nativeAfterAnimationColor = native.afterAnimationColor;
+  }
+}
+function isNativeAfterAnimationFallback(entry2) {
+  return entry2.nativeAfterAnimation !== void 0 && Object.entries(entry2).every(
+    ([key2, value]) => value === void 0 || [
+      "elementId",
+      "nativeAfterAnimation",
+      "nativeAfterAnimationColor",
+      "soundRId",
+      "soundPath",
+      "soundName",
+      "stopSound"
+    ].includes(key2)
+  );
+}
+exports.AFTER_ANIMATION_VALUES = void 0; exports.DEFAULT_AFTER_ANIMATION_DIM_COLOR = void 0;
+var init_editor_animation_after_effect = __esm({
+  "pptx/core/services/editor-animation-after-effect.ts"() {
+    init_editor_animation_entry();
+    init_animation_after_effect_write();
+    init_animation_timing_tree();
+    exports.AFTER_ANIMATION_VALUES = [
+      "none",
+      "dimToColor",
+      "hideAfterAnimation",
+      "hideOnNextClick"
+    ];
+    exports.DEFAULT_AFTER_ANIMATION_DIM_COLOR = "#808080";
+  }
+});
+
 // pptx/core/services/slide-name.ts
 function asNode3(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
@@ -84045,6 +84449,7 @@ var init_PptxSlideLoaderService = __esm({
     init_animation_target_reconcile();
     init_animation_timeline_anchors();
     init_native_animation_media_duration();
+    init_editor_animation_after_effect();
     init_slide_name();
     init_slide_transition_envelope();
     exports.PptxSlideLoaderService = class {
@@ -84256,6 +84661,8 @@ var init_PptxSlideLoaderService = __esm({
             }
           });
           reconcileAnimationTargets(elements3, nativeAnimations, animations, animationTimelineAnchors);
+          animations ??= [];
+          mergeNativeAfterAnimationIntoEditorAnimations(nativeAnimations, animations, rawTiming);
           mergeNativeSoundIntoEditorAnimations(nativeAnimations, animations);
           mergeNativeBuildTemplatesIntoEditorAnimations(nativeAnimations, animations);
           applyHiddenFlagFromRawXml(elements3);
@@ -84598,6 +85005,7 @@ function sortOrder(animation) {
 exports.PptxEditorAnimationService = void 0;
 var init_PptxEditorAnimationService = __esm({
   "pptx/core/services/PptxEditorAnimationService.ts"() {
+    init_editor_animation_after_effect();
     init_editor_animation_normalizers();
     init_editor_animation_trigger_meta();
     exports.PptxEditorAnimationService = class {
@@ -84696,7 +85104,7 @@ var init_PptxEditorAnimationService = __esm({
        * @param animations - Editor animations to serialize.
        */
       applyEditorAnimations(slideNode, animations) {
-        const sequenced = [...animations].sort((left, right) => sortOrder(left) - sortOrder(right));
+        const sequenced = animations.filter((entry2) => !isNativeAfterAnimationFallback(entry2)).sort((left, right) => sortOrder(left) - sortOrder(right));
         const sanitizedAnimations = sequenced.map((animation) => {
           const elementId = String(animation.elementId || "").trim();
           if (elementId.length === 0) {
@@ -84710,7 +85118,7 @@ var init_PptxEditorAnimationService = __esm({
           const orderIsTreeDerived = animation.orderFromTimeline !== void 0 && animation.order === animation.orderFromTimeline;
           const order = typeof animation.order === "number" && Number.isFinite(animation.order) && !orderIsTreeDerived ? Math.round(animation.order) : void 0;
           const repeatCount = typeof animation.repeatCount === "number" && Number.isFinite(animation.repeatCount) && animation.repeatCount > 0 ? animation.repeatCount : void 0;
-          if (!entrance && !exit3 && !emphasis && !animation.motionPath) {
+          if (!entrance && !exit3 && !emphasis && !animation.motionPath && animation.afterAnimation === void 0) {
             return null;
           }
           return {
@@ -85195,70 +85603,6 @@ var init_animation_effect_filter_parsing = __esm({
   }
 });
 
-// pptx/core/services/native-animation-after-effect.ts
-function hasAfterEffectFlag(cTn) {
-  const raw = cTn?.["@_afterEffect"];
-  return raw === "1" || raw === "true";
-}
-function extractSrgbHex(colorContainer) {
-  const srgb = colorContainer?.["a:srgbClr"];
-  const val = srgb?.["@_val"];
-  return val !== void 0 ? `#${String(val).toUpperCase()}` : void 0;
-}
-function findDimBehaviour(subTnLst) {
-  for (const node of ensureArray11(subTnLst["p:animClr"])) {
-    const cBhvr = node["p:cBhvr"];
-    if (extractAttrNameFromCBhvr(cBhvr) !== "ppt_c") {
-      continue;
-    }
-    if (!hasAfterEffectFlag(cBhvr?.["p:cTn"])) {
-      continue;
-    }
-    const toNode = node["p:to"];
-    const color2 = extractSrgbHex(toNode);
-    if (color2) {
-      return { action: "dimToColor", color: color2 };
-    }
-    const colorRef = themeColorRefFromSchemeClr(toNode?.["a:schemeClr"]);
-    return colorRef ? { action: "dimToColor", colorRef } : { action: "dimToColor" };
-  }
-  return void 0;
-}
-function findHideBehaviour(subTnLst) {
-  for (const node of ensureArray11(subTnLst["p:set"])) {
-    const cBhvr = node["p:cBhvr"];
-    if (extractAttrNameFromCBhvr(cBhvr) !== "style.visibility") {
-      continue;
-    }
-    const innerCTn = cBhvr?.["p:cTn"];
-    if (!hasAfterEffectFlag(innerCTn)) {
-      continue;
-    }
-    const toNode = node["p:to"];
-    const strVal = toNode?.["p:strVal"]?.["@_val"];
-    if (String(strVal ?? "").toLowerCase() !== "hidden") {
-      continue;
-    }
-    const action = innerCTn?.["@_masterRel"] === "sameClick" ? "hideAfterAnimation" : "hideOnNextClick";
-    return { action };
-  }
-  return void 0;
-}
-function extractAfterAnimationFromSubTnLst(cTn) {
-  const subTnLst = cTn["p:subTnLst"];
-  if (!subTnLst) {
-    return void 0;
-  }
-  return findDimBehaviour(subTnLst) ?? findHideBehaviour(subTnLst);
-}
-var init_native_animation_after_effect = __esm({
-  "pptx/core/services/native-animation-after-effect.ts"() {
-    init_theme_color_ref();
-    init_native_animation_attr_name();
-    init_native_animation_helpers();
-  }
-});
-
 // pptx/core/services/native-animation-cbhvr-attrs.ts
 function extractCBhvrAttrs(cBhvr) {
   if (!cBhvr) {
@@ -85407,6 +85751,16 @@ function readTiming(cTn) {
     return {};
   }
   const timing = {};
+  const starts = ensureArray11(cTn["p:stCondLst"]?.["p:cond"]);
+  if (starts.length > 1 || cTn["@_dur"] === "indefinite" || cTn["@_repeatCount"] === "indefinite" || cTn["@_repeatDur"] !== void 0 || cTn["p:endCondLst"] !== void 0 || cTn["p:endSync"] !== void 0 || starts.some(
+    (condition) => condition === null || typeof condition !== "object" || condition["@_evt"] !== void 0 || condition["@_tn"] !== void 0 || condition["@_rtn"] !== void 0 || condition["p:tn"] !== void 0 || condition["p:rtn"] !== void 0 || condition["p:tgtEl"] !== void 0 || condition["@_delay"] !== void 0 && !/^\d+$/u.test(String(condition["@_delay"])) || condition["@_delay"] === "indefinite"
+  )) {
+    timing.unsupportedSetTiming = true;
+  }
+  const fill = cTn["@_fill"];
+  if (fill === "remove" || fill === "freeze" || fill === "hold" || fill === "transition") {
+    timing.fill = fill;
+  }
   const durationMs = readTimingAttr(cTn["@_dur"]);
   if (durationMs !== void 0) {
     timing.durationMs = durationMs;
@@ -85812,6 +86166,7 @@ function buildTimingNodeAnimation(cTn, trigger, group) {
     commandString: cmdInfo.commandString,
     textTarget: textTarget ?? void 0,
     cTnAttributes: roundTripAttrs,
+    unsupportedOpacitySetTiming: cTn["@_dur"] === "indefinite" || cTn["p:endSync"] !== void 0 || void 0,
     afterEffect: afterEffectFlag,
     afterAnimationAction: parsedAfterAnimation?.action,
     afterAnimationColor: parsedAfterAnimation?.color,
@@ -86615,79 +86970,6 @@ var init_PptxSlideTransitionService = __esm({
   }
 });
 
-// pptx/core/services/animation-after-effect-write.ts
-function applyAfterAnimationBehavior(effectCTn, anim, shapeId) {
-  delete effectCTn["p:subTnLst"];
-  delete effectCTn["@_afterEffect"];
-  if (anim.afterAnimation === "dimToColor" && anim.afterAnimationColor) {
-    effectCTn["p:subTnLst"] = buildDimSubTnLst(shapeId, anim.afterAnimationColor);
-    return;
-  }
-  if (anim.afterAnimation === "hideAfterAnimation") {
-    const entranceId = effectCTn["@_id"] !== void 0 ? String(effectCTn["@_id"]) : "0";
-    effectCTn["p:subTnLst"] = buildHideSubTnLst(shapeId, "sameClick", entranceId);
-    return;
-  }
-  if (anim.afterAnimation === "hideOnNextClick") {
-    effectCTn["p:subTnLst"] = buildHideSubTnLst(shapeId, "nextClick");
-  }
-}
-function buildDimSubTnLst(shapeId, colorHex) {
-  const hex3 = colorHex.replace(/^#/u, "").toUpperCase();
-  return {
-    "p:animClr": {
-      "@_clrSpc": "rgb",
-      "@_dir": "cw",
-      "p:cBhvr": {
-        "@_override": "childStyle",
-        "p:cTn": {
-          "@_dur": "1",
-          "@_fill": "hold",
-          "@_display": "0",
-          "@_masterRel": "nextClick",
-          "@_afterEffect": "1"
-        },
-        "p:tgtEl": { "p:spTgt": { "@_spid": shapeId } },
-        "p:attrNameLst": { "p:attrName": "ppt_c" }
-      },
-      "p:to": { "a:srgbClr": { "@_val": hex3 } }
-    }
-  };
-}
-function buildHideSubTnLst(shapeId, masterRel, entranceId) {
-  const cTn = {
-    "@_dur": "1",
-    "@_fill": "hold",
-    "@_display": "0",
-    "@_masterRel": masterRel,
-    "@_afterEffect": "1"
-  };
-  if (masterRel === "sameClick") {
-    cTn["p:stCondLst"] = {
-      "p:cond": {
-        "@_evt": "end",
-        "@_delay": "0",
-        "p:tn": { "@_val": entranceId ?? "0" }
-      }
-    };
-  }
-  return {
-    "p:set": {
-      "p:cBhvr": {
-        "@_override": "childStyle",
-        "p:cTn": cTn,
-        "p:tgtEl": { "p:spTgt": { "@_spid": shapeId } },
-        "p:attrNameLst": { "p:attrName": "style.visibility" }
-      },
-      "p:to": { "p:strVal": { "@_val": "hidden" } }
-    }
-  };
-}
-var init_animation_after_effect_write = __esm({
-  "pptx/core/services/animation-after-effect-write.ts"() {
-  }
-});
-
 // pptx/core/services/animation-behavior-captures.json
 var animation_behavior_captures_default;
 var init_animation_behavior_captures = __esm({
@@ -104921,6 +105203,33 @@ function updateEffectNodeAttributes(cTn, anim, presetClass, shapeId, allocateId)
   applySoundToEffectCTn(cTn, anim);
 }
 function surgicallyUpdateTimingTree(rawTiming, animations) {
+  const sourceRefs = indexEffectNodes(rawTiming);
+  for (const entry2 of animations.filter((animation) => animation.afterAnimation !== void 0)) {
+    if (sourceRefs.filter(
+      (ref) => ref.spid === entry2.elementId && ["entr", "emph"].includes(ref.presetClass)
+    ).length > 1)
+      throw new Error(
+        "Cannot edit an ambiguous native after-animation target with multiple effects"
+      );
+  }
+  const explicitClears = new Map(
+    animations.filter((a) => a.afterAnimation !== void 0 && !hasAuthoredAnimationEffect(a)).map((a) => [a.elementId, a])
+  );
+  const clearRefs = sourceRefs.filter(
+    (ref) => ref.spid && explicitClears.has(ref.spid) && (ref.presetClass === "entr" || ref.presetClass === "emph")
+  );
+  for (const target of explicitClears.keys()) {
+    if (!clearRefs.some((ref) => ref.spid === target))
+      throw new Error("Cannot edit after-animation without a supported native effect");
+    if (clearRefs.filter((ref) => ref.spid === target).length > 1)
+      throw new Error(
+        "Cannot clear an ambiguous native after-animation target with multiple effects"
+      );
+  }
+  clearRefs.forEach((ref) => assertAfterAnimationClearSupported(ref.cTn));
+  clearRefs.forEach(
+    (ref) => applyAfterAnimationBehavior(ref.cTn, explicitClears.get(ref.spid), ref.spid)
+  );
   const desired = collectDesiredEffects(animations);
   const previouslyOwned = readOwnedEffectKeys(rawTiming);
   if (desired.length === 0 && previouslyOwned.size === 0) {
@@ -104987,6 +105296,7 @@ function surgicallyUpdateTimingTree(rawTiming, animations) {
 }
 var init_animation_timing_surgical = __esm({
   "pptx/core/services/animation-timing-surgical.ts"() {
+    init_editor_animation_entry();
     init_animation_after_effect_write();
     init_animation_behavior_captured();
     init_animation_timing_build_surgical();
@@ -105037,9 +105347,11 @@ var init_PptxAnimationWriteService = __esm({
         const validAnimations = animations.filter((a) => a.entrance || a.exit || a.emphasis || a.motionPath).sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
         if (existingRawTiming) {
           const cloned = typeof structuredClone === "function" ? structuredClone(existingRawTiming) : JSON.parse(JSON.stringify(existingRawTiming));
-          return surgicallyUpdateTimingTree(cloned, validAnimations);
+          return surgicallyUpdateTimingTree(cloned, animations);
         }
         if (validAnimations.length === 0) {
+          if (animations.some((entry2) => entry2.afterAnimation !== void 0))
+            throw new Error("Cannot edit after-animation without a supported native effect");
           return void 0;
         }
         this.nextId = 1;
@@ -105225,6 +105537,121 @@ var init_animation_behavior_native = __esm({
   }
 });
 
+// pptx/core/services/editor-animation-after-effect-precedence.ts
+function applyAfterAnimationFromEditorList(nativeAnimations, editorAnimations) {
+  if (!editorAnimations || editorAnimations.length === 0) {
+    return [...nativeAnimations];
+  }
+  const byElement = /* @__PURE__ */ new Map();
+  for (const ea of editorAnimations) {
+    if (ea.afterAnimation !== void 0) {
+      byElement.set(ea.elementId, ea);
+    }
+  }
+  if (byElement.size === 0) {
+    return [...nativeAnimations];
+  }
+  for (const [id, editor] of byElement) {
+    const matches = nativeAnimations.filter(
+      (native) => native.targetId === id && ["entr", "emph"].includes(native.presetClass ?? "")
+    );
+    if (matches.length > 1)
+      throw new Error(
+        "Cannot edit an ambiguous native after-animation target with multiple effects"
+      );
+    if (matches.length === 0 && !hasAuthoredAnimationEffect(editor))
+      throw new Error("Cannot edit after-animation without a supported native effect");
+    for (const native of matches) {
+      if (native.textTarget || native.target && (native.target.type !== "shape" || native.target.backgroundOnly || native.target.subShapeId || native.target.graphicElement || native.target.oleChartElement))
+        throw new Error("Editing after-animation supports whole-shape targets only");
+      assertAfterAnimationClearSupported({
+        "p:subTnLst": native.cTnAttributes?.["p:subTnLst"]
+      });
+    }
+  }
+  return nativeAnimations.map((anim) => {
+    if (!anim.targetId || !["entr", "emph"].includes(anim.presetClass ?? "")) {
+      return anim;
+    }
+    const ea = byElement.get(anim.targetId);
+    if (!ea) {
+      return anim;
+    }
+    return {
+      ...anim,
+      afterAnimationAction: ea.afterAnimation === "none" ? void 0 : ea.afterAnimation,
+      afterAnimationColor: ea.afterAnimationColor,
+      // The editor's own model has no theme-colour-ref concept (it always
+      // writes a concrete hex); clear a native scheme ref so a stale one
+      // never survives an edit that overrides the colour.
+      afterAnimationColorRef: void 0
+    };
+  });
+}
+var init_editor_animation_after_effect_precedence = __esm({
+  "pptx/core/services/editor-animation-after-effect-precedence.ts"() {
+    init_animation_after_effect_write();
+    init_editor_animation_entry();
+  }
+});
+
+// pptx/core/services/animation-opacity-set.ts
+function resolveOpacitySet(anim) {
+  if (anim.unsupportedOpacitySetTiming || anim.endConditions?.length || anim.rawEndCondLst !== void 0 || anim.cTnAttributes?.["@_tmFilter"] !== void 0 || anim.cTnAttributes?.["@_endSync"] !== void 0)
+    return void 0;
+  if (anim.afterAnimationAction !== void 0) return void 0;
+  if (anim.target?.type === "shape" && (anim.target.backgroundOnly || anim.target.subShapeId || anim.target.graphicElement || anim.target.oleChartElement))
+    return void 0;
+  if (anim.textTarget || anim.target && anim.target.type !== "shape" || anim.trigger === "onHover")
+    return void 0;
+  if (anim.presetClass !== "emph" || anim.autoReverse || (anim.repeatCount ?? 1) !== 1 || anim.repeatDurMs !== void 0)
+    return void 0;
+  const behaviors = anim.behaviors;
+  if (!behaviors?.length || behaviors.some(
+    (b) => b.kind !== "set" && !(b.kind === "animEffect" && b.filter === "image" && (b.transition === void 0 || b.transition === "none"))
+  ))
+    return void 0;
+  const sets = behaviors.filter((b) => b.kind === "set");
+  if (sets.length !== 1) return void 0;
+  const hints = behaviors.filter((b) => b.kind === "animEffect");
+  if (hints.length > 1) return void 0;
+  const hint = hints[0];
+  if (hint && (hint.timing.unsupportedSetTiming || hint.timing.autoReverse || (hint.timing.repeatCount ?? 1) !== 1 || hint.timing.tmFilter !== void 0))
+    return void 0;
+  const set2 = sets[0];
+  if (set2.attrNames.length !== 1 || set2.attrNames[0] !== "style.opacity" || set2.additive !== void 0 && !["base", "repl", "none"].includes(set2.additive))
+    return void 0;
+  const raw = set2.value;
+  if (typeof raw !== "number" && (typeof raw !== "string" || !/^[+-]?(?:\d+(?:\.\d*)?|\.\d+)$/u.test(raw.trim())))
+    return void 0;
+  const value = Number(raw);
+  const { timing } = set2;
+  if (timing.unsupportedSetTiming) return void 0;
+  if (anim.fill === "transition" || timing.fill === "transition") return void 0;
+  if (!Number.isFinite(value) || value < 0 || value > 1 || timing.autoReverse || (timing.repeatCount ?? 1) !== 1 || timing.tmFilter !== void 0)
+    return void 0;
+  const delayMs = timing.delayMs ?? 0;
+  const durationMs = timing.durationMs;
+  if (!Number.isFinite(delayMs) || delayMs < 0 || durationMs === void 0 || !Number.isFinite(durationMs) || durationMs < 0)
+    return void 0;
+  const effectDuration = anim.durationMs ?? delayMs + durationMs;
+  if (!Number.isFinite(effectDuration) || effectDuration < delayMs || (anim.speedPct ?? 100) !== 100)
+    return void 0;
+  const holdEndState = holds(anim.fill) && holds(timing.fill);
+  return {
+    value,
+    delayMs,
+    durationMs: holds(timing.fill) ? effectDuration - delayMs : Math.min(durationMs, effectDuration - delayMs),
+    holdEndState
+  };
+}
+var holds;
+var init_animation_opacity_set = __esm({
+  "pptx/core/services/animation-opacity-set.ts"() {
+    holds = (fill) => fill === "hold" || fill === "freeze";
+  }
+});
+
 // pptx/core/services/index.ts
 var init_services = __esm({
   "pptx/core/services/index.ts"() {
@@ -105247,10 +105674,14 @@ var init_services = __esm({
     init_animation_behavior_native();
     init_animation_write_node_builders();
     init_animation_after_effect_write();
+    init_editor_animation_entry();
+    init_editor_animation_after_effect();
+    init_editor_animation_after_effect_precedence();
     init_native_animation_after_effect();
     init_native_animation_helpers();
     init_animation_target_build_helpers();
     init_animation_effect_filter_parsing();
+    init_animation_opacity_set();
   }
 });
 
@@ -121295,8 +121726,8 @@ function buildDefRPr(style, existing, resolveColor2) {
   return rPr;
 }
 function applyChartAxisTitleStyleToXml(axisNode, style, getLocalName2, resolveColor2) {
-  const hasAny = style.fontFamily !== void 0 || style.fontSize !== void 0 || style.fontBold !== void 0 || style.fontColor !== void 0;
-  if (!hasAny) {
+  const hasAny2 = style.fontFamily !== void 0 || style.fontSize !== void 0 || style.fontBold !== void 0 || style.fontColor !== void 0;
+  if (!hasAny2) {
     return;
   }
   const titleKey = findKey7(axisNode, "title", getLocalName2);
@@ -123150,8 +123581,8 @@ function applyRotationFlipToRawNode(node, rotation, flipH, flipV) {
   const spPrKey = findChildKey2(node, "spPr");
   const container2 = spPrKey ? node[spPrKey] ?? node : node;
   const xfrmKey = findChildKey2(container2, "xfrm");
-  const hasAny = Boolean(rotation) || Boolean(flipH) || Boolean(flipV);
-  if (!xfrmKey && !hasAny) {
+  const hasAny2 = Boolean(rotation) || Boolean(flipH) || Boolean(flipV);
+  if (!xfrmKey && !hasAny2) {
     return;
   }
   const xfrm = xfrmKey ? container2[xfrmKey] : {};
@@ -123186,24 +123617,24 @@ function hexVal(hex3) {
 }
 function buildRunProps(para) {
   const rPr = {};
-  let hasAny = false;
+  let hasAny2 = false;
   if (para.fontSize !== void 0) {
     rPr["@_sz"] = String(Math.round(para.fontSize * 100));
-    hasAny = true;
+    hasAny2 = true;
   }
   if (para.bold) {
     rPr["@_b"] = "1";
-    hasAny = true;
+    hasAny2 = true;
   }
   if (para.italic) {
     rPr["@_i"] = "1";
-    hasAny = true;
+    hasAny2 = true;
   }
   if (para.color) {
     rPr["a:solidFill"] = { "a:srgbClr": { "@_val": hexVal(para.color) } };
-    hasAny = true;
+    hasAny2 = true;
   }
-  return hasAny ? rPr : void 0;
+  return hasAny2 ? rPr : void 0;
 }
 function buildParagraphNode(para) {
   const node = {};
@@ -125246,7 +125677,7 @@ var init_blob_url_to_data_url = __esm({
 
 // pptx/core/core/runtime/image-a14-effects-model.ts
 function applyA14ExtensionToEffects(effects, a14) {
-  let hasAny = false;
+  let hasAny2 = false;
   if (a14.artisticEffect !== void 0) {
     effects.artisticEffect = a14.artisticEffect;
     if (a14.originalImageRelId !== void 0) {
@@ -125258,15 +125689,15 @@ function applyA14ExtensionToEffects(effects, a14) {
     if (a14.artisticParams) {
       effects.artisticParams = a14.artisticParams;
     }
-    hasAny = true;
+    hasAny2 = true;
   }
   if (a14.backgroundRemoval) {
     effects.backgroundRemoval = a14.backgroundRemoval;
-    hasAny = true;
+    hasAny2 = true;
   }
   if (a14.originalImageRelId !== void 0) {
     effects.originalImageRelId = a14.originalImageRelId;
-    hasAny = true;
+    hasAny2 = true;
   }
   const corrections = {};
   if (a14.sharpenSoften) {
@@ -125289,9 +125720,9 @@ function applyA14ExtensionToEffects(effects, a14) {
     if (a14.originalImageRelId !== void 0) {
       effects.prerenderedCorrections = corrections;
     }
-    hasAny = true;
+    hasAny2 = true;
   }
-  return hasAny;
+  return hasAny2;
 }
 var init_image_a14_effects_model = __esm({
   "pptx/core/core/runtime/image-a14-effects-model.ts"() {
@@ -127562,13 +127993,13 @@ var init_PptxHandlerRuntimeImageEffects = __esm({
           return null;
         }
         const effects = {};
-        let hasAny = false;
+        let hasAny2 = false;
         const brightRaw = blip["@_bright"] ?? blip["@_brt"];
         if (brightRaw !== null) {
           const val = parseInt(String(brightRaw));
           if (Number.isFinite(val)) {
             effects.brightness = val / 1e3;
-            hasAny = true;
+            hasAny2 = true;
           }
         }
         const contrastRaw = blip["@_contrast"] ?? blip["@_cont"];
@@ -127576,7 +128007,7 @@ var init_PptxHandlerRuntimeImageEffects = __esm({
           const val = parseInt(String(contrastRaw));
           if (Number.isFinite(val)) {
             effects.contrast = val / 1e3;
-            hasAny = true;
+            hasAny2 = true;
           }
         }
         const colorEffects = parseImageColorEffects(
@@ -127586,12 +128017,12 @@ var init_PptxHandlerRuntimeImageEffects = __esm({
         );
         Object.assign(effects, colorEffects);
         if (Object.keys(colorEffects).length > 0) {
-          hasAny = true;
+          hasAny2 = true;
         }
         const alphaEffects = parseImageAlphaEffects(blip, (node) => this.parseColor(node));
         Object.assign(effects, alphaEffects);
         if (Object.keys(alphaEffects).length > 0) {
-          hasAny = true;
+          hasAny2 = true;
         }
         const lumNode = blip["a:lum"];
         if (lumNode) {
@@ -127611,7 +128042,7 @@ var init_PptxHandlerRuntimeImageEffects = __esm({
             }
           }
           effects.lum = lumEffect;
-          hasAny = true;
+          hasAny2 = true;
         }
         const hslNode = blip["a:hsl"];
         if (hslNode) {
@@ -127638,7 +128069,7 @@ var init_PptxHandlerRuntimeImageEffects = __esm({
             }
           }
           effects.hsl = hslEffect;
-          hasAny = true;
+          hasAny2 = true;
         }
         const tintNode = blip["a:tint"];
         if (tintNode) {
@@ -127658,7 +128089,7 @@ var init_PptxHandlerRuntimeImageEffects = __esm({
             }
           }
           effects.tint = tintEffect;
-          hasAny = true;
+          hasAny2 = true;
         }
         const fillOverlay = blip["a:fillOverlay"];
         if (fillOverlay) {
@@ -127685,7 +128116,7 @@ var init_PptxHandlerRuntimeImageEffects = __esm({
             ...resolvedGradient ? { resolvedGradient } : {},
             ...resolvedPattern ? { resolvedPattern } : {}
           };
-          hasAny = true;
+          hasAny2 = true;
         }
         const blurNode = blip["a:blur"];
         if (blurNode) {
@@ -127703,16 +128134,16 @@ var init_PptxHandlerRuntimeImageEffects = __esm({
             blurEffect.grow = s === "1" || s === "true";
           }
           effects.blur = blurEffect;
-          hasAny = true;
+          hasAny2 = true;
         }
         const extLst = xmlChild(blip, "a:extLst");
         if (extLst) {
           const a14 = parseA14ImageExtension(this.ensureArray(extLst["a:ext"]));
           if (a14 && applyA14ExtensionToEffects(effects, a14)) {
-            hasAny = true;
+            hasAny2 = true;
           }
         }
-        return hasAny ? effects : null;
+        return hasAny2 ? effects : null;
       }
       /**
        * Resolve a blip `a:fillOverlay/a:gradFill` to the structured gradient a
@@ -129365,8 +129796,8 @@ function buildTextRunEffectListXml(style, parseColor) {
   const hasTextHsl = typeof style.textHslHue === "number" || typeof style.textHslSaturation === "number" || typeof style.textHslLuminance === "number";
   const hasTextClrChange = Boolean(style.textClrChangeFrom) && Boolean(style.textClrChangeTo);
   const hasTextDuotone = Boolean(style.textDuotone);
-  const hasAny = hasTextShadow || hasTextInnerShadow || hasTextPresetShadow || hasTextGlow || hasTextReflection || hasTextBlur || hasTextSoftEdge || hasTextAlphaModFix || hasTextAlphaMod || hasTextHsl || hasTextClrChange || hasTextDuotone;
-  if (!hasAny) {
+  const hasAny2 = hasTextShadow || hasTextInnerShadow || hasTextPresetShadow || hasTextGlow || hasTextReflection || hasTextBlur || hasTextSoftEdge || hasTextAlphaModFix || hasTextAlphaMod || hasTextHsl || hasTextClrChange || hasTextDuotone;
+  if (!hasAny2) {
     return void 0;
   }
   const effectLst = {};
@@ -133717,6 +134148,87 @@ var init_table_column_width_save = __esm({
   }
 });
 
+// pptx/core/core/runtime/table-style-change-cell-clear.ts
+function normaliseStyleId(id) {
+  const text2 = typeof id === "string" || typeof id === "number" ? String(id) : "";
+  const trimmed2 = text2.trim().toUpperCase();
+  if (!trimmed2) {
+    return "";
+  }
+  return trimmed2.startsWith("{") ? trimmed2 : `{${trimmed2}}`;
+}
+function xmlTableStyleId(tblPr) {
+  if (!tblPr || typeof tblPr !== "object") {
+    return "";
+  }
+  const props = tblPr;
+  const node = props["a:tableStyleId"];
+  const spec = normaliseStyleId(
+    node && typeof node === "object" ? node["#text"] : node
+  );
+  if (spec) {
+    return spec;
+  }
+  const legacy = props["a:tblStyle"];
+  return normaliseStyleId(legacy?.["@_val"] || props["@_tblStyle"]);
+}
+function tableStyleIdChanged(tblPr, nextStyleId) {
+  if (nextStyleId === void 0) {
+    return false;
+  }
+  return normaliseStyleId(nextStyleId) !== xmlTableStyleId(tblPr);
+}
+function clearCellFormattingForStyleChange(xmlCell, style) {
+  const tcPr = xmlCell["a:tcPr"];
+  if (!tcPr || typeof tcPr !== "object") {
+    return;
+  }
+  const props = tcPr;
+  if (!hasAny(style, FILL_FIELDS)) {
+    for (const key2 of FILL_KEYS) {
+      delete props[key2];
+    }
+  }
+  for (const [key2, fields] of LINE_KEYS) {
+    if (!hasAny(style, fields)) {
+      delete props[key2];
+    }
+  }
+  if (!style?.cell3D) {
+    delete props["a:cell3D"];
+  }
+}
+var FILL_KEYS, LINE_KEYS, FILL_FIELDS, hasAny;
+var init_table_style_change_cell_clear = __esm({
+  "pptx/core/core/runtime/table-style-change-cell-clear.ts"() {
+    FILL_KEYS = [
+      "a:noFill",
+      "a:solidFill",
+      "a:gradFill",
+      "a:blipFill",
+      "a:pattFill",
+      "a:grpFill"
+    ];
+    LINE_KEYS = [
+      ["a:lnL", ["borderLeftWidth", "borderLeftColor", "borderLeftDash"]],
+      ["a:lnR", ["borderRightWidth", "borderRightColor", "borderRightDash"]],
+      ["a:lnT", ["borderTopWidth", "borderTopColor", "borderTopDash"]],
+      ["a:lnB", ["borderBottomWidth", "borderBottomColor", "borderBottomDash"]],
+      ["a:lnTlToBr", ["borderDiagDownWidth", "borderDiagDownColor"]],
+      ["a:lnBlToTr", ["borderDiagUpWidth", "borderDiagUpColor"]]
+    ];
+    FILL_FIELDS = [
+      "fillMode",
+      "backgroundColor",
+      "gradientFillStops",
+      "patternFillPreset",
+      "backgroundImageFillPath",
+      "backgroundImageFillData"
+    ];
+    hasAny = (style, keys) => keys.some((key2) => style?.[key2] !== void 0);
+  }
+});
+
 // pptx/core/core/runtime/table-paragraph-save-order.ts
 function runTag(run) {
   return run.isLineBreak ? "a:br" : run.isField ? "a:fld" : "a:r";
@@ -134755,6 +135267,7 @@ var init_PptxHandlerRuntimeSaveDataSerialization = __esm({
     init_PptxHandlerRuntimeChartUserShapes();
     init_save_table_merge_helpers();
     init_table_column_width_save();
+    init_table_style_change_cell_clear();
     init_table_paragraph_save_order();
     init_table_structural_ops();
     init_table_tblpr_save();
@@ -134776,6 +135289,7 @@ var init_PptxHandlerRuntimeSaveDataSerialization = __esm({
           if (!tbl) {
             return;
           }
+          const styleChanged = tableData.clearDirectCellFormatting === true || tableStyleIdChanged(tbl["a:tblPr"], tableData.tableStyleId);
           serializeTablePropertyFlags(tbl, tableData);
           writeTablePropertiesOwnFillAndEffects(tbl["a:tblPr"], tableData);
           const xmlRows = this.ensureArray(tbl["a:tr"]);
@@ -134807,6 +135321,9 @@ var init_PptxHandlerRuntimeSaveDataSerialization = __esm({
                 if (cell.text !== void 0) {
                   this.writeTableCellText(xmlCell, cell.text);
                 }
+                if (styleChanged) {
+                  clearCellFormattingForStyleChange(xmlCell, cell.style);
+                }
                 if (cell.style) {
                   this.writeTableCellStyle(xmlCell, cell.style, cell.paragraphs);
                 }
@@ -134830,6 +135347,9 @@ var init_PptxHandlerRuntimeSaveDataSerialization = __esm({
               if (cell.text !== void 0) {
                 this.writeTableCellText(xmlCell, cell.text);
               }
+              if (styleChanged) {
+                clearCellFormattingForStyleChange(xmlCell, cell.style);
+              }
               if (cell.style) {
                 this.writeTableCellStyle(xmlCell, cell.style, cell.paragraphs);
               }
@@ -145504,6 +146024,7 @@ var PptxHandlerRuntime60;
 var init_PptxHandlerRuntimeGeometryParsing = __esm({
   "pptx/core/core/runtime/PptxHandlerRuntimeGeometryParsing.ts"() {
     init_color_primitives();
+    init_custom_geometry_command_order();
     init_custom_geometry_parser();
     init_guide_formula();
     init_PptxHandlerRuntimePlaceholderLookup();
@@ -145665,6 +146186,10 @@ var init_PptxHandlerRuntimeGeometryParsing = __esm({
         const pathLst = custGeom["a:pathLst"];
         if (isNonEmpty(pathLst)) {
           result.pathLstXml = pathLst;
+          const pathCommandOrder = readPathListCommandOrder(pathLst);
+          if (pathCommandOrder) {
+            result.pathCommandOrder = pathCommandOrder;
+          }
         }
         return Object.keys(result).length > 0 ? result : void 0;
       }
@@ -146575,7 +147100,7 @@ var init_PptxHandlerRuntimeShapeBodyParsing = __esm({
           return void 0;
         }
         const locks = {};
-        let hasAny = false;
+        let hasAny2 = false;
         const boolAttr2 = (attr6) => {
           const raw = spLocks[attr6];
           if (raw === void 0) {
@@ -146588,7 +147113,7 @@ var init_PptxHandlerRuntimeShapeBodyParsing = __esm({
           const val = boolAttr2(attr6);
           if (val !== void 0) {
             fn(val);
-            hasAny = true;
+            hasAny2 = true;
           }
         };
         set2("@_noGrp", (v) => {
@@ -146627,7 +147152,7 @@ var init_PptxHandlerRuntimeShapeBodyParsing = __esm({
         set2("@_noCrop", (v) => {
           locks.noCrop = v;
         });
-        return hasAny ? locks : void 0;
+        return hasAny2 ? locks : void 0;
       }
       /**
        * Parse the `@txBox` attribute from a `p:cNvSpPr` node. Returns `true` /
@@ -155255,13 +155780,15 @@ var init_PptxHandlerRuntimeChartParsing = __esm({
 });
 
 // pptx/core/core/runtime/PptxHandlerRuntimePresentationStructure.ts
-var PptxHandlerRuntime96;
+var XSD_INT_MIN, XSD_INT_MAX, PptxHandlerRuntime96;
 var init_PptxHandlerRuntimePresentationStructure = __esm({
   "pptx/core/core/runtime/PptxHandlerRuntimePresentationStructure.ts"() {
     init_kinsoku_parser();
     init_presentation_section_parser();
     init_header_footer_parts();
     init_PptxHandlerRuntimeChartParsing();
+    XSD_INT_MIN = -2147483648;
+    XSD_INT_MAX = 2147483647;
     PptxHandlerRuntime96 = class extends PptxHandlerRuntime95 {
       parseEditorAnimations(slideXml3) {
         return this.editorAnimationService.parseEditorAnimations(slideXml3);
@@ -155444,6 +155971,22 @@ var init_PptxHandlerRuntimePresentationStructure = __esm({
         const lexical = String(raw).trim().toLowerCase();
         return lexical !== "0" && lexical !== "false";
       }
+      /**
+       * Extract `p:presentation/@firstSlideNum` (ECMA-376 §19.2.1.26, an
+       * `xsd:int`). `undefined` when absent, not an integer, or outside the
+       * `xsd:int` range (-2147483648 to 2147483647, which also rejects digit
+       * strings too long to parse), so the spec default (`1`) is never forced
+       * onto the typed model.
+       */
+      extractFirstSlideNumber() {
+        const pres = this.presentationData?.["p:presentation"];
+        const lexical = String(pres?.["@_firstSlideNum"] ?? "").trim();
+        if (!/^[+-]?\d+$/.test(lexical)) {
+          return void 0;
+        }
+        const value = Number(lexical);
+        return value >= XSD_INT_MIN && value <= XSD_INT_MAX ? value : void 0;
+      }
     };
   }
 });
@@ -156114,7 +156657,7 @@ var init_PptxHandlerRuntimeLoadPipeline = __esm({
           this.commentAuthorDetails.size > 0 ? Array.from(this.commentAuthorDetails.values()) : void 0
         ).withModernCommentAuthors(
           this.modernCommentAuthors.size > 0 ? Array.from(this.modernCommentAuthors.values()) : void 0
-        ).withConformance(this.isStrictOoxml ? "strict" : "transitional").withEmbedTrueTypeFonts(embedTrueTypeFonts).withDefaultTextStyle(defaultTextStyle).build();
+        ).withConformance(this.isStrictOoxml ? "strict" : "transitional").withEmbedTrueTypeFonts(embedTrueTypeFonts).withFirstSlideNumber(this.extractFirstSlideNumber()).withDefaultTextStyle(defaultTextStyle).build();
       }
       /**
        * Walk the raw XML of every slide to find the highest numeric `@_id`
@@ -160536,7 +161079,10 @@ var init_PptxHandler = __esm({
         const imported = deserializePptxFromJson(text2);
         const blankBytes = await buildBlankPresentationArchive({
           width: imported.widthEmu,
-          height: imported.heightEmu
+          height: imported.heightEmu,
+          // Saving writes presentation.xml from the loaded archive, not from
+          // the overlaid model, so the archive must carry the value itself.
+          firstSlideNumber: imported.firstSlideNumber
         });
         const base = await super.load(blankBytes, options);
         return applyImportedPptxData(base, imported);
@@ -169801,6 +170347,29 @@ assign26(["presentation:attribute:embedTrueTypeFonts"], {
     )
   ]
 });
+assign26(["presentation:attribute:firstSlideNum"], {
+  parse: "native",
+  preserve: "native",
+  edit: "unassessed",
+  serialize: "unassessed",
+  note: "`p:presentation/@firstSlideNum` is parsed onto `PptxData.firstSlideNumber` (absent or non-integer stays `undefined`, spec default 1) and the shared field substitution shows `firstSlideNumber + index` for `slidenum` fields. A save keeps the attribute because the loaded presentation.xml object is rewritten in place; there is no save option to change it.",
+  evidence: [
+    testEvidence(
+      "src/__tests__/integration/presentation-first-slide-number.test.ts",
+      [
+        "is undefined (spec default: 1) when the attribute is absent",
+        "parses an explicit @firstSlideNum onto the typed model",
+        "accepts zero and ignores a value that is not an integer"
+      ],
+      ["parse"]
+    ),
+    testEvidence(
+      "src/__tests__/integration/presentation-first-slide-number.test.ts",
+      ["survives a save that rewrites presentation.xml and reloads as the same value"],
+      ["preserve"]
+    )
+  ]
+});
 assign26(["presentation:element:smartTags", "presentation:complexType:CT_SmartTags"], {
   parse: "native",
   preserve: "native",
@@ -178355,8 +178924,10 @@ exports.addSmartArtNodeAsChild = addSmartArtNodeAsChild;
 exports.addTableStyleToMap = addTableStyleToMap;
 exports.algorithmParam = algorithmParam;
 exports.alphaLabel = alphaLabel;
+exports.animationFor = animationFor;
 exports.applyActiveXControlsToSlide = applyActiveXControlsToSlide;
 exports.applyAfterAnimationBehavior = applyAfterAnimationBehavior;
+exports.applyAfterAnimationFromEditorList = applyAfterAnimationFromEditorList;
 exports.applyBubbleChartOptions = applyBubbleChartOptions;
 exports.applyChartLayouts = applyChartLayouts;
 exports.applyChartManualLayout = applyChartManualLayout;
@@ -178583,6 +179154,8 @@ exports.generateMediaFilename = generateMediaFilename;
 exports.generateTableStyleGuid = generateTableStyleGuid;
 exports.getAdjustmentAwareClipPath = getAdjustmentAwareClipPath;
 exports.getAdjustmentAwareShapeClipPath = getAdjustmentAwareShapeClipPath;
+exports.getAfterAnimation = getAfterAnimation;
+exports.getAfterAnimationState = getAfterAnimationState;
 exports.getAnimationPresetInfo = getAnimationPresetInfo;
 exports.getCalloutLeaderLineGeometry = getCalloutLeaderLineGeometry;
 exports.getCalloutTier = getCalloutTier;
@@ -178636,6 +179209,7 @@ exports.groupElements = groupElements;
 exports.guidToKey = guidToKey;
 exports.guideEmuToPx = guideEmuToPx;
 exports.guidePxToEmu = guidePxToEmu;
+exports.hasAnimation = hasAnimation;
 exports.hasDirectSubstitution = hasDirectSubstitution;
 exports.hasNonTrivialOverride = hasNonTrivialOverride;
 exports.hasReference = hasReference;
@@ -178674,6 +179248,7 @@ exports.isImageLikeElement = isImageLikeElement;
 exports.isInkElement = isInkElement;
 exports.isLegacyPpt = isLegacyPpt;
 exports.isNamespaceSupported = isNamespaceSupported;
+exports.isNativeAfterAnimationOnly = isNativeAfterAnimationOnly;
 exports.isOle2CompoundFile = isOle2CompoundFile;
 exports.isParetoChartData = isParetoChartData;
 exports.isPptxJsonText = isPptxJsonText;
@@ -178700,6 +179275,7 @@ exports.lookupPresetShape = lookupPresetShape;
 exports.lookupPresetTextRectOverride = lookupPresetTextRectOverride;
 exports.mailMerge = mailMerge;
 exports.makeStoreAwareId = makeStoreAwareId;
+exports.mergeNativeAfterAnimationIntoEditorAnimations = mergeNativeAfterAnimationIntoEditorAnimations;
 exports.mergeNativeSoundIntoEditorAnimations = mergeNativeSoundIntoEditorAnimations;
 exports.mergePresentation = mergePresentation;
 exports.mergeShapes = mergeShapes;
@@ -178878,6 +179454,7 @@ exports.resolveModel3DMimeType = resolveModel3DMimeType;
 exports.resolveModifyVerifierAlgorithmName = resolveModifyVerifierAlgorithmName;
 exports.resolveOleEditorKindFromPayload = resolveOleEditorKindFromPayload;
 exports.resolveOoxmlPresetMapping = resolveOoxmlPresetMapping;
+exports.resolveOpacitySet = resolveOpacitySet;
 exports.resolveRatioConstraint = resolveRatioConstraint;
 exports.resolveReferenceUriToPart = resolveReferenceUriToPart;
 exports.resolveSmartArtEffectIntensity = resolveSmartArtEffectIntensity;
@@ -178902,6 +179479,8 @@ exports.serializeSlidePackageClipboard = serializeSlidePackageClipboard;
 exports.serializeSmartArtDefinitionHeaderList = serializeSmartArtDefinitionHeaderList;
 exports.serializeSvgPath = serializeSvgPath;
 exports.serializeTimeTargetElement = serializeTimeTargetElement;
+exports.setAfterAnimation = setAfterAnimation;
+exports.setAfterAnimationColor = setAfterAnimationColor;
 exports.setChartAreaFormat = setChartAreaFormat;
 exports.setChartAxis = setChartAxis;
 exports.setChartAxisGridlineStyle = setChartAxisGridlineStyle;
@@ -178988,6 +179567,7 @@ exports.updateChartUserShape = updateChartUserShape;
 exports.updateChartUserShapeAtPath = updateChartUserShapeAtPath;
 exports.updateMergeAttrsInRawXml = updateMergeAttrsInRawXml;
 exports.updateSmartArtNodeText = updateSmartArtNodeText;
+exports.upsert = upsert;
 exports.validatePptx = validatePptx;
 exports.validateSmartArtColorStyleLabels = validateSmartArtColorStyleLabels;
 exports.validateSmartArtConstraintRules = validateSmartArtConstraintRules;