docx-wasm 0.4.12-beta2 → 0.4.12-beta4

package/js/footer.ts

@@ -1,9 +1,10 @@
+import { PageNum } from "./page-num";
 import { Paragraph } from "./paragraph";
 import { Table } from "./table";
 
 export class Footer {
   hasNumberings = false;
-  children: (Paragraph | Table)[] = [];
+  children: (Paragraph | Table | PageNum)[] = [];
 
   addParagraph(p: Paragraph) {
     if (p.hasNumberings) {
@@ -20,4 +21,9 @@ export class Footer {
     this.children.push(t);
     return this;
   }
+
+  addPageNum(p: PageNum) {
+    this.children.push(p);
+    return this;
+  }
 }

package/js/header.ts

@@ -1,9 +1,10 @@
+import { PageNum } from "./page-num";
 import { Paragraph } from "./paragraph";
 import { Table } from "./table";
 
 export class Header {
   hasNumberings = false;
-  children: (Paragraph | Table)[] = [];
+  children: (Paragraph | Table | PageNum)[] = [];
 
   addParagraph(p: Paragraph) {
     if (p.hasNumberings) {
@@ -20,4 +21,9 @@ export class Header {
     this.children.push(t);
     return this;
   }
+
+  addPageNum(p: PageNum) {
+    this.children.push(p);
+    return this;
+  }
 }

package/js/index.ts

@@ -422,8 +422,11 @@ export class Docx {
       this.sectionProperty._header.children.forEach((c) => {
         if (c instanceof Paragraph) {
           header = header.add_paragraph(build(c));
-        } else {
+        } else if (c instanceof Table) {
           header = header.add_table(c.build());
+        } else {
+          const p = c.build();
+          header = header.add_page_num(p);
         }
       });
       docx = docx.header(header);
@@ -434,8 +437,11 @@ export class Docx {
       this.sectionProperty._firstHeader.children.forEach((c) => {
         if (c instanceof Paragraph) {
           header = header.add_paragraph(build(c));
-        } else {
+        } else if (c instanceof Table) {
           header = header.add_table(c.build());
+        } else {
+          const p = c.build();
+          header = header.add_page_num(p);
         }
       });
       docx = docx.first_header(header);
@@ -446,8 +452,11 @@ export class Docx {
       this.sectionProperty._evenHeader.children.forEach((c) => {
         if (c instanceof Paragraph) {
           header = header.add_paragraph(build(c));
-        } else {
+        } else if (c instanceof Table) {
           header = header.add_table(c.build());
+        } else {
+          const p = c.build();
+          header = header.add_page_num(p);
         }
       });
       docx = docx.even_header(header);
@@ -458,8 +467,11 @@ export class Docx {
       this.sectionProperty._footer.children.forEach((c) => {
         if (c instanceof Paragraph) {
           footer = footer.add_paragraph(build(c));
-        } else {
+        } else if (c instanceof Table) {
           footer = footer.add_table(c.build());
+        } else {
+          const p = c.build();
+          footer = footer.add_page_num(p);
         }
       });
       docx = docx.footer(footer);
@@ -470,8 +482,11 @@ export class Docx {
       this.sectionProperty._firstFooter.children.forEach((c) => {
         if (c instanceof Paragraph) {
           footer = footer.add_paragraph(build(c));
-        } else {
+        } else if (c instanceof Table) {
           footer = footer.add_table(c.build());
+        } else {
+          const p = c.build();
+          footer = footer.add_page_num(p);
         }
       });
       docx = docx.first_footer(footer);
@@ -482,8 +497,11 @@ export class Docx {
       this.sectionProperty._evenFooter.children.forEach((c) => {
         if (c instanceof Paragraph) {
           footer = footer.add_paragraph(build(c));
-        } else {
+        } else if (c instanceof Table) {
           footer = footer.add_table(c.build());
+        } else {
+          const p = c.build();
+          footer = footer.add_page_num(p);
         }
       });
       docx = docx.even_footer(footer);
@@ -668,5 +686,6 @@ export * from "./tab";
 export * from "./json";
 export * from "./webextension";
 export * from "./header";
+export * from "./page-num";
 export * from "./footer";
 export * from "./image";

package/js/json/paragraph.ts

@@ -6,6 +6,9 @@ import {
   SectionPropertyJSON,
 } from "..";
 import { LineSpacingJSON } from "./line_spacing";
+import { FrameProperty as FramePropertyJSON } from "./bindings/FrameProperty";
+
+export { FrameProperty as FramePropertyJSON } from "./bindings/FrameProperty";
 
 export type ParagraphChildJSON =
   | RunJSON
@@ -76,6 +79,7 @@ export type ParagraphPropertyJSON = {
   };
   sectionProperty?: SectionPropertyJSON;
   tabs: CustomTabStopJSON[];
+  frameProperty?: FramePropertyJSON;
 };
 
 export type ParagraphJSON = {

package/js/page-num.ts

@@ -0,0 +1,132 @@
+import * as wasm from "./pkg/docx_wasm";
+
+export type 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;
+};
+
+export class PageNum {
+  frameProperty: FrameProperty | null = null;
+
+  height(h: number) {
+    this.frameProperty = { ...this.frameProperty };
+    this.frameProperty.h = h;
+    return this;
+  }
+  hRule(r: string) {
+    this.frameProperty = { ...this.frameProperty };
+    this.frameProperty.hRule = r;
+    return this;
+  }
+
+  hAnchor(a: string) {
+    this.frameProperty = { ...this.frameProperty };
+    this.frameProperty.hAnchor = a;
+    return this;
+  }
+
+  hSpace(s: number) {
+    this.frameProperty = { ...this.frameProperty };
+    this.frameProperty.hSpace = s;
+    return this;
+  }
+
+  vAnchor(a: string) {
+    this.frameProperty = { ...this.frameProperty };
+    this.frameProperty.vAnchor = a;
+    return this;
+  }
+
+  vSpace(s: number) {
+    this.frameProperty = { ...this.frameProperty };
+    this.frameProperty.vSpace = s;
+    return this;
+  }
+
+  width(w: number) {
+    this.frameProperty = { ...this.frameProperty };
+    this.frameProperty.w = w;
+    return this;
+  }
+
+  wrap(w: string) {
+    this.frameProperty = { ...this.frameProperty };
+    this.frameProperty.wrap = w;
+    return this;
+  }
+
+  x(x: number) {
+    this.frameProperty = { ...this.frameProperty };
+    this.frameProperty.x = x;
+    return this;
+  }
+
+  xAlign(a: string) {
+    this.frameProperty = { ...this.frameProperty };
+    this.frameProperty.xAlign = a;
+    return this;
+  }
+
+  y(y: number) {
+    this.frameProperty = { ...this.frameProperty };
+    this.frameProperty.y = y;
+    return this;
+  }
+
+  yAlign(y: string) {
+    this.frameProperty = { ...this.frameProperty };
+    this.frameProperty.yAlign = y;
+    return this;
+  }
+
+  build() {
+    let pageNum = wasm.createPageNum();
+    if (this.frameProperty?.h != null) {
+      pageNum = pageNum.height(this.frameProperty.h);
+    }
+    if (this.frameProperty?.hRule != null) {
+      pageNum = pageNum.h_rule(this.frameProperty.hRule);
+    }
+    if (this.frameProperty?.hAnchor != null) {
+      pageNum = pageNum.h_anchor(this.frameProperty.hAnchor);
+    }
+    if (this.frameProperty?.hSpace != null) {
+      pageNum = pageNum.h_space(this.frameProperty.hSpace);
+    }
+    if (this.frameProperty?.vAnchor != null) {
+      pageNum = pageNum.v_anchor(this.frameProperty.vAnchor);
+    }
+    if (this.frameProperty?.vSpace != null) {
+      pageNum = pageNum.v_space(this.frameProperty.vSpace);
+    }
+    if (this.frameProperty?.w != null) {
+      pageNum = pageNum.width(this.frameProperty.w);
+    }
+    if (this.frameProperty?.wrap != null) {
+      pageNum = pageNum.wrap(this.frameProperty.wrap);
+    }
+    if (this.frameProperty?.x != null) {
+      pageNum = pageNum.x(this.frameProperty.x);
+    }
+    if (this.frameProperty?.xAlign != null) {
+      pageNum = pageNum.x_align(this.frameProperty.xAlign);
+    }
+    if (this.frameProperty?.y != null) {
+      pageNum = pageNum.y(this.frameProperty.y);
+    }
+    if (this.frameProperty?.yAlign != null) {
+      pageNum = pageNum.y_align(this.frameProperty.yAlign);
+    }
+    return pageNum;
+  }
+}

package/package.json

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