pptxtojson 1.4.0 → 1.5.1

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.4.0",
+	"version": "1.5.1",
 	"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/shape.js

@@ -45,11 +45,12 @@ export function getCustomShapePath(custShapType, w, h) {
 
   let moveToNode = getTextByPathList(pathNodes, ['a:moveTo'])
 
-  const lnToNodes = pathNodes['a:lnTo']
+  let lnToNodes = pathNodes['a:lnTo']
   let cubicBezToNodes = pathNodes['a:cubicBezTo']
   const arcToNodes = pathNodes['a:arcTo']
   let closeNode = getTextByPathList(pathNodes, ['a:close'])
   if (!Array.isArray(moveToNode)) moveToNode = [moveToNode]
+  if (!Array.isArray(lnToNodes)) lnToNodes = [lnToNodes]
 
   const multiSapeAry = []
   if (moveToNode.length > 0) {
@@ -91,9 +92,7 @@ export function getCustomShapePath(custShapType, w, h) {
     }
     if (cubicBezToNodes) {
       const cubicBezToPtNodesAry = []
-      if (!Array.isArray(cubicBezToNodes)) {
-        cubicBezToNodes = [cubicBezToNodes]
-      }
+      if (!Array.isArray(cubicBezToNodes)) cubicBezToNodes = [cubicBezToNodes]
       Object.keys(cubicBezToNodes).forEach(key => {
         cubicBezToPtNodesAry.push(cubicBezToNodes[key]['a:pt'])
       })