pptxtojson 1.3.0 → 1.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pptxtojson",
-	"version": "1.3.0",
+	"version": "1.3.2",
 	"description": "A javascript tool for parsing .pptx file",
 	"type": "module",
 	"main": "./dist/index.umd.js",

package/src/fill.js

@@ -459,7 +459,7 @@ export async function getSlideBackgroundFill(warpObj) {
   }
 }
 
-export async function getShapeFill(node, isSvgMode, warpObj, source) {
+export async function getShapeFill(node, pNode, isSvgMode, warpObj, source) {
   const fillType = getFillType(getTextByPathList(node, ['p:spPr']))
   let type = 'color'
   let fillValue = ''
@@ -491,6 +491,19 @@ export async function getShapeFill(node, isSvgMode, warpObj, source) {
     fillValue = getSolidFill(clrName, undefined, undefined, warpObj)
     type = 'color'
   }
+  if (!fillValue && pNode) {
+    const grpFill = getTextByPathList(node, ['p:spPr', 'a:grpFill'])
+    if (grpFill) {
+      const grpShpFill = pNode['p:grpSpPr']
+      if (grpShpFill) {
+        const spShpNode = { 'p:spPr': grpShpFill }
+        return getShapeFill(spShpNode, node, isSvgMode, warpObj, source)
+      }
+    } 
+    else if (fillType === 'NO_FILL') {
+      return isSvgMode ? 'none' : ''
+    }
+  }
 
   return {
     type,

package/src/pptxtojson.js

@@ -268,7 +268,7 @@ async function processSingleSlide(zip, sldFileName, themeContent, defaultTextSty
   for (const nodeKey in nodes) {
     if (nodes[nodeKey].constructor !== Array) nodes[nodeKey] = [nodes[nodeKey]]
     for (const node of nodes[nodeKey]) {
-      const ret = await processNodesInSlide(nodeKey, node, warpObj, 'slide')
+      const ret = await processNodesInSlide(nodeKey, node, nodes, warpObj, 'slide')
       if (ret) elements.push(ret)
     }
   }
@@ -314,7 +314,7 @@ async function getLayoutElements(warpObj) {
         for (let i = 0; i < nodesSldLayout[nodeKey].length; i++) {
           const ph = getTextByPathList(nodesSldLayout[nodeKey][i], ['p:nvSpPr', 'p:nvPr', 'p:ph'])
           if (!ph) {
-            const ret = await processNodesInSlide(nodeKey, nodesSldLayout[nodeKey][i], warpObj, 'slideLayoutBg')
+            const ret = await processNodesInSlide(nodeKey, nodesSldLayout[nodeKey][i], nodesSldLayout, warpObj, 'slideLayoutBg')
             if (ret) elements.push(ret)
           }
         }
@@ -322,7 +322,7 @@ async function getLayoutElements(warpObj) {
       else {
         const ph = getTextByPathList(nodesSldLayout[nodeKey], ['p:nvSpPr', 'p:nvPr', 'p:ph'])
         if (!ph) {
-          const ret = await processNodesInSlide(nodeKey, nodesSldLayout[nodeKey], warpObj, 'slideLayoutBg')
+          const ret = await processNodesInSlide(nodeKey, nodesSldLayout[nodeKey], nodesSldLayout, warpObj, 'slideLayoutBg')
           if (ret) elements.push(ret)
         }
       }
@@ -334,7 +334,7 @@ async function getLayoutElements(warpObj) {
         for (let i = 0; i < nodesSldMaster[nodeKey].length; i++) {
           const ph = getTextByPathList(nodesSldMaster[nodeKey][i], ['p:nvSpPr', 'p:nvPr', 'p:ph'])
           if (!ph) {
-            const ret = await processNodesInSlide(nodeKey, nodesSldMaster[nodeKey][i], warpObj, 'slideMasterBg')
+            const ret = await processNodesInSlide(nodeKey, nodesSldMaster[nodeKey][i], nodesSldMaster, warpObj, 'slideMasterBg')
             if (ret) elements.push(ret)
           }
         }
@@ -342,7 +342,7 @@ async function getLayoutElements(warpObj) {
       else {
         const ph = getTextByPathList(nodesSldMaster[nodeKey], ['p:nvSpPr', 'p:nvPr', 'p:ph'])
         if (!ph) {
-          const ret = await processNodesInSlide(nodeKey, nodesSldMaster[nodeKey], warpObj, 'slideMasterBg')
+          const ret = await processNodesInSlide(nodeKey, nodesSldMaster[nodeKey], nodesSldMaster, warpObj, 'slideMasterBg')
           if (ret) elements.push(ret)
         }
       }
@@ -390,15 +390,15 @@ function indexNodes(content) {
   return { idTable, idxTable, typeTable }
 }
 
-async function processNodesInSlide(nodeKey, nodeValue, warpObj, source) {
+async function processNodesInSlide(nodeKey, nodeValue, nodes, warpObj, source) {
   let json
 
   switch (nodeKey) {
     case 'p:sp': // Shape, Text
-      json = await processSpNode(nodeValue, warpObj, source)
+      json = await processSpNode(nodeValue, nodes, warpObj, source)
       break
     case 'p:cxnSp': // Shape, Text
-      json = await processCxnSpNode(nodeValue, warpObj, source)
+      json = await processCxnSpNode(nodeValue, nodes, warpObj, source)
       break
     case 'p:pic': // Image, Video, Audio
       json = await processPicNode(nodeValue, warpObj, source)
@@ -464,6 +464,9 @@ async function processGroupSpNode(node, warpObj, source) {
   const chcx = parseInt(xfrmNode['a:chExt']['attrs']['cx']) * RATIO_EMUs_Points
   const chcy = parseInt(xfrmNode['a:chExt']['attrs']['cy']) * RATIO_EMUs_Points
 
+  const isFlipV = getTextByPathList(xfrmNode, ['attrs', 'flipV']) === '1'
+  const isFlipH = getTextByPathList(xfrmNode, ['attrs', 'flipH']) === '1'
+
   let rotate = getTextByPathList(xfrmNode, ['attrs', 'rot']) || 0
   if (rotate) rotate = angleToDegrees(rotate)
 
@@ -474,12 +477,12 @@ async function processGroupSpNode(node, warpObj, source) {
   for (const nodeKey in node) {
     if (node[nodeKey].constructor === Array) {
       for (const item of node[nodeKey]) {
-        const ret = await processNodesInSlide(nodeKey, item, warpObj, source)
+        const ret = await processNodesInSlide(nodeKey, item, node, warpObj, source)
         if (ret) elements.push(ret)
       }
     }
     else {
-      const ret = await processNodesInSlide(nodeKey, node[nodeKey], warpObj, source)
+      const ret = await processNodesInSlide(nodeKey, node[nodeKey], node, warpObj, source)
       if (ret) elements.push(ret)
     }
   }
@@ -492,6 +495,8 @@ async function processGroupSpNode(node, warpObj, source) {
     height: cy,
     rotate,
     order,
+    isFlipV,
+    isFlipH,
     elements: elements.map(element => ({
       ...element,
       left: (element.left - chx) * ws,
@@ -502,7 +507,7 @@ async function processGroupSpNode(node, warpObj, source) {
   }
 }
 
-async function processSpNode(node, warpObj, source) {
+async function processSpNode(node, pNode, warpObj, source) {
   const name = getTextByPathList(node, ['p:nvSpPr', 'p:cNvPr', 'attrs', 'name'])
   const idx = getTextByPathList(node, ['p:nvSpPr', 'p:nvPr', 'p:ph', 'attrs', 'idx'])
   let type = getTextByPathList(node, ['p:nvSpPr', 'p:nvPr', 'p:ph', 'attrs', 'type'])
@@ -537,18 +542,18 @@ async function processSpNode(node, warpObj, source) {
     else type = 'obj'
   }
 
-  return await genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type, order, warpObj, source)
+  return await genShape(node, pNode, slideLayoutSpNode, slideMasterSpNode, name, type, order, warpObj, source)
 }
 
-async function processCxnSpNode(node, warpObj, source) {
+async function processCxnSpNode(node, pNode, warpObj, source) {
   const name = node['p:nvCxnSpPr']['p:cNvPr']['attrs']['name']
   const type = (node['p:nvCxnSpPr']['p:nvPr']['p:ph'] === undefined) ? undefined : node['p:nvSpPr']['p:nvPr']['p:ph']['attrs']['type']
   const order = node['attrs']['order']
 
-  return await genShape(node, undefined, undefined, name, type, order, warpObj, source)
+  return await genShape(node, pNode, undefined, undefined, name, type, order, warpObj, source)
 }
 
-async function genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type, order, warpObj, source) {
+async function genShape(node, pNode, slideLayoutSpNode, slideMasterSpNode, name, type, order, warpObj, source) {
   const xfrmList = ['p:spPr', 'a:xfrm']
   const slideXfrmNode = getTextByPathList(node, xfrmList)
   const slideLayoutXfrmNode = getTextByPathList(slideLayoutSpNode, xfrmList)
@@ -577,7 +582,7 @@ async function genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type,
   if (node['p:txBody']) content = genTextBody(node['p:txBody'], node, slideLayoutSpNode, type, warpObj)
 
   const { borderColor, borderWidth, borderType, strokeDasharray } = getBorder(node, type, warpObj)
-  const fill = await getShapeFill(node, undefined, warpObj, source) || ''
+  const fill = await getShapeFill(node, pNode, undefined, warpObj, source) || ''
 
   let shadow
   const outerShdwNode = getTextByPathList(node, ['p:spPr', 'a:effectLst', 'a:outerShdw'])
@@ -607,12 +612,14 @@ async function genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type,
 
   if (shadow) data.shadow = shadow
 
+  const isHasValidText = data.content && hasValidText(data.content)
+
   if (custShapType && type !== 'diagram') {
     const ext = getTextByPathList(slideXfrmNode, ['a:ext', 'attrs'])
     const w = parseInt(ext['cx']) * RATIO_EMUs_Points
     const h = parseInt(ext['cy']) * RATIO_EMUs_Points
     const d = getCustomShapePath(custShapType, w, h)
-    if (data.content && !hasValidText(data.content)) data.content = ''
+    if (!isHasValidText) data.content = ''
 
     return {
       ...data,
@@ -621,11 +628,19 @@ async function genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type,
       path: d,
     }
   }
-  if (shapType && (type === 'obj' || !type)) {
-    if (data.content && !hasValidText(data.content)) data.content = ''
+  if (shapType && (type === 'obj' || !type || shapType !== 'rect')) {
+    if (!isHasValidText) data.content = ''
+    return {
+      ...data,
+      type: 'shape',
+      shapType,
+    }
+  }
+  if (shapType && !isHasValidText && (fill || borderWidth)) {
     return {
       ...data,
       type: 'shape',
+      content: '',
       shapType,
     }
   }
@@ -735,6 +750,20 @@ async function processPicNode(node, warpObj, source) {
       order,
     }
   }
+
+  let rect
+  const srcRectAttrs = getTextByPathList(node, ['p:blipFill', 'a:srcRect', 'attrs'])
+  if (srcRectAttrs && (srcRectAttrs.t || srcRectAttrs.b || srcRectAttrs.l || srcRectAttrs.r)) {
+    rect = {}
+    if (srcRectAttrs.t) rect.t = srcRectAttrs.t / 1000
+    if (srcRectAttrs.b) rect.b = srcRectAttrs.b / 1000
+    if (srcRectAttrs.l) rect.l = srcRectAttrs.l / 1000
+    if (srcRectAttrs.r) rect.r = srcRectAttrs.r / 1000
+  }
+  const geom = getTextByPathList(node, ['p:spPr', 'a:prstGeom', 'attrs', 'prst']) || 'rect'
+
+  const { borderColor, borderWidth, borderType, strokeDasharray } = getBorder(node, undefined, warpObj)
+
   return {
     type: 'image',
     top,
@@ -746,6 +775,12 @@ async function processPicNode(node, warpObj, source) {
     isFlipV,
     isFlipH,
     order,
+    rect,
+    geom,
+    borderColor,
+    borderWidth,
+    borderType,
+    borderStrokeDasharray: strokeDasharray,
   }
 }
 
@@ -1015,7 +1050,7 @@ async function genDiagram(node, warpObj) {
   const elements = []
   if (dgmDrwSpArray) {
     for (const item of dgmDrwSpArray) {
-      const el = await processSpNode(item, warpObj, 'diagramBg')
+      const el = await processSpNode(item, node, warpObj, 'diagramBg')
       if (el) elements.push(el)
     }
   }

package/src/shadow.js

@@ -5,7 +5,7 @@ export function getShadow(node, warpObj) {
   const chdwClrNode = getSolidFill(node, undefined, undefined, warpObj)
   const outerShdwAttrs = node['attrs']
   const dir = outerShdwAttrs['dir'] ? (parseInt(outerShdwAttrs['dir']) / 60000) : 0
-  const dist = parseInt(outerShdwAttrs['dist']) * RATIO_EMUs_Points
+  const dist = outerShdwAttrs['dist'] ? parseInt(outerShdwAttrs['dist']) * RATIO_EMUs_Points : 0
   const blurRad = outerShdwAttrs['blurRad'] ? parseInt(outerShdwAttrs['blurRad']) * RATIO_EMUs_Points : ''
   const vx = dist * Math.sin(dir * Math.PI / 180)
   const hx = dist * Math.cos(dir * Math.PI / 180)

package/src/table.js

@@ -55,7 +55,7 @@ export async function getTableCellParams(tcNode, thisTblStyle, cellSource, warpO
   const getCelFill = getTextByPathList(tcNode, ['a:tcPr'])
   if (getCelFill) {
     const cellObj = { 'p:spPr': getCelFill }
-    const fill = await getShapeFill(cellObj, undefined, warpObj)
+    const fill = await getShapeFill(cellObj, undefined, false, warpObj, 'slide')
 
     if (fill && fill.type === 'color' && fill.value) {
       fillColor = fill.value