pptxtojson 1.2.0 → 1.2.2

package/package.json

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

package/src/border.js

@@ -3,9 +3,19 @@ import { getSchemeColorFromTheme } from './schemeColor'
 import { getTextByPathList } from './utils'
 
 export function getBorder(node, elType, warpObj) {
-  const lineNode = node['p:spPr']['a:ln']
+  let lineNode = node['p:spPr']['a:ln']
+  if (!lineNode) {
+    const lnRefNode = getTextByPathList(node, ['p:style', 'a:lnRef'])
+    if (lnRefNode) {
+      const lnIdx = getTextByPathList(lnRefNode, ['attrs', 'idx'])
+      lineNode = warpObj['themeContent']['a:theme']['a:themeElements']['a:fmtScheme']['a:lnStyleLst']['a:ln'][Number(lnIdx) - 1]
+    }
+  }
+  if (!lineNode) lineNode = node
+
+  const isNoFill = getTextByPathList(lineNode, ['a:noFill'])
 
-  let borderWidth = parseInt(getTextByPathList(lineNode, ['attrs', 'w'])) / 12700
+  let borderWidth = isNoFill ? 0 : (parseInt(getTextByPathList(lineNode, ['attrs', 'w'])) / 12700)
   if (isNaN(borderWidth)) {
     if (lineNode) borderWidth = 0
     else if (elType !== 'obj') borderWidth = 0

package/src/fill.js

@@ -112,10 +112,16 @@ export function getGradientFill(node, warpObj) {
     }
   }
   const lin = node['a:lin']
-  let rot = 90
-  if (lin) rot = angleToDegrees(lin['attrs']['ang']) + 90
+  let rot = 0
+  let pathType = 'line'
+  if (lin) rot = angleToDegrees(lin['attrs']['ang'])
+  else {
+    const path = node['a:path']
+    if (path && path['attrs'] && path['attrs']['path']) pathType = path['attrs']['path'] 
+  }
   return {
     rot,
+    path: pathType,
     colors: colors.sort((a, b) => parseInt(a.pos) - parseInt(b.pos)),
   }
 }
@@ -136,10 +142,16 @@ export function getBgGradientFill(bgPr, phClr, slideMasterContent, warpObj) {
       }
     }
     const lin = grdFill['a:lin']
-    let rot = 90
-    if (lin) rot = angleToDegrees(lin['attrs']['ang']) + 90
+    let rot = 0
+    let pathType = 'line'
+    if (lin) rot = angleToDegrees(lin['attrs']['ang']) + 0
+    else {
+      const path = grdFill['a:path']
+      if (path && path['attrs'] && path['attrs']['path']) pathType = path['attrs']['path'] 
+    }
     return {
       rot,
+      path: pathType,
       colors: colors.sort((a, b) => parseInt(a.pos) - parseInt(b.pos)),
     }
   }

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,
   }
 }
@@ -949,7 +956,11 @@ async function genChart(node, warpObj) {
   const { width, height } = getSize(xfrmNode, undefined, undefined)
 
   const rid = node['a:graphic']['a:graphicData']['c:chart']['attrs']['r:id']
-  const refName = warpObj['slideResObj'][rid]['target']
+  let refName = getTextByPathList(warpObj['slideResObj'], [rid, 'target'])
+  if (!refName) refName = getTextByPathList(warpObj['layoutResObj'], [rid, 'target'])
+  if (!refName) refName = getTextByPathList(warpObj['masterResObj'], [rid, 'target'])
+  if (!refName) return {}
+
   const content = await readXmlFile(warpObj['zip'], refName)
   const plotArea = getTextByPathList(content, ['c:chartSpace', 'c:chart', 'c:plotArea'])
 

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'])