@cj-tech-master/excelts 9.5.0 → 9.5.1

package/dist/browser/modules/word/docx-packager.js

@@ -9,8 +9,8 @@
 import { zip } from "../archive/create-archive.js";
 import { XmlWriter } from "../xml/writer.js";
 import { ContentType, RelType, PartPath, STD_DOC_ATTRIBUTES } from "./constants.js";
-import { ContentTypesManager } from "./content-types.js";
-import { RelationshipManager } from "./relationships.js";
+import { createContentTypes, addContentTypeDefault, addContentTypeOverride, addImageContentTypeDefaults, renderContentTypes } from "./content-types.js";
+import { createRelationships, addRelationship, addRelationshipWithId, getRelationshipCount, renderRelationships } from "./relationships.js";
 import { renderChartPart } from "./writers/chart-writer.js";
 import { renderComments, renderCommentsExtended } from "./writers/comment-writer.js";
 import { renderDocument, CHART_RID_REGISTRY } from "./writers/document-writer.js";
@@ -202,42 +202,42 @@ function collectHyperlinksFromHeaderFooter(content) {
 export async function packageDocx(doc, compressionLevel) {
     const archive = zip({ level: compressionLevel ?? 6 });
     // Managers
-    const contentTypes = new ContentTypesManager();
-    const packageRels = new RelationshipManager();
-    const documentRels = new RelationshipManager();
+    const contentTypes = createContentTypes();
+    const packageRels = createRelationships();
+    const documentRels = createRelationships();
     // --- Package relationships ---
-    packageRels.add(RelType.OfficeDocument, "word/document.xml");
-    packageRels.add(RelType.CoreProperties, "docProps/core.xml");
-    packageRels.add(RelType.ExtendedProperties, "docProps/app.xml");
+    addRelationship(packageRels, RelType.OfficeDocument, "word/document.xml");
+    addRelationship(packageRels, RelType.CoreProperties, "docProps/core.xml");
+    addRelationship(packageRels, RelType.ExtendedProperties, "docProps/app.xml");
     // Custom properties
     const hasCustomProps = doc.customProperties && doc.customProperties.length > 0;
     if (hasCustomProps) {
-        packageRels.add(RelType.CustomProperties, "docProps/custom.xml");
+        addRelationship(packageRels, RelType.CustomProperties, "docProps/custom.xml");
     }
     // --- Document relationships ---
-    documentRels.add(RelType.Styles, "styles.xml");
-    documentRels.add(RelType.Settings, "settings.xml");
-    documentRels.add(RelType.FontTable, "fontTable.xml");
-    documentRels.add(RelType.Theme, "theme/theme1.xml");
+    addRelationship(documentRels, RelType.Styles, "styles.xml");
+    addRelationship(documentRels, RelType.Settings, "settings.xml");
+    addRelationship(documentRels, RelType.FontTable, "fontTable.xml");
+    addRelationship(documentRels, RelType.Theme, "theme/theme1.xml");
     // Numbering
     const hasNumbering = (doc.abstractNumberings && doc.abstractNumberings.length > 0) ||
         (doc.numberingInstances && doc.numberingInstances.length > 0);
     if (hasNumbering) {
-        documentRels.add(RelType.Numbering, "numbering.xml");
+        addRelationship(documentRels, RelType.Numbering, "numbering.xml");
     }
     // Footnotes & Endnotes
     const hasFootnotes = doc.footnotes && doc.footnotes.length > 0;
     const hasEndnotes = doc.endnotes && doc.endnotes.length > 0;
     if (hasFootnotes) {
-        documentRels.add(RelType.Footnotes, "footnotes.xml");
+        addRelationship(documentRels, RelType.Footnotes, "footnotes.xml");
     }
     if (hasEndnotes) {
-        documentRels.add(RelType.Endnotes, "endnotes.xml");
+        addRelationship(documentRels, RelType.Endnotes, "endnotes.xml");
     }
     // Comments
     const hasComments = doc.comments && doc.comments.length > 0;
     if (hasComments) {
-        documentRels.add(RelType.Comments, "comments.xml");
+        addRelationship(documentRels, RelType.Comments, "comments.xml");
     }
     // Images
     const imageExtensions = new Set();
@@ -259,14 +259,14 @@ export async function packageDocx(doc, compressionLevel) {
                 const baseName = img.fileName.replace(/\.[^.]+$/, "");
                 const fallbackFileName = `${baseName}_fallback.png`;
                 // Register PNG fallback as the main rId
-                const fbRId = documentRels.add(RelType.Image, `media/${fallbackFileName}`);
+                const fbRId = addRelationship(documentRels, RelType.Image, `media/${fallbackFileName}`);
                 img.rId = fbRId;
                 if (oldRid) {
                     imageRidMap.set(oldRid, fbRId);
                 }
                 imageExtensions.add("png");
                 // Register SVG as separate image
-                const svgRId = documentRels.add(RelType.Image, `media/${img.fileName}`);
+                const svgRId = addRelationship(documentRels, RelType.Image, `media/${img.fileName}`);
                 svgRidMap.set(img.fileName, svgRId);
                 const ext = img.fileName.split(".").pop()?.toLowerCase();
                 if (ext) {
@@ -275,7 +275,7 @@ export async function packageDocx(doc, compressionLevel) {
                 svgFallbacks.push({ fallbackFileName, data: img.fallbackData });
             }
             else {
-                const rId = documentRels.add(RelType.Image, `media/${img.fileName}`);
+                const rId = addRelationship(documentRels, RelType.Image, `media/${img.fileName}`);
                 img.rId = rId;
                 if (oldRid) {
                     imageRidMap.set(oldRid, rId);
@@ -342,7 +342,7 @@ export async function packageDocx(doc, compressionLevel) {
     const hyperlinks = collectHyperlinks(doc.body);
     for (const link of hyperlinks) {
         if (link.url) {
-            const rId = documentRels.add(RelType.Hyperlink, link.url, "External");
+            const rId = addRelationship(documentRels, RelType.Hyperlink, link.url, "External");
             link.rId = rId;
         }
     }
@@ -352,11 +352,11 @@ export async function packageDocx(doc, compressionLevel) {
     altChunks.forEach((chunk, i) => {
         const fileName = chunk.fileName ?? `afchunk${i + 1}.html`;
         // Register relationship for the alt chunk
-        const rId = documentRels.add("http://schemas.openxmlformats.org/officeDocument/2006/relationships/aFChunk", fileName);
+        const rId = addRelationship(documentRels, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/aFChunk", fileName);
         chunk.rId = rId;
         // Register content type
         const ct = chunk.contentType ?? "text/html";
-        contentTypes.addOverride(`/word/${fileName}`, ct);
+        addContentTypeOverride(contentTypes, `/word/${fileName}`, ct);
         // Write data to archive
         if (chunk.data) {
             archive.add(`word/${fileName}`, chunk.data);
@@ -367,17 +367,17 @@ export async function packageDocx(doc, compressionLevel) {
     const headerRelManagers = new Map();
     if (doc.headers) {
         for (const [key, headerDef] of doc.headers) {
-            const rId = documentRels.add(RelType.Header, `header${headerIndex}.xml`);
+            const rId = addRelationship(documentRels, RelType.Header, `header${headerIndex}.xml`);
             headerDef.rId = rId;
-            // Create per-header relationship manager for images and hyperlinks
-            const hRels = new RelationshipManager();
+            // Create per-header relationship state for images and hyperlinks
+            const hRels = createRelationships();
             const imgRids = collectImageRidsFromContent(headerDef.content);
             if (imgRids.size > 0 && doc.images) {
                 for (const oldRid of imgRids) {
                     // O(1) lookup: direct or via remap
                     const img = imageByRid.get(oldRid) ?? imageByRid.get(imageRidMap.get(oldRid) ?? "");
                     if (img) {
-                        hRels.addWithId(oldRid, RelType.Image, `media/${img.fileName}`);
+                        addRelationshipWithId(hRels, oldRid, RelType.Image, `media/${img.fileName}`);
                     }
                 }
             }
@@ -385,11 +385,11 @@ export async function packageDocx(doc, compressionLevel) {
             const hLinks = collectHyperlinksFromHeaderFooter(headerDef.content);
             for (const link of hLinks) {
                 if (link.url) {
-                    const linkRId = hRels.add(RelType.Hyperlink, link.url, "External");
+                    const linkRId = addRelationship(hRels, RelType.Hyperlink, link.url, "External");
                     link.rId = linkRId;
                 }
             }
-            if (hRels.count > 0) {
+            if (getRelationshipCount(hRels) > 0) {
                 headerRelManagers.set(key, hRels);
             }
             headerIndex++;
@@ -400,16 +400,16 @@ export async function packageDocx(doc, compressionLevel) {
     const footerRelManagers = new Map();
     if (doc.footers) {
         for (const [key, footerDef] of doc.footers) {
-            const rId = documentRels.add(RelType.Footer, `footer${footerIndex}.xml`);
+            const rId = addRelationship(documentRels, RelType.Footer, `footer${footerIndex}.xml`);
             footerDef.rId = rId;
-            // Create per-footer relationship manager for images and hyperlinks
-            const fRels = new RelationshipManager();
+            // Create per-footer relationship state for images and hyperlinks
+            const fRels = createRelationships();
             const imgRids = collectImageRidsFromContent(footerDef.content);
             if (imgRids.size > 0 && doc.images) {
                 for (const oldRid of imgRids) {
                     const img = imageByRid.get(oldRid) ?? imageByRid.get(imageRidMap.get(oldRid) ?? "");
                     if (img) {
-                        fRels.addWithId(oldRid, RelType.Image, `media/${img.fileName}`);
+                        addRelationshipWithId(fRels, oldRid, RelType.Image, `media/${img.fileName}`);
                     }
                 }
             }
@@ -417,11 +417,11 @@ export async function packageDocx(doc, compressionLevel) {
             const fLinks = collectHyperlinksFromHeaderFooter(footerDef.content);
             for (const link of fLinks) {
                 if (link.url) {
-                    const linkRId = fRels.add(RelType.Hyperlink, link.url, "External");
+                    const linkRId = addRelationship(fRels, RelType.Hyperlink, link.url, "External");
                     link.rId = linkRId;
                 }
             }
-            if (fRels.count > 0) {
+            if (getRelationshipCount(fRels) > 0) {
                 footerRelManagers.set(key, fRels);
             }
             footerIndex++;
@@ -434,67 +434,67 @@ export async function packageDocx(doc, compressionLevel) {
     if (doc.watermark) {
         // Use next header index
         const wmHdrIdx = headerIndex;
-        watermarkHeaderRId = documentRels.add(RelType.Header, `header${wmHdrIdx}.xml`);
+        watermarkHeaderRId = addRelationship(documentRels, RelType.Header, `header${wmHdrIdx}.xml`);
         watermarkHeaderIndex = wmHdrIdx;
         // If image watermark, add image relationship in header .rels
         if (doc.watermark.type === "image") {
-            const wmRels = new RelationshipManager();
+            const wmRels = createRelationships();
             const wmRId = doc.watermark.rId;
             const img = imageByRid.get(wmRId) ?? imageByRid.get(imageRidMap.get(wmRId) ?? "");
             if (img) {
-                wmRels.addWithId(wmRId, RelType.Image, `media/${img.fileName}`);
+                addRelationshipWithId(wmRels, wmRId, RelType.Image, `media/${img.fileName}`);
             }
             watermarkHeaderRels = wmRels;
         }
         headerIndex++;
     }
     // --- Content Types ---
-    contentTypes.addImageDefaults(imageExtensions);
-    contentTypes.addOverride(PartPath.Document, ContentType.Document);
-    contentTypes.addOverride(PartPath.Styles, ContentType.Styles);
-    contentTypes.addOverride(PartPath.Settings, ContentType.Settings);
-    contentTypes.addOverride(PartPath.FontTable, ContentType.FontTable);
-    contentTypes.addOverride(PartPath.Theme, ContentType.Theme);
+    addImageContentTypeDefaults(contentTypes, imageExtensions);
+    addContentTypeOverride(contentTypes, PartPath.Document, ContentType.Document);
+    addContentTypeOverride(contentTypes, PartPath.Styles, ContentType.Styles);
+    addContentTypeOverride(contentTypes, PartPath.Settings, ContentType.Settings);
+    addContentTypeOverride(contentTypes, PartPath.FontTable, ContentType.FontTable);
+    addContentTypeOverride(contentTypes, PartPath.Theme, ContentType.Theme);
     if (hasNumbering) {
-        contentTypes.addOverride(PartPath.Numbering, ContentType.Numbering);
+        addContentTypeOverride(contentTypes, PartPath.Numbering, ContentType.Numbering);
     }
     if (hasFootnotes) {
-        contentTypes.addOverride(PartPath.Footnotes, ContentType.Footnotes);
+        addContentTypeOverride(contentTypes, PartPath.Footnotes, ContentType.Footnotes);
     }
     if (hasEndnotes) {
-        contentTypes.addOverride(PartPath.Endnotes, ContentType.Endnotes);
+        addContentTypeOverride(contentTypes, PartPath.Endnotes, ContentType.Endnotes);
     }
     if (hasComments) {
-        contentTypes.addOverride(PartPath.Comments, ContentType.Comments);
+        addContentTypeOverride(contentTypes, PartPath.Comments, ContentType.Comments);
     }
     headerIndex = 1;
     if (doc.headers) {
         for (const [,] of doc.headers) {
-            contentTypes.addOverride(PartPath.header(headerIndex), ContentType.Header);
+            addContentTypeOverride(contentTypes, PartPath.header(headerIndex), ContentType.Header);
             headerIndex++;
         }
     }
     footerIndex = 1;
     if (doc.footers) {
         for (const [,] of doc.footers) {
-            contentTypes.addOverride(PartPath.footer(footerIndex), ContentType.Footer);
+            addContentTypeOverride(contentTypes, PartPath.footer(footerIndex), ContentType.Footer);
             footerIndex++;
         }
     }
     if (watermarkHeaderIndex !== undefined) {
-        contentTypes.addOverride(PartPath.header(watermarkHeaderIndex), ContentType.Header);
+        addContentTypeOverride(contentTypes, PartPath.header(watermarkHeaderIndex), ContentType.Header);
     }
-    contentTypes.addOverride(PartPath.CoreProps, ContentType.CoreProperties);
-    contentTypes.addOverride(PartPath.AppProps, ContentType.ExtendedProperties);
+    addContentTypeOverride(contentTypes, PartPath.CoreProps, ContentType.CoreProperties);
+    addContentTypeOverride(contentTypes, PartPath.AppProps, ContentType.ExtendedProperties);
     if (hasCustomProps) {
-        contentTypes.addOverride(PartPath.CustomProps, ContentType.CustomProperties);
+        addContentTypeOverride(contentTypes, PartPath.CustomProps, ContentType.CustomProperties);
     }
     // --- Generate & add parts to archive ---
     // Note: [Content_Types].xml and _rels/.rels are serialized LAST so that any
     // relationships/content types registered during content rendering (e.g.
     // thumbnails, chart parts, alt chunks) are included.
     // word/_rels/document.xml.rels
-    archive.add(PartPath.DocumentRels, renderXml(xml => documentRels.render(xml)));
+    archive.add(PartPath.DocumentRels, renderXml(xml => renderRelationships(documentRels, xml)));
     // Build an effective doc that includes the auto-generated watermark header
     // reference in section properties (without mutating the caller's doc).
     let effectiveDoc = doc;
@@ -530,7 +530,7 @@ export async function packageDocx(doc, compressionLevel) {
     const chartRIds = [];
     charts.forEach(chartContent => {
         const num = chartRIds.length + 1;
-        const rId = documentRels.add(RelType.Chart, `charts/chart${num}.xml`);
+        const rId = addRelationship(documentRels, RelType.Chart, `charts/chart${num}.xml`);
         chartRIds.push(rId);
         // Store rId in registry so renderChartDrawing can look it up
         CHART_RID_REGISTRY.set(chartContent, rId);
@@ -545,7 +545,7 @@ export async function packageDocx(doc, compressionLevel) {
     archive.add(PartPath.FontTable, renderXml(xml => renderFontTable(xml, doc.fonts)));
     // word/fonts/*.odttf (embedded fonts)
     if (doc.embeddedFonts && doc.embeddedFonts.length > 0) {
-        const fontTableRels = new RelationshipManager();
+        const fontTableRels = createRelationships();
         const usedRIds = new Set();
         // Collect rIds referenced in fontTable
         if (doc.fonts) {
@@ -569,26 +569,26 @@ export async function packageDocx(doc, compressionLevel) {
             archive.add(partPath, ef.data);
             // Register relationship from fontTable.xml
             if (usedRIds.has(ef.rId)) {
-                fontTableRels.addWithId(ef.rId, RelType.Font, `fonts/${ef.fileName}`);
+                addRelationshipWithId(fontTableRels, ef.rId, RelType.Font, `fonts/${ef.fileName}`);
             }
             else {
                 // Add anyway so the embedded font isn't orphaned
-                fontTableRels.addWithId(ef.rId, RelType.Font, `fonts/${ef.fileName}`);
+                addRelationshipWithId(fontTableRels, ef.rId, RelType.Font, `fonts/${ef.fileName}`);
             }
             // Register content type for .odttf / .ttf
             const ext = ef.fileName.split(".").pop()?.toLowerCase();
             if (ext === "odttf") {
-                contentTypes.addDefault("odttf", ContentType.ObfuscatedFont);
+                addContentTypeDefault(contentTypes, "odttf", ContentType.ObfuscatedFont);
             }
             else if (ext === "ttf") {
-                contentTypes.addDefault("ttf", "application/x-font-ttf");
+                addContentTypeDefault(contentTypes, "ttf", "application/x-font-ttf");
             }
             else if (ext === "otf") {
-                contentTypes.addDefault("otf", "application/x-font-otf");
+                addContentTypeDefault(contentTypes, "otf", "application/x-font-otf");
             }
         }
         // Write fontTable.xml.rels
-        archive.add("word/_rels/fontTable.xml.rels", renderXml(xml => fontTableRels.render(xml)));
+        archive.add("word/_rels/fontTable.xml.rels", renderXml(xml => renderRelationships(fontTableRels, xml)));
     }
     // Custom XML parts (for SDT data binding)
     if (doc.customXmlParts && doc.customXmlParts.length > 0) {
@@ -619,13 +619,13 @@ export async function packageDocx(doc, compressionLevel) {
             });
             archive.add(propsPath, propsXml);
             // Write item rels (links itemN.xml → itemPropsN.xml)
-            const itemRels = new RelationshipManager();
-            itemRels.add(RelType.CustomXmlProps, `itemProps${num}.xml`);
-            archive.add(`word/customXml/_rels/item${num}.xml.rels`, renderXml(xml => itemRels.render(xml)));
+            const itemRels = createRelationships();
+            addRelationship(itemRels, RelType.CustomXmlProps, `itemProps${num}.xml`);
+            archive.add(`word/customXml/_rels/item${num}.xml.rels`, renderXml(xml => renderRelationships(itemRels, xml)));
             // Register content types
-            contentTypes.addOverride(`/word/customXml/itemProps${num}.xml`, "application/vnd.openxmlformats-officedocument.customXmlProperties+xml");
+            addContentTypeOverride(contentTypes, `/word/customXml/itemProps${num}.xml`, "application/vnd.openxmlformats-officedocument.customXmlProperties+xml");
             // Add to document rels
-            documentRels.add(RelType.CustomXml, `customXml/item${num}.xml`);
+            addRelationship(documentRels, RelType.CustomXml, `customXml/item${num}.xml`);
         });
     }
     // word/theme/theme1.xml
@@ -650,8 +650,8 @@ export async function packageDocx(doc, compressionLevel) {
         if (hasExtended) {
             const extXml = renderXml(xml => renderCommentsExtended(xml, doc.comments));
             archive.add(PartPath.CommentsExtended, extXml);
-            documentRels.add(RelType.CommentsExtended, "commentsExtended.xml");
-            contentTypes.addOverride(`/${PartPath.CommentsExtended}`, ContentType.CommentsExtended);
+            addRelationship(documentRels, RelType.CommentsExtended, "commentsExtended.xml");
+            addContentTypeOverride(contentTypes, `/${PartPath.CommentsExtended}`, ContentType.CommentsExtended);
         }
     }
     // Headers
@@ -664,8 +664,8 @@ export async function packageDocx(doc, compressionLevel) {
             // Header .rels file
             const hKey = keys[hIdx];
             const hRels = headerRelManagers.get(hKey);
-            if (hRels && hRels.count > 0) {
-                archive.add(`word/_rels/header${headerIndex}.xml.rels`, renderXml(xml => hRels.render(xml)));
+            if (hRels && getRelationshipCount(hRels) > 0) {
+                archive.add(`word/_rels/header${headerIndex}.xml.rels`, renderXml(xml => renderRelationships(hRels, xml)));
             }
             headerIndex++;
             hIdx++;
@@ -681,8 +681,8 @@ export async function packageDocx(doc, compressionLevel) {
             // Footer .rels file
             const fKey = keys[fIdx];
             const fRels = footerRelManagers.get(fKey);
-            if (fRels && fRels.count > 0) {
-                archive.add(`word/_rels/footer${footerIndex}.xml.rels`, renderXml(xml => fRels.render(xml)));
+            if (fRels && getRelationshipCount(fRels) > 0) {
+                archive.add(`word/_rels/footer${footerIndex}.xml.rels`, renderXml(xml => renderRelationships(fRels, xml)));
             }
             footerIndex++;
             fIdx++;
@@ -691,8 +691,8 @@ export async function packageDocx(doc, compressionLevel) {
     // Watermark header
     if (watermarkHeaderIndex !== undefined && doc.watermark) {
         archive.add(PartPath.header(watermarkHeaderIndex), renderXml(xml => renderWatermarkHeader(xml, doc.watermark)));
-        if (watermarkHeaderRels && watermarkHeaderRels.count > 0) {
-            archive.add(`word/_rels/header${watermarkHeaderIndex}.xml.rels`, renderXml(xml => watermarkHeaderRels.render(xml)));
+        if (watermarkHeaderRels && getRelationshipCount(watermarkHeaderRels) > 0) {
+            archive.add(`word/_rels/header${watermarkHeaderIndex}.xml.rels`, renderXml(xml => renderRelationships(watermarkHeaderRels, xml)));
         }
     }
     // Media / images
@@ -716,14 +716,14 @@ export async function packageDocx(doc, compressionLevel) {
     // word/webSettings.xml
     if (doc.webSettings) {
         archive.add(PartPath.WebSettings, renderXml(xml => renderWebSettings(xml, doc.webSettings)));
-        documentRels.add(RelType.WebSettings, "webSettings.xml");
-        contentTypes.addOverride(`/${PartPath.WebSettings}`, ContentType.WebSettings);
+        addRelationship(documentRels, RelType.WebSettings, "webSettings.xml");
+        addContentTypeOverride(contentTypes, `/${PartPath.WebSettings}`, ContentType.WebSettings);
     }
     // word/people.xml
     if (doc.people && doc.people.length > 0) {
         archive.add(PartPath.People, renderXml(xml => renderPeople(xml, doc.people)));
-        documentRels.add(RelType.People, "people.xml");
-        contentTypes.addOverride(`/${PartPath.People}`, ContentType.People);
+        addRelationship(documentRels, RelType.People, "people.xml");
+        addContentTypeOverride(contentTypes, `/${PartPath.People}`, ContentType.People);
     }
     // docProps/thumbnail
     if (doc.thumbnail) {
@@ -735,8 +735,8 @@ export async function packageDocx(doc, compressionLevel) {
         const thumbPath = `docProps/thumbnail.${ext}`;
         archive.add(thumbPath, doc.thumbnail.data);
         // Package rels: target is relative to package root (docProps/thumbnail.jpeg)
-        packageRels.add("http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail", thumbPath);
-        contentTypes.addDefault(ext, doc.thumbnail.contentType);
+        addRelationship(packageRels, "http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail", thumbPath);
+        addContentTypeDefault(contentTypes, ext, doc.thumbnail.contentType);
     }
     // Write opaque (unrecognized) parts for round-trip preservation
     if (doc.opaqueParts) {
@@ -745,23 +745,23 @@ export async function packageDocx(doc, compressionLevel) {
             // Register content type: explicit > inferred by extension > skip
             const ext = part.path.split(".").pop()?.toLowerCase();
             if (part.contentType) {
-                contentTypes.addOverride(`/${part.path}`, part.contentType);
+                addContentTypeOverride(contentTypes, `/${part.path}`, part.contentType);
             }
             else if (ext) {
                 // Infer from common extensions so [Content_Types].xml isn't incomplete
                 const inferred = inferContentType(ext);
                 if (inferred) {
-                    contentTypes.addOverride(`/${part.path}`, inferred);
+                    addContentTypeOverride(contentTypes, `/${part.path}`, inferred);
                 }
             }
             // Write part relationships if any
             if (part.relationships && part.relationships.length > 0) {
-                const partRels = new RelationshipManager();
+                const partRels = createRelationships();
                 for (const rel of part.relationships) {
-                    partRels.addWithId(rel.id, rel.type, rel.target, rel.targetMode);
+                    addRelationshipWithId(partRels, rel.id, rel.type, rel.target, rel.targetMode);
                 }
                 const relsPath = getPartRelsPath(part.path);
-                archive.add(relsPath, renderXml(xml => partRels.render(xml)));
+                archive.add(relsPath, renderXml(xml => renderRelationships(partRels, xml)));
             }
         }
     }
@@ -772,12 +772,12 @@ export async function packageDocx(doc, compressionLevel) {
         // Register chart part
         archive.add(chartPath, renderXml(xml => renderChartPart(xml, chartContent.chart)));
         // Register content type
-        contentTypes.addOverride(`/word/charts/chart${num}.xml`, ContentType.Chart);
+        addContentTypeOverride(contentTypes, `/word/charts/chart${num}.xml`, ContentType.Chart);
     });
     // LAST: Write [Content_Types].xml and _rels/.rels after all parts have registered
     // their content types and relationships.
-    archive.add(PartPath.ContentTypes, renderXml(xml => contentTypes.render(xml)));
-    archive.add(PartPath.PackageRels, renderXml(xml => packageRels.render(xml)));
+    archive.add(PartPath.ContentTypes, renderXml(xml => renderContentTypes(contentTypes, xml)));
+    archive.add(PartPath.PackageRels, renderXml(xml => renderRelationships(packageRels, xml)));
     return archive.bytes();
 }
 /** Recursively collect altChunks from body content. */

package/dist/browser/modules/word/html-renderer.js

@@ -5,7 +5,7 @@
  * Supports paragraphs, runs with formatting, tables, lists, images, hyperlinks,
  * headings, comments, footnotes/endnotes, and more.
  */
-import { resolveThemeColor } from "./document.js";
+import { resolveThemeColor } from "./color-utils.js";
 import { bytesToBase64 } from "./internal-utils.js";
 /**
  * Convert a DocxDocument to HTML.

package/dist/browser/modules/word/html.d.ts

@@ -0,0 +1,13 @@
+/**
+ * DOCX Module - HTML Renderer (Subpath Export)
+ *
+ * Import separately to avoid pulling html-renderer into the bundle
+ * when only core document building is needed.
+ *
+ * @example
+ * ```ts
+ * import { renderToHtml } from "excelts/word/html";
+ * ```
+ */
+export { renderToHtml } from "./html-renderer.js";
+export type { HtmlRenderOptions, HtmlRenderResult } from "./html-renderer.js";

package/dist/browser/modules/word/html.js

@@ -0,0 +1,12 @@
+/**
+ * DOCX Module - HTML Renderer (Subpath Export)
+ *
+ * Import separately to avoid pulling html-renderer into the bundle
+ * when only core document building is needed.
+ *
+ * @example
+ * ```ts
+ * import { renderToHtml } from "excelts/word/html";
+ * ```
+ */
+export { renderToHtml } from "./html-renderer.js";

package/dist/browser/modules/word/index.base.d.ts

@@ -6,14 +6,11 @@
 export type { HalfPoint, Twips, Emu, EighthPoint, HexColor, ShadingType, BorderStyle, PageOrientation, PageSize, PageMargins, ColumnDef, SectionColumns, SectionBreakType, PageNumberFormat, HeaderFooterType, HeaderFooterRef, PageVerticalAlign, DocumentGridType, PageTextDirection, Border, ArtBorderType, PageBorders, SectionProperties, UnderlineStyle, VerticalAlign, HighlightColor, FontSpec, Shading, UnderlineSpec, TextEffect, EmphasisMarkType, ColorSpec, RunProperties, RunContent, TextContent, BreakContent, TabContent, PositionalTabContent, RubyContent, RubyAlign, RubyProperties, SymbolContent, FootnoteRefContent, EndnoteRefContent, FieldContent, InlineImageContent, CarriageReturnContent, NoBreakHyphenContent, SoftHyphenContent, LastRenderedPageBreakContent, AnnotationReferenceContent, PageNumberType, DateFieldContent, Run, RevisionInfo, InsertedRun, DeletedRun, MovedFromRun, MovedToRun, MoveRangeMarker, CustomXmlTrackingMarker, ParagraphPropertyChange, RunPropertyChange, SectionPropertyChange, TableRowRevision, CommentDef, CommentRangeStart, CommentRangeEnd, CommentReference, Alignment, LineSpacingRule, LineSpacing, Indentation, TabStopType, TabStopLeader, TabStop, PositionalTabAlignment, PositionalTabRelativeTo, PositionalTabLeader, ParagraphBorders, NumberingRef, FrameAnchorType, DropCapType, ParagraphFrame, ParagraphProperties, Paragraph, Hyperlink, BookmarkStart, BookmarkEnd, ParagraphChild, TableWidth, TableBorders, TableCellMargins, TableLayout, TableLook, TableFloat, TableProperties, RowHeightRule, TableRowProperties, VerticalCellAlign, TextDirection, VerticalMerge, TableCellProperties, TableCell, TableRow, Table, HorizontalPositionRelative, VerticalPositionRelative, WrapStyle, WrapTextSide, WrapMargins, FloatingImage, DrawingShape, PresetShapeType, Chart, ChartType, ChartSeries, ChartLegendPosition, ChartAxis, ChartContent, AltChunk, WebSettings, PersonInfo, NoteType, TablePropertyChange, TableRowPropertyChange, TableCellPropertyChange, CellMergeRevision, OpaquePart, OpaqueRelationship, OpaqueDrawing, TableOfContents, MathRun, MathFraction, MathSuperScript, MathSubScript, MathSubSuperScript, MathPreSubSuperScript, MathPhantom, MathGroupChar, MathBorderBox, MathRadical, MathDelimiter, MathNary, MathFunction, MathLimit, MathMatrix, MathAccent, MathBar, MathBox, MathEquationArray, MathContent, MathBlock, TextBox, CheckBox, SdtListItem, SdtDateProperties, SdtProperties, SdtDataBinding, SdtCheckboxProperties, SdtRepeatingSectionProperties, StructuredDocumentTag, CustomXmlPart, BodyContent, StyleType, TableStyleConditionType, TableStyleConditionalFormat, StyleDef, DocDefaults, NumberFormat, LevelJustification, LevelSuffix, NumberingLevel, MultiLevelType, AbstractNumbering, LevelOverride, NumberingInstance, NumPicBullet, HeaderFooterContent, HeaderDef, FooterDef, FootnoteDef, EndnoteDef, ImageMediaType, ImageDef, FontFamily, FontPitch, FontDef, EmbeddedFont, ProtectionType, HyphenationSettings, DocumentSettings, CompatSetting, CompatFlag, DocumentBackground, DocumentTheme, ThemeColorScheme, ThemeFontScheme, ThemeFont, ThemeFormatScheme, ThemeColorName, CustomPropertyValue, CustomProperty, CoreProperties, AppProperties, DocxDocument, DocxOptions } from "./types.js";
 export { DocxError, DocxParseError, DocxWriteError, DocxMissingPartError, DocxInvalidStructureError, DocxUnsupportedFeatureError, isDocxError } from "./errors.js";
 export { inchesToTwips, twipsToInches, cmToTwips, twipsToCm, ptToTwips, twipsToPt, mmToTwips, inchesToEmu, emuToInches, cmToEmu, emuToCm, ptToEmu, pxToEmu, emuToPx, ptToHalfPoint, halfPointToPt, ptToEighthPoint, eighthPointToPt, lineMultiplierToSpacing, spacingToLineMultiplier, percentToTablePct, tablePctToPercent } from "./units.js";
-export { DocumentBuilder, text, bold, italic, pageBreak, lineBreak, columnBreak, tab, positionalTab, ruby, carriageReturn, noBreakHyphen, softHyphen, field, pageNumberField, totalPagesField, sectionPagesField, sectionField, dateField, sequenceField, timeField, authorField, titleField, subjectField, keywordsField, fileNameField, fileSizeField, styleRefField, refField, pageRefField, noteRefField, hyperlinkField, quoteField, tocField, tcField, indexEntryField, indexField, ifField, includeTextField, includePictureField, formTextField, formCheckboxField, formDropdownField, paragraph, textParagraph, heading, hyperlink, bookmarkStart, bookmarkEnd, commentRangeStart, commentRangeEnd, commentReference, insertedRun, deletedRun, movedFromRun, movedToRun, moveFromRangeStart, moveFromRangeEnd, moveToRangeStart, moveToRangeEnd, checkBox, mathBlock, mathRun, mathFraction, mathSqrt, mathRoot, mathSum, mathIntegral, mathProduct, mathSuperScript, mathSubScript, mathSubSuperScript, mathPreSubSuperScript, mathPhantom, mathGroupChar, mathBorderBox, mathDelimiter, mathNary, mathFunction, mathLimit, mathMatrix, mathAccent, mathBar, mathBox, mathEquationArray, symbol, floatingImage, drawingShape, chart, structuredDocumentTag, border, gridBorders, cell, row, table, simpleTable, searchText, replaceText, resolveThemeColor, patchDocument, mailMerge, paragraphCount, countWords, getHeadings, findBookmark, findComment, listImages, listTables, listHyperlinks, tableCount, extractText } from "./document.js";
-export type { SearchResult, PatchContent, PatchOperation, PatchOptions, DocumentHeading } from "./document.js";
+export { Document, text, bold, italic, pageBreak, lineBreak, columnBreak, tab, positionalTab, ruby, carriageReturn, noBreakHyphen, softHyphen, field, pageNumberField, totalPagesField, sectionPagesField, sectionField, dateField, sequenceField, timeField, authorField, titleField, subjectField, keywordsField, fileNameField, fileSizeField, styleRefField, refField, pageRefField, noteRefField, hyperlinkField, quoteField, tocField, tcField, indexEntryField, indexField, ifField, includeTextField, includePictureField, formTextField, formCheckboxField, formDropdownField, paragraph, textParagraph, heading, hyperlink, bookmarkStart, bookmarkEnd, commentRangeStart, commentRangeEnd, commentReference, insertedRun, deletedRun, movedFromRun, movedToRun, moveFromRangeStart, moveFromRangeEnd, moveToRangeStart, moveToRangeEnd, checkBox, mathBlock, mathRun, mathFraction, mathSqrt, mathRoot, mathSum, mathIntegral, mathProduct, mathSuperScript, mathSubScript, mathSubSuperScript, mathPreSubSuperScript, mathPhantom, mathGroupChar, mathBorderBox, mathDelimiter, mathNary, mathFunction, mathLimit, mathMatrix, mathAccent, mathBar, mathBox, mathEquationArray, symbol, floatingImage, drawingShape, chart, structuredDocumentTag, border, gridBorders, cell, row, table, simpleTable, searchText, replaceText, resolveThemeColor, mailMerge, paragraphCount, countWords, getHeadings, findBookmark, findComment, listImages, listTables, listHyperlinks, tableCount, extractText } from "./document.js";
+export type { DocumentHandle, SearchResult, DocumentHeading } from "./document.js";
+export type { PatchContent, PatchOperation, PatchOptions } from "./document-io.js";
 export { packageDocx } from "./docx-packager.js";
 export { readDocx } from "./docx-reader.js";
-export { deobfuscateFont, obfuscateFont, generateFontKey } from "./font-obfuscation.js";
-export { isEncryptedDocx, verifyPassword, decryptPackage, parseEncryptionInfoXml, deriveEncryptionKey, AGILE_BLOCK_KEYS } from "./encryption.js";
-export type { AgileEncryptionInfo } from "./encryption.js";
-export { hasDigitalSignatures, parseSignatureXml, extractSignatures, isWellFormedSignature } from "./digital-signatures.js";
-export type { DigitalSignatureInfo } from "./digital-signatures.js";
-export { renderToHtml } from "./html-renderer.js";
-export type { HtmlRenderOptions, HtmlRenderResult } from "./html-renderer.js";
+export { toBuffer, toBase64, patchDocument } from "./document-io.js";
+export { Field, Drawing, TrackChanges, Sdt, Query } from "./namespaces.js";
+export { Math as MathML } from "./namespaces.js";

package/dist/browser/modules/word/index.base.js

@@ -8,7 +8,7 @@ export { DocxError, DocxParseError, DocxWriteError, DocxMissingPartError, DocxIn
 // Units
 export { inchesToTwips, twipsToInches, cmToTwips, twipsToCm, ptToTwips, twipsToPt, mmToTwips, inchesToEmu, emuToInches, cmToEmu, emuToCm, ptToEmu, pxToEmu, emuToPx, ptToHalfPoint, halfPointToPt, ptToEighthPoint, eighthPointToPt, lineMultiplierToSpacing, spacingToLineMultiplier, percentToTablePct, tablePctToPercent } from "./units.js";
 // Builder helpers
-export { DocumentBuilder, 
+export { Document, 
 // Run helpers
 text, bold, italic, pageBreak, lineBreak, columnBreak, tab, positionalTab, ruby, carriageReturn, noBreakHyphen, softHyphen, field, pageNumberField, totalPagesField, sectionPagesField, sectionField, dateField, sequenceField, timeField, authorField, titleField, subjectField, keywordsField, fileNameField, fileSizeField, styleRefField, refField, pageRefField, noteRefField, hyperlinkField, quoteField, tocField, tcField, indexEntryField, indexField, ifField, includeTextField, includePictureField, formTextField, formCheckboxField, formDropdownField, 
 // Paragraph helpers
@@ -34,18 +34,15 @@ chart,
 // SDT helper
 structuredDocumentTag, 
 // Table helpers
-border, gridBorders, cell, row, table, simpleTable, searchText, replaceText, resolveThemeColor, patchDocument, mailMerge, 
+border, gridBorders, cell, row, table, simpleTable, searchText, replaceText, resolveThemeColor, mailMerge, 
 // Query API
 paragraphCount, countWords, getHeadings, findBookmark, findComment, listImages, listTables, listHyperlinks, tableCount, extractText } from "./document.js";
 // Packager
 export { packageDocx } from "./docx-packager.js";
 // Reader
 export { readDocx } from "./docx-reader.js";
-// Font obfuscation utilities
-export { deobfuscateFont, obfuscateFont, generateFontKey } from "./font-obfuscation.js";
-// Encryption utilities
-export { isEncryptedDocx, verifyPassword, decryptPackage, parseEncryptionInfoXml, deriveEncryptionKey, AGILE_BLOCK_KEYS } from "./encryption.js";
-// Digital signature utilities
-export { hasDigitalSignatures, parseSignatureXml, extractSignatures, isWellFormedSignature } from "./digital-signatures.js";
-// HTML Renderer
-export { renderToHtml } from "./html-renderer.js";
+// Document IO (toBuffer, toBase64, patchDocument)
+export { toBuffer, toBase64, patchDocument } from "./document-io.js";
+// Sub-namespaces for grouped API ergonomics (no name conflicts with types)
+export { Field, Drawing, TrackChanges, Sdt, Query } from "./namespaces.js";
+export { Math as MathML } from "./namespaces.js";