@lofcz/pptxtojson 2.2.4 → 2.2.5

package/dist/index.js

@@ -3162,17 +3162,18 @@ function genTextBody(textBodyNode, spNode, slideLayoutSpNode, slideMasterSpNode,
         const align = getHorizontalAlign(pNode, spNode, type, slideLayoutSpNode, slideMasterSpNode, warpObj);
         const spacing = getParagraphSpacing(pNode, textBodyNode, slideLayoutSpNode, slideMasterSpNode, type, slideMasterTextStyles, warpObj);
         const indent = getParagraphIndent(pNode, textBodyNode, slideLayoutSpNode, slideMasterSpNode, type, slideMasterTextStyles, warpObj);
-        const listType = getListType(pNode);
+        const listType = getListType(pNode, textBodyNode, slideLayoutSpNode, slideMasterSpNode, type, slideMasterTextStyles, warpObj);
         const listLevel = getListLevel(pNode);
         let alignStyle = align;
         if ('distribute' === align) alignStyle = 'justify';
-        let styleText = `text-align: ${alignStyle};line-height: 1.2;`;
+        let styleText = `text-align: ${alignStyle};`;
         if ('distribute' === align) styleText += "text-align-last: justify;text-justify: distribute;";
         if (spacing) {
             if (spacing.lineSpacing) styleText += `line-height: ${spacing.lineSpacing};`;
+            else styleText += "line-height: 1.2;";
             if (spacing.spaceBefore) styleText += `margin-top: ${spacing.spaceBefore};`;
             if (spacing.spaceAfter) styleText += `margin-bottom: ${spacing.spaceAfter};`;
-        }
+        } else styleText += "line-height: 1.2;";
         if (indent) {
             if (!listType && indent.marginLeft) styleText += `margin-left: ${indent.marginLeft};`;
             if (!listType && indent.textIndent) styleText += `text-indent: ${indent.textIndent};`;
@@ -3267,19 +3268,21 @@ function getMathRunStyleText(mathRun, siblingRun, pNode, textBodyNode, pFontStyl
     if (fontColor && 'string' == typeof fontColor) styleText += `color: ${fontColor};`;
     return styleText;
 }
-function getListType(node) {
-    const pPrNode = node['a:pPr'];
-    if (!pPrNode) return '';
-    if (pPrNode['a:buNone']) return '';
+function getListType(node, textBodyNode, slideLayoutSpNode, slideMasterSpNode, type, slideMasterTextStyles, warpObj) {
     const hasContent = node['a:r'] || node['a:br'] || node['a:fld'];
     if (!hasContent) return '';
-    if (pPrNode['a:buChar']) return 'ul';
-    if (pPrNode['a:buAutoNum']) return 'ol';
+    const styleNodes = getParagraphStyleNodes(node, textBodyNode, slideLayoutSpNode, slideMasterSpNode, type, slideMasterTextStyles, warpObj);
+    if (!styleNodes) return '';
+    for (const styleNode of styleNodes){
+        if (styleNode['a:buNone']) break;
+        if (styleNode['a:buChar'] || styleNode['a:buBlip']) return 'ul';
+        if (styleNode['a:buAutoNum']) return 'ol';
+    }
     return '';
 }
 function getListLevel(node) {
     const pPrNode = node['a:pPr'];
-    if (!pPrNode) return -1;
+    if (!pPrNode) return 0;
     const lvlNode = getTextByPathList(pPrNode, [
         'attrs',
         'lvl'
@@ -3287,6 +3290,30 @@ function getListLevel(node) {
     if (void 0 !== lvlNode) return parseInt(lvlNode);
     return 0;
 }
+function schemeColorToCss(color) {
+    if (!color) return '';
+    return color.startsWith('#') ? color : `#${color}`;
+}
+function applyHyperlinkRunStyle(styleText, node, warpObj) {
+    let next = styleText;
+    const runStyleNode = getTextByPathList(node, [
+        'a:rPr'
+    ]);
+    const runFill = runStyleNode ? getFillType(runStyleNode) : '';
+    const runHasOwnColor = 'SOLID_FILL' === runFill || 'GRADIENT_FILL' === runFill;
+    if (!runHasOwnColor) {
+        const hlinkColor = schemeColorToCss(getSchemeColorFromTheme('a:hlink', warpObj)) || '#0563C1';
+        if (/color\s*:/.test(next)) next = next.replace(/color\s*:\s*[^;]+;/, `color: ${hlinkColor};`);
+        else next += `color: ${hlinkColor};`;
+    }
+    const runUnderline = getTextByPathList(node, [
+        'a:rPr',
+        'attrs',
+        'u'
+    ]);
+    if ('none' !== runUnderline && !/text-decoration\s*:\s*underline/.test(next)) next += 'text-decoration: underline;';
+    return next;
+}
 function genSpanElement(node, pNode, textBodyNode, pFontStyle, slideLayoutSpNode, slideMasterSpNode, type, slideMasterTextStyles, defaultTextStyle, warpObj) {
     const { styleText, text, hasLink, linkURL } = getSpanStyleInfo(node, pNode, textBodyNode, pFontStyle, slideLayoutSpNode, slideMasterSpNode, type, slideMasterTextStyles, defaultTextStyle, warpObj);
     const processedText = text.replace(/\t/g, '    ').replace(/\s/g, ' ');
@@ -3343,6 +3370,7 @@ function getSpanStyleInfo(node, pNode, textBodyNode, pFontStyle, slideLayoutSpNo
         'r:id'
     ]);
     const hasLink = linkID && warpObj['slideResObj'][linkID];
+    if (hasLink) styleText = applyHyperlinkRunStyle(styleText, node, warpObj);
     return {
         styleText,
         text,
@@ -9797,21 +9825,62 @@ function sortSlideXml(p1, p2) {
     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 normalizePartName(name) {
+    return String(name || '').replace(/\\/g, '/').replace(/^\//, '');
+}
+function relationshipsPartFor(partName) {
+    const name = normalizePartName(partName);
+    const slash = name.lastIndexOf('/');
+    const dir = -1 === slash ? '' : name.slice(0, slash + 1);
+    const file = -1 === slash ? name : name.slice(slash + 1);
+    return `${dir}_rels/${file}.rels`;
+}
+function resolvePartTarget(sourcePart, target) {
+    const raw = String(target || '').replace(/\\/g, '/');
+    if (!raw) return '';
+    if (raw.startsWith('/')) return normalizePartName(raw);
+    const source = normalizePartName(sourcePart);
+    const slash = source.lastIndexOf('/');
+    const dir = -1 === slash ? '' : source.slice(0, slash + 1);
+    const out = [];
+    for (const seg of `${dir}${raw}`.split('/'))if (seg && '.' !== seg) if ('..' === seg) out.pop();
+    else out.push(seg);
+    return out.join('/');
 }
 function relationshipRid(attrs) {
     if (!attrs) return '';
     return attrs['r:id'] || attrs.rId || '';
 }
+async function getPresentationPart(zip) {
+    const rels = asNodeArray(getTextByPathList(await readXmlFile(zip, '_rels/.rels'), [
+        'Relationships',
+        'Relationship'
+    ]));
+    for (const rel of rels){
+        const type = getTextByPathList(rel, [
+            'attrs',
+            'Type'
+        ]);
+        const target = getTextByPathList(rel, [
+            'attrs',
+            'Target'
+        ]);
+        const targetMode = getTextByPathList(rel, [
+            'attrs',
+            'TargetMode'
+        ]);
+        if (!targetMode || 'external' !== String(targetMode).toLowerCase()) {
+            if ('officeDocument' === getRelTypeName(type) && target) {
+                const loc = resolvePartTarget('', target);
+                if (loc) return loc;
+            }
+        }
+    }
+    return 'ppt/presentation.xml';
+}
 async function getSlidesFromPresentation(zip) {
-    const relsContent = await readXmlFile(zip, 'ppt/_rels/presentation.xml.rels');
-    const relItems = asNodeArray(getTextByPathList(relsContent, [
+    const presentationPart = await getPresentationPart(zip);
+    const relItems = asNodeArray(getTextByPathList(await readXmlFile(zip, relationshipsPartFor(presentationPart)), [
         'Relationships',
         'Relationship'
     ]));
@@ -9830,14 +9899,19 @@ async function getSlidesFromPresentation(zip) {
             'attrs',
             'Target'
         ]);
+        const targetMode = getTextByPathList(rel, [
+            'attrs',
+            'TargetMode'
+        ]);
         if (!id || !target) continue;
-        const loc = resolvePresentationTarget(target);
+        if (targetMode && 'external' === String(targetMode).toLowerCase()) continue;
+        const loc = resolvePartTarget(presentationPart, target);
         if (loc) {
             relsMap[id] = loc;
             if ('slide' === getRelTypeName(type)) slideTargets.push(loc);
         }
     }
-    const presentation = await readXmlFile(zip, 'ppt/presentation.xml');
+    const presentation = await readXmlFile(zip, presentationPart);
     const sldIds = asNodeArray(getTextByPathList(presentation, [
         'p:presentation',
         'p:sldIdLst',
@@ -9849,7 +9923,7 @@ async function getSlidesFromPresentation(zip) {
         if (rid && relsMap[rid]) ordered.push(relsMap[rid]);
     }
     if (ordered.length) return ordered;
-    return slideTargets.sort(sortSlideXml);
+    return slideTargets;
 }
 async function getContentTypes(zip) {
     const ContentTypesJson = await readXmlFile(zip, '[Content_Types].xml');
@@ -9857,7 +9931,7 @@ async function getContentTypes(zip) {
         'Types',
         'Override'
     ]));
-    let slidesLocArray = [];
+    const overrideSlides = [];
     let slideLayoutsLocArray = [];
     for (const item of overrides){
         const contentType = item?.attrs?.ContentType;
@@ -9866,7 +9940,7 @@ async function getContentTypes(zip) {
         const loc = String(partName).replace(/^\//, '');
         switch(contentType){
             case 'application/vnd.openxmlformats-officedocument.presentationml.slide+xml':
-                slidesLocArray.push(loc);
+                overrideSlides.push(loc);
                 break;
             case 'application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml':
                 slideLayoutsLocArray.push(loc);
@@ -9874,9 +9948,9 @@ async function getContentTypes(zip) {
             default:
         }
     }
-    slidesLocArray = slidesLocArray.sort(sortSlideXml);
     slideLayoutsLocArray = slideLayoutsLocArray.sort(sortSlideXml);
-    if (!slidesLocArray.length) slidesLocArray = await getSlidesFromPresentation(zip);
+    let slidesLocArray = await getSlidesFromPresentation(zip);
+    if (!slidesLocArray.length) slidesLocArray = overrideSlides.sort(sortSlideXml);
     return {
         slides: slidesLocArray,
         slideLayouts: slideLayoutsLocArray