pptxtojson 0.1.1 → 0.1.2

package/package.json

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

package/src/fontStyle.js

@@ -70,13 +70,11 @@ export function getFontItalic(node) {
 }
 
 export function getFontDecoration(node) {
-  const underline = getTextByPathList(node, ['a:rPr', 'attrs', 'u']) === 'sng' ? 'underline' : ''
-  const strike = getTextByPathList(node, ['a:rPr', 'attrs', 'strike']) === 'sngStrike' ? 'line-through' : ''
+  return getTextByPathList(node, ['a:rPr', 'attrs', 'u']) === 'sng' ? 'underline' : ''
+}
 
-  if (!underline && !strike) return ''
-  else if (underline && !strike) return underline
-  else if (!underline && strike) return strike
-  return `${underline} ${strike}`
+export function getFontDecorationLine(node) {
+  return getTextByPathList(node, ['a:rPr', 'attrs', 'strike']) === 'sngStrike' ? 'line-through' : ''
 }
 
 export function getFontSpace(node, fontsizeFactor) {

package/src/pptxtojson.js

@@ -1,7 +1,7 @@
 import JSZip from 'jszip'
 import { readXmlFile } from './readXmlFile'
 import { getBorder } from './border'
-import { getSlideBackgroundFill, getShapeFill } from './fill'
+import { getSlideBackgroundFill, getShapeFill, getSolidFill } from './fill'
 import { getChartInfo } from './chart'
 import { getVerticalAlign } from './align'
 import { getPosition, getSize } from './position'
@@ -252,6 +252,8 @@ async function processSingleSlide(zip, sldFileName, themeContent, defaultTextSty
     }
   }
 
+  const tableStyles = await readXmlFile(zip, 'ppt/tableStyles.xml')
+
   const slideContent = await readXmlFile(zip, sldFileName)
   const nodes = slideContent['p:sld']['p:cSld']['p:spTree']
   const warpObj = {
@@ -261,6 +263,7 @@ async function processSingleSlide(zip, sldFileName, themeContent, defaultTextSty
     slideMasterContent: slideMasterContent,
     slideMasterTables: slideMasterTables,
     slideContent: slideContent,
+    tableStyles: tableStyles,
     slideResObj: slideResObj,
     slideMasterTextStyles: slideMasterTextStyles,
     layoutResObj: layoutResObj,
@@ -673,6 +676,39 @@ function genTable(node, warpObj) {
   const { top, left } = getPosition(xfrmNode, undefined, undefined, SLIDE_FACTOR)
   const { width, height } = getSize(xfrmNode, undefined, undefined, SLIDE_FACTOR)
 
+  const getTblPr = getTextByPathList(node, ['a:graphic', 'a:graphicData', 'a:tbl', 'a:tblPr'])
+
+  let thisTblStyle
+  const tbleStyleId = getTblPr['a:tableStyleId']
+  if (tbleStyleId) {
+    const tbleStylList = warpObj['tableStyles']['a:tblStyleLst']['a:tblStyle']
+    if (tbleStylList) {
+      if (tbleStylList.constructor === Array) {
+        for (let k = 0; k < tbleStylList.length; k++) {
+          if (tbleStylList[k]['attrs']['styleId'] === tbleStyleId) {
+            thisTblStyle = tbleStylList[k]
+          }
+        }
+      } 
+      else {
+        if (tbleStylList['attrs']['styleId'] === tbleStyleId) {
+          thisTblStyle = tbleStylList
+        }
+      }
+    }
+  }
+
+  let themeColor = ''
+  let tbl_bgFillschemeClr = getTextByPathList(thisTblStyle, ['a:tblBg', 'a:fillRef'])
+  if (tbl_bgFillschemeClr) {
+    themeColor = getSolidFill(tbl_bgFillschemeClr, undefined, undefined, warpObj)
+  }
+  if (tbl_bgFillschemeClr === undefined) {
+    tbl_bgFillschemeClr = getTextByPathList(thisTblStyle, ['a:wholeTbl', 'a:tcStyle', 'a:fill', 'a:solidFill'])
+    themeColor = getSolidFill(tbl_bgFillschemeClr, undefined, undefined, warpObj)
+  }
+  if (themeColor !== '') themeColor = '#' + themeColor
+
   const trNodes = tableNode['a:tr']
   
   const data = []
@@ -723,6 +759,7 @@ function genTable(node, warpObj) {
     width,
     height,
     data,
+    themeColor,
   }
 }
 

package/src/readXmlFile.js

@@ -1,12 +1,14 @@
 import * as txml from 'txml/dist/txml.mjs'
 
+let cust_attr_order = 0
+
 export function simplifyLostLess(children, parentAttributes = {}) {
   const out = {}
   if (!children.length) return out
 
   if (children.length === 1 && typeof children[0] === 'string') {
     return Object.keys(parentAttributes).length ? {
-      attrs: parentAttributes,
+      attrs: { order: cust_attr_order++, ...parentAttributes },
       value: children[0],
     } : children[0]
   }
@@ -20,7 +22,7 @@ export function simplifyLostLess(children, parentAttributes = {}) {
     out[child.tagName].push(kids)
 
     if (Object.keys(child.attributes).length) {
-      kids.attrs = child.attributes
+      kids.attrs = { order: cust_attr_order++, ...child.attributes }
     }
   }
   for (const child in out) {

package/src/shape.js

@@ -57,11 +57,12 @@ export function getCustomShapePath(custShapType, w, h) {
           const moveToNoPt = moveToPtNode[key]
           const spX = moveToNoPt['attrs', 'x']
           const spY = moveToNoPt['attrs', 'y']
-          
+          const order = moveToNoPt['attrs', 'order']
           multiSapeAry.push({
             type: 'movto',
             x: spX,
             y: spY,
+            order,
           })
         })
       }
@@ -74,10 +75,12 @@ export function getCustomShapePath(custShapType, w, h) {
             const lnToNoPt = lnToPtNode[key]
             const ptX = lnToNoPt['attrs', 'x']
             const ptY = lnToNoPt['attrs', 'y']
+            const order = lnToNoPt['attrs', 'order']
             multiSapeAry.push({
               type: 'lnto',
               x: ptX,
               y: ptY,
+              order,
             })
           })
         }
@@ -101,14 +104,17 @@ export function getCustomShapePath(custShapType, w, h) {
           }
           pts_ary.push(pt_obj)
         })
+        const order = key[0]['attrs']['order']
         multiSapeAry.push({
           type: 'cubicBezTo',
-          cubBzPt: pts_ary
+          cubBzPt: pts_ary,
+          order,
         })
       })
     }
     if (arcToNodes) {
       const arcToNodesAttrs = arcToNodes['attrs']
+      const order = arcToNodesAttrs['order']
       const hR = arcToNodesAttrs['hR']
       const wR = arcToNodesAttrs['wR']
       const stAng = arcToNodesAttrs['stAng']
@@ -128,6 +134,7 @@ export function getCustomShapePath(custShapType, w, h) {
         swAng: swAng,
         shftX: shftX,
         shftY: shftY,
+        order,
       })
     }
     if (closeNode) {
@@ -135,13 +142,15 @@ export function getCustomShapePath(custShapType, w, h) {
       Object.keys(closeNode).forEach(() => {
         multiSapeAry.push({
           type: 'close',
+          order: Infinity,
         })
       })
     }
 
+    multiSapeAry.sort((a, b) => a.order - b.order)
+
     let k = 0
     while (k < multiSapeAry.length) {
-
       if (multiSapeAry[k].type === 'movto') {
         const spX = parseInt(multiSapeAry[k].x) * cX
         const spY = parseInt(multiSapeAry[k].y) * cY

package/src/text.js

@@ -8,6 +8,7 @@ import {
   getFontBold,
   getFontItalic,
   getFontDecoration,
+  getFontDecorationLine,
   getFontSpace,
   getFontSubscript,
   getFontShadow,
@@ -108,6 +109,7 @@ export function genSpanElement(node, slideLayoutSpNode, type, warpObj, fontsizeF
   const fontBold = getFontBold(node)
   const fontItalic = getFontItalic(node)
   const fontDecoration = getFontDecoration(node)
+  const fontDecorationLine = getFontDecorationLine(node)
   const fontSpace = getFontSpace(node, fontsizeFactor)
   const shadow = getFontShadow(node, warpObj, slideFactor)
   const subscript = getFontSubscript(node)
@@ -118,6 +120,7 @@ export function genSpanElement(node, slideLayoutSpNode, type, warpObj, fontsizeF
   if (fontBold) styleText += `font-weight: ${fontBold};`
   if (fontItalic) styleText += `font-style: ${fontItalic};`
   if (fontDecoration) styleText += `text-decoration: ${fontDecoration};`
+  if (fontDecorationLine) styleText += `text-decoration-line: ${fontDecorationLine};`
   if (fontSpace) styleText += `letter-spacing: ${fontSpace};`
   if (subscript) styleText += `vertical-align: ${subscript}; font-size: smaller;`
   if (shadow) styleText += `text-shadow: ${shadow};`