pptxtojson 1.1.0 → 1.2.0

package/src/readXmlFile.js

@@ -19,11 +19,15 @@ export function simplifyLostLess(children, parentAttributes = {}) {
     if (!out[child.tagName]) out[child.tagName] = []
 
     const kids = simplifyLostLess(child.children || [], child.attributes)
-    out[child.tagName].push(kids)
-
-    if (Object.keys(child.attributes).length) {
-      kids.attrs = { order: cust_attr_order++, ...child.attributes }
+    
+    if (typeof kids === 'object') {
+      if (!kids.attrs) kids.attrs = { order: cust_attr_order++ }
+      else kids.attrs.order = cust_attr_order++
     }
+    if (Object.keys(child.attributes || {}).length) {
+      kids.attrs = { ...kids.attrs, ...child.attributes }
+    }
+    out[child.tagName].push(kids)
   }
   for (const child in out) {
     if (out[child].length === 1) out[child] = out[child][0]

package/src/table.js

@@ -43,7 +43,7 @@ export function getTableBorders(node, warpObj) {
   return borderStyles
 }
 
-export function getTableCellParams(tcNode, thisTblStyle, cellSource, warpObj) {
+export async function getTableCellParams(tcNode, thisTblStyle, cellSource, warpObj) {
   const rowSpan = getTextByPathList(tcNode, ['attrs', 'rowSpan'])
   const colSpan = getTextByPathList(tcNode, ['attrs', 'gridSpan'])
   const vMerge = getTextByPathList(tcNode, ['attrs', 'vMerge'])
@@ -55,7 +55,11 @@ export function getTableCellParams(tcNode, thisTblStyle, cellSource, warpObj) {
   const getCelFill = getTextByPathList(tcNode, ['a:tcPr'])
   if (getCelFill) {
     const cellObj = { 'p:spPr': getCelFill }
-    fillColor = getShapeFill(cellObj, undefined, warpObj)
+    const fill = await getShapeFill(cellObj, undefined, warpObj)
+
+    if (fill && fill.type === 'color' && fill.value) {
+      fillColor = fill.value 
+    }
   }
   if (!fillColor) {
     let bgFillschemeClr

package/src/utils.js

@@ -54,8 +54,6 @@ export function eachElement(node, func) {
 }
 
 export function getTextByPathList(node, path) {
-  if (path.constructor !== Array) throw Error('Error of path type! path is not array.')
-
   if (!node) return node
 
   for (const key of path) {
@@ -150,4 +148,13 @@ export function toHex(n) {
     hex = '0' + hex
   }
   return hex
+}
+
+export function hasValidText(htmlString) {
+  if (!DOMParser) return true
+
+  const parser = new DOMParser()
+  const doc = parser.parseFromString(htmlString, 'text/html')
+  const text = doc.body.textContent || doc.body.innerText
+  return text.trim() !== ''
 }