docx 7.8.1 → 8.0.0

package/build/patcher/content-types-manager.d.ts

@@ -0,0 +1,2 @@
+import { Element } from "xml-js";
+export declare const appendContentType: (element: Element, contentType: string, extension: string) => void;

package/build/patcher/from-docx.d.ts

@@ -0,0 +1,25 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import { ParagraphChild } from "../file/paragraph";
+import { FileChild } from "../file/file-child";
+type InputDataType = Buffer | string | number[] | Uint8Array | ArrayBuffer | Blob | NodeJS.ReadableStream;
+export declare enum PatchType {
+    DOCUMENT = "file",
+    PARAGRAPH = "paragraph"
+}
+type ParagraphPatch = {
+    readonly type: PatchType.PARAGRAPH;
+    readonly children: readonly ParagraphChild[];
+};
+type FilePatch = {
+    readonly type: PatchType.DOCUMENT;
+    readonly children: readonly FileChild[];
+};
+export type IPatch = ParagraphPatch | FilePatch;
+export interface PatchDocumentOptions {
+    readonly patches: {
+        readonly [key: string]: IPatch;
+    };
+}
+export declare const patchDocument: (data: InputDataType, options: PatchDocumentOptions) => Promise<Buffer>;
+export {};

package/build/patcher/index.d.ts

@@ -0,0 +1 @@
+export * from "./from-docx";

package/build/patcher/paragraph-split-inject.d.ts

@@ -0,0 +1,6 @@
+import { Element } from "xml-js";
+export declare const findRunElementIndexWithToken: (paragraphElement: Element, token: string) => number;
+export declare const splitRunElement: (runElement: Element, token: string) => {
+    readonly left: Element;
+    readonly right: Element;
+};

package/build/patcher/paragraph-token-replacer.d.ts

@@ -0,0 +1,8 @@
+import { Element } from "xml-js";
+import { IRenderedParagraphNode } from "./run-renderer";
+export declare const replaceTokenInParagraphElement: ({ paragraphElement, renderedParagraph, originalText, replacementText, }: {
+    readonly paragraphElement: Element;
+    readonly renderedParagraph: IRenderedParagraphNode;
+    readonly originalText: string;
+    readonly replacementText: string;
+}) => Element;

package/build/patcher/relationship-manager.d.ts

@@ -0,0 +1,4 @@
+import { Element } from "xml-js";
+import { RelationshipType, TargetModeType } from "../file/relationships/relationship/relationship";
+export declare const getNextRelationshipIndex: (relationships: Element) => number;
+export declare const appendRelationship: (relationships: Element, id: number | string, type: RelationshipType, target: string, targetMode?: TargetModeType) => readonly Element[];

package/build/patcher/replacer.d.ts

@@ -0,0 +1,5 @@
+import { Element } from "xml-js";
+import { IContext } from "../file/xml-components";
+import { IPatch } from "./from-docx";
+import { IRenderedParagraphNode } from "./run-renderer";
+export declare const replacer: (json: Element, patch: IPatch, patchText: string, renderedParagraphs: readonly IRenderedParagraphNode[], context: IContext) => Element;

package/build/patcher/run-renderer.d.ts

@@ -0,0 +1,22 @@
+import { ElementWrapper } from "./traverser";
+export interface IRenderedParagraphNode {
+    readonly text: string;
+    readonly runs: readonly IRenderedRunNode[];
+    readonly index: number;
+    readonly path: readonly number[];
+}
+interface StartAndEnd {
+    readonly start: number;
+    readonly end: number;
+}
+type IParts = {
+    readonly text: string;
+    readonly index: number;
+} & StartAndEnd;
+export type IRenderedRunNode = {
+    readonly text: string;
+    readonly parts: readonly IParts[];
+    readonly index: number;
+} & StartAndEnd;
+export declare const renderParagraphNode: (node: ElementWrapper) => IRenderedParagraphNode;
+export {};

package/build/patcher/traverser.d.ts

@@ -0,0 +1,8 @@
+import { Element } from "xml-js";
+import { IRenderedParagraphNode } from "./run-renderer";
+export interface ElementWrapper {
+    readonly element: Element;
+    readonly index: number;
+    readonly parent: ElementWrapper | undefined;
+}
+export declare const findLocationOfText: (node: Element, text: string) => readonly IRenderedParagraphNode[];

package/build/patcher/util.d.ts

@@ -0,0 +1,5 @@
+import { Element } from "xml-js";
+export declare const toJson: (xmlData: string) => Element;
+export declare const createTextElementContents: (text: string) => Element[];
+export declare const patchSpaceAttribute: (element: Element) => Element;
+export declare const getFirstLevelElements: (relationships: Element, id: string) => Element[];

package/build/tests/utility.d.ts

@@ -1,3 +1,3 @@
-export declare class Utility {
-    static jsonify(obj: object): any;
-}
+export declare class Utility {
+    static jsonify(obj: object): any;
+}

package/build/util/convenience-functions.d.ts

@@ -1,4 +1,4 @@
-export declare const convertMillimetersToTwip: (millimeters: number) => number;
-export declare const convertInchesToTwip: (inches: number) => number;
-export declare const uniqueNumericId: () => number;
-export declare const uniqueId: () => string;
+export declare const convertMillimetersToTwip: (millimeters: number) => number;
+export declare const convertInchesToTwip: (inches: number) => number;
+export declare const uniqueNumericId: () => number;
+export declare const uniqueId: () => string;

package/build/util/index.d.ts

@@ -1,2 +1,2 @@
-export * from "./convenience-functions";
-export * from "./values";
+export * from "./convenience-functions";
+export * from "./values";

package/build/util/values.d.ts

@@ -1,17 +1,20 @@
-export declare const decimalNumber: (val: number) => number;
-export declare const unsignedDecimalNumber: (val: number) => number;
-export declare const longHexNumber: (val: string) => string;
-export declare const shortHexNumber: (val: string) => string;
-export declare const uCharHexNumber: (val: string) => string;
-export declare const universalMeasureValue: (val: string) => string;
-export declare const positiveUniversalMeasureValue: (val: string) => string;
-export declare const hexColorValue: (val: string) => string;
-export declare const signedTwipsMeasureValue: (val: string | number) => string | number;
-export declare const hpsMeasureValue: (val: string | number) => string | number;
-export declare const signedHpsMeasureValue: (val: string | number) => string | number;
-export declare const twipsMeasureValue: (val: string | number) => string | number;
-export declare const percentageValue: (val: string) => string;
-export declare const measurementOrPercentValue: (val: number | string) => number | string;
-export declare const eighthPointMeasureValue: (val: number) => number;
-export declare const pointMeasureValue: (val: number) => number;
-export declare const dateTimeValue: (val: Date) => string;
+export type UniversalMeasure = `${"-" | ""}${number}${"mm" | "cm" | "in" | "pt" | "pc" | "pi"}`;
+export type PositiveUniversalMeasure = `${number}${"mm" | "cm" | "in" | "pt" | "pc" | "pi"}`;
+export type Percentage = `${"-" | ""}${number}%`;
+export declare const decimalNumber: (val: number) => number;
+export declare const unsignedDecimalNumber: (val: number) => number;
+export declare const longHexNumber: (val: string) => string;
+export declare const shortHexNumber: (val: string) => string;
+export declare const uCharHexNumber: (val: string) => string;
+export declare const universalMeasureValue: (val: UniversalMeasure) => UniversalMeasure;
+export declare const positiveUniversalMeasureValue: (val: PositiveUniversalMeasure) => PositiveUniversalMeasure;
+export declare const hexColorValue: (val: string) => string;
+export declare const signedTwipsMeasureValue: (val: UniversalMeasure | number) => UniversalMeasure | number;
+export declare const hpsMeasureValue: (val: PositiveUniversalMeasure | number) => string | number;
+export declare const signedHpsMeasureValue: (val: UniversalMeasure | number) => string | number;
+export declare const twipsMeasureValue: (val: PositiveUniversalMeasure | number) => PositiveUniversalMeasure | number;
+export declare const percentageValue: (val: Percentage) => Percentage;
+export declare const measurementOrPercentValue: (val: number | Percentage | UniversalMeasure) => number | UniversalMeasure | Percentage;
+export declare const eighthPointMeasureValue: (val: number) => number;
+export declare const pointMeasureValue: (val: number) => number;
+export declare const dateTimeValue: (val: Date) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docx",
-  "version": "7.8.1",
+  "version": "8.0.0",
   "description": "Easily generate .docx files with JS/TS with a nice declarative API. Works for Node and on the Browser.",
   "main": "build/index.js",
   "scripts": {
@@ -52,7 +52,7 @@
   "dependencies": {
     "@types/node": "^18.0.0",
     "jszip": "^3.1.5",
-    "nanoid": "^3.1.20",
+    "nanoid": "^3.3.4",
     "xml": "^1.0.1",
     "xml-js": "^1.6.8"
   },
@@ -64,6 +64,7 @@
   "homepage": "https://github.com/dolanmiu/docx#readme",
   "devDependencies": {
     "@types/chai": "^4.2.15",
+    "@types/chai-as-promised": "^7.1.5",
     "@types/glob": "^8.0.0",
     "@types/mocha": "^10.0.0",
     "@types/prompt": "^1.1.1",
@@ -76,16 +77,17 @@
     "@typescript-eslint/parser": "^5.36.1",
     "buffer": "^6.0.3",
     "chai": "^4.3.6",
+    "chai-as-promised": "^7.1.1",
     "cspell": "^6.2.2",
     "docsify-cli": "^4.3.0",
     "eslint": "^8.23.0",
-    "eslint-plugin-functional": "^4.3.1",
+    "eslint-plugin-functional": "^5.0.1",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsdoc": "^39.3.6",
+    "eslint-plugin-jsdoc": "^40.0.0",
     "eslint-plugin-no-null": "^1.0.2",
     "eslint-plugin-prefer-arrow": "^1.2.3",
-    "eslint-plugin-unicorn": "^45.0.0",
-    "glob": "^8.0.1",
+    "eslint-plugin-unicorn": "^46.0.0",
+    "glob": "^9.3.0",
     "jszip": "^3.1.5",
     "mocha": "^10.0.0",
     "nyc": "^15.1.0",
@@ -96,7 +98,7 @@
     "replace-in-file": "^6.2.0",
     "request": "^2.88.0",
     "request-promise": "^4.2.2",
-    "rimraf": "^3.0.2",
+    "rimraf": "^4.0.4",
     "shelljs": "^0.8.4",
     "sinon": "^15.0.0",
     "stream-browserify": "^3.0.0",
@@ -105,7 +107,7 @@
     "tsconfig-paths": "^4.0.0",
     "tsconfig-paths-webpack-plugin": "^4.0.0",
     "typedoc": "^0.23.2",
-    "typescript": "4.9.4",
+    "typescript": "5.0.2",
     "unzipper": "^0.10.11",
     "webpack": "^5.28.0",
     "webpack-cli": "^5.0.0"

package/src/export/formatter.ts

@@ -2,7 +2,7 @@ import { BaseXmlComponent, IContext, IXmlableObject } from "@file/xml-components
 
 export class Formatter {
     // tslint:disable-next-line: no-object-literal-type-assertion
-    public format(input: BaseXmlComponent, context: IContext = {} as IContext): IXmlableObject {
+    public format(input: BaseXmlComponent, context: IContext = { stack: [] } as unknown as IContext): IXmlableObject {
         const output = input.prepForXml(context);
 
         if (output) {

package/src/export/packer/next-compiler.ts

@@ -59,9 +59,8 @@ export class Compiler {
             }
         }
 
-        for (const data of file.Media.Array) {
-            const mediaData = data.stream;
-            zip.file(`word/media/${data.fileName}`, mediaData);
+        for (const { stream, fileName } of file.Media.Array) {
+            zip.file(`word/media/${fileName}`, stream);
         }
 
         return zip;
@@ -74,6 +73,7 @@ export class Compiler {
             this.formatter.format(file.Document.View, {
                 viewWrapper: file.Document,
                 file,
+                stack: [],
             }),
             {
                 indent: prettify,
@@ -100,6 +100,7 @@ export class Compiler {
                         this.formatter.format(file.Document.Relationships, {
                             viewWrapper: file.Document,
                             file,
+                            stack: [],
                         }),
                         {
                             indent: prettify,
@@ -125,6 +126,7 @@ export class Compiler {
                         this.formatter.format(file.Styles, {
                             viewWrapper: file.Document,
                             file,
+                            stack: [],
                         }),
                         {
                             indent: prettify,
@@ -144,6 +146,7 @@ export class Compiler {
                     this.formatter.format(file.CoreProperties, {
                         viewWrapper: file.Document,
                         file,
+                        stack: [],
                     }),
                     {
                         indent: prettify,
@@ -160,6 +163,7 @@ export class Compiler {
                     this.formatter.format(file.Numbering, {
                         viewWrapper: file.Document,
                         file,
+                        stack: [],
                     }),
                     {
                         indent: prettify,
@@ -176,6 +180,7 @@ export class Compiler {
                     this.formatter.format(file.FileRelationships, {
                         viewWrapper: file.Document,
                         file,
+                        stack: [],
                     }),
                     {
                         indent: prettify,
@@ -191,6 +196,7 @@ export class Compiler {
                     this.formatter.format(headerWrapper.View, {
                         viewWrapper: headerWrapper,
                         file,
+                        stack: [],
                     }),
                     {
                         indent: prettify,
@@ -214,6 +220,7 @@ export class Compiler {
                         this.formatter.format(headerWrapper.Relationships, {
                             viewWrapper: headerWrapper,
                             file,
+                            stack: [],
                         }),
                         {
                             indent: prettify,
@@ -230,6 +237,7 @@ export class Compiler {
                     this.formatter.format(footerWrapper.View, {
                         viewWrapper: footerWrapper,
                         file,
+                        stack: [],
                     }),
                     {
                         indent: prettify,
@@ -253,6 +261,7 @@ export class Compiler {
                         this.formatter.format(footerWrapper.Relationships, {
                             viewWrapper: footerWrapper,
                             file,
+                            stack: [],
                         }),
                         {
                             indent: prettify,
@@ -269,6 +278,7 @@ export class Compiler {
                     this.formatter.format(headerWrapper.View, {
                         viewWrapper: headerWrapper,
                         file,
+                        stack: [],
                     }),
                     {
                         indent: prettify,
@@ -293,6 +303,7 @@ export class Compiler {
                     this.formatter.format(footerWrapper.View, {
                         viewWrapper: footerWrapper,
                         file,
+                        stack: [],
                     }),
                     {
                         indent: prettify,
@@ -317,6 +328,7 @@ export class Compiler {
                     this.formatter.format(file.ContentTypes, {
                         viewWrapper: file.Document,
                         file,
+                        stack: [],
                     }),
                     {
                         indent: prettify,
@@ -332,6 +344,7 @@ export class Compiler {
                     this.formatter.format(file.CustomProperties, {
                         viewWrapper: file.Document,
                         file,
+                        stack: [],
                     }),
                     {
                         indent: prettify,
@@ -348,6 +361,7 @@ export class Compiler {
                     this.formatter.format(file.AppProperties, {
                         viewWrapper: file.Document,
                         file,
+                        stack: [],
                     }),
                     {
                         indent: prettify,
@@ -363,7 +377,8 @@ export class Compiler {
                 data: xml(
                     this.formatter.format(file.FootNotes.View, {
                         viewWrapper: file.FootNotes,
-                        file: file,
+                        file,
+                        stack: [],
                     }),
                     {
                         indent: prettify,
@@ -378,7 +393,8 @@ export class Compiler {
                 data: xml(
                     this.formatter.format(file.FootNotes.Relationships, {
                         viewWrapper: file.FootNotes,
-                        file: file,
+                        file,
+                        stack: [],
                     }),
                     {
                         indent: prettify,
@@ -394,6 +410,7 @@ export class Compiler {
                     this.formatter.format(file.Settings, {
                         viewWrapper: file.Document,
                         file,
+                        stack: [],
                     }),
                     {
                         indent: prettify,
@@ -410,6 +427,7 @@ export class Compiler {
                     this.formatter.format(file.Comments, {
                         viewWrapper: file.Document,
                         file,
+                        stack: [],
                     }),
                     {
                         indent: prettify,

package/src/file/document/body/section-properties/properties/column.ts

@@ -1,25 +1,23 @@
-import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
-import { twipsMeasureValue } from "@util/values";
+import { NextAttributeComponent, XmlComponent } from "@file/xml-components";
+import { PositiveUniversalMeasure, twipsMeasureValue } from "@util/values";
 
-export interface IColumnAttributes {
-    readonly width: number | string;
-    readonly space?: number | string;
-}
+// <xsd:complexType name="CT_Column">
+//     <xsd:attribute name="w" type="s:ST_TwipsMeasure" use="optional" />
+//     <xsd:attribute name="space" type="s:ST_TwipsMeasure" use="optional" default="0" />
+// </xsd:complexType>
 
-export class ColumnAttributes extends XmlAttributeComponent<IColumnAttributes> {
-    protected readonly xmlKeys = {
-        width: "w:w",
-        space: "w:space",
-    };
-}
+type IColumnAttributes = {
+    readonly width: number | PositiveUniversalMeasure;
+    readonly space?: number | PositiveUniversalMeasure;
+};
 
 export class Column extends XmlComponent {
     public constructor({ width, space }: IColumnAttributes) {
         super("w:col");
         this.root.push(
-            new ColumnAttributes({
-                width: twipsMeasureValue(width),
-                space: space === undefined ? undefined : twipsMeasureValue(space),
+            new NextAttributeComponent<IColumnAttributes>({
+                width: { key: "w:w", value: twipsMeasureValue(width) },
+                space: { key: "w:space", value: space === undefined ? undefined : twipsMeasureValue(space) },
             }),
         );
     }

package/src/file/document/body/section-properties/properties/columns.ts

@@ -1,5 +1,5 @@
-import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
-import { decimalNumber, twipsMeasureValue } from "@util/values";
+import { NextAttributeComponent, XmlComponent } from "@file/xml-components";
+import { decimalNumber, PositiveUniversalMeasure, twipsMeasureValue } from "@util/values";
 
 import { Column } from "./column";
 
@@ -12,32 +12,23 @@ import { Column } from "./column";
 //     <xsd:attribute name="num" type="ST_DecimalNumber" use="optional" default="1"/>
 //     <xsd:attribute name="sep" type="s:ST_OnOff" use="optional"/>
 // </xsd:complexType>
-export interface IColumnsAttributes {
-    readonly space?: number | string;
+export type IColumnsAttributes = {
+    readonly space?: number | PositiveUniversalMeasure;
     readonly count?: number;
     readonly separate?: boolean;
     readonly equalWidth?: boolean;
     readonly children?: readonly Column[];
-}
-
-export class ColumnsAttributes extends XmlAttributeComponent<IColumnsAttributes> {
-    protected readonly xmlKeys = {
-        space: "w:space",
-        count: "w:num",
-        separate: "w:sep",
-        equalWidth: "w:equalWidth",
-    };
-}
+};
 
 export class Columns extends XmlComponent {
     public constructor({ space, count, separate, equalWidth, children }: IColumnsAttributes) {
         super("w:cols");
         this.root.push(
-            new ColumnsAttributes({
-                space: space === undefined ? undefined : twipsMeasureValue(space),
-                count: count === undefined ? undefined : decimalNumber(count),
-                separate,
-                equalWidth,
+            new NextAttributeComponent<Omit<IColumnsAttributes, "children">>({
+                space: { key: "w:space", value: space === undefined ? undefined : twipsMeasureValue(space) },
+                count: { key: "w:num", value: count === undefined ? undefined : decimalNumber(count) },
+                separate: { key: "w:sep", value: separate },
+                equalWidth: { key: "w:equalWidth", value: equalWidth },
             }),
         );
 

package/src/file/document/body/section-properties/properties/line-number.ts

@@ -1,6 +1,6 @@
 // http://officeopenxml.com/WPsectionLineNumbering.php
-import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
-import { decimalNumber, twipsMeasureValue } from "@util/values";
+import { NextAttributeComponent, XmlComponent } from "@file/xml-components";
+import { decimalNumber, PositiveUniversalMeasure, twipsMeasureValue } from "@util/values";
 
 // <xsd:simpleType name="ST_LineNumberRestart">
 // <xsd:restriction base="xsd:string">
@@ -26,27 +26,23 @@ export interface ILineNumberAttributes {
     readonly countBy?: number;
     readonly start?: number;
     readonly restart?: LineNumberRestartFormat;
-    readonly distance?: number | string;
-}
-
-export class LineNumberAttributes extends XmlAttributeComponent<ILineNumberAttributes> {
-    protected readonly xmlKeys = {
-        countBy: "w:countBy",
-        start: "w:start",
-        restart: "w:restart",
-        distance: "w:distance",
-    };
+    readonly distance?: number | PositiveUniversalMeasure;
 }
 
 export class LineNumberType extends XmlComponent {
     public constructor({ countBy, start, restart, distance }: ILineNumberAttributes) {
         super("w:lnNumType");
         this.root.push(
-            new LineNumberAttributes({
-                countBy: countBy === undefined ? undefined : decimalNumber(countBy),
-                start: start === undefined ? undefined : decimalNumber(start),
-                restart,
-                distance: distance === undefined ? undefined : twipsMeasureValue(distance),
+            new NextAttributeComponent<{
+                readonly countBy?: number;
+                readonly start?: number;
+                readonly restart?: LineNumberRestartFormat;
+                readonly distance?: number | PositiveUniversalMeasure;
+            }>({
+                countBy: { key: "w:countBy", value: countBy === undefined ? undefined : decimalNumber(countBy) },
+                start: { key: "w:start", value: start === undefined ? undefined : decimalNumber(start) },
+                restart: { key: "w:restart", value: restart },
+                distance: { key: "w:distance", value: distance === undefined ? undefined : twipsMeasureValue(distance) },
             }),
         );
     }

package/src/file/document/body/section-properties/properties/page-borders.ts

@@ -75,7 +75,7 @@ export class PageBorders extends IgnoreIfEmptyXmlComponent {
         super("w:pgBorders");
 
         if (!options) {
-            return;
+            return this;
         }
 
         if (options.pageBorders) {

package/src/file/document/body/section-properties/properties/page-margin.ts

@@ -1,5 +1,5 @@
-import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
-import { signedTwipsMeasureValue, twipsMeasureValue } from "@util/values";
+import { NextAttributeComponent, XmlComponent } from "@file/xml-components";
+import { PositiveUniversalMeasure, signedTwipsMeasureValue, twipsMeasureValue, UniversalMeasure } from "@util/values";
 
 // <xsd:complexType name="CT_PageMar">
 //     <xsd:attribute name="top" type="ST_SignedTwipsMeasure" use="required"/>
@@ -10,48 +10,36 @@ import { signedTwipsMeasureValue, twipsMeasureValue } from "@util/values";
 //     <xsd:attribute name="footer" type="s:ST_TwipsMeasure" use="required"/>
 //     <xsd:attribute name="gutter" type="s:ST_TwipsMeasure" use="required"/>
 // </xsd:complexType>
-export interface IPageMarginAttributes {
-    readonly top?: number | string;
-    readonly right?: number | string;
-    readonly bottom?: number | string;
-    readonly left?: number | string;
-    readonly header?: number | string;
-    readonly footer?: number | string;
-    readonly gutter?: number | string;
-}
-
-export class PageMarginAttributes extends XmlAttributeComponent<IPageMarginAttributes> {
-    protected readonly xmlKeys = {
-        top: "w:top",
-        right: "w:right",
-        bottom: "w:bottom",
-        left: "w:left",
-        header: "w:header",
-        footer: "w:footer",
-        gutter: "w:gutter",
-    };
-}
+export type IPageMarginAttributes = {
+    readonly top?: number | UniversalMeasure;
+    readonly right?: number | PositiveUniversalMeasure;
+    readonly bottom?: number | UniversalMeasure;
+    readonly left?: number | PositiveUniversalMeasure;
+    readonly header?: number | PositiveUniversalMeasure;
+    readonly footer?: number | PositiveUniversalMeasure;
+    readonly gutter?: number | PositiveUniversalMeasure;
+};
 
 export class PageMargin extends XmlComponent {
     public constructor(
-        top: number | string,
-        right: number | string,
-        bottom: number | string,
-        left: number | string,
-        header: number | string,
-        footer: number | string,
-        gutter: number | string,
+        top: number | UniversalMeasure,
+        right: number | PositiveUniversalMeasure,
+        bottom: number | UniversalMeasure,
+        left: number | PositiveUniversalMeasure,
+        header: number | PositiveUniversalMeasure,
+        footer: number | PositiveUniversalMeasure,
+        gutter: number | PositiveUniversalMeasure,
     ) {
         super("w:pgMar");
         this.root.push(
-            new PageMarginAttributes({
-                top: signedTwipsMeasureValue(top),
-                right: twipsMeasureValue(right),
-                bottom: signedTwipsMeasureValue(bottom),
-                left: twipsMeasureValue(left),
-                header: twipsMeasureValue(header),
-                footer: twipsMeasureValue(footer),
-                gutter: twipsMeasureValue(gutter),
+            new NextAttributeComponent<IPageMarginAttributes>({
+                top: { key: "w:top", value: signedTwipsMeasureValue(top) },
+                right: { key: "w:right", value: twipsMeasureValue(right) },
+                bottom: { key: "w:bottom", value: signedTwipsMeasureValue(bottom) },
+                left: { key: "w:left", value: twipsMeasureValue(left) },
+                header: { key: "w:header", value: twipsMeasureValue(header) },
+                footer: { key: "w:footer", value: twipsMeasureValue(footer) },
+                gutter: { key: "w:gutter", value: twipsMeasureValue(gutter) },
             }),
         );
     }