fix: some errors (#841)

* fix: some errors

* fix: use 2021

* fix: pkgs

* fix: tsc

* fix: snaps

Author: bokuweb

Cargo.lock

@@ -177,3 +177,4 @@ $ pnpm test -- --updateSnapshot
 - [x] Table of contents
 - [ ] Section
 - [ ] Textbox
+

README.md

@@ -26,7 +26,7 @@ wasm = ["wasm-bindgen", "ts-rs", "image"]
 [dependencies]
 xml-rs = { version = "0.8.27", default-features = false }
 thiserror = "2.0.12"
-zip = { version = "4.3.0", default-features = false, features = ["deflate"] }
+zip = { version = "0.6.3", default-features = false, features = ["deflate"] }
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = {version = "1.0.142" }
 base64 = "0.22.1"

docx-core/Cargo.toml

@@ -9,15 +9,13 @@ where
     W: Write + Seek,
 {
     let mut zip = zip::ZipWriter::new(w);
-    let default_options = FileOptions::<()>::default()
-        .compression_method(zip::CompressionMethod::Stored)
-        .unix_permissions(0o755);
-    zip.add_directory("word/", default_options)?;
-    zip.add_directory("word/_rels", default_options)?;
-    zip.add_directory("_rels/", default_options)?;
-    zip.add_directory("docProps/", default_options)?;
 
-    let options = FileOptions::<()>::default()
+    zip.add_directory("word/", Default::default())?;
+    zip.add_directory("word/_rels", Default::default())?;
+    zip.add_directory("_rels/", Default::default())?;
+    zip.add_directory("docProps/", Default::default())?;
+
+    let options = FileOptions::default()
         .compression_method(zip::CompressionMethod::Stored)
         .unix_permissions(0o755);
 
@@ -71,7 +69,7 @@ where
     }
 
     if !xml.media.is_empty() {
-        zip.add_directory("word/media/", default_options)?;
+        zip.add_directory("word/media/", Default::default())?;
         for m in xml.media {
             // For now only png supported
             zip.start_file(format!("word/media/{}.png", m.0), options)?;
@@ -81,11 +79,11 @@ where
 
     // For now support only taskpanes
     if let Some(taskpanes) = xml.taskpanes {
-        zip.add_directory("word/webextensions/", default_options)?;
+        zip.add_directory("word/webextensions/", Default::default())?;
         zip.start_file("word/webextensions/taskpanes.xml", options)?;
         zip.write_all(&taskpanes)?;
 
-        zip.add_directory("word/webextensions/_rels", default_options)?;
+        zip.add_directory("word/webextensions/_rels", Default::default())?;
         zip.start_file("word/webextensions/_rels/taskpanes.xml.rels", options)?;
         zip.write_all(&xml.taskpanes_rels)?;
 
@@ -99,7 +97,7 @@ where
     }
 
     if !xml.custom_items.is_empty() {
-        zip.add_directory("customXml/_rels", default_options)?;
+        zip.add_directory("customXml/_rels", Default::default())?;
     }
 
     for (i, item) in xml.custom_items.into_iter().enumerate() {

docx-core/src/zipper/mod.rs

@@ -10,7 +10,7 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-wasm-bindgen = "0.2.100"
+wasm-bindgen = "0.2.92"
 console_error_panic_hook = "0.1.7"
 docx-rs= { path = "../docx-core", features = ["wasm"] }
 

docx-wasm/Cargo.toml

@@ -1,2 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type AlignmentType = "both" | "center" | "distribute" | "start" | "end" | "left" | "right" | "justified";
+export type AlignmentType = "both" | "center" | "distribute" | "start" | "end" | "left" | "right" | "justified";

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

@@ -1,2 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type BorderType = "nil" | "none" | "single" | "thick" | "double" | "dotted" | "dashed" | "dotDash" | "dotDotDash" | "triple" | "thinThickSmallGap" | "thickThinSmallGap" | "thinThickThinSmallGap" | "thinThickMediumGap" | "thickThinMediumGap" | "thinThickThinMediumGap" | "thinThickLargeGap" | "thickThinLargeGap" | "thinThickThinLargeGap" | "wave" | "doubleWave" | "dashSmallGap" | "dashDotStroked" | "threeDEmboss" | "threeDEngrave" | "outset" | "inset" | "apples" | "archedScallops" | "babyPacifier" | "babyRattle";
+export type BorderType = "nil" | "none" | "single" | "thick" | "double" | "dotted" | "dashed" | "dotDash" | "dotDotDash" | "triple" | "thinThickSmallGap" | "thickThinSmallGap" | "thinThickThinSmallGap" | "thinThickMediumGap" | "thickThinMediumGap" | "thinThickThinMediumGap" | "thinThickLargeGap" | "thickThinLargeGap" | "thinThickThinLargeGap" | "wave" | "doubleWave" | "dashSmallGap" | "dashDotStroked" | "threeDEmboss" | "threeDEngrave" | "outset" | "inset" | "apples" | "archedScallops" | "babyPacifier" | "babyRattle";

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

@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { PicAlign } from "./PicAlign";
 
-export type DrawingPosition = { offset: number } | { align: PicAlign };
+export type DrawingPosition = { "offset": number } | { "align": PicAlign };

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

@@ -1,2 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type DrawingPositionType = "anchor" | "inline";
+export type DrawingPositionType = "anchor" | "inline";

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

@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { FieldCharType } from "./FieldCharType";
 
-export interface FieldChar { fieldCharType: FieldCharType, dirty: boolean, }
+export type FieldChar = { fieldCharType: FieldCharType, dirty: boolean, };