pptxtojson 1.2.2 → 1.3.1

package/package.json

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

package/src/border.js

@@ -3,7 +3,7 @@ import { getSchemeColorFromTheme } from './schemeColor'
 import { getTextByPathList } from './utils'
 
 export function getBorder(node, elType, warpObj) {
-  let lineNode = node['p:spPr']['a:ln']
+  let lineNode = getTextByPathList(node, ['p:spPr', 'a:ln'])
   if (!lineNode) {
     const lnRefNode = getTextByPathList(node, ['p:style', 'a:lnRef'])
     if (lnRefNode) {
@@ -46,7 +46,7 @@ export function getBorder(node, elType, warpObj) {
     }
   }
 
-  if (!borderColor) borderColor = '#000'
+  if (!borderColor) borderColor = '#000000'
   else borderColor = `#${borderColor}`
 
   const type = getTextByPathList(lineNode, ['a:prstDash', 'attrs', 'val'])

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'])
@@ -735,6 +740,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 +765,12 @@ async function processPicNode(node, warpObj, source) {
     isFlipV,
     isFlipH,
     order,
+    rect,
+    geom,
+    borderColor,
+    borderWidth,
+    borderType,
+    borderStrokeDasharray: strokeDasharray,
   }
 }
 
@@ -781,6 +806,17 @@ async function genTable(node, warpObj) {
   const { width, height } = getSize(xfrmNode, undefined, undefined)
 
   const getTblPr = getTextByPathList(node, ['a:graphic', 'a:graphicData', 'a:tbl', 'a:tblPr'])
+  let getColsGrid = getTextByPathList(node, ['a:graphic', 'a:graphicData', 'a:tbl', 'a:tblGrid', 'a:gridCol'])
+  if (getColsGrid.constructor !== Array) getColsGrid = [getColsGrid]
+
+  const colWidths = []
+  if (getColsGrid) {
+    for (const item of getColsGrid) {
+      const colWidthParam = getTextByPathList(item, ['attrs', 'w']) || 0
+      const colWidth = parseInt(colWidthParam) * RATIO_EMUs_Points
+      colWidths.push(colWidth)
+    }
+  }
 
   const firstRowAttr = getTblPr['attrs'] ? getTblPr['attrs']['firstRow'] : undefined
   const firstColAttr = getTblPr['attrs'] ? getTblPr['attrs']['firstCol'] : undefined
@@ -818,13 +854,10 @@ async function genTable(node, warpObj) {
   }
   if (thisTblStyle) thisTblStyle['tblStylAttrObj'] = tblStylAttrObj
 
-  let tbl_border
+  let borders = {}
   const tblStyl = getTextByPathList(thisTblStyle, ['a:wholeTbl', 'a:tcStyle'])
   const tblBorderStyl = getTextByPathList(tblStyl, ['a:tcBdr'])
-  if (tblBorderStyl) {
-    const tbl_borders = getTableBorders(tblBorderStyl, warpObj)
-    if (tbl_borders) tbl_border = tbl_borders.bottom || tbl_borders.left || tbl_borders.right || tbl_borders.top
-  }
+  if (tblBorderStyl) borders = getTableBorders(tblBorderStyl, warpObj)
 
   let tbl_bgcolor = ''
   let tbl_bgFillschemeClr = getTextByPathList(thisTblStyle, ['a:tblBg', 'a:fillRef'])
@@ -840,8 +873,13 @@ async function genTable(node, warpObj) {
   if (trNodes.constructor !== Array) trNodes = [trNodes]
   
   const data = []
+  const rowHeights = []
   for (let i = 0; i < trNodes.length; i++) {
     const trNode = trNodes[i]
+    
+    const rowHeightParam = getTextByPathList(trNodes[i], ['attrs', 'h']) || 0
+    const rowHeight = parseInt(rowHeightParam) * RATIO_EMUs_Points
+    rowHeights.push(rowHeight)
 
     const {
       fillColor,
@@ -900,6 +938,7 @@ async function genTable(node, warpObj) {
         if (cell.fontBold || fontBold) td.fontBold = cell.fontBold || fontBold
         if (cell.fontColor || fontColor) td.fontColor = cell.fontColor || fontColor
         if (cell.fillColor || fillColor || tbl_bgcolor) td.fillColor = cell.fillColor || fillColor || tbl_bgcolor
+        if (cell.borders) td.borders = cell.borders
 
         tr.push(td)
       }
@@ -931,6 +970,7 @@ async function genTable(node, warpObj) {
       if (cell.fontBold || fontBold) td.fontBold = cell.fontBold || fontBold
       if (cell.fontColor || fontColor) td.fontColor = cell.fontColor || fontColor
       if (cell.fillColor || fillColor || tbl_bgcolor) td.fillColor = cell.fillColor || fillColor || tbl_bgcolor
+      if (cell.borders) td.borders = cell.borders
 
       tr.push(td)
     }
@@ -945,7 +985,9 @@ async function genTable(node, warpObj) {
     height,
     data,
     order,
-    ...(tbl_border || {}),
+    borders,
+    rowHeights,
+    colWidths,
   }
 }
 
@@ -998,7 +1040,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/table.js

@@ -3,7 +3,7 @@ import { getTextByPathList } from './utils'
 import { getBorder } from './border'
 
 export function getTableBorders(node, warpObj) {
-  const borderStyles = {}
+  const borders = {}
   if (node['a:bottom']) {
     const obj = {
       'p:spPr': {
@@ -11,7 +11,7 @@ export function getTableBorders(node, warpObj) {
       }
     }
     const border = getBorder(obj, undefined, warpObj)
-    borderStyles.bottom = border
+    borders.bottom = border
   }
   if (node['a:top']) {
     const obj = {
@@ -20,7 +20,7 @@ export function getTableBorders(node, warpObj) {
       }
     }
     const border = getBorder(obj, undefined, warpObj)
-    borderStyles.top = border
+    borders.top = border
   }
   if (node['a:right']) {
     const obj = {
@@ -29,7 +29,7 @@ export function getTableBorders(node, warpObj) {
       }
     }
     const border = getBorder(obj, undefined, warpObj)
-    borderStyles.right = border
+    borders.right = border
   }
   if (node['a:left']) {
     const obj = {
@@ -38,9 +38,9 @@ export function getTableBorders(node, warpObj) {
       }
     }
     const border = getBorder(obj, undefined, warpObj)
-    borderStyles.left = border
+    borders.left = border
   }
-  return borderStyles
+  return borders
 }
 
 export async function getTableCellParams(tcNode, thisTblStyle, cellSource, warpObj) {
@@ -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 
@@ -76,10 +76,38 @@ export async function getTableCellParams(tcNode, thisTblStyle, cellSource, warpO
     if (getTextByPathList(rowTxtStyl, ['attrs', 'b']) === 'on') fontBold = true
   }
 
+  let lin_bottm = getTextByPathList(tcNode, ['a:tcPr', 'a:lnB'])
+  if (!lin_bottm) {
+    if (cellSource) lin_bottm = getTextByPathList(thisTblStyle[cellSource], ['a:tcStyle', 'a:tcBdr', 'a:bottom', 'a:ln'])
+    if (!lin_bottm) lin_bottm = getTextByPathList(thisTblStyle, ['a:wholeTbl', 'a:tcStyle', 'a:tcBdr', 'a:bottom', 'a:ln'])
+  }
+  let lin_top = getTextByPathList(tcNode, ['a:tcPr', 'a:lnT'])
+  if (!lin_top) {
+    if (cellSource) lin_top = getTextByPathList(thisTblStyle[cellSource], ['a:tcStyle', 'a:tcBdr', 'a:top', 'a:ln'])
+    if (!lin_top) lin_top = getTextByPathList(thisTblStyle, ['a:wholeTbl', 'a:tcStyle', 'a:tcBdr', 'a:top', 'a:ln'])
+  }
+  let lin_left = getTextByPathList(tcNode, ['a:tcPr', 'a:lnL'])
+  if (!lin_left) {
+    if (cellSource) lin_left = getTextByPathList(thisTblStyle[cellSource], ['a:tcStyle', 'a:tcBdr', 'a:left', 'a:ln'])
+    if (!lin_left) lin_left = getTextByPathList(thisTblStyle, ['a:wholeTbl', 'a:tcStyle', 'a:tcBdr', 'a:left', 'a:ln'])
+  }
+  let lin_right = getTextByPathList(tcNode, ['a:tcPr', 'a:lnR'])
+  if (!lin_right) {
+    if (cellSource) lin_right = getTextByPathList(thisTblStyle[cellSource], ['a:tcStyle', 'a:tcBdr', 'a:right', 'a:ln'])
+    if (!lin_right) lin_right = getTextByPathList(thisTblStyle, ['a:wholeTbl', 'a:tcStyle', 'a:tcBdr', 'a:right', 'a:ln'])
+  }
+
+  const borders = {}
+  if (lin_bottm) borders.bottom = getBorder(lin_bottm, undefined, warpObj)
+  if (lin_top) borders.top = getBorder(lin_top, undefined, warpObj)
+  if (lin_left) borders.left = getBorder(lin_left, undefined, warpObj)
+  if (lin_right) borders.right = getBorder(lin_right, undefined, warpObj)
+
   return {
     fillColor,
     fontColor,
     fontBold,
+    borders,
     rowSpan: rowSpan ? +rowSpan : undefined,
     colSpan: colSpan ? +colSpan : undefined,
     vMerge: vMerge ? +vMerge : undefined,