@harbour-enterprises/superdoc 0.6.63 → 0.6.65

package/dist/super-editor/chunks/{converter-DvoY_Ajb.js → converter-BvHlOZbx.js}

@@ -17391,9 +17391,9 @@ const prepareCommentsXmlFilesForExport = ({
   defs,
   commentsWithParaIds,
   exportType,
-  converter,
-  relationships = []
+  converter
 }) => {
+  const relationships = [];
   if (exportType === "clean") {
     const documentXml = removeCommentsFilesFromConvertedXml(convertedXml);
     return { documentXml, relationships };
@@ -17687,7 +17687,7 @@ function addNewLinkRelationship(params, link) {
 }
 function addNewImageRelationship(params, imagePath) {
   const newId = "rId" + generateDocxRandomId();
-  params.relationships.push({
+  const newRel = {
     type: "element",
     name: "Relationship",
     attributes: {
@@ -17695,7 +17695,8 @@ function addNewImageRelationship(params, imagePath) {
       Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
       Target: imagePath
     }
-  });
+  };
+  params.relationships.push(newRel);
   return newId;
 }
 function translateList(params) {
@@ -20618,7 +20619,7 @@ const _SuperConverter = class _SuperConverter {
       return;
     }
   }
-  static updateDocumentVersion(docx = this.convertedXml, version = "0.6.63") {
+  static updateDocumentVersion(docx = this.convertedXml, version = "0.6.65") {
     const customLocation = "docProps/custom.xml";
     if (!docx[customLocation]) {
       docx[customLocation] = generateCustomXml();
@@ -20755,15 +20756,13 @@ const _SuperConverter = class _SuperConverter {
       ...params.media,
       ...this.media
     });
-    const { documentXml, relationships } = __privateMethod(this, _SuperConverter_instances, prepareCommentsXmlFilesForExport_fn).call(this, {
+    const { documentXml: updatedXml, relationships } = __privateMethod(this, _SuperConverter_instances, prepareCommentsXmlFilesForExport_fn).call(this, {
       defs: params.exportedCommentDefs,
       exportType: commentsExportType,
-      commentsWithParaIds,
-      relationships: params.relationships
+      commentsWithParaIds
     });
-    this.convertedXml = documentXml;
-    const updatedRelationships = relationships;
-    __privateMethod(this, _SuperConverter_instances, exportProcessNewRelationships_fn).call(this, updatedRelationships);
+    this.convertedXml = { ...this.convertedXml, ...updatedXml };
+    __privateMethod(this, _SuperConverter_instances, exportProcessNewRelationships_fn).call(this, [...params.relationships, ...relationships]);
     storeSuperdocVersion(this.convertedXml);
     return xml;
   }
@@ -20785,20 +20784,17 @@ prepareCommentsXmlFilesForExport_fn = function({ defs, exportType, commentsWithP
 exportProcessNewRelationships_fn = function(rels = []) {
   const relsData = this.convertedXml["word/_rels/document.xml.rels"];
   const relationships = relsData.elements.find((x) => x.name === "Relationships");
-  const newRels = [...relationships.elements];
+  const newRels = [];
   let largestId = Math.max(...relationships.elements.map((el) => Number(el.attributes.Id.replace("rId", ""))));
   rels.forEach((rel) => {
     const existingTarget = relationships.elements.find((el) => el.attributes.Target === rel.attributes.Target);
-    if (existingTarget) {
-      console.debug("Duplicate relationship found", rel.attributes.Target);
-      return;
-    }
-    rel.attributes.Target = rel.attributes?.Target?.replace(/&/g, "&").replace(/-/g, "-");
-    rel.attributes.Id = `rId${++largestId}`;
+    if (existingTarget) return;
+    rel.attributes.Target = rel.attributes?.Target?.replace(/&/g, "&");
+    const existingId = rel.attributes.Id;
+    rel.attributes.Id = existingId.length > 6 ? existingId : `rId${++largestId}`;
     newRels.push(rel);
   });
-  relationships.elements = newRels;
-  console.debug("New relationships added", newRels, relsData);
+  relationships.elements = [...relationships.elements, ...newRels];
   this.convertedXml["word/_rels/document.xml.rels"] = relsData;
 };
 exportProcessMediaFiles_fn = async function(media) {
@@ -20884,7 +20880,7 @@ function storeSuperdocVersion(docx) {
 function generateCustomXml() {
   return DEFAULT_CUSTOM_XML;
 }
-function generateSuperdocVersion(pid = 2, version = "0.6.63") {
+function generateSuperdocVersion(pid = 2, version = "0.6.65") {
   return {
     type: "element",
     name: "property",
@@ -20955,4 +20951,4 @@ export {
   twipsToLines as y,
   pixelsToTwips as z
 };
-//# sourceMappingURL=converter-DvoY_Ajb.js.map
+//# sourceMappingURL=converter-BvHlOZbx.js.map