pptxtojson 2.0.5 → 2.1.0

package/package.json

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

package/src/border.js

@@ -1,8 +1,19 @@
-import tinycolor from 'tinycolor2'
-import { getSchemeColorFromTheme } from './schemeColor'
-import { getTextByPathList } from './utils'
-
-export function getBorder(node, elType, warpObj) {
+import tinycolor from 'tinycolor2'
+import { getSolidFill } from './fill'
+import { getSchemeColorFromTheme } from './schemeColor'
+import { getTextByPathList } from './utils'
+
+function getLineEnd(node) {
+  const attrs = getTextByPathList(node, ['attrs'])
+  if (!attrs) return undefined
+
+  const lineEnd = { type: attrs.type || 'none' }
+  if (attrs.w) lineEnd.width = attrs.w
+  if (attrs.len) lineEnd.length = attrs.len
+  return lineEnd
+}
+
+export function getBorder(node, elType, warpObj) {
   let lineNode = getTextByPathList(node, ['p:spPr', 'a:ln'])
   if (!lineNode) {
     const lnRefNode = getTextByPathList(node, ['p:style', 'a:lnRef'])
@@ -22,12 +33,8 @@ export function getBorder(node, elType, warpObj) {
     else borderWidth = 1
   }
 
-  let borderColor = getTextByPathList(lineNode, ['a:solidFill', 'a:srgbClr', 'attrs', 'val'])
-  if (!borderColor) {
-    const schemeClrNode = getTextByPathList(lineNode, ['a:solidFill', 'a:schemeClr'])
-    const schemeClr = 'a:' + getTextByPathList(schemeClrNode, ['attrs', 'val'])
-    borderColor = getSchemeColorFromTheme(schemeClr, warpObj)
-  }
+  const solidFill = getTextByPathList(lineNode, ['a:solidFill'])
+  let borderColor = getSolidFill(solidFill, undefined, undefined, warpObj)
 
   if (!borderColor) {
     const schemeClrNode = getTextByPathList(node, ['p:style', 'a:lnRef', 'a:schemeClr'])
@@ -44,15 +51,15 @@ export function getBorder(node, elType, warpObj) {
         borderColor = tinycolor({ h: color.h, s: color.s, l: color.l * shade, a: color.a }).toHex()
       }
     }
-  }
-
-  if (!borderColor) borderColor = '#000000'
-  else borderColor = `#${borderColor}`
+  }
+
+  if (!borderColor) borderColor = '#000000'
+  else if (!borderColor.startsWith('#')) borderColor = `#${borderColor}`
 
   const type = getTextByPathList(lineNode, ['a:prstDash', 'attrs', 'val'])
   let borderType = 'solid'
   let strokeDasharray = '0'
-  switch (type) {
+  switch (type) {
     case 'solid':
       borderType = 'solid'
       strokeDasharray = '0'
@@ -93,13 +100,18 @@ export function getBorder(node, elType, warpObj) {
       borderType = 'dotted'
       strokeDasharray = '2, 5'
       break
-    default:
-  }
-
-  return {
-    borderColor,
-    borderWidth,
-    borderType,
-    strokeDasharray,
-  }
-}
+    default:
+  }
+
+  const headEnd = getLineEnd(getTextByPathList(lineNode, ['a:headEnd']))
+  const tailEnd = getLineEnd(getTextByPathList(lineNode, ['a:tailEnd']))
+
+  return {
+    borderColor,
+    borderWidth,
+    borderType,
+    strokeDasharray,
+    headEnd,
+    tailEnd,
+  }
+}

package/src/pptxtojson.js

@@ -267,7 +267,9 @@ async function processSingleSlide(zip, sldFileName, themeContent, defaultTextSty
     }
   }
 
+  let currentThemeContent = themeContent
   if (themeFilename) {
+    currentThemeContent = currentThemeContent || await readXmlFileCached(zip, themeFilename, xmlCache)
     const themeName = themeFilename.split('/').pop()
     const themeResFileName = themeFilename.replace(themeName, '_rels/' + themeName) + '.rels'
     const themeResContent = await readXmlFile(zip, themeResFileName)
@@ -305,7 +307,7 @@ async function processSingleSlide(zip, sldFileName, themeContent, defaultTextSty
     slideMasterTextStyles,
     layoutResObj,
     masterResObj,
-    themeContent,
+    themeContent: currentThemeContent,
     themeResObj,
     diagramFileCache: {},
     defaultTextStyle,
@@ -775,6 +777,7 @@ async function genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type,
 
   const { top, left } = getPosition(slideXfrmNode, slideLayoutXfrmNode, slideMasterXfrmNode)
   const { width, height } = getSize(slideXfrmNode, slideLayoutXfrmNode, slideMasterXfrmNode)
+  const pathViewBox = { x: 0, y: 0, width, height }
 
   const isFlipV = getTextByPathList(slideXfrmNode, ['attrs', 'flipV']) === '1'
   const isFlipH = getTextByPathList(slideXfrmNode, ['attrs', 'flipH']) === '1'
@@ -792,7 +795,7 @@ async function genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type,
   let content = ''
   if (node['p:txBody']) content = genTextBody(node['p:txBody'], node, slideLayoutSpNode, slideMasterSpNode, type, warpObj)
 
-  const { borderColor, borderWidth, borderType, strokeDasharray } = getBorder(node, type, warpObj)
+  const { borderColor, borderWidth, borderType, strokeDasharray, headEnd, tailEnd } = getBorder(node, type, warpObj)
   const fill = await getShapeFill(node, warpObj, source, {
     groupHierarchy,
     slideLayoutSpNode,
@@ -828,9 +831,11 @@ async function genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type,
   }
 
   if (shadow) data.shadow = shadow
-  if (autoFit) data.autoFit = autoFit
-  if (link) data.link = link
-  if (textInset) data.textInset = textInset
+  if (autoFit) data.autoFit = autoFit
+  if (link) data.link = link
+  if (textInset) data.textInset = textInset
+  if (headEnd) data.headEnd = headEnd
+  if (tailEnd) data.tailEnd = tailEnd
 
   const isHasValidText = data.content && hasValidText(data.content)
 
@@ -846,6 +851,7 @@ async function genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type,
       type: 'shape',
       shapType: 'custom',
       path: d,
+      pathViewBox: { x: 0, y: 0, width: w, height: h },
     }
     if (isStrokeOnlyCustomGeometry(custShapType)) customShapeData.strokeOnly = true
 
@@ -854,26 +860,34 @@ async function genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type,
 
   let shapePath = ''
   if (shapType) shapePath = getShapePath(shapType, width, height, node)
+  const STROKE_ONLY_PRESET_SHAPE_TYPES = ['arc', 'leftBrace', 'rightBrace', 'bracePair', 'leftBracket', 'rightBracket', 'bracketPair']
+  const isStrokeOnlyPresetShape = STROKE_ONLY_PRESET_SHAPE_TYPES.includes(shapType)
 
   if (shapType && (type === 'obj' || !type || shapType !== 'rect')) {
     if (!isHasValidText) data.content = ''
-    return {
+    const shapeData = {
       ...data,
       type: 'shape',
       shapType,
       path: shapePath,
+      pathViewBox,
       keypoints,
     }
+    if (isStrokeOnlyPresetShape) shapeData.strokeOnly = true
+    return shapeData
   }
   if (shapType && !isHasValidText && (fill || borderWidth)) {
-    return {
+    const shapeData = {
       ...data,
       type: 'shape',
       content: '',
       shapType,
       path: shapePath,
+      pathViewBox,
       keypoints,
     }
+    if (isStrokeOnlyPresetShape) shapeData.strokeOnly = true
+    return shapeData
   }
   return {
     ...data,