abstract-document 20.0.3 → 20.1.0

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,11 +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;