docx 7.4.1 → 7.5.0

package/src/file/table-of-contents/alias.ts

@@ -5,7 +5,7 @@ class AliasAttributes extends XmlAttributeComponent<{ readonly alias: string }>
 }
 
 export class Alias extends XmlComponent {
-    constructor(alias: string) {
+    public constructor(alias: string) {
         super("w:alias");
         this.root.push(new AliasAttributes({ alias }));
     }

package/src/file/table-of-contents/field-instruction.ts

@@ -8,7 +8,7 @@ import { ITableOfContentsOptions } from "./table-of-contents-properties";
 export class FieldInstruction extends XmlComponent {
     private readonly properties: ITableOfContentsOptions;
 
-    constructor(properties: ITableOfContentsOptions = {}) {
+    public constructor(properties: ITableOfContentsOptions = {}) {
         super("w:instrText");
 
         this.properties = properties;

package/src/file/table-of-contents/sdt-content.ts

@@ -1,7 +1,7 @@
 import { XmlComponent } from "@file/xml-components";
 
 export class StructuredDocumentTagContent extends XmlComponent {
-    constructor() {
+    public constructor() {
         super("w:sdtContent");
     }
 }

package/src/file/table-of-contents/sdt-properties.ts

@@ -3,7 +3,7 @@ import { XmlComponent } from "@file/xml-components";
 import { Alias } from "./alias";
 
 export class StructuredDocumentTagProperties extends XmlComponent {
-    constructor(alias: string) {
+    public constructor(alias: string) {
         super("w:sdtPr");
         this.root.push(new Alias(alias));
     }

package/src/file/table-of-contents/table-of-contents-properties.ts

@@ -2,7 +2,7 @@ export class StyleLevel {
     public readonly styleName: string;
     public readonly level: number;
 
-    constructor(styleName: string, level: number) {
+    public constructor(styleName: string, level: number) {
         this.styleName = styleName;
         this.level = level;
     }
@@ -98,7 +98,7 @@ export interface ITableOfContentsOptions {
      * with each doublet being a comma-separated set of style name and table of content level.
      * \t can be combined with \o.
      */
-    readonly stylesWithLevels?: StyleLevel[];
+    readonly stylesWithLevels?: readonly StyleLevel[];
 
     /**
      * \u Uses the applied paragraph outline level.

package/src/file/table-of-contents/table-of-contents.spec.ts

@@ -14,9 +14,7 @@ describe("Table of Contents", () => {
         });
 
         it("should construct a TOC with all the options and alias", () => {
-            const styles = new Array<StyleLevel>();
-            styles.push(new StyleLevel("SL", 1));
-            styles.push(new StyleLevel("SL", 2));
+            const styles = [new StyleLevel("SL", 1), new StyleLevel("SL", 2)];
 
             const props = {
                 captionLabel: "A",

package/src/file/table-of-contents/table-of-contents.ts

@@ -10,7 +10,7 @@ import { StructuredDocumentTagProperties } from "./sdt-properties";
 import { ITableOfContentsOptions } from "./table-of-contents-properties";
 
 export class TableOfContents extends XmlComponent {
-    constructor(alias: string = "Table of Contents", properties?: ITableOfContentsOptions) {
+    public constructor(alias: string = "Table of Contents", properties?: ITableOfContentsOptions) {
         super("w:sdt");
         this.root.push(new StructuredDocumentTagProperties(alias));
 

package/src/file/track-revision/track-revision-components/deleted-page-number.ts

@@ -3,7 +3,7 @@ import { SpaceType } from "@file/space-type";
 import { XmlComponent } from "@file/xml-components";
 
 export class DeletedPage extends XmlComponent {
-    constructor() {
+    public constructor() {
         super("w:delInstrText");
         this.root.push(new TextAttributes({ space: SpaceType.PRESERVE }));
         this.root.push("PAGE");
@@ -11,7 +11,7 @@ export class DeletedPage extends XmlComponent {
 }
 
 export class DeletedNumberOfPages extends XmlComponent {
-    constructor() {
+    public constructor() {
         super("w:delInstrText");
         this.root.push(new TextAttributes({ space: SpaceType.PRESERVE }));
         this.root.push("NUMPAGES");
@@ -19,7 +19,7 @@ export class DeletedNumberOfPages extends XmlComponent {
 }
 
 export class DeletedNumberOfPagesSection extends XmlComponent {
-    constructor() {
+    public constructor() {
         super("w:delInstrText");
         this.root.push(new TextAttributes({ space: SpaceType.PRESERVE }));
         this.root.push("SECTIONPAGES");

package/src/file/track-revision/track-revision-components/deleted-text-run.ts

@@ -13,7 +13,7 @@ interface IDeletedRunOptions extends IRunOptions, IChangedAttributesProperties {
 export class DeletedTextRun extends XmlComponent {
     protected readonly deletedTextRunWrapper: DeletedTextRunWrapper;
 
-    constructor(options: IDeletedRunOptions) {
+    public constructor(options: IDeletedRunOptions) {
         super("w:del");
         this.root.push(
             new ChangeAttributes({
@@ -28,7 +28,7 @@ export class DeletedTextRun extends XmlComponent {
 }
 
 class DeletedTextRunWrapper extends XmlComponent {
-    constructor(options: IRunOptions) {
+    public constructor(options: IRunOptions) {
         super("w:r");
         this.root.push(new RunProperties(options));
 

package/src/file/track-revision/track-revision-components/deleted-text.ts

@@ -3,7 +3,7 @@ import { SpaceType } from "@file/space-type";
 import { XmlComponent } from "@file/xml-components";
 
 export class DeletedText extends XmlComponent {
-    constructor(text: string) {
+    public constructor(text: string) {
         super("w:delText");
         this.root.push(new TextAttributes({ space: SpaceType.PRESERVE }));
 

package/src/file/track-revision/track-revision-components/inserted-text-run.ts

@@ -6,7 +6,7 @@ import { ChangeAttributes, IChangedAttributesProperties } from "../track-revisio
 interface IInsertedRunOptions extends IChangedAttributesProperties, IRunOptions {}
 
 export class InsertedTextRun extends XmlComponent {
-    constructor(options: IInsertedRunOptions) {
+    public constructor(options: IInsertedRunOptions) {
         super("w:ins");
         this.root.push(
             new ChangeAttributes({

package/src/file/vertical-align/vertical-align.ts

@@ -25,7 +25,7 @@ export class VerticalAlignAttributes extends XmlAttributeComponent<{
 }
 
 export class VerticalAlignElement extends XmlComponent {
-    constructor(value: VerticalAlign) {
+    public constructor(value: VerticalAlign) {
         super("w:vAlign");
         this.root.push(new VerticalAlignAttributes({ verticalAlign: value }));
     }

package/src/file/xml-components/base.ts

@@ -10,7 +10,7 @@ export interface IContext {
 export abstract class BaseXmlComponent {
     protected readonly rootKey: string;
 
-    constructor(rootKey: string) {
+    public constructor(rootKey: string) {
         this.rootKey = rootKey;
     }
 

package/src/file/xml-components/default-attributes.ts

@@ -1,14 +1,14 @@
 import { BaseXmlComponent, IContext } from "./base";
 import { IXmlableObject } from "./xmlable-object";
 
-export type AttributeMap<T> = { [P in keyof T]: string };
+export type AttributeMap<T> = { readonly [P in keyof T]: string };
 
-export abstract class XmlAttributeComponent<T> extends BaseXmlComponent {
+export abstract class XmlAttributeComponent<T extends object> extends BaseXmlComponent {
     // tslint:disable-next-line:readonly-keyword
-    protected root: T;
+    protected readonly root: T;
     protected readonly xmlKeys?: AttributeMap<T>;
 
-    constructor(properties: T) {
+    public constructor(properties: T) {
         super("_attr");
         this.root = properties;
     }
@@ -19,6 +19,7 @@ export abstract class XmlAttributeComponent<T> extends BaseXmlComponent {
             const value = this.root[key];
             if (value !== undefined) {
                 const newKey = (this.xmlKeys && this.xmlKeys[key]) || key;
+                // eslint-disable-next-line functional/immutable-data
                 attrs[newKey] = value;
             }
         });

package/src/file/xml-components/imported-xml-component.spec.ts

@@ -1,9 +1,10 @@
 import { expect } from "chai";
 import { Element, xml2js } from "xml-js";
 
-import { EMPTY_OBJECT, ImportedXmlComponent } from "./";
+import { EMPTY_OBJECT } from "@file/xml-components";
+
+import { convertToXmlComponent, ImportedXmlComponent } from "./imported-xml-component";
 import { IContext } from "./base";
-import { convertToXmlComponent } from "./imported-xml-component";
 
 const xmlString = `
         <w:p w:one="value 1" w:two="value 2">

package/src/file/xml-components/imported-xml-component.ts

@@ -1,18 +1,22 @@
-// tslint:disable:no-any
 import { Element as XmlElement, xml2js } from "xml-js";
-import { IXmlableObject, XmlAttributeComponent, XmlComponent } from ".";
+
+import { IXmlableObject, XmlAttributeComponent, XmlComponent } from "@file/xml-components";
+
 import { IContext } from "./base";
 
 /**
  * Converts the given xml element (in json format) into XmlComponent.
+ *
  * @param element the xml element in json presentation
  */
 
-export function convertToXmlComponent(element: XmlElement): ImportedXmlComponent | string | undefined {
+export const convertToXmlComponent = (element: XmlElement): ImportedXmlComponent | string | undefined => {
     switch (element.type) {
         case undefined:
         case "element":
+            // eslint-disable-next-line no-case-declarations
             const xmlComponent = new ImportedXmlComponent(element.name as string, element.attributes);
+            // eslint-disable-next-line no-case-declarations
             const childElements = element.elements || [];
             for (const childElm of childElements) {
                 const child = convertToXmlComponent(childElm);
@@ -26,8 +30,9 @@ export function convertToXmlComponent(element: XmlElement): ImportedXmlComponent
         default:
             return undefined;
     }
-}
+};
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 class ImportedXmlComponentAttributes extends XmlAttributeComponent<any> {
     // noop
 }
@@ -51,8 +56,8 @@ export class ImportedXmlComponent extends XmlComponent {
      * @param importedContent xml content of the imported component
      */
 
-    // tslint:disable-next-line:variable-name
-    constructor(rootKey: string, _attr?: any) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    public constructor(rootKey: string, _attr?: any) {
         super(rootKey);
         if (_attr) {
             this.root.push(new ImportedXmlComponentAttributes(_attr));
@@ -68,8 +73,8 @@ export class ImportedXmlComponent extends XmlComponent {
  * Used for the attributes of root element that is being imported.
  */
 export class ImportedRootElementAttributes extends XmlComponent {
-    // tslint:disable-next-line:variable-name
-    constructor(private readonly _attr: any) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    public constructor(private readonly _attr: any) {
         super("");
     }
 

package/src/file/xml-components/initializable-xml-component.ts

@@ -1,7 +1,7 @@
 import { XmlComponent } from "@file/xml-components";
 
 export abstract class InitializableXmlComponent extends XmlComponent {
-    constructor(rootKey: string, initComponent?: InitializableXmlComponent) {
+    public constructor(rootKey: string, initComponent?: InitializableXmlComponent) {
         super(rootKey);
 
         if (initComponent) {

package/src/file/xml-components/simple-elements.ts

@@ -13,7 +13,7 @@ import { hpsMeasureValue } from "@util/values";
 //     <xsd:attribute name="val" type="s:ST_OnOff"/>
 // </xsd:complexType>
 export class OnOffElement extends XmlComponent {
-    constructor(name: string, val: boolean | undefined = true) {
+    public constructor(name: string, val: boolean | undefined = true) {
         super(name);
         if (val !== true) {
             this.root.push(new Attributes({ val }));
@@ -27,7 +27,7 @@ export class OnOffElement extends XmlComponent {
 //     <xsd:attribute name="val" type="ST_HpsMeasure" use="required"/>
 // </xsd:complexType>
 export class HpsMeasureElement extends XmlComponent {
-    constructor(name: string, val: number | string) {
+    public constructor(name: string, val: number | string) {
         super(name);
         this.root.push(new Attributes({ val: hpsMeasureValue(val) }));
     }
@@ -39,7 +39,7 @@ export class HpsMeasureElement extends XmlComponent {
 //     <xsd:attribute name="val" type="s:ST_String" use="required"/>
 // </xsd:complexType>
 export class StringValueElement extends XmlComponent {
-    constructor(name: string, val: string) {
+    public constructor(name: string, val: string) {
         super(name);
         this.root.push(new Attributes({ val }));
     }
@@ -47,7 +47,7 @@ export class StringValueElement extends XmlComponent {
 
 // This represents various number element types.
 export class NumberValueElement extends XmlComponent {
-    constructor(name: string, val: number) {
+    public constructor(name: string, val: number) {
         super(name);
         this.root.push(new Attributes({ val }));
     }
@@ -58,7 +58,7 @@ export class NumberValueElement extends XmlComponent {
 // new StringContainer("hello", "world")
 // <hello>world</hello>
 export class StringContainer extends XmlComponent {
-    constructor(name: string, val: string) {
+    public constructor(name: string, val: string) {
         super(name);
         this.root.push(val);
     }

package/src/file/xml-components/xml-component.ts

@@ -4,10 +4,10 @@ import { IXmlableObject } from "./xmlable-object";
 export const EMPTY_OBJECT = Object.seal({});
 
 export abstract class XmlComponent extends BaseXmlComponent {
-    // tslint:disable-next-line:readonly-keyword no-any
+    // eslint-disable-next-line functional/prefer-readonly-type, @typescript-eslint/no-explicit-any
     protected root: (BaseXmlComponent | string | any)[];
 
-    constructor(rootKey: string) {
+    public constructor(rootKey: string) {
         super(rootKey);
         this.root = new Array<BaseXmlComponent | string>();
     }
@@ -46,5 +46,7 @@ export abstract class IgnoreIfEmptyXmlComponent extends XmlComponent {
         if (result && (typeof result[this.rootKey] !== "object" || Object.keys(result[this.rootKey]).length)) {
             return result;
         }
+
+        return undefined;
     }
 }

package/src/import-dotx/import-dotx.ts

@@ -1,3 +1,5 @@
+/* eslint-disable */
+// This will be deprecated soon
 import * as JSZip from "jszip";
 import { Element as XMLElement, ElementCompact as XMLElementCompact, xml2js } from "xml-js";
 

package/src/index.spec.ts

@@ -5,7 +5,6 @@ import { Document } from "./index";
 describe("Index", () => {
     describe("Document", () => {
         it("should instantiate the Document", () => {
-            // tslint:disable-next-line: no-unused-expression
             expect(
                 new Document({
                     sections: [],

package/src/tests/utility.ts

@@ -1,5 +1,5 @@
 export class Utility {
-    // tslint:disable-next-line:no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     public static jsonify(obj: object): any {
         const stringifiedJson = JSON.stringify(obj);
         return JSON.parse(stringifiedJson);

package/src/util/convenience-functions.spec.ts

@@ -19,14 +19,12 @@ describe("Utility", () => {
 
     describe("#uniqueNumericId", () => {
         it("should generate a unique incrementing ID", () => {
-            // tslint:disable-next-line: no-unused-expression
             expect(uniqueNumericId()).to.not.be.undefined;
         });
     });
 
     describe("#uniqueId", () => {
         it("should generate a unique pseudorandom ID", () => {
-            // tslint:disable-next-line: no-unused-expression
             expect(uniqueId()).to.not.be.empty;
         });
     });

package/src/util/convenience-functions.ts

@@ -3,18 +3,10 @@ import { nanoid } from "nanoid/non-secure";
 let currentCount = 0;
 
 // Twip - twentieths of a point
-export const convertMillimetersToTwip = (millimeters: number): number => {
-    return Math.floor((millimeters / 25.4) * 72 * 20);
-};
+export const convertMillimetersToTwip = (millimeters: number): number => Math.floor((millimeters / 25.4) * 72 * 20);
 
-export const convertInchesToTwip = (inches: number): number => {
-    return Math.floor(inches * 72 * 20);
-};
+export const convertInchesToTwip = (inches: number): number => Math.floor(inches * 72 * 20);
 
-export const uniqueNumericId = (): number => {
-    return ++currentCount;
-};
+export const uniqueNumericId = (): number => ++currentCount;
 
-export const uniqueId = (): string => {
-    return nanoid().toLowerCase();
-};
+export const uniqueId = (): string => nanoid().toLowerCase();

package/src/util/values.ts

@@ -7,63 +7,57 @@
 // <xsd:simpleType name="ST_DecimalNumber">
 //     <xsd:restriction base="xsd:integer"/>
 // </xsd:simpleType>
-export function decimalNumber(val: number): number {
+export const decimalNumber = (val: number): number => {
     if (isNaN(val)) {
         throw new Error(`Invalid value '${val}' specified. Must be an integer.`);
     }
     return Math.floor(val);
-}
+};
 
 // <xsd:simpleType name="ST_UnsignedDecimalNumber">
 //     <xsd:restriction base="xsd:unsignedLong"/>
 // </xsd:simpleType>
-export function unsignedDecimalNumber(val: number): number {
+export const unsignedDecimalNumber = (val: number): number => {
     const value = decimalNumber(val);
     if (value < 0) {
         throw new Error(`Invalid value '${val}' specified. Must be a positive integer.`);
     }
     return value;
-}
+};
 
 // The xsd:hexBinary type represents binary data as a sequence of binary octets.
 // It uses hexadecimal encoding, where each binary octet is a two-character hexadecimal number.
 // Lowercase and uppercase letters A through F are permitted. For example, 0FB8 and 0fb8 are two
 // equal xsd:hexBinary representations consisting of two octets.
 // http://www.datypic.com/sc/xsd/t-xsd_hexBinary.html
-function hexBinary(val: string, length: number): string {
+const hexBinary = (val: string, length: number): string => {
     const expectedLength = length * 2;
-    if (val.length !== expectedLength || isNaN(Number("0x" + val))) {
+    if (val.length !== expectedLength || isNaN(Number(`0x${val}`))) {
         throw new Error(`Invalid hex value '${val}'. Expected ${expectedLength} digit hex value`);
     }
     return val;
-}
+};
 
 // <xsd:simpleType name="ST_LongHexNumber">
 //     <xsd:restriction base="xsd:hexBinary">
 //         <xsd:length value="4"/>
 //     </xsd:restriction>
 // </xsd:simpleType>
-export function longHexNumber(val: string): string {
-    return hexBinary(val, 4);
-}
+export const longHexNumber = (val: string): string => hexBinary(val, 4);
 
 // <xsd:simpleType name="ST_ShortHexNumber">
 //     <xsd:restriction base="xsd:hexBinary">
 //         <xsd:length value="2"/>
 //     </xsd:restriction>
 // </xsd:simpleType>
-export function shortHexNumber(val: string): string {
-    return hexBinary(val, 2);
-}
+export const shortHexNumber = (val: string): string => hexBinary(val, 2);
 
 // <xsd:simpleType name="ST_UcharHexNumber">
 //     <xsd:restriction base="xsd:hexBinary">
 //         <xsd:length value="1"/>
 //     </xsd:restriction>
 // </xsd:simpleType>
-export function uCharHexNumber(val: string): string {
-    return hexBinary(val, 1);
-}
+export const uCharHexNumber = (val: string): string => hexBinary(val, 1);
 
 // <xsd:simpleType name="ST_LongHexNumber">
 // <xsd:restriction base="xsd:hexBinary">
@@ -76,7 +70,7 @@ export function uCharHexNumber(val: string): string {
 //         <xsd:pattern value="-?[0-9]+(\.[0-9]+)?(mm|cm|in|pt|pc|pi)"/>
 //     </xsd:restriction>
 // </xsd:simpleType>
-export function universalMeasureValue(val: string): string {
+export const universalMeasureValue = (val: string): string => {
     const unit = val.slice(-2);
     if (!universalMeasureUnits.includes(unit)) {
         throw new Error(`Invalid unit '${unit}' specified. Valid units are ${universalMeasureUnits.join(", ")}`);
@@ -86,7 +80,7 @@ export function universalMeasureValue(val: string): string {
         throw new Error(`Invalid value '${amount}' specified. Expected a valid number.`);
     }
     return `${Number(amount)}${unit}`;
-}
+};
 const universalMeasureUnits = ["mm", "cm", "in", "pt", "pc", "pi"];
 
 // <xsd:simpleType name="ST_PositiveUniversalMeasure">
@@ -94,13 +88,13 @@ const universalMeasureUnits = ["mm", "cm", "in", "pt", "pc", "pi"];
 //         <xsd:pattern value="[0-9]+(\.[0-9]+)?(mm|cm|in|pt|pc|pi)"/>
 //     </xsd:restriction>
 // </xsd:simpleType>
-export function positiveUniversalMeasureValue(val: string): string {
+export const positiveUniversalMeasureValue = (val: string): string => {
     const value = universalMeasureValue(val);
     if (parseFloat(value) < 0) {
         throw new Error(`Invalid value '${value}' specified. Expected a positive number.`);
     }
     return value;
-}
+};
 
 // <xsd:simpleType name="ST_HexColor">
 //     <xsd:union memberTypes="ST_HexColorAuto s:ST_HexColorRGB"/>
@@ -116,7 +110,7 @@ export function positiveUniversalMeasureValue(val: string): string {
 //             <xsd:length value="3" fixed="true"/>
 //         </xsd:restriction>
 //     </xsd:simpleType>
-export function hexColorValue(val: string): string {
+export const hexColorValue = (val: string): string => {
     if (val === "auto") {
         return val;
     }
@@ -124,42 +118,38 @@ export function hexColorValue(val: string): string {
     // Most clients work with it, but strip it off anyway for strict compliance.
     const color = val.charAt(0) === "#" ? val.substring(1) : val;
     return hexBinary(color, 3);
-}
+};
 
 // <xsd:simpleType name="ST_SignedTwipsMeasure">
 //     <xsd:union memberTypes="xsd:integer s:ST_UniversalMeasure"/>
 // </xsd:simpleType>
-export function signedTwipsMeasureValue(val: string | number): string | number {
-    return typeof val === "string" ? universalMeasureValue(val) : decimalNumber(val);
-}
+export const signedTwipsMeasureValue = (val: string | number): string | number =>
+    typeof val === "string" ? universalMeasureValue(val) : decimalNumber(val);
 
 // <xsd:simpleType name="ST_HpsMeasure">
 //     <xsd:union memberTypes="s:ST_UnsignedDecimalNumber s:ST_PositiveUniversalMeasure"/>
 // </xsd:simpleType>
-export function hpsMeasureValue(val: string | number): string | number {
-    return typeof val === "string" ? positiveUniversalMeasureValue(val) : unsignedDecimalNumber(val);
-}
+export const hpsMeasureValue = (val: string | number): string | number =>
+    typeof val === "string" ? positiveUniversalMeasureValue(val) : unsignedDecimalNumber(val);
 
 // <xsd:simpleType name="ST_SignedHpsMeasure">
 //     <xsd:union memberTypes="xsd:integer s:ST_UniversalMeasure"/>
 // </xsd:simpleType>
-export function signedHpsMeasureValue(val: string | number): string | number {
-    return typeof val === "string" ? universalMeasureValue(val) : decimalNumber(val);
-}
+export const signedHpsMeasureValue = (val: string | number): string | number =>
+    typeof val === "string" ? universalMeasureValue(val) : decimalNumber(val);
 
 // <xsd:simpleType name="ST_TwipsMeasure">
 //     <xsd:union memberTypes="ST_UnsignedDecimalNumber ST_PositiveUniversalMeasure"/>
 // </xsd:simpleType>
-export function twipsMeasureValue(val: string | number): string | number {
-    return typeof val === "string" ? positiveUniversalMeasureValue(val) : unsignedDecimalNumber(val);
-}
+export const twipsMeasureValue = (val: string | number): string | number =>
+    typeof val === "string" ? positiveUniversalMeasureValue(val) : unsignedDecimalNumber(val);
 
 // <xsd:simpleType name="ST_Percentage">
 //     <xsd:restriction base="xsd:string">
 //         <xsd:pattern value="-?[0-9]+(\.[0-9]+)?%"/>
 //     </xsd:restriction>
 // </xsd:simpleType>
-export function percentageValue(val: string): string {
+export const percentageValue = (val: string): string => {
     if (val.slice(-1) !== "%") {
         throw new Error(`Invalid value '${val}'. Expected percentage value (eg '55%')`);
     }
@@ -168,7 +158,7 @@ export function percentageValue(val: string): string {
         throw new Error(`Invalid value '${percent}' specified. Expected a valid number.`);
     }
     return `${Number(percent)}%`;
-}
+};
 
 // <xsd:simpleType name="ST_MeasurementOrPercent">
 //     <xsd:union memberTypes="ST_DecimalNumberOrPercent s:ST_UniversalMeasure"/>
@@ -182,7 +172,7 @@ export function percentageValue(val: string): string {
 //     <xsd:restriction base="xsd:integer"/>
 // </xsd:simpleType>
 
-export function measurementOrPercentValue(val: number | string): number | string {
+export const measurementOrPercentValue = (val: number | string): number | string => {
     if (typeof val === "number") {
         return decimalNumber(val);
     }
@@ -190,7 +180,7 @@ export function measurementOrPercentValue(val: number | string): number | string
         return percentageValue(val);
     }
     return universalMeasureValue(val);
-}
+};
 
 // <xsd:simpleType name="ST_EighthPointMeasure">
 //     <xsd:restriction base="s:ST_UnsignedDecimalNumber"/>
@@ -222,6 +212,4 @@ export const pointMeasureValue = unsignedDecimalNumber;
 //
 // Luckily, js has this format built in already. See:
 // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString
-export function dateTimeValue(val: Date): string {
-    return val.toISOString();
-}
+export const dateTimeValue = (val: Date): string => val.toISOString();