Revert tsrs (#846)

bokuweb · web-flow · commit 0bbc6f94dc67 · 2025-08-23T09:48:23.000+09:00
* fix: revert ts-rs

* fix

* fix

* fix
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/docx-core/Cargo.toml b/docx-core/Cargo.toml
@@ -32,7 +32,7 @@ serde_json = {version = "1.0.142" }
 base64 = "0.22.1"
 image = { version = "0.25.6", default-features = false, features=["gif", "jpeg", "png", "bmp", "tiff"], optional = true }
 wasm-bindgen = { version = "0.2.92", optional = true }
-ts-rs = { version = "11.0.1", optional = true }
+ts-rs = { version = "6.1", optional = true }
 
 [dev-dependencies]
 pretty_assertions = "1.4.1"
diff --git a/docx-core/bindings/FontGroup.ts b/docx-core/bindings/FontGroup.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { FontSchemeFont } from "./FontSchemeFont";
 
-export type FontGroup = { latin: string, ea: string, cs: string, fonts: Array<FontSchemeFont>, };
+export interface FontGroup { latin: string, ea: string, cs: string, fonts: Array<FontSchemeFont>, }
diff --git a/docx-core/bindings/FontScheme.ts b/docx-core/bindings/FontScheme.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { FontGroup } from "./FontGroup";
 
-export type FontScheme = { majorFont: FontGroup, minorFont: FontGroup, };
+export interface FontScheme { majorFont: FontGroup, minorFont: FontGroup, }
diff --git a/docx-core/bindings/FontSchemeFont.ts b/docx-core/bindings/FontSchemeFont.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type FontSchemeFont = { script: string, typeface: string, };
+export interface FontSchemeFont { script: string, typeface: string, }
diff --git a/docx-core/bindings/Theme.ts b/docx-core/bindings/Theme.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { FontScheme } from "./FontScheme";
 
-export type Theme = { fontSchema: FontScheme, };
+export interface Theme { fontSchema: FontScheme, }
diff --git a/docx-wasm/js/json/bindings/AlignmentType.ts b/docx-wasm/js/json/bindings/AlignmentType.ts
@@ -1,3 +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";
diff --git a/docx-wasm/js/json/bindings/BorderType.ts b/docx-wasm/js/json/bindings/BorderType.ts
@@ -1,3 +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";
diff --git a/docx-wasm/js/json/bindings/DrawingPosition.ts b/docx-wasm/js/json/bindings/DrawingPosition.ts
@@ -1,4 +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 };
diff --git a/docx-wasm/js/json/bindings/DrawingPositionType.ts b/docx-wasm/js/json/bindings/DrawingPositionType.ts
@@ -1,3 +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";
diff --git a/docx-wasm/js/json/bindings/FieldChar.ts b/docx-wasm/js/json/bindings/FieldChar.ts
@@ -1,4 +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 type FieldChar = { fieldCharType: FieldCharType, dirty: boolean, };
+export interface FieldChar { fieldCharType: FieldCharType, dirty: boolean, }
diff --git a/docx-wasm/js/json/bindings/FieldCharType.ts b/docx-wasm/js/json/bindings/FieldCharType.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type FieldCharType = "begin" | "separate" | "end" | "unsupported";
+export type FieldCharType = "begin" | "separate" | "end" | "unsupported";
diff --git a/docx-wasm/js/json/bindings/FontGroup.ts b/docx-wasm/js/json/bindings/FontGroup.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { FontSchemeFont } from "./FontSchemeFont";
 
-export type FontGroup = { latin: string, ea: string, cs: string, fonts: Array<FontSchemeFont>, };
+export interface FontGroup { latin: string, ea: string, cs: string, fonts: Array<FontSchemeFont>, }
diff --git a/docx-wasm/js/json/bindings/FontScheme.ts b/docx-wasm/js/json/bindings/FontScheme.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { FontGroup } from "./FontGroup";
 
-export type FontScheme = { majorFont: FontGroup, minorFont: FontGroup, };
+export interface FontScheme { majorFont: FontGroup, minorFont: FontGroup, }
diff --git a/docx-wasm/js/json/bindings/FontSchemeFont.ts b/docx-wasm/js/json/bindings/FontSchemeFont.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type FontSchemeFont = { script: string, typeface: string, };
+export interface FontSchemeFont { script: string, typeface: string, }
diff --git a/docx-wasm/js/json/bindings/FrameProperty.ts b/docx-wasm/js/json/bindings/FrameProperty.ts
@@ -1,48 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type FrameProperty = { 
-/**
- * Frame Height
- * Represents the following attribute in the schema: w:h
- */
-h: number | null, 
-/**
- * Frame Height Type
- * Represents the following attribute in the schema: w:hRule
- */
-hRule: string | null, 
-/**
- * Frame Horizontal Positioning Base
- * Represents the following attribute in the schema: w:hAnchor
- */
-hAnchor: string | null, 
-/**
- * Horizontal Frame Padding
- * Represents the following attribute in the schema: w:hSpace
- */
-hSpace: number | null, vAnchor: string | null, vSpace: number | null, w: number | null, 
-/**
- * Text Wrapping Around Frame
- * Represents the following attribute in the schema: w:wrap
- */
-wrap: string | null, 
-/**
- * Absolute Horizontal Position
- * Represents the following attribute in the schema: w:x
- */
-x: number | null, 
-/**
- * Relative Horizontal Position
- * Represents the following attribute in the schema: w:xAlign
- */
-xAlign: string | null, 
-/**
- * Absolute Vertical Position
- * Represents the following attribute in the schema: w:y
- */
-y: number | null, 
-/**
- * Relative Vertical Position
- * Represents the following attribute in the schema: w:yAlign
- */
-yAlign: string | null, };
+export interface FrameProperty { h?: number, hRule?: string, hAnchor?: string, hSpace?: number, vAnchor?: string, vSpace?: number, w?: number, wrap?: string, x?: number, xAlign?: string, y?: number, yAlign?: string, }
diff --git a/docx-wasm/js/json/bindings/HyperlinkType.ts b/docx-wasm/js/json/bindings/HyperlinkType.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type HyperlinkType = "anchor" | "external";
+export type HyperlinkType = "anchor" | "external";
diff --git a/docx-wasm/js/json/bindings/ImageData.ts b/docx-wasm/js/json/bindings/ImageData.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ImageData = { id: string, };
+export interface ImageData { id: string, }
diff --git a/docx-wasm/js/json/bindings/InstrHyperlink.ts b/docx-wasm/js/json/bindings/InstrHyperlink.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type InstrHyperlink = { target: string, anchor: boolean, };
+export interface InstrHyperlink { target: string, anchor: boolean, }
diff --git a/docx-wasm/js/json/bindings/InstrToC.ts b/docx-wasm/js/json/bindings/InstrToC.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { StyleWithLevel } from "./StyleWithLevel";
 
-export type InstrToC = { headingStylesRange: [number, number] | null, tcFieldLevelRange: [number, number] | null, omitPageNumbersLevelRange: [number, number] | null, entryBookmarkName: string | null, stylesWithLevels: Array<StyleWithLevel>, entryAndPageNumberSeparator: string | null, sequenceAndPageNumbersSeparator: string | null, captionLabel: string | null, captionLabelIncludingNumbers: string | null, seqFieldIdentifierForPrefix: string | null, tcFieldIdentifier: string | null | null, hyperlink: boolean, preserveTab: boolean, preserveNewLine: boolean, useAppliedParagraphLineLevel: boolean, hideTabAndPageNumbersInWebview: boolean, };
+export interface InstrToC { headingStylesRange?: [number, number], tcFieldLevelRange?: [number, number], omitPageNumbersLevelRange?: [number, number], entryBookmarkName?: string, stylesWithLevels: Array<StyleWithLevel>, entryAndPageNumberSeparator?: string, sequenceAndPageNumbersSeparator?: string, captionLabel: string | null, captionLabelIncludingNumbers?: string, seqFieldIdentifierForPrefix?: string, tcFieldIdentifier?: string | null, hyperlink: boolean, preserveTab: boolean, preserveNewLine: boolean, useAppliedParagraphLineLevel: boolean, hideTabAndPageNumbersInWebview: boolean, }
diff --git a/docx-wasm/js/json/bindings/PageNumType.ts b/docx-wasm/js/json/bindings/PageNumType.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type PageNumType = { start: number | null, chapStyle: string | null, };
+export interface PageNumType { start?: number, chapStyle?: string, }
diff --git a/docx-wasm/js/json/bindings/Pic.ts b/docx-wasm/js/json/bindings/Pic.ts
@@ -4,29 +4,4 @@ import type { DrawingPositionType } from "./DrawingPositionType";
 import type { RelativeFromHType } from "./RelativeFromHType";
 import type { RelativeFromVType } from "./RelativeFromVType";
 
-export type Pic = { id: string, image: Array<number>, size: [number, number], positionType: DrawingPositionType, 
-/**
- * Specifies that this object shall be positioned using the positioning information in the
- * simplePos child element (§20.4.2.13). This positioning, when specified, positions the
- * object on the page by placing its top left point at the x-y coordinates specified by that
- * element.
- */
-simplePos: boolean, simplePosX: number, simplePosY: number, 
-/**
- * Specifies how this DrawingML object behaves when its anchor is located in a table cell;
- * and its specified position would cause it to intersect with a table cell displayed in the
- * document. That behavior shall be as follows:
- */
-layoutInCell: boolean, 
-/**
- * Specifies the relative Z-ordering of all DrawingML objects in this document. Each floating
- * DrawingML object shall have a Z-ordering value, which determines which object is
- * displayed when any two objects intersect. Higher values shall indicate higher Z-order;
- * lower values shall indicate lower Z-order.
- */
-relativeHeight: number, allowOverlap: boolean, positionH: DrawingPosition, positionV: DrawingPosition, relativeFromH: RelativeFromHType, relativeFromV: RelativeFromVType, 
-/**
- * Specifies the minimum distance which shall be maintained between the top edge of this drawing object and any subsequent text within the document when this graphical object is displayed within the document's contents.,
- * The distance shall be measured in EMUs (English Metric Units).,
- */
-distT: number, distB: number, distL: number, distR: number, rot: number, };
+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, rot: number, }
diff --git a/docx-wasm/js/json/bindings/PicAlign.ts b/docx-wasm/js/json/bindings/PicAlign.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type PicAlign = "left" | "right" | "center" | "bottom" | "top";
+export type PicAlign = "left" | "right" | "center" | "bottom" | "top";
diff --git a/docx-wasm/js/json/bindings/PositionalTab.ts b/docx-wasm/js/json/bindings/PositionalTab.ts
@@ -3,4 +3,4 @@ import type { PositionalTabAlignmentType } from "./PositionalTabAlignmentType";
 import type { PositionalTabRelativeTo } from "./PositionalTabRelativeTo";
 import type { TabLeaderType } from "./TabLeaderType";
 
-export type PositionalTab = { alignment: PositionalTabAlignmentType, relativeTo: PositionalTabRelativeTo, leader: TabLeaderType, };
+export interface PositionalTab { alignment: PositionalTabAlignmentType, relativeTo: PositionalTabRelativeTo, leader: TabLeaderType, }
diff --git a/docx-wasm/js/json/bindings/PositionalTabAlignmentType.ts b/docx-wasm/js/json/bindings/PositionalTabAlignmentType.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type PositionalTabAlignmentType = "center" | "left" | "right";
+export type PositionalTabAlignmentType = "center" | "left" | "right";
diff --git a/docx-wasm/js/json/bindings/PositionalTabRelativeTo.ts b/docx-wasm/js/json/bindings/PositionalTabRelativeTo.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type PositionalTabRelativeTo = "indent" | "margin";
+export type PositionalTabRelativeTo = "indent" | "margin";
diff --git a/docx-wasm/js/json/bindings/RelativeFromHType.ts b/docx-wasm/js/json/bindings/RelativeFromHType.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type RelativeFromHType = "character" | "column" | "insideMargin" | "leftMargin" | "margin" | "outsizeMargin" | "page" | "rightMargin";
+export type RelativeFromHType = "character" | "column" | "insideMargin" | "leftMargin" | "margin" | "outsizeMargin" | "page" | "rightMargin";
diff --git a/docx-wasm/js/json/bindings/RelativeFromVType.ts b/docx-wasm/js/json/bindings/RelativeFromVType.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type RelativeFromVType = "bottomMargin" | "insideMargin" | "line" | "margin" | "outsizeMargin" | "page" | "paragraph" | "topMargin";
+export type RelativeFromVType = "bottomMargin" | "insideMargin" | "line" | "margin" | "outsizeMargin" | "page" | "paragraph" | "topMargin";
diff --git a/docx-wasm/js/json/bindings/Shape.ts b/docx-wasm/js/json/bindings/Shape.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { ImageData } from "./ImageData";
 
-export type Shape = { style: string | null, imageData: ImageData | null, };
+export interface Shape { style?: string, imageData?: ImageData, }
diff --git a/docx-wasm/js/json/bindings/StyleWithLevel.ts b/docx-wasm/js/json/bindings/StyleWithLevel.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type StyleWithLevel = [string, number];
+export type StyleWithLevel = [string, number];
diff --git a/docx-wasm/js/json/bindings/Tab.ts b/docx-wasm/js/json/bindings/Tab.ts
diff --git a/docx-wasm/js/json/bindings/TabLeaderType.ts b/docx-wasm/js/json/bindings/TabLeaderType.ts
diff --git a/docx-wasm/js/json/bindings/TabValueType.ts b/docx-wasm/js/json/bindings/TabValueType.ts
diff --git a/docx-wasm/js/json/bindings/TableCellBorder.ts b/docx-wasm/js/json/bindings/TableCellBorder.ts
diff --git a/docx-wasm/js/json/bindings/TableCellBorderPosition.ts b/docx-wasm/js/json/bindings/TableCellBorderPosition.ts
diff --git a/docx-wasm/js/json/bindings/TableCellBorders.ts b/docx-wasm/js/json/bindings/TableCellBorders.ts
diff --git a/docx-wasm/js/json/bindings/TablePositionProperty.ts b/docx-wasm/js/json/bindings/TablePositionProperty.ts
diff --git a/docx-wasm/js/json/bindings/TextAlignmentType.ts b/docx-wasm/js/json/bindings/TextAlignmentType.ts
diff --git a/docx-wasm/js/json/bindings/Theme.ts b/docx-wasm/js/json/bindings/Theme.ts
diff --git a/docx-wasm/js/section-property.ts b/docx-wasm/js/section-property.ts
diff --git a/docx-wasm/package.json b/docx-wasm/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.`
`2`	`2`
`3`		`-export type FontSchemeFont = { script: string, typeface: string, };`
	`3`	`+export interface FontSchemeFont { script: string, typeface: string, }`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.`
`2`	`2`
`3`		`-export type AlignmentType = "both" \| "center" \| "distribute" \| "start" \| "end" \| "left" \| "right" \| "justified";`
	`3`	`+export type AlignmentType = "both" \| "center" \| "distribute" \| "start" \| "end" \| "left" \| "right" \| "justified";`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.`
`2`	`2`
`3`		-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";
	`3`	+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";
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.`
`2`	`2`
`3`		`-export type DrawingPositionType = "anchor" \| "inline";`
	`3`	`+export type DrawingPositionType = "anchor" \| "inline";`