abstract-document 20.0.4 → 20.1.0

package/src/abstract-document/styles/paragraph-style.ts

@@ -1,6 +1,6 @@
-import * as TextStyle from "./text-style.js";
 import * as LayoutFoundation from "../primitives/layout-foundation.js";
 import type * as Position from "./position.js";
+import * as TextStyle from "./text-style.js";
 
 export type TextAlignment = "Start" | "Center" | "End" | "Justify";
 
@@ -20,12 +20,7 @@ export interface ParagraphStyleProps {
 }
 
 export function create(props?: ParagraphStyleProps): ParagraphStyle {
-  const {
-    alignment,
-    margins = LayoutFoundation.create(),
-    position = "relative",
-    textStyle = TextStyle.create(),
-  } = props || {};
+  const { alignment, margins = LayoutFoundation.create(), position = "relative", textStyle = TextStyle.create() } = props ?? {};
   return {
     type: "ParagraphStyle",
     alignment,
@@ -35,14 +30,11 @@ export function create(props?: ParagraphStyleProps): ParagraphStyle {
   };
 }
 
-export function overrideWith(
-  overrider: ParagraphStyle | undefined,
-  toOverride: ParagraphStyle | undefined
-): ParagraphStyle {
-  const a: ParagraphStyleProps = overrider || {};
-  const b: ParagraphStyleProps = toOverride || {};
+export function overrideWith(overrider: ParagraphStyle | undefined, toOverride: ParagraphStyle | undefined): ParagraphStyle {
+  const a: ParagraphStyleProps = overrider ?? {};
+  const b: ParagraphStyleProps = toOverride ?? {};
   return create({
-    alignment: a.alignment || b.alignment,
+    alignment: a.alignment ?? b.alignment,
     margins: LayoutFoundation.overrideWith(a.margins, b.margins),
     textStyle: TextStyle.overrideWith(a.textStyle, b.textStyle),
   });

package/src/abstract-document/styles/style.ts

@@ -3,11 +3,7 @@ import * as TableCellStyle from "./table-cell-style.js";
 import * as TableStyle from "./table-style.js";
 import * as TextStyle from "./text-style.js";
 
-export type Style =
-  | ParagraphStyle.ParagraphStyle
-  | TableCellStyle.TableCellStyle
-  | TableStyle.TableStyle
-  | TextStyle.TextStyle;
+export type Style = ParagraphStyle.ParagraphStyle | TableCellStyle.TableCellStyle | TableStyle.TableStyle | TextStyle.TextStyle;
 
 export function overrideWith(overrider: Style | undefined, toOverride: Style | undefined): Style | undefined {
   if (!overrider) {

package/src/abstract-document/styles/table-cell-style.ts

@@ -1,5 +1,5 @@
-import * as LayoutFoundation from "../primitives/layout-foundation.js";
 import * as LayoutFoundationColor from "../primitives/layout-foundation-color.js";
+import * as LayoutFoundation from "../primitives/layout-foundation.js";
 
 export type RowAlignment = "Top" | "Middle" | "Bottom";
 
@@ -23,7 +23,7 @@ export interface TableCellStyleProps {
 }
 
 export function create(props?: TableCellStyleProps): TableCellStyle {
-  const { background, borders, borderColor, borderColors, padding, verticalAlignment } = props || {};
+  const { background, borders, borderColor, borderColors, padding, verticalAlignment } = props ?? {};
   return {
     type: "TableCellStyle",
     background,
@@ -35,18 +35,15 @@ export function create(props?: TableCellStyleProps): TableCellStyle {
   };
 }
 
-export function overrideWith(
-  overrider: TableCellStyle | undefined,
-  toOverride: TableCellStyle | undefined
-): TableCellStyle {
-  const a: TableCellStyleProps = overrider || {};
-  const b: TableCellStyleProps = toOverride || {};
+export function overrideWith(overrider: TableCellStyle | undefined, toOverride: TableCellStyle | undefined): TableCellStyle {
+  const a: TableCellStyleProps = overrider ?? {};
+  const b: TableCellStyleProps = toOverride ?? {};
   return create({
-    background: a.background || b.background,
+    background: a.background ?? b.background,
     borders: LayoutFoundation.overrideWith(a.borders, b.borders),
-    borderColor: a.borderColor || b.borderColor,
+    borderColor: a.borderColor ?? b.borderColor,
     borderColors: LayoutFoundationColor.overrideWith(a.borderColors, b.borderColors),
     padding: LayoutFoundation.overrideWith(a.padding, b.padding),
-    verticalAlignment: a.verticalAlignment || b.verticalAlignment,
+    verticalAlignment: a.verticalAlignment ?? b.verticalAlignment,
   });
 }

package/src/abstract-document/styles/table-style.ts

@@ -1,6 +1,6 @@
 import * as LayoutFoundation from "../primitives/layout-foundation.js";
-import * as TableCellStyle from "./table-cell-style.js";
 import type * as Position from "./position.js";
+import * as TableCellStyle from "./table-cell-style.js";
 
 export type TableAlignment = "Left" | "Center" | "Right";
 
@@ -20,12 +20,7 @@ export interface TableStyleProps {
 }
 
 export function create(props?: TableStyleProps): TableStyle {
-  const {
-    margins = LayoutFoundation.create(),
-    alignment,
-    position = "relative",
-    cellStyle = TableCellStyle.create(),
-  } = props || {};
+  const { margins = LayoutFoundation.create(), alignment, position = "relative", cellStyle = TableCellStyle.create() } = props ?? {};
   return {
     type: "TableStyle",
     position,
@@ -40,7 +35,7 @@ export function overrideWith(overrider: TableStyle, toOverride: TableStyle): Tab
   const b: TableStyleProps = toOverride || {};
   return create({
     margins: LayoutFoundation.overrideWith(a.margins, b.margins),
-    alignment: a.alignment || b.alignment,
+    alignment: a.alignment ?? b.alignment,
     cellStyle: TableCellStyle.overrideWith(a.cellStyle, b.cellStyle),
   });
 }

package/src/abstract-document/styles/text-style.ts

@@ -61,12 +61,7 @@ export function create(props?: TextStyleProps): TextStyle {
 
 export function overrideWith(overrider: TextStyle | undefined, toOverride: TextStyle | undefined): TextStyle {
   const overriddenFontWeight: Partial<TextStyle> =
-    overrider?.light ||
-    overrider?.normal ||
-    overrider?.mediumBold ||
-    overrider?.bold ||
-    overrider?.extraBold ||
-    overrider?.fontWeight
+    overrider?.light || overrider?.normal || overrider?.mediumBold || overrider?.bold || overrider?.extraBold || overrider?.fontWeight
       ? {
           light: overrider?.light,
           normal: overrider?.normal,
@@ -83,20 +78,20 @@ export function overrideWith(overrider: TextStyle | undefined, toOverride: TextS
           extraBold: toOverride?.extraBold,
           fontWeight: toOverride?.fontWeight,
         };
-  const a: TextStyleProps = overrider || {};
-  const b: TextStyleProps = toOverride || {};
+  const a: TextStyleProps = overrider ?? {};
+  const b: TextStyleProps = toOverride ?? {};
   return create({
-    fontFamily: a.fontFamily || b.fontFamily,
-    color: a.color || b.color,
-    fontSize: a.fontSize || b.fontSize,
-    fontScale: a.fontScale || b.fontScale,
-    italic: a.italic || b.italic,
-    subScript: a.subScript || b.subScript,
-    superScript: a.superScript || b.superScript,
-    underline: a.underline || b.underline,
-    verticalPosition: a.verticalPosition || b.verticalPosition,
-    indent: a.indent || b.indent,
-    lineGap: a.lineGap || b.lineGap,
+    fontFamily: a.fontFamily ?? b.fontFamily,
+    color: a.color ?? b.color,
+    fontSize: a.fontSize ?? b.fontSize,
+    fontScale: a.fontScale ?? b.fontScale,
+    italic: a.italic ?? b.italic,
+    subScript: a.subScript ?? b.subScript,
+    superScript: a.superScript ?? b.superScript,
+    underline: a.underline ?? b.underline,
+    verticalPosition: a.verticalPosition ?? b.verticalPosition,
+    indent: a.indent ?? b.indent,
+    lineGap: a.lineGap ?? b.lineGap,
     lineBreak: a.lineBreak ?? b.lineBreak,
     baseline: a.baseline ?? b.baseline,
     strike: a.strike ?? b.strike,
@@ -107,7 +102,7 @@ export function overrideWith(overrider: TextStyle | undefined, toOverride: TextS
 }
 
 export function calculateFontSize(textStyle: TextStyle | undefined, defaultFontSize: number): number {
-  const fontSize = textStyle && textStyle.fontSize ? textStyle.fontSize : defaultFontSize;
-  const fontScale = textStyle && textStyle.fontScale ? textStyle.fontScale : 1.0;
+  const fontSize = textStyle?.fontSize ?? defaultFontSize;
+  const fontScale = textStyle?.fontScale ?? 1.0;
   return fontSize * fontScale;
 }

package/src/abstract-document/table/table-cell.ts

@@ -19,13 +19,13 @@ export interface TableCellProps {
 }
 
 export function create(props?: TableCellProps, children?: ReadonlyArray<SectionElement.SectionElement>): TableCell {
-  const { styleName = "", columnSpan = 1, rowSpan = 1, style = TableCellStyle.create(), dummy = false } = props || {};
+  const { styleName = "", columnSpan = 1, rowSpan = 1, style = TableCellStyle.create(), dummy = false } = props ?? {};
   return {
     styleName,
     columnSpan,
     rowSpan,
     style,
     dummy,
-    children: children || [],
+    children: children ?? [],
   };
 }

package/src/abstract-document/table/table-row.ts

@@ -4,11 +4,10 @@ export interface TableRow {
   readonly children: ReadonlyArray<TableCell>;
 }
 
-export interface TableRowProps {}
+export type TableRowProps = object;
 
-export function create(props?: TableRowProps, children?: ReadonlyArray<TableCell>): TableRow {
-  const {} = props || {};
+export function create(_props?: TableRowProps, children?: ReadonlyArray<TableCell>): TableRow {
   return {
-    children: children || [],
+    children: children ?? [],
   };
 }

package/src/abstract-document/types.ts

@@ -1,3 +1,2 @@
-// tslint:disable-next-line:readonly-keyword
 export type Indexer<T> = { [key: string]: T };
 export type Guid = string;

package/src/abstract-document-exporters/docx/document-container.ts

@@ -1,18 +1,29 @@
-import { RefContainer } from "./ref-container.js";
-import { XmlWriter } from "./xml-writer.js";
+import type { RefContainer } from "./ref-container.js";
+import { createRefContainer } from "./ref-container.js";
+import type { XmlWriter } from "./xml-writer.js";
+import { createXmlWriter } from "./xml-writer.js";
 
-//tslint:disable:no-class no-this
+export interface DocumentContainer {
+  readonly filePath: string;
+  readonly fileName: string;
+  readonly refId: string;
+  readonly contentType: string;
+  readonly references: RefContainer;
+  readonly XMLWriter: XmlWriter;
+}
 
-export class DocumentContainer {
-  readonly filePath!: string;
-  readonly fileName!: string;
-  readonly refId!: string;
-  readonly contentType!: string;
-  readonly references: RefContainer = new RefContainer();
+export function createDocumentContainer(filePath: string, fileName: string, refId: string, contentType: string): DocumentContainer {
+  const xmlWriter = createXmlWriter();
 
-  private readonly _xmlWriter: XmlWriter = new XmlWriter();
+  return {
+    filePath,
+    fileName,
+    refId,
+    contentType,
+    references: createRefContainer(),
 
-  get XMLWriter(): XmlWriter {
-    return this._xmlWriter;
-  }
+    get XMLWriter(): XmlWriter {
+      return xmlWriter;
+    },
+  };
 }

package/src/abstract-document-exporters/docx/docx-constants.ts

@@ -1,21 +1,17 @@
-// tslint:disable:variable-name
-
-export const WordNamespace = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
+export const WordNamespace = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
 export const WordPrefix = "w";
 export const VmlNamespace = "urn:schemas-microsoft-com:vml";
 export const VmlPrefix = "v";
 export const OfficeNamespace = "urn:schemas-microsoft-com:office:office";
 export const OfficePrefix = "o";
 export const HeadRelXml =
-  // tslint:disable-next-line:max-line-length
   "<?xml version='1.0' encoding='utf-8'?><Relationships xmlns='http://schemas.openxmlformats.org/package/2006/relationships'><Relationship Type='http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument' Target='/word/document.xml' Id='Rac2f7d58837f4830'/></Relationships>";
 
 export const RelNamespace = "http://schemas.openxmlformats.org/officeDocument/2006/relationships";
 export const RelPrefix = "r";
 export const PointOoXmlFactor = 20;
 
-export const ImageStyle =
-  "width:{0}pt;height:{1}pt;mso-position-horizontal-relative:char;mso-position-vertical-relative:line;v-text-anchor:middle";
+export const ImageStyle = "width:{0}pt;height:{1}pt;mso-position-horizontal-relative:char;mso-position-vertical-relative:line;v-text-anchor:middle";
 
 export const ContentTypeNamespace = "http://schemas.openxmlformats.org/package/2006/content-types.js";
 export const HeaderNamespace = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header";

package/src/abstract-document-exporters/docx/ref-container.ts

@@ -1,50 +1,57 @@
-import * as DocxConstants from "./docx-constants.js";
-import { XmlWriter } from "./xml-writer.js";
-
-//tslint:disable:no-class no-this
-
-export class RefContainer {
-  // tslint:disable-next-line:readonly-keyword
-  _references: Array<string> = [];
-
-  private readonly _xmlWriter: XmlWriter = new XmlWriter();
-
-  get XMLWriter(): XmlWriter {
-    return this._xmlWriter;
-  }
+import * as DocxConstants from "./docx-constants.js";
+import type { XmlWriter } from "./xml-writer.js";
+import { createXmlWriter } from "./xml-writer.js";
+
+export interface RefContainer {
+  readonly XMLWriter: XmlWriter;
+  readonly count: number;
+  AddReference: (refId: string, filePath: string, type: string) => void;
+  AddReference2: (refId: string, filePath: string, type: string) => void;
+  finish: () => void;
+}
 
-  constructor() {
-    this.XMLWriter.WriteStartDocument(true);
-    this.XMLWriter.WriteStartElement("Relationships", DocxConstants.RelationNamespace);
-  }
+export function createRefContainer(): RefContainer {
+  let references: Array<string> = [];
+  const xmlWriter = createXmlWriter();
 
-  AddReference(refId: string, filePath: string, type: string): void {
-    if (filePath.startsWith("/") === false) {
-      filePath = "/" + filePath;
-    }
-    this.AddReference2(refId, filePath, type);
-  }
+  xmlWriter.WriteStartDocument(true);
+  xmlWriter.WriteStartElement("Relationships", DocxConstants.RelationNamespace);
 
-  AddReference2(refId: string, filePath: string, type: string): void {
-    if (this._references.indexOf(refId) !== -1) {
+  function addReference2(refId: string, filePath: string, type: string): void {
+    if (references.indexOf(refId) !== -1) {
       return;
     }
-    this.XMLWriter.WriteStartElement("Relationship");
-    this.XMLWriter.WriteAttributeString("Type", type);
+    xmlWriter.WriteStartElement("Relationship");
+    xmlWriter.WriteAttributeString("Type", type);
     filePath = filePath.replace("\\", "/");
-    this.XMLWriter.WriteAttributeString("Target", filePath);
-    this.XMLWriter.WriteAttributeString("Id", refId);
-    this.XMLWriter.WriteEndElement();
-    this._references.push(refId);
+    xmlWriter.WriteAttributeString("Target", filePath);
+    xmlWriter.WriteAttributeString("Id", refId);
+    xmlWriter.WriteEndElement();
+    references.push(refId);
   }
 
-  get count(): number {
-    return this._references.length;
-  }
-
-  finish(): void {
-    this.XMLWriter.WriteEndElement();
-    this.XMLWriter.close();
-    this._references = [];
-  }
+  return {
+    get XMLWriter(): XmlWriter {
+      return xmlWriter;
+    },
+
+    get count(): number {
+      return references.length;
+    },
+
+    AddReference(refId: string, filePath: string, type: string): void {
+      if (!filePath.startsWith("/")) {
+        filePath = "/" + filePath;
+      }
+      addReference2(refId, filePath, type);
+    },
+
+    AddReference2: addReference2,
+
+    finish(): void {
+      xmlWriter.WriteEndElement();
+      xmlWriter.close();
+      references = [];
+    },
+  };
 }

package/src/abstract-document-exporters/docx/string-utils.ts

@@ -1,16 +1,16 @@
+// oxlint-disable no-bitwise
 // https://github.com/google/closure-library/blob/e877b1eac410c0d842bcda118689759512e0e26f/closure/goog/crypt/crypt.js
 
-//tslint:disable
-
 /**
  * Converts a JS string to a UTF-8 "byte" array.
+ *
  * @param {string} str 16-bit unicode string.
- * @return {!Array<number>} UTF-8 byte array.
+ * @returns {!number[]} UTF-8 byte array.
  */
 export function stringToUtf8ByteArray(str: string): Uint8Array {
   // TODO(user): Use native implementations if/when available
-  let out: any[] = [],
-    p: number = 0;
+  const out: Array<number> = [];
+  let p: number = 0;
   for (let i = 0; i < str.length; i++) {
     let c = str.charCodeAt(i);
     if (c < 128) {
@@ -18,7 +18,7 @@ export function stringToUtf8ByteArray(str: string): Uint8Array {
     } else if (c < 2048) {
       out[p++] = (c >> 6) | 192;
       out[p++] = (c & 63) | 128;
-    } else if ((c & 0xfc00) == 0xd800 && i + 1 < str.length && (str.charCodeAt(i + 1) & 0xfc00) == 0xdc00) {
+    } else if ((c & 0xfc00) === 0xd800 && i + 1 < str.length && (str.charCodeAt(i + 1) & 0xfc00) === 0xdc00) {
       // Surrogate Pair
       c = 0x10000 + ((c & 0x03ff) << 10) + (str.charCodeAt(++i) & 0x03ff);
       out[p++] = (c >> 18) | 240;