@adeu/core 1.6.8 → 1.6.9

package/src/docx/bridge.ts

@@ -1,41 +1,54 @@
-import JSZip from 'jszip';
-import { parseXml, findChild, findAllDescendants, serializeXml } from './dom.js';
+import JSZip from "jszip";
+import {
+  parseXml,
+  findChild,
+  findAllDescendants,
+  serializeXml,
+} from "./dom.js";
 
 export class Relationship {
   constructor(
     public id: string,
     public type: string,
     public target: string,
-    public isExternal: boolean
+    public isExternal: boolean,
   ) {}
 }
 
 export class Part {
   public rels: Map<string, Relationship> = new Map();
   public _element: Element;
-
+  public package?: DocxPackage;
   constructor(
     public partname: string,
     public blob: string,
     element: Element,
-    public contentType: string
+    public contentType: string,
   ) {
     this._element = element;
   }
 
-  public addRelationship(id: string, type: string, target: string, isExternal: boolean = false) {
+  public addRelationship(
+    id: string,
+    type: string,
+    target: string,
+    isExternal: boolean = false,
+  ) {
     this.rels.set(id, new Relationship(id, type, target, isExternal));
-    
+
     // Directly append the relationship element to the document structure
-    if (this.partname.endsWith('.rels')) {
+    if (this.partname.endsWith(".rels")) {
       const doc = this._element.ownerDocument;
       if (doc) {
         // Use strict namespace to ensure it parses successfully on reload
-        const relEl = doc.createElementNS('http://schemas.openxmlformats.org/package/2006/relationships', 'Relationship');
-        relEl.setAttribute('Id', id);
-        relEl.setAttribute('Type', type);
-        relEl.setAttribute('Target', target);
-        if (isExternal) relEl.setAttribute('TargetMode', 'External');
+        const relEl = doc.createElementNS(
+          "http://schemas.openxmlformats.org/package/2006/relationships",
+          "Relationship",
+        );
+        relEl.setAttribute("Id", id);
+        relEl.setAttribute("Type", type);
+        relEl.setAttribute("Target", target);
+        if (isExternal) relEl.setAttribute("TargetMode", "External");
         this._element.appendChild(relEl);
       }
     }
@@ -50,32 +63,44 @@ export class DocxPackage {
 
   public getPartByPath(path: string): Part | undefined {
     // Strip leading slash for jszip compat
-    const searchPath = path.startsWith('/') ? path.substring(1) : path;
-    return this.parts.find((p) => p.partname === searchPath || p.partname === '/' + searchPath);
+    const searchPath = path.startsWith("/") ? path.substring(1) : path;
+    return this.parts.find(
+      (p) => p.partname === searchPath || p.partname === "/" + searchPath,
+    );
   }
 
   public nextPartname(pattern: string): string {
     let i = 1;
     while (true) {
-      const candidate = pattern.replace('%d', i === 1 ? '' : i.toString());
+      const candidate = pattern.replace("%d", i === 1 ? "" : i.toString());
       if (!this.getPartByPath(candidate)) return candidate;
       i++;
     }
   }
 
-  public addPart(partname: string, contentType: string, xmlString: string): Part {
+  public addPart(
+    partname: string,
+    contentType: string,
+    xmlString: string,
+  ): Part {
     const doc = parseXml(xmlString);
-    const part = new Part(partname, xmlString, doc.documentElement, contentType);
+    const part = new Part(
+      partname,
+      xmlString,
+      doc.documentElement,
+      contentType,
+    );
+    part.package = this;
     this.parts.push(part);
 
     // Update [Content_Types].xml
-    const ctPart = this.getPartByPath('[Content_Types].xml');
+    const ctPart = this.getPartByPath("[Content_Types].xml");
     if (ctPart) {
       const docCT = ctPart._element.ownerDocument;
       if (docCT) {
-        const override = docCT.createElement('Override');
-        override.setAttribute('PartName', partname);
-        override.setAttribute('ContentType', contentType);
+        const override = docCT.createElement("Override");
+        override.setAttribute("PartName", partname);
+        override.setAttribute("ContentType", contentType);
         ctPart._element.appendChild(override);
       }
     }
@@ -84,14 +109,18 @@ export class DocxPackage {
 
   public getOrCreateRelsPart(sourcePartname: string): Part {
     // e.g., /word/document.xml -> /word/_rels/document.xml.rels
-    const parts = sourcePartname.split('/');
+    const parts = sourcePartname.split("/");
     const file = parts.pop();
-    const relsPath = parts.join('/') + '/_rels/' + file + '.rels';
-    
+    const relsPath = parts.join("/") + "/_rels/" + file + ".rels";
+
     let relsPart = this.getPartByPath(relsPath);
     if (!relsPart) {
       const xml = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"></Relationships>`;
-      relsPart = this.addPart(relsPath, 'application/vnd.openxmlformats-package.relationships+xml', xml);
+      relsPart = this.addPart(
+        relsPath,
+        "application/vnd.openxmlformats-package.relationships+xml",
+        xml,
+      );
     }
     return relsPart;
   }
@@ -99,63 +128,75 @@ export class DocxPackage {
 
 export class DocumentObject {
   public part: Part;
-  public settings: { oddAndEvenPagesHeaderFooter: boolean } = { oddAndEvenPagesHeaderFooter: false };
+  public settings: { oddAndEvenPagesHeaderFooter: boolean } = {
+    oddAndEvenPagesHeaderFooter: false,
+  };
   // Simplification for the TS port: sections hold header/footer refs
-  public sections: any[] = []; 
+  public sections: any[] = [];
 
-  constructor(public pkg: DocxPackage, part: Part) {
+  constructor(
+    public pkg: DocxPackage,
+    part: Part,
+  ) {
     this.part = part;
   }
 
   public get element(): Element {
-    return findChild(this.part._element, 'w:body') || this.part._element;
+    return findChild(this.part._element, "w:body") || this.part._element;
   }
 
   /**
    * Main entrypoint for loading a DOCX buffer into the DOM wrapper.
    */
-  public static async load(buffer: Buffer | ArrayBuffer): Promise<DocumentObject> {
+  public static async load(
+    buffer: Buffer | ArrayBuffer,
+  ): Promise<DocumentObject> {
     const zip = await JSZip.loadAsync(buffer);
     const pkg = new DocxPackage(zip);
 
     // 1. Load Content Types
-    const ctFile = zip.file('[Content_Types].xml');
+    const ctFile = zip.file("[Content_Types].xml");
     let contentTypes: Record<string, string> = {};
     if (ctFile) {
-      const ctXml = parseXml(await ctFile.async('text'));
-      const overrides = findAllDescendants(ctXml.documentElement, 'Override');
+      const ctXml = parseXml(await ctFile.async("text"));
+      const overrides = findAllDescendants(ctXml.documentElement, "Override");
       for (const override of overrides) {
-        contentTypes[override.getAttribute('PartName') || ''] = override.getAttribute('ContentType') || '';
+        contentTypes[override.getAttribute("PartName") || ""] =
+          override.getAttribute("ContentType") || "";
       }
     }
 
     // 2. Pre-load all XML parts to allow synchronous traversal later
     for (const [path, file] of Object.entries(zip.files)) {
-      if (!file.dir && (path.endsWith('.xml') || path.endsWith('.rels'))) {
-        const text = await file.async('text');
+      if (!file.dir && (path.endsWith(".xml") || path.endsWith(".rels"))) {
+        const text = await file.async("text");
         const doc = parseXml(text);
-        const cType = contentTypes['/' + path] || 'application/xml';
-        const part = new Part('/' + path, text, doc.documentElement, cType);
+        const cType = contentTypes["/" + path] || "application/xml";
+        const part = new Part("/" + path, text, doc.documentElement, cType);
+        part.package = pkg;
         pkg.parts.push(part);
       }
     }
 
     // 3. Resolve Relationships for the main document
-    const mainPart = pkg.getPartByPath('word/document.xml');
-    if (!mainPart) throw new Error('Invalid DOCX: Missing word/document.xml');
+    const mainPart = pkg.getPartByPath("word/document.xml");
+    if (!mainPart) throw new Error("Invalid DOCX: Missing word/document.xml");
     pkg.mainDocumentPart = mainPart;
 
-    const relsPart = pkg.getPartByPath('word/_rels/document.xml.rels');
+    const relsPart = pkg.getPartByPath("word/_rels/document.xml.rels");
     if (relsPart) {
-      const relElements = findAllDescendants(relsPart._element, 'Relationship');
+      const relElements = findAllDescendants(relsPart._element, "Relationship");
       for (const rel of relElements) {
-        const rId = rel.getAttribute('Id');
-        const target = rel.getAttribute('Target');
-        const type = rel.getAttribute('Type');
-        const targetMode = rel.getAttribute('TargetMode');
-        
+        const rId = rel.getAttribute("Id");
+        const target = rel.getAttribute("Target");
+        const type = rel.getAttribute("Type");
+        const targetMode = rel.getAttribute("TargetMode");
+
         if (rId && target && type) {
-          mainPart.rels.set(rId, new Relationship(rId, type, target, targetMode === 'External'));
+          mainPart.rels.set(
+            rId,
+            new Relationship(rId, type, target, targetMode === "External"),
+          );
         }
       }
     }
@@ -167,11 +208,11 @@ export class DocumentObject {
     let rId = 1;
     while (this.part.rels.has(`rId${rId}`)) rId++;
     const id = `rId${rId}`;
-    
+
     // In DOCX, targets in .rels are relative to the source part's directory.
     // /word/document.xml relating to /word/comments.xml -> target is "comments.xml"
-    const target = part.partname.split('/').pop()!;
-    
+    const target = part.partname.split("/").pop()!;
+
     this.part.rels.set(id, new Relationship(id, relType, target, false));
     const relsPart = this.pkg.getOrCreateRelsPart(this.part.partname);
     relsPart.addRelationship(id, relType, target, false);
@@ -181,7 +222,7 @@ export class DocumentObject {
     let rId = 1;
     while (this.part.rels.has(`rId${rId}`)) rId++;
     const id = `rId${rId}`;
-    
+
     this.part.rels.set(id, new Relationship(id, relType, target, true));
     const relsPart = this.pkg.getOrCreateRelsPart(this.part.partname);
     relsPart.addRelationship(id, relType, target, true);
@@ -191,11 +232,12 @@ export class DocumentObject {
   public async save(): Promise<Buffer> {
     for (const part of this.pkg.parts) {
       let xmlStr = serializeXml(part._element.ownerDocument || part._element);
-      if (!xmlStr.startsWith('<?xml')) {
-        xmlStr = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n' + xmlStr;
+      if (!xmlStr.startsWith("<?xml")) {
+        xmlStr =
+          '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n' + xmlStr;
       }
       this.pkg.zip.file(part.partname.substring(1), xmlStr); // Strip leading slash for JSZip
     }
-    return this.pkg.zip.generateAsync({ type: 'nodebuffer' });
+    return this.pkg.zip.generateAsync({ type: "nodebuffer" });
   }
-}
+}

package/src/docx/dom.ts

@@ -1,4 +1,4 @@
-import { DOMParser, XMLSerializer } from '@xmldom/xmldom';
+import { DOMParser, XMLSerializer } from "@xmldom/xmldom";
 
 /**
  * Simulates docx.oxml.ns.qn. In xmldom, namespaces are preserved in tagName.
@@ -11,7 +11,10 @@ export const qn = (name: string) => name;
 export function findChild(element: Element, tagName: string): Element | null {
   for (let i = 0; i < element.childNodes.length; i++) {
     const child = element.childNodes[i];
-    if (child.nodeType === 1 /* ELEMENT_NODE */ && (child as Element).tagName === tagName) {
+    if (
+      child.nodeType === 1 /* ELEMENT_NODE */ &&
+      (child as Element).tagName === tagName
+    ) {
       return child as Element;
     }
   }
@@ -35,7 +38,10 @@ export function findChildren(element: Element, tagName: string): Element[] {
 /**
  * Simulates lxml element.findall(".//w:tag") - searches ALL descendants.
  */
-export function findAllDescendants(element: Element, tagName: string): Element[] {
+export function findAllDescendants(
+  element: Element,
+  tagName: string,
+): Element[] {
   return Array.from(element.getElementsByTagName(tagName));
 }
 
@@ -43,12 +49,65 @@ export function findAllDescendants(element: Element, tagName: string): Element[]
  * Parses raw XML strings into xmldom Documents.
  */
 export function parseXml(xmlString: string): Document {
-  return new DOMParser().parseFromString(xmlString, 'text/xml');
+  return new DOMParser().parseFromString(xmlString, "text/xml");
 }
 
 /**
- * Serializes an xmldom Document or Element back to a string.
+ * Serializes an xmldom Document or Element back to a string,
+ * enforcing deterministic attribute ordering on the root element.
  */
 export function serializeXml(node: Node): string {
-  return new XMLSerializer().serializeToString(node);
-}
+  let xml = new XMLSerializer().serializeToString(node);
+
+  // BUG-11: Deterministic namespace ordering on root elements.
+  const rootTagRegex = /<([a-zA-Z0-9_:]+)(\s+[^>]+?)(>|\/>)/;
+  const match = rootTagRegex.exec(xml);
+
+  if (match && !match[1].startsWith("?")) {
+    const index = match.index;
+    const textBefore = xml.substring(0, index);
+
+    // Ensure this is the absolute root tag (only <?xml...?> allowed before it)
+    const isRoot =
+      !textBefore.includes("<") ||
+      (textBefore.trim().startsWith("<?xml") &&
+        (textBefore.match(/</g) || []).length === 1);
+
+    if (isRoot) {
+      const fullTag = match[0];
+      const elemStart = `<${match[1]}`;
+      const attrsStr = match[2];
+      const tagEnd = match[3];
+
+      // Robust extraction matching any quote style and internal spacing
+      const attrRegex = /([a-zA-Z0-9_:]+)\s*=\s*(["'])(.*?)\2/g;
+      const attrs: string[] = [];
+      let m;
+      while ((m = attrRegex.exec(attrsStr)) !== null) {
+        attrs.push(m[0].trim());
+      }
+
+      // Sort attributes: xmlns definitions first, then standard attributes
+      attrs.sort((a, b) => {
+        const aName = a.split("=")[0].trim();
+        const bName = b.split("=")[0].trim();
+        const aIsXmlns = aName.startsWith("xmlns");
+        const bIsXmlns = bName.startsWith("xmlns");
+        if (aIsXmlns && !bIsXmlns) return -1;
+        if (!aIsXmlns && bIsXmlns) return 1;
+        return aName < bName ? -1 : aName > bName ? 1 : 0;
+      });
+
+      const newTag =
+        attrs.length > 0
+          ? `${elemStart} ${attrs.join(" ")}${tagEnd}`
+          : `${elemStart}${tagEnd}`;
+      xml =
+        xml.substring(0, index) +
+        newTag +
+        xml.substring(index + fullTag.length);
+    }
+  }
+
+  return xml;
+}