pptxtojson 1.2.1 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pptxtojson",
-	"version": "1.2.1",
+	"version": "1.3.0",
 	"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/pptxtojson.js

@@ -1,7 +1,7 @@
 import JSZip from 'jszip'
 import { readXmlFile } from './readXmlFile'
 import { getBorder } from './border'
-import { getSlideBackgroundFill, getShapeFill, getSolidFill } from './fill'
+import { getSlideBackgroundFill, getShapeFill, getSolidFill, getPicFill } from './fill'
 import { getChartInfo } from './chart'
 import { getVerticalAlign } from './align'
 import { getPosition, getSize } from './position'
@@ -414,7 +414,7 @@ async function processNodesInSlide(nodeKey, nodeValue, warpObj, source) {
         json = await processGroupSpNode(getTextByPathList(nodeValue, ['mc:Fallback']), warpObj, source)
       }
       else if (getTextByPathList(nodeValue, ['mc:Choice'])) {
-        json = processMathNode(getTextByPathList(nodeValue, ['mc:Choice']))
+        json = await processMathNode(nodeValue, warpObj, source)
       }
       break
     default:
@@ -423,15 +423,21 @@ async function processNodesInSlide(nodeKey, nodeValue, warpObj, source) {
   return json
 }
 
-function processMathNode(node) {
+async function processMathNode(node, warpObj, source) {
+  const choice = getTextByPathList(node, ['mc:Choice'])
+  const fallback = getTextByPathList(node, ['mc:Fallback'])
+
   const order = node['attrs']['order']
-  const xfrmNode = getTextByPathList(node, ['p:sp', 'p:spPr', 'a:xfrm'])
+  const xfrmNode = getTextByPathList(choice, ['p:sp', 'p:spPr', 'a:xfrm'])
   const { top, left } = getPosition(xfrmNode, undefined, undefined)
   const { width, height } = getSize(xfrmNode, undefined, undefined)
 
-  const oMath = findOMath(node)[0]
+  const oMath = findOMath(choice)[0]
   const latex = latexFormart(parseOMath(oMath))
 
+  const blipFill = getTextByPathList(fallback, ['p:sp', 'p:spPr', 'a:blipFill'])
+  const picBase64 = await getPicFill(source, blipFill, warpObj)
+
   return {
     type: 'math',
     top,
@@ -439,6 +445,7 @@ function processMathNode(node) {
     width, 
     height,
     latex,
+    picBase64,
     order,
   }
 }
@@ -774,6 +781,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
@@ -811,13 +829,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'])
@@ -833,8 +848,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,
@@ -893,6 +913,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)
       }
@@ -924,6 +945,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)
     }
@@ -938,7 +960,9 @@ async function genTable(node, warpObj) {
     height,
     data,
     order,
-    ...(tbl_border || {}),
+    borders,
+    rowHeights,
+    colWidths,
   }
 }
 

package/src/shape.js

@@ -35,7 +35,7 @@ export function getCustomShapePath(custShapType, w, h) {
   const pathLstNode = getTextByPathList(custShapType, ['a:pathLst'])
   let pathNodes = getTextByPathList(pathLstNode, ['a:path'])
 
-  if (Array.isArray(pathNodes)) pathNodes = pathNodes.pop()
+  if (Array.isArray(pathNodes)) pathNodes = pathNodes.shift()
 
   const maxX = parseInt(pathNodes['attrs']['w'])
   const maxY = parseInt(pathNodes['attrs']['h'])

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) {
@@ -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,