pptxtojson 1.3.2 → 1.5.0

package/index.html

@@ -98,8 +98,8 @@
 		</div>
 
 		<div class="link">
-			<a target="_blank" href="https://github.com/pipipi-pikachu/pptx2json">Github仓库</a>
-			<a target="_blank" href="https://pipipi-pikachu.github.io/PPTist/">可视化测试</a>
+			<a target="_blank" href="https://github.com/pipipi-pikachu/pptx2json">Github 仓库</a>
+			<a target="_blank" href="https://pipipi-pikachu.github.io/PPTist/">在 PPTist 中测试</a>
 		</div>
 	</div>
 	<div id="jsoneditor"></div>

package/package.json

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

package/rollup.config.js

@@ -22,6 +22,11 @@ export default {
       name: 'pptxtojson',
       sourcemap: true,
     },
+    {
+      file: 'dist/index.cjs',
+      format: 'cjs',
+      sourcemap: true,
+    },
     {
       file: 'dist/index.js',
       format: 'es',

package/src/fill.js

@@ -33,8 +33,10 @@ export function getFillType(node) {
 }
 
 export async function getPicFill(type, node, warpObj) {
+  if (!node) return ''
+
   let img
-  const rId = node['a:blip']['attrs']['r:embed']
+  const rId = getTextByPathList(node, ['a:blip', 'attrs', 'r:embed'])
   let imgPath
   if (type === 'slideBg' || type === 'slide') {
     imgPath = getTextByPathList(warpObj, ['slideResObj', rId, 'target'])
@@ -58,7 +60,7 @@ export async function getPicFill(type, node, warpObj) {
     imgPath = escapeHtml(imgPath)
 
     const imgExt = imgPath.split('.').pop()
-    if (imgExt === 'xml') return undefined
+    if (imgExt === 'xml') return ''
 
     const imgArrayBuffer = await warpObj['zip'].file(imgPath).async('arraybuffer')
     const imgMimeType = getMimeType(imgExt)

package/src/pptxtojson.js

@@ -12,6 +12,7 @@ import { getShadow } from './shadow'
 import { getTableBorders, getTableCellParams, getTableRowParams } from './table'
 import { RATIO_EMUs_Points } from './constants'
 import { findOMath, latexFormart, parseOMath } from './math'
+import { getShapePath } from './shapePath'
 
 export async function parse(file) {
   const slides = []
@@ -438,6 +439,12 @@ async function processMathNode(node, warpObj, source) {
   const blipFill = getTextByPathList(fallback, ['p:sp', 'p:spPr', 'a:blipFill'])
   const picBase64 = await getPicFill(source, blipFill, warpObj)
 
+  let text = ''
+  if (getTextByPathList(choice, ['p:sp', 'p:txBody', 'a:p', 'a:r'])) {
+    const sp = getTextByPathList(choice, ['p:sp'])
+    text = genTextBody(sp['p:txBody'], sp, undefined, undefined, warpObj)
+  }
+
   return {
     type: 'math',
     top,
@@ -446,6 +453,7 @@ async function processMathNode(node, warpObj, source) {
     height,
     latex,
     picBase64,
+    text,
     order,
   }
 }
@@ -628,12 +636,17 @@ async function genShape(node, pNode, slideLayoutSpNode, slideMasterSpNode, name,
       path: d,
     }
   }
+
+  let shapePath = ''
+  if (shapType) shapePath = getShapePath(shapType, width, height, node)
+
   if (shapType && (type === 'obj' || !type || shapType !== 'rect')) {
     if (!isHasValidText) data.content = ''
     return {
       ...data,
       type: 'shape',
       shapType,
+      path: shapePath,
     }
   }
   if (shapType && !isHasValidText && (fill || borderWidth)) {
@@ -642,6 +655,7 @@ async function genShape(node, pNode, slideLayoutSpNode, slideMasterSpNode, name,
       type: 'shape',
       content: '',
       shapType,
+      path: shapePath,
     }
   }
   return {
@@ -665,7 +679,12 @@ async function processPicNode(node, warpObj, source) {
   const imgFileExt = extractFileExtension(imgName).toLowerCase()
   const zip = warpObj['zip']
   const imgArrayBuffer = await zip.file(imgName).async('arraybuffer')
-  const xfrmNode = node['p:spPr']['a:xfrm']
+
+  let xfrmNode = node['p:spPr']['a:xfrm']
+  if (!xfrmNode) {
+    const idx = getTextByPathList(node, ['p:nvPicPr', 'p:nvPr', 'p:ph', 'attrs', 'idx'])
+    if (idx) xfrmNode = getTextByPathList(warpObj['slideLayoutTables'], ['idxTable', idx, 'p:spPr', 'a:xfrm'])
+  }
 
   const mimeType = getMimeType(imgFileExt)
   const { top, left } = getPosition(xfrmNode, undefined, undefined)