update json (#458)

docx-core/src/documents/elements/drawing.rs

@@ -1,22 +1,56 @@
 use super::*;
-use serde::Serialize;
+use serde::{ser::*, Serialize};
 
 use crate::documents::BuildXML;
 use crate::types::*;
 use crate::xml_builder::*;
 
-#[derive(Debug, Clone, Serialize, PartialEq, Default)]
+#[derive(Debug, Clone, PartialEq, Default)]
-#[serde(rename_all = "camelCase")]
 pub struct Drawing {
     pub data: Option<DrawingData>,
 }
 
-#[derive(Debug, Clone, Serialize, PartialEq)]
+impl Serialize for Drawing {
-#[serde(rename_all = "camelCase")]
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        match self.data {
+            Some(DrawingData::Pic(ref pic)) => {
+                let mut t = serializer.serialize_struct("Drawing", 2)?;
+                t.serialize_field("type", "pic")?;
+                t.serialize_field("data", pic)?;
+                t.end()
+            }
+            _ => {
+                let t = serializer.serialize_struct("Drawing", 2)?;
+                t.end()
+            }
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq)]
 pub enum DrawingData {
     Pic(Pic),
 }
 
+impl Serialize for DrawingData {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        match *self {
+            DrawingData::Pic(ref pic) => {
+                let mut t = serializer.serialize_struct("Pic", 2)?;
+                t.serialize_field("type", "pic")?;
+                t.serialize_field("data", pic)?;
+                t.end()
+            }
+        }
+    }
+}
+
 impl Drawing {
     pub fn new() -> Drawing {
         Default::default()

docx-core/src/documents/elements/pic.rs

@@ -5,23 +5,8 @@ use crate::documents::*;
 use crate::types::*;
 use crate::xml_builder::*;
 
-#[derive(Debug, Clone, Copy, Serialize, PartialEq)]
+#[derive(Debug, Clone, Serialize, PartialEq, ts_rs::TS)]
-#[serde(rename_all = "camelCase")]
+#[ts(export)]
-pub enum PicAlign {
-    Left,
-    Right,
-    Bottom,
-    Top,
-}
-
-#[derive(Debug, Clone, Copy, Serialize, PartialEq)]
-#[serde(rename_all = "camelCase")]
-pub enum DrawingPosition {
-    Offset(i32),
-    Align(PicAlign),
-}
-
-#[derive(Debug, Clone, Serialize, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub struct Pic {
     pub id: String,
@@ -62,8 +47,7 @@ pub struct Pic {
 }
 
 impl Pic {
-    pub fn 
+    pub fn new(buf: Vec<u8>) -> Pic {
-    new(buf: Vec<u8>) -> Pic {
         let id = create_pic_rid(generate_pic_id());
         let dimg = image::load_from_memory(&buf).unwrap();
         let size = dimg.dimensions();

docx-core/src/reader/drawing.rs

@@ -6,6 +6,7 @@ use std::str::FromStr;
 use xml::attribute::OwnedAttribute;
 use xml::reader::{EventReader, XmlEvent};
 
+use crate::types::*;
 use crate::{DrawingPositionType, RelativeFromHType, RelativeFromVType};
 
 use super::*;

docx-core/src/types/drawing_position.rs

@@ -3,9 +3,29 @@ use serde::Serialize;
 use wasm_bindgen::prelude::*;
 
 #[wasm_bindgen]
-#[derive(Debug, Clone, Copy, Serialize, PartialEq)]
+#[derive(Debug, Clone, Copy, Serialize, PartialEq, ts_rs::TS)]
+#[ts(export)]
 #[serde(rename_all = "camelCase")]
 pub enum DrawingPositionType {
     Anchor,
     Inline,
 }
+
+#[wasm_bindgen]
+#[derive(Debug, Clone, Copy, Serialize, PartialEq, ts_rs::TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub enum PicAlign {
+    Left,
+    Right,
+    Bottom,
+    Top,
+}
+
+#[derive(Debug, Clone, Copy, Serialize, PartialEq, ts_rs::TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub enum DrawingPosition {
+    Offset(i32),
+    Align(PicAlign),
+}

docx-core/src/types/relative_from_type.rs

@@ -8,7 +8,8 @@ use std::str::FromStr;
 
 // @See: 20.4.3.4 ST_RelFromH (Horizontal Relative Positioning)
 #[wasm_bindgen]
-#[derive(Debug, Clone, Copy, PartialEq, Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Serialize, ts_rs::TS)]
+#[ts(export)]
 #[serde(rename_all = "camelCase")]
 pub enum RelativeFromHType {
     /// Specifies that the horizontal positioning shall be
@@ -80,7 +81,8 @@ impl FromStr for RelativeFromHType {
 }
 
 #[wasm_bindgen]
-#[derive(Debug, Clone, Copy, PartialEq, Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Serialize, ts_rs::TS)]
+#[ts(export)]
 #[serde(rename_all = "camelCase")]
 pub enum RelativeFromVType {
     BottomMargin,

docx-wasm/js/json/bindings/DrawingPosition.ts

@@ -0,0 +1,3 @@
+import type { PicAlign } from "./PicAlign";
+
+export type DrawingPosition = { offset: number } | { align: PicAlign };

docx-wasm/js/json/bindings/DrawingPositionType.ts

@@ -0,0 +1,2 @@
+
+export type DrawingPositionType = "anchor" | "inline";

docx-wasm/js/json/bindings/Pic.ts

@@ -0,0 +1,6 @@
+import type { DrawingPosition } from "./DrawingPosition";
+import type { DrawingPositionType } from "./DrawingPositionType";
+import type { RelativeFromHType } from "./RelativeFromHType";
+import type { RelativeFromVType } from "./RelativeFromVType";
+
+export interface Pic { id: string, image: Array<number>, size: [number, number], positionType: DrawingPositionType, simplePos: boolean, simplePosX: number, simplePosY: number, layoutInCell: boolean, relativeHeight: number, allowOverlap: boolean, positionH: DrawingPosition, positionV: DrawingPosition, relativeFromH: RelativeFromHType, relativeFromV: RelativeFromVType, distT: number, distB: number, distL: number, distR: number, }

docx-wasm/js/json/bindings/PicAlign.ts

@@ -0,0 +1,2 @@
+
+export type PicAlign = "left" | "right" | "bottom" | "top";

docx-wasm/js/json/bindings/RelativeFromHType.ts

@@ -0,0 +1,2 @@
+
+export type RelativeFromHType = "character" | "column" | "insideMargin" | "leftMargin" | "margin" | "outsizeMargin" | "page" | "rightMargin";

docx-wasm/js/json/bindings/RelativeFromVType.ts

@@ -0,0 +1,2 @@
+
+export type RelativeFromVType = "bottomMargin" | "insideMargin" | "line" | "margin" | "outsizeMargin" | "page" | "paragraph" | "topMargin";

docx-wasm/js/json/drawing.ts

@@ -3,12 +3,10 @@ import { TextBoxContentJSON } from "./textbox-content";
 export type DrawingJSON = {
   type: "drawing";
   data: {
-    children: DrawingChildJSON[];
+    type: "pic";
   };
 };
 
-export type DrawingChildJSON = WpAnchorJSON;
-
 export type WpAnchorJSON = {
   type: "anchor";
   data: {

docx-wasm/js/json/index.ts

@@ -47,6 +47,8 @@ export type DocxJSON = {
   webSettings: WebSettingsJSON;
   fontTable: {};
   themes: ThemeJSON[];
+  // base64 encoded iamges
+  images: string[];
 };
 
 export type SettingsJSON = {

docx-wasm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docx-wasm",
-  "version": "0.0.249",
+  "version": "0.0.250",
   "main": "dist/node/index.js",
   "browser": "dist/web/index.js",
   "author": "bokuweb <bokuweb12@gmail.com>",

docx-wasm/test/__snapshots__/index.test.js.snap

@@ -11724,33 +11724,32 @@ Object {
                   Object {
                     "data": Object {
                       "data": Object {
-                        "pic": Object {
+                        "allowOverlap": true,
-                          "allowOverlap": true,
+                        "distB": 0,
-                          "distB": 0,
+                        "distL": 0,
-                          "distL": 0,
+                        "distR": 0,
-                          "distR": 0,
+                        "distT": 0,
-                          "distT": 0,
+                        "id": "rId4",
-                          "id": "rId4",
+                        "layoutInCell": true,
-                          "layoutInCell": true,
+                        "positionH": Object {
-                          "positionH": Object {
+                          "offset": 0,
-                            "offset": 0,
-                          },
-                          "positionType": "inline",
-                          "positionV": Object {
-                            "offset": 0,
-                          },
-                          "relativeFromH": "margin",
-                          "relativeFromV": "margin",
-                          "relativeHeight": 0,
-                          "simplePos": false,
-                          "simplePosX": 0,
-                          "simplePosY": 0,
-                          "size": Array [
-                            1275711,
-                            1699947,
-                          ],
                         },
+                        "positionType": "inline",
+                        "positionV": Object {
+                          "offset": 0,
+                        },
+                        "relativeFromH": "margin",
+                        "relativeFromV": "margin",
+                        "relativeHeight": 0,
+                        "simplePos": false,
+                        "simplePosX": 0,
+                        "simplePosY": 0,
+                        "size": Array [
+                          1275711,
+                          1699947,
+                        ],
                       },
+                      "type": "pic",
                     },
                     "type": "drawing",
                   },
@@ -11794,33 +11793,32 @@ Object {
                   Object {
                     "data": Object {
                       "data": Object {
-                        "pic": Object {
+                        "allowOverlap": true,
-                          "allowOverlap": true,
+                        "distB": 0,
-                          "distB": 0,
+                        "distL": 114300,
-                          "distL": 114300,
+                        "distR": 114300,
-                          "distR": 114300,
+                        "distT": 0,
-                          "distT": 0,
+                        "id": "rId5",
-                          "id": "rId5",
+                        "layoutInCell": true,
-                          "layoutInCell": true,
+                        "positionH": Object {
-                          "positionH": Object {
+                          "offset": 798195,
-                            "offset": 798195,
-                          },
-                          "positionType": "anchor",
-                          "positionV": Object {
-                            "offset": 2510155,
-                          },
-                          "relativeFromH": "margin",
-                          "relativeFromV": "margin",
-                          "relativeHeight": 251658240,
-                          "simplePos": false,
-                          "simplePosX": 798195,
-                          "simplePosY": 2510155,
-                          "size": Array [
-                            1264920,
-                            1685925,
-                          ],
                         },
+                        "positionType": "anchor",
+                        "positionV": Object {
+                          "offset": 2510155,
+                        },
+                        "relativeFromH": "margin",
+                        "relativeFromV": "margin",
+                        "relativeHeight": 251658240,
+                        "simplePos": false,
+                        "simplePosX": 798195,
+                        "simplePosY": 2510155,
+                        "size": Array [
+                          1264920,
+                          1685925,
+                        ],
                       },
+                      "type": "pic",
                     },
                     "type": "drawing",
                   },