@lofcz/pptxtojson 2.2.3 → 2.2.4

package/dist/index.cjs

@@ -9818,27 +9818,97 @@ async function parse(file, options = {}) {
         }
     };
 }
+function asNodeArray(node) {
+    if (!node) return [];
+    return node.constructor === Array ? node : [
+        node
+    ];
+}
+function sortSlideXml(p1, p2) {
+    const n1 = +(/(\d+)\.xml/.exec(p1)?.[1] || 0);
+    const n2 = +(/(\d+)\.xml/.exec(p2)?.[1] || 0);
+    return n1 - n2;
+}
+function resolvePresentationTarget(target) {
+    let relTarget = String(target || '').replace(/\\/g, '/');
+    if (!relTarget) return '';
+    if (0 === relTarget.indexOf('/ppt/')) return relTarget.substr(1);
+    if (-1 !== relTarget.indexOf('../')) return relTarget.replace('../', 'ppt/');
+    if (0 === relTarget.indexOf('ppt/')) return relTarget;
+    return 'ppt/' + relTarget.replace(/^\//, '');
+}
+function relationshipRid(attrs) {
+    if (!attrs) return '';
+    return attrs['r:id'] || attrs.rId || '';
+}
+async function getSlidesFromPresentation(zip) {
+    const relsContent = await readXmlFile(zip, 'ppt/_rels/presentation.xml.rels');
+    const relItems = asNodeArray(getTextByPathList(relsContent, [
+        'Relationships',
+        'Relationship'
+    ]));
+    const relsMap = {};
+    const slideTargets = [];
+    for (const rel of relItems){
+        const id = getTextByPathList(rel, [
+            'attrs',
+            'Id'
+        ]);
+        const type = getTextByPathList(rel, [
+            'attrs',
+            'Type'
+        ]);
+        const target = getTextByPathList(rel, [
+            'attrs',
+            'Target'
+        ]);
+        if (!id || !target) continue;
+        const loc = resolvePresentationTarget(target);
+        if (loc) {
+            relsMap[id] = loc;
+            if ('slide' === getRelTypeName(type)) slideTargets.push(loc);
+        }
+    }
+    const presentation = await readXmlFile(zip, 'ppt/presentation.xml');
+    const sldIds = asNodeArray(getTextByPathList(presentation, [
+        'p:presentation',
+        'p:sldIdLst',
+        'p:sldId'
+    ]));
+    const ordered = [];
+    for (const sldId of sldIds){
+        const rid = relationshipRid(sldId?.attrs);
+        if (rid && relsMap[rid]) ordered.push(relsMap[rid]);
+    }
+    if (ordered.length) return ordered;
+    return slideTargets.sort(sortSlideXml);
+}
 async function getContentTypes(zip) {
     const ContentTypesJson = await readXmlFile(zip, '[Content_Types].xml');
-    const subObj = ContentTypesJson['Types']['Override'];
+    const overrides = asNodeArray(getTextByPathList(ContentTypesJson, [
+        'Types',
+        'Override'
+    ]));
     let slidesLocArray = [];
     let slideLayoutsLocArray = [];
-    for (const item of subObj)switch(item['attrs']['ContentType']){
-        case 'application/vnd.openxmlformats-officedocument.presentationml.slide+xml':
-            slidesLocArray.push(item['attrs']['PartName'].substr(1));
-            break;
-        case 'application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml':
-            slideLayoutsLocArray.push(item['attrs']['PartName'].substr(1));
-            break;
-        default:
+    for (const item of overrides){
+        const contentType = item?.attrs?.ContentType;
+        const partName = item?.attrs?.PartName;
+        if (!contentType || !partName) continue;
+        const loc = String(partName).replace(/^\//, '');
+        switch(contentType){
+            case 'application/vnd.openxmlformats-officedocument.presentationml.slide+xml':
+                slidesLocArray.push(loc);
+                break;
+            case 'application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml':
+                slideLayoutsLocArray.push(loc);
+                break;
+            default:
+        }
     }
-    const sortSlideXml = (p1, p2)=>{
-        const n1 = +/(\d+)\.xml/.exec(p1)[1];
-        const n2 = +/(\d+)\.xml/.exec(p2)[1];
-        return n1 - n2;
-    };
     slidesLocArray = slidesLocArray.sort(sortSlideXml);
     slideLayoutsLocArray = slideLayoutsLocArray.sort(sortSlideXml);
+    if (!slidesLocArray.length) slidesLocArray = await getSlidesFromPresentation(zip);
     return {
         slides: slidesLocArray,
         slideLayouts: slideLayoutsLocArray