pptxtojson 0.0.12 → 0.1.0

package/README.md

@@ -1,12 +1,8 @@
 # 🎨 PPTX2JSON
-这是一个派生于 [PPTX2HTML](https://github.com/g21589/PPTX2HTML) 的工具。可以将 .pptx 文件解析为 JSON 数据。目前还不足以用于生产环境。
+这是一个可以将PPT幻灯片(.pptx)文件解析为 JSON 数据的库。
 
 在线DEMO：https://pipipi-pikachu.github.io/pptx2json/
 
-相较于原版：
-- 使用更现代的语法和依赖重写（原项目年代较久远），方便阅读和理解；
-- 删除了所有非核心代码，仅关注 XML 的解析过程；
-- 输出 JSON 格式的解析结果；
 
 # 🔨安装
 > npm install pptxtojson
@@ -19,18 +15,25 @@
 ```js
 import { parse } from 'pptxtojson'
 
+const options = {
+	slideFactor: 75 / 914400, // 幻灯片尺寸转换因子，默认 96 / 914400
+	fontsizeFactor: 100 / 96, // 字号转换因子，默认 100 / 75
+}
+
 document.querySelector('input').addEventListener('change', evt => {
 	const file = evt.target.files[0]
 	
 	const reader = new FileReader()
 	reader.onload = async e => {
-		const json = await parse(e.target.result)
+		const json = await parse(e.target.result, options)
 		console.log(json)
 	}
 	reader.readAsArrayBuffer(file)
 })
 ```
 
+# 🙏 感谢
+> 本仓库主要参考了 [PPTX2HTML](https://github.com/g21589/PPTX2HTML) 、[PPTXjs](https://github.com/meshesha/PPTXjs) 的实现
 
 # 📄 开源协议
 AGPL-3.0 License | Copyright © 2020-PRESENT [pipipi-pikachu](https://github.com/pipipi-pikachu)

package/dist/index.d.ts

@@ -1,3 +1,10 @@
+export interface Shadow {
+  h: number
+  v: number
+  blur: number
+  color: string
+}
+
 export interface Shape {
   type: 'shape'
   left: number
@@ -8,7 +15,9 @@ export interface Shape {
   cy: number
   borderColor: string
   borderWidth: number
-  borderType: 'solid' | 'dashed'
+  borderType: 'solid' | 'dashed' | 'dotted'
+  borderStrokeDasharray: string
+  shadow?: Shadow
   fillColor: string
   content: string
   isFlipV: boolean
@@ -29,10 +38,13 @@ export interface Text {
   height: number
   borderColor: string
   borderWidth: number
-  borderType: 'solid' | 'dashed'
+  borderType: 'solid' | 'dashed' | 'dotted'
+  borderStrokeDasharray: string
+  shadow?: Shadow
   fillColor: string
   isFlipV: boolean
   isFlipH: boolean
+  isVertical: boolean
   rotate: number
   content: string
   vAlign: string
@@ -66,7 +78,22 @@ export interface Table {
   data: TableCell[][]
 }
 
-export type ChartType = 'lineChart' | 'stackedBarChart' | 'barChart' | 'pieChart' | 'pie3DChart' | 'stackedAreaChart' | 'areaChart'
+export type ChartType = 'lineChart' |
+  'line3DChart' |
+  'barChart' |
+  'bar3DChart' |
+  'pieChart' |
+  'pie3DChart' |
+  'doughnutChart' |
+  'areaChart' |
+  'area3DChart' |
+  'scatterChart' |
+  'bubbleChart' |
+  'radarChart' |
+  'surfaceChart' |
+  'surface3DChart' |
+  'stockChart'
+
 export interface ChartValue {
   x: string
   y: number
@@ -86,8 +113,13 @@ export interface CommonChart {
   top: number
   width: number
   height: number
-  data: ChartItem[],
+  data: ChartItem[]
   chartType: ChartType
+  barDir?: 'bar' | 'col'
+  marker?: boolean
+  holeSize?: string
+  grouping?: string
+  style?: string
 }
 export interface ScatterChart {
   type: 'chart'
@@ -100,15 +132,35 @@ export interface ScatterChart {
 }
 export type Chart = CommonChart | ScatterChart
 
+export interface Video {
+  type: 'video'
+  left: number
+  top: number
+  width: number
+  height: number
+  blob?: string
+  src?: string
+}
+
+export interface Audio {
+  type: 'audio'
+  left: number
+  top: number
+  width: number
+  height: number
+  blob: string
+}
+
 export interface Diagram {
   type: 'diagram'
   left: number
   top: number
   width: number
   height: number
+  elements: (Shape | Text)[]
 }
 
-export type BaseElement = Shape | Text | Image | Table | Chart | Diagram
+export type BaseElement = Shape | Text | Image | Table | Chart | Video | Audio | Diagram
 
 export interface Group {
   type: 'group'
@@ -137,8 +189,10 @@ export interface SlideGradientFill {
   type: 'gradient'
   value: {
     rot: number
-    colors: string[]
-    pos: string[]
+    colors: {
+      pos: string
+      color: string
+    }[]
   }
 }
 
@@ -149,7 +203,12 @@ export interface Slide {
   elements: Element[]
 }
 
-export const parse: (file: ArrayBuffer) => Promise<{
+export interface Options {
+  slideFactor?: number
+  fontsizeFactor?: number
+}
+
+export const parse: (file: ArrayBuffer, options?: Options) => Promise<{
   slides: Slide[]
   size: {
     width: number