pptxtojson 2.0.0 → 2.0.1

package/package.json

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

package/src/diagram.js

@@ -1,4 +1,5 @@
 import { readXmlFile } from './readXmlFile'
+import { getTextNodeValue } from './text'
 import { getTextByPathList } from './utils'
 
 export async function loadDiagramFile(warpObj, filename, transformDrawing = false) {
@@ -112,7 +113,7 @@ export function getSmartArtTextData(dataContent) {
             if (!Array.isArray(runs)) runs = [runs]
 
             runs.forEach(r => {
-              const t = getTextByPathList(r, ['a:t'])
+              const t = getTextNodeValue(getTextByPathList(r, ['a:t']))
               if (t && typeof t === 'string') nodeText += t
             })
           }

package/src/pptxtojson.js

@@ -5,7 +5,7 @@ import { getSlideBackgroundFill, getShapeFill, getSolidFill, getPicFill, getPicF
 import { getChartInfo } from './chart'
 import { getVerticalAlign, getTextAutoFit } from './align'
 import { getPosition, getSize } from './position'
-import { genTextBody } from './text'
+import { genTextBody, getTextNodeValue } from './text'
 import { getCustomShapePath, identifyShape } from './shape'
 import { extractFileExtension, getTextByPathList, angleToDegrees, isVideoLink, escapeHtml, hasValidText, numberToFixed } from './utils'
 import { getShadow } from './shadow'
@@ -392,7 +392,7 @@ function getNote(noteContent) {
       if (rNodes) {
         if (rNodes.constructor !== Array) rNodes = [rNodes]
         for (const r of rNodes) {
-          const t = getTextByPathList(r, ['a:t'])
+          const t = getTextNodeValue(getTextByPathList(r, ['a:t']))
           if (t && typeof t === 'string') text += t
         }
       }

package/src/readXmlFile.js

@@ -2,6 +2,10 @@ import * as txml from 'txml/dist/txml.mjs'
 
 let cust_attr_order = 0
 
+function isWhitespaceTextNode(node) {
+  return typeof node === 'string' && node.trim() === ''
+}
+
 export function simplifyLostLess(children, parentAttributes = {}) {
   const out = {}
   if (!children.length) return out
@@ -13,6 +17,7 @@ export function simplifyLostLess(children, parentAttributes = {}) {
     } : children[0]
   }
   for (const child of children) {
+    if (isWhitespaceTextNode(child)) continue
     if (typeof child !== 'object') return
     if (child.tagName === '?xml') continue
 
@@ -39,7 +44,7 @@ export function simplifyLostLess(children, parentAttributes = {}) {
 export async function readXmlFile(zip, filename) {
   try {
     const data = await zip.file(filename).async('string')
-    return simplifyLostLess(txml.parse(data))
+    return simplifyLostLess(txml.parse(data, { keepWhitespace: true }))
   }
   catch {
     return null

package/src/shapePath.js

@@ -4,28 +4,33 @@ import { RATIO_EMUs_Points } from './constants'
 import { getTextByPathList } from './utils'
 
 function shapePie(H, w, adj1, adj2, isClose) {
-  const pieVal = parseInt(adj2)
-  const piAngle = parseInt(adj1)
+  const pieVal = parseFloat(adj2)
+  const piAngle = parseFloat(adj1)
   const size = parseInt(H)
-  const radius = size / 2
+  const radiusY = size / 2
+  const radiusX = w / 2
+  const centerX = radiusX
+  const centerY = radiusY
 
   let value = pieVal - piAngle
   if (value < 0) value = 360 + value
   value = Math.min(Math.max(value, 0), 360)
 
-  const x = Math.cos((2 * Math.PI) / (360 / value))
-  const y = Math.sin((2 * Math.PI) / (360 / value))
+  const startRadians = piAngle * Math.PI / 180
+  const endRadians = (piAngle + value) * Math.PI / 180
+  const startX = centerX + Math.cos(startRadians) * radiusX
+  const startY = centerY + Math.sin(startRadians) * radiusY
+  const endX = centerX + Math.cos(endRadians) * radiusX
+  const endY = centerY + Math.sin(endRadians) * radiusY
 
   let longArc, d
   if (isClose) {
     longArc = (value <= 180) ? 0 : 1
-    d = `M${radius},${radius} L${radius},0 A${radius},${radius} 0 ${longArc},1 ${radius + y * radius},${radius - x * radius} z`
+    d = `M${centerX},${centerY} L${startX},${startY} A${radiusX},${radiusY} 0 ${longArc},1 ${endX},${endY} z`
   } 
   else {
     longArc = (value <= 180) ? 0 : 1
-    const radius1 = radius
-    const radius2 = w / 2
-    d = `M${radius1},0 A${radius2},${radius1} 0 ${longArc},1 ${radius2 + y * radius2},${radius1 - x * radius1}`
+    d = `M${startX},${startY} A${radiusX},${radiusY} 0 ${longArc},1 ${endX},${endY}`
   }
 
   return d
@@ -1434,17 +1439,18 @@ export function getShapePath(shapType, w, h, node) {
         }
 
         if (shapAdjst) {
-          let shapAdjst1 = getTextByPathList(shapAdjst, ['attrs', 'fmla'])
-          let shapAdjst2 = shapAdjst1
-          if (shapAdjst1 === undefined) {
-            shapAdjst1 = shapAdjst[0]['attrs']['fmla']
-            shapAdjst2 = shapAdjst[1]['attrs']['fmla']
-          }
-          if (shapAdjst1) {
-            adj1 = parseInt(shapAdjst1.substring(4)) / 60000
-          }
-          if (shapAdjst2) {
-            adj2 = parseInt(shapAdjst2.substring(4)) / 60000
+          const shapAdjstAry = Array.isArray(shapAdjst) ? shapAdjst : [shapAdjst]
+          for (const adj of shapAdjstAry) {
+            const name = getTextByPathList(adj, ['attrs', 'name'])
+            const fmla = getTextByPathList(adj, ['attrs', 'fmla'])
+            if (!name || !fmla) continue
+
+            if (name === 'adj1') {
+              adj1 = parseInt(fmla.substring(4)) / 60000
+            }
+            else if (name === 'adj2') {
+              adj2 = parseInt(fmla.substring(4)) / 60000
+            }
           }
         }
 
@@ -4628,4 +4634,4 @@ export function getShapePath(shapType, w, h, node) {
   }
 
   return pathData
-}
+}

package/src/text.js

@@ -14,6 +14,12 @@ import {
   getFontShadow,
 } from './fontStyle'
 
+export function getTextNodeValue(node) {
+  if (typeof node === 'string') return node
+  if (node && typeof node.value === 'string') return node.value
+  return undefined
+}
+
 export function genTextBody(textBodyNode, spNode, slideLayoutSpNode, slideMasterSpNode, type, warpObj) {
   if (!textBodyNode) return ''
 
@@ -170,8 +176,8 @@ export function getSpanStyleInfo(node, pNode, textBodyNode, pFontStyle, slideLay
   const lvlNode = getTextByPathList(pPrNode, ['attrs', 'lvl'])
   if (lvlNode !== undefined) lvl = parseInt(lvlNode) + 1
 
-  let text = node['a:t']
-  if (typeof text !== 'string') text = getTextByPathList(node, ['a:fld', 'a:t'])
+  let text = getTextNodeValue(node['a:t'])
+  if (typeof text !== 'string') text = getTextNodeValue(getTextByPathList(node, ['a:fld', 'a:t']))
   if (typeof text !== 'string') text = ' '
 
   let styleText = ''