ppt2json 0.3.2 → 0.3.4

package/dist/index.js

@@ -1803,18 +1803,20 @@ async function getPicFill(type, node, warpObj) {
 }
 function getPicFillOpacity(node) {
   const aBlipNode = node["a:blip"];
-  const aphaModFixNode = getTextByPathList(aBlipNode, ["a:alphaModFix", "attrs"]);
-  let opacity = 1;
-  if (aphaModFixNode && aphaModFixNode["amt"] && aphaModFixNode["amt"] !== "") {
-    opacity = parseInt(aphaModFixNode["amt"]) / 1e5;
-  }
-  return opacity;
+  return getBlipOpacityRatio(aBlipNode) ?? 1;
 }
 function getPicFilters(node) {
   if (!node) return null;
   const aBlipNode = node["a:blip"];
   if (!aBlipNode) return null;
   const filters = {};
+  const opacity = getBlipOpacityRatio(aBlipNode);
+  if (opacity !== void 0) {
+    filters.opacity = formatFilterPercent(opacity);
+  }
+  if (aBlipNode["a:grayscl"]) {
+    filters.grayscale = "100%";
+  }
   const extLstNode = aBlipNode["a:extLst"];
   if (extLstNode && extLstNode["a:ext"]) {
     const extNodes = Array.isArray(extLstNode["a:ext"]) ? extLstNode["a:ext"] : [extLstNode["a:ext"]];
@@ -1828,7 +1830,12 @@ function getPicFilters(node) {
         if (effect["a14:saturation"]) {
           const satAttr = getTextByPathList(effect, ["a14:saturation", "attrs", "sat"]);
           if (satAttr) {
-            filters.saturation = parseInt(String(satAttr)) / 1e5;
+            const saturation = parseInt(String(satAttr)) / 1e5;
+            if (saturation <= 0) {
+              filters.grayscale = "100%";
+            } else {
+              filters.saturation = saturation;
+            }
           }
         }
         if (effect["a14:brightnessContrast"]) {
@@ -1866,16 +1873,34 @@ function getPicFilters(node) {
 async function getBgPicFill(bgPr, sorce, warpObj) {
   const picBase64 = await getPicFill(sorce, bgPr["a:blipFill"], warpObj);
   const aBlipNode = bgPr["a:blipFill"]["a:blip"];
-  const aphaModFixNode = getTextByPathList(aBlipNode, ["a:alphaModFix", "attrs"]);
-  let opacity = 1;
-  if (aphaModFixNode && aphaModFixNode["amt"] && aphaModFixNode["amt"] !== "") {
-    opacity = parseInt(aphaModFixNode["amt"]) / 1e5;
-  }
+  const opacity = getBlipOpacityRatio(aBlipNode) ?? 1;
   return {
     picBase64,
     opacity
   };
 }
+function getBlipOpacityRatio(aBlipNode) {
+  if (!aBlipNode) return void 0;
+  const alphaNodes = Array.isArray(aBlipNode["a:alphaModFix"]) ? aBlipNode["a:alphaModFix"] : aBlipNode["a:alphaModFix"] ? [aBlipNode["a:alphaModFix"]] : [];
+  if (!alphaNodes.length) return void 0;
+  let opacity = 1;
+  let hasOpacity = false;
+  for (const alphaNode of alphaNodes) {
+    const amt = alphaNode?.attrs?.amt;
+    if (amt === void 0 || amt === "") continue;
+    const parsed = parseInt(String(amt), 10);
+    if (!Number.isFinite(parsed)) continue;
+    opacity *= parsed / 1e5;
+    hasOpacity = true;
+  }
+  return hasOpacity ? opacity : void 0;
+}
+function formatFilterPercent(value) {
+  const percent = Math.max(0, Math.min(100, value * 100));
+  const rounded = Math.round(percent * 1e3) / 1e3;
+  const normalized = Number.isInteger(rounded) ? rounded.toFixed(0) : String(rounded);
+  return `${normalized}%`;
+}
 function getGradientFill(node, warpObj) {
   const gsLst = node["a:gsLst"]["a:gs"];
   const colors = [];
@@ -3128,7 +3153,7 @@ function getSpanStyleInfo(node, pNode, textBodyNode, pFontStyle, slideLayoutSpNo
 
 // parser/shape.ts
 function shapeArc(cX, cY, rX, rY, stAng, endAng, isClose) {
-  let dData;
+  let dData = "";
   let angle = stAng;
   if (endAng >= stAng) {
     while (angle <= endAng) {
@@ -3173,66 +3198,87 @@ function identifyShape(shapeData) {
   return matchShape(analysis);
 }
 function extractPathCommands(path) {
-  const commands = [];
-  const moveToList = normalizeToArray(path["a:moveTo"]);
-  moveToList.forEach((moveTo) => {
-    const pt = Array.isArray(moveTo?.["a:pt"]) ? moveTo["a:pt"][0] : moveTo?.["a:pt"];
-    if (pt) {
-      commands.push({
-        type: "moveTo",
-        points: [{ x: parseInt(pt.attrs?.x) || 0, y: parseInt(pt.attrs?.y) || 0 }]
-      });
-    }
-  });
-  const lineToList = normalizeToArray(path["a:lnTo"]);
-  lineToList.forEach((lnTo) => {
-    const pt = lnTo["a:pt"];
-    if (pt) {
-      commands.push({
-        type: "lineTo",
-        points: [{ x: parseInt(pt.attrs?.x) || 0, y: parseInt(pt.attrs?.y) || 0 }]
-      });
-    }
-  });
-  const cubicList = normalizeToArray(path["a:cubicBezTo"]);
-  cubicList.forEach((cubic) => {
-    const pts = normalizeToArray(cubic["a:pt"]);
-    const points = pts.map((pt) => ({
-      x: parseInt(pt.attrs?.x) || 0,
-      y: parseInt(pt.attrs?.y) || 0
-    }));
-    if (points.length === 3) {
-      commands.push({ type: "cubicBezTo", points });
+  const orderedNodes = collectOrderedCommandNodes(path);
+  return orderedNodes.flatMap(({ type, node }) => {
+    switch (type) {
+      case "moveTo": {
+        const pt = Array.isArray(node?.["a:pt"]) ? node["a:pt"][0] : node?.["a:pt"];
+        if (!pt) return [];
+        return [{
+          type: "moveTo",
+          points: [{ x: parseInt(pt.attrs?.x) || 0, y: parseInt(pt.attrs?.y) || 0 }]
+        }];
+      }
+      case "lineTo": {
+        const pt = node?.["a:pt"];
+        if (!pt) return [];
+        return [{
+          type: "lineTo",
+          points: [{ x: parseInt(pt.attrs?.x) || 0, y: parseInt(pt.attrs?.y) || 0 }]
+        }];
+      }
+      case "cubicBezTo": {
+        const pts = normalizeToArray(node?.["a:pt"]);
+        const points = pts.map((pt) => ({
+          x: parseInt(pt.attrs?.x) || 0,
+          y: parseInt(pt.attrs?.y) || 0
+        }));
+        return points.length === 3 ? [{ type: "cubicBezTo", points }] : [];
+      }
+      case "arcTo":
+        return [{
+          type: "arcTo",
+          wR: parseInt(node?.attrs?.wR) || 0,
+          hR: parseInt(node?.attrs?.hR) || 0,
+          stAng: parseInt(node?.attrs?.stAng) || 0,
+          swAng: parseInt(node?.attrs?.swAng) || 0
+        }];
+      case "quadBezTo": {
+        const pts = normalizeToArray(node?.["a:pt"]);
+        const points = pts.map((pt) => ({
+          x: parseInt(pt.attrs?.x) || 0,
+          y: parseInt(pt.attrs?.y) || 0
+        }));
+        return points.length ? [{ type: "quadBezTo", points }] : [];
+      }
+      case "close":
+        return [{ type: "close" }];
+      default:
+        return [];
     }
   });
-  const arcList = normalizeToArray(path["a:arcTo"]);
-  arcList.forEach((arc) => {
-    commands.push({
-      type: "arcTo",
-      wR: parseInt(arc.attrs?.wR) || 0,
-      hR: parseInt(arc.attrs?.hR) || 0,
-      stAng: parseInt(arc.attrs?.stAng) || 0,
-      swAng: parseInt(arc.attrs?.swAng) || 0
-    });
-  });
-  const quadList = normalizeToArray(path["a:quadBezTo"]);
-  quadList.forEach((quad) => {
-    const pts = normalizeToArray(quad["a:pt"]);
-    const points = pts.map((pt) => ({
-      x: parseInt(pt.attrs?.x) || 0,
-      y: parseInt(pt.attrs?.y) || 0
-    }));
-    commands.push({ type: "quadBezTo", points });
-  });
-  if (path["a:close"]) {
-    commands.push({ type: "close" });
-  }
-  return commands;
 }
 function normalizeToArray(value) {
   if (!value) return [];
   return Array.isArray(value) ? value : [value];
 }
+function collectOrderedCommandNodes(path) {
+  const commandNodes = [
+    ...toOrderedCommandEntries(path["a:moveTo"], "moveTo"),
+    ...toOrderedCommandEntries(path["a:lnTo"], "lineTo"),
+    ...toOrderedCommandEntries(path["a:cubicBezTo"], "cubicBezTo"),
+    ...toOrderedCommandEntries(path["a:arcTo"], "arcTo"),
+    ...toOrderedCommandEntries(path["a:quadBezTo"], "quadBezTo"),
+    ...toOrderedCommandEntries(path["a:close"], "close")
+  ];
+  return commandNodes.sort((left, right) => {
+    if (left.order !== right.order) return left.order - right.order;
+    return left.index - right.index;
+  });
+}
+function toOrderedCommandEntries(value, type) {
+  return normalizeToArray(value).map((node, index) => ({
+    type,
+    node,
+    index,
+    order: getNodeOrder(node)
+  }));
+}
+function getNodeOrder(node) {
+  const raw = node?.attrs?.order;
+  const order = typeof raw === "number" ? raw : parseInt(String(raw ?? ""), 10);
+  return Number.isFinite(order) ? order : Number.MAX_SAFE_INTEGER;
+}
 function buildCustomShapeSegment(pathNode, w, h) {
   if (!pathNode || typeof pathNode !== "object") return "";
   const maxX = parseInt(pathNode.attrs?.w) || 0;
@@ -8206,9 +8252,28 @@ async function parse2(file) {
     }
   };
 }
+function getNodeByLocalName(node, localName) {
+  if (!node || typeof node !== "object") return void 0;
+  if (node[localName] !== void 0) return node[localName];
+  for (const key of Object.keys(node)) {
+    if (key === localName || key.endsWith(":" + localName)) {
+      return node[key];
+    }
+  }
+  return void 0;
+}
+function toNodeArray(node) {
+  if (node === void 0 || node === null) return [];
+  return Array.isArray(node) ? node : [node];
+}
+function getRelationshipArray(content) {
+  const relationshipsNode = getNodeByLocalName(content, "Relationships");
+  return toNodeArray(getNodeByLocalName(relationshipsNode, "Relationship"));
+}
 async function getContentTypes(zip) {
   const ContentTypesJson = await readXmlFile(zip, "[Content_Types].xml");
-  const subObj = ContentTypesJson["Types"]["Override"];
+  const typesNode = getNodeByLocalName(ContentTypesJson, "Types");
+  const subObj = toNodeArray(getNodeByLocalName(typesNode, "Override"));
   let slidesLocArray = [];
   let slideLayoutsLocArray = [];
   for (const item of subObj) {
@@ -8246,17 +8311,13 @@ async function getSlideInfo(zip) {
 }
 async function getTheme(zip) {
   const preResContent = await readXmlFile(zip, "ppt/_rels/presentation.xml.rels");
-  const relationshipArray = preResContent["Relationships"]["Relationship"];
+  const relationshipArray = getRelationshipArray(preResContent);
   let themeURI;
-  if (relationshipArray.constructor === Array) {
-    for (const relationshipItem of relationshipArray) {
-      if (relationshipItem["attrs"]["Type"] === "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme") {
-        themeURI = relationshipItem["attrs"]["Target"];
-        break;
-      }
+  for (const relationshipItem of relationshipArray) {
+    if (relationshipItem["attrs"]["Type"] === "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme") {
+      themeURI = relationshipItem["attrs"]["Target"];
+      break;
     }
-  } else if (relationshipArray["attrs"]["Type"] === "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme") {
-    themeURI = relationshipArray["attrs"]["Target"];
   }
   const themeContent = await readXmlFile(zip, "ppt/" + themeURI);
   const themeColors = [];
@@ -8273,8 +8334,7 @@ async function getTheme(zip) {
 async function processSingleSlide(zip, sldFileName, themeContent, defaultTextStyle) {
   const resName = sldFileName.replace("slides/slide", "slides/_rels/slide") + ".rels";
   const resContent = await readXmlFile(zip, resName);
-  let relationshipArray = resContent["Relationships"]["Relationship"];
-  if (relationshipArray.constructor !== Array) relationshipArray = [relationshipArray];
+  let relationshipArray = getRelationshipArray(resContent);
   let noteFilename = "";
   let layoutFilename = "";
   let masterFilename = "";
@@ -8339,8 +8399,7 @@ async function processSingleSlide(zip, sldFileName, themeContent, defaultTextSty
   const slideLayoutTables = await indexNodes(slideLayoutContent);
   const slideLayoutResFilename = layoutFilename.replace("slideLayouts/slideLayout", "slideLayouts/_rels/slideLayout") + ".rels";
   const slideLayoutResContent = await readXmlFile(zip, slideLayoutResFilename);
-  relationshipArray = slideLayoutResContent["Relationships"]["Relationship"];
-  if (relationshipArray.constructor !== Array) relationshipArray = [relationshipArray];
+  relationshipArray = getRelationshipArray(slideLayoutResContent);
   for (const relationshipArrayItem of relationshipArray) {
     const relType = relationshipArrayItem["attrs"]["Type"].replace("http://schemas.openxmlformats.org/officeDocument/2006/relationships/", "");
     let relTarget = relationshipArrayItem["attrs"]["Target"];
@@ -8362,8 +8421,7 @@ async function processSingleSlide(zip, sldFileName, themeContent, defaultTextSty
   const slideMasterTables = indexNodes(slideMasterContent);
   const slideMasterResFilename = masterFilename.replace("slideMasters/slideMaster", "slideMasters/_rels/slideMaster") + ".rels";
   const slideMasterResContent = await readXmlFile(zip, slideMasterResFilename);
-  relationshipArray = slideMasterResContent["Relationships"]["Relationship"];
-  if (relationshipArray.constructor !== Array) relationshipArray = [relationshipArray];
+  relationshipArray = getRelationshipArray(slideMasterResContent);
   for (const relationshipArrayItem of relationshipArray) {
     const relType = relationshipArrayItem["attrs"]["Type"].replace("http://schemas.openxmlformats.org/officeDocument/2006/relationships/", "");
     let relTarget = relationshipArrayItem["attrs"]["Target"];
@@ -8385,9 +8443,8 @@ async function processSingleSlide(zip, sldFileName, themeContent, defaultTextSty
     const themeResFileName = themeFilename.replace(themeName, "_rels/" + themeName) + ".rels";
     const themeResContent = await readXmlFile(zip, themeResFileName);
     if (themeResContent) {
-      relationshipArray = themeResContent["Relationships"]["Relationship"];
+      relationshipArray = getRelationshipArray(themeResContent);
       if (relationshipArray) {
-        if (relationshipArray.constructor !== Array) relationshipArray = [relationshipArray];
         for (const relationshipArrayItem of relationshipArray) {
           themeResObj[relationshipArrayItem["attrs"]["Id"]] = {
             "type": relationshipArrayItem["attrs"]["Type"].replace("http://schemas.openxmlformats.org/officeDocument/2006/relationships/", ""),
@@ -8415,8 +8472,7 @@ async function processSingleSlide(zip, sldFileName, themeContent, defaultTextSty
     }
     const digramResContent = await readXmlFile(zip, diagramResFileName);
     if (digramResContent) {
-      relationshipArray = digramResContent["Relationships"]["Relationship"];
-      if (relationshipArray.constructor !== Array) relationshipArray = [relationshipArray];
+      relationshipArray = getRelationshipArray(digramResContent);
       for (const relationshipArrayItem of relationshipArray) {
         diagramResObj[relationshipArrayItem["attrs"]["Id"]] = {
           "type": relationshipArrayItem["attrs"]["Type"].replace("http://schemas.openxmlformats.org/officeDocument/2006/relationships/", ""),
@@ -9262,7 +9318,9 @@ function parseGradientPosition(value) {
 }
 function mapGradient(value) {
   if (!value || typeof value !== "object") return void 0;
-  const colors = Array.isArray(value.colors) ? value.colors.filter((stop) => stop && typeof stop === "object").map((stop) => ({
+  const colors = Array.isArray(value.colors) ? value.colors.filter(
+    (stop) => typeof stop === "object" && stop !== null
+  ).map((stop) => ({
     pos: parseGradientPosition(stop.pos),
     color: mapFillColor(stop.color) ?? "#FFFFFF"
   })) : [];
@@ -9535,7 +9593,7 @@ function mapElement(raw) {
       fill,
       ...special ? { special: true } : {},
       text: hasText ? {
-        content: normalizedShapeText,
+        content: normalizedShapeText ?? "",
         align: normalizeVAlign(raw.vAlign) ?? "middle",
         defaultColor: normalizeColor(raw.defaultColor) ?? normalizeColor(raw.color) ?? "#333",
         defaultFontName: raw.fontName ?? "",
@@ -9590,7 +9648,6 @@ function normalizeElement(element) {
     element.text.content = normalizeTextContent(element.text.content);
   }
   if (element.type === "image") {
-    delete element.filters;
     delete element.imageType;
     delete element.outline;
   }
@@ -9649,6 +9706,7 @@ function mapBaseElement(raw, exportedMeta) {
     rotate: raw.rotate,
     fill,
     opacity: raw.opacity,
+    filters: raw.filters,
     outline: outline ?? void 0,
     shadow: shadow ?? void 0,
     flipH: raw.isFlipH,