docxmlater 11.0.10 → 12.1.0

package/dist/processors/CompatibilityUpgrader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CompatibilityUpgrader.d.ts","sourceRoot":"","sources":["../../src/processors/CompatibilityUpgrader.ts"],"names":[],"mappings":"AAoBA,MAAM,WAAW,aAAa;IAE5B,YAAY,EAAE,MAAM,CAAC;IAGrB,OAAO,EAAE,MAAM,CAAC;IAGhB,YAAY,EAAE,MAAM,EAAE,CAAC;IAGvB,aAAa,EAAE,MAAM,EAAE,CAAC;IAGxB,kBAAkB,EAAE,OAAO,CAAC;IAG5B,OAAO,EAAE,OAAO,CAAC;CAClB;AAKD,qBAAa,qBAAqB;IAchC,MAAM,CAAC,kBAAkB,CACvB,WAAW,EAAE,MAAM,EACnB,YAAY,SAAK,GAChB;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,aAAa,CAAA;KAAE;IA4IzC,MAAM,CAAC,sBAAsB,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;QACjE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACnC,QAAQ,EAAE,OAAO,CAAC;KACnB;IAyBD,OAAO,CAAC,MAAM,CAAC,sBAAsB;CAMtC"}
+{"version":3,"file":"CompatibilityUpgrader.d.ts","sourceRoot":"","sources":["../../src/processors/CompatibilityUpgrader.ts"],"names":[],"mappings":"AAoBA,MAAM,WAAW,aAAa;IAE5B,YAAY,EAAE,MAAM,CAAC;IAGrB,OAAO,EAAE,MAAM,CAAC;IAGhB,YAAY,EAAE,MAAM,EAAE,CAAC;IAGvB,aAAa,EAAE,MAAM,EAAE,CAAC;IAGxB,kBAAkB,EAAE,OAAO,CAAC;IAG5B,OAAO,EAAE,OAAO,CAAC;CAClB;AAKD,qBAAa,qBAAqB;IAchC,MAAM,CAAC,kBAAkB,CACvB,WAAW,EAAE,MAAM,EACnB,YAAY,SAAK,GAChB;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,aAAa,CAAA;KAAE;IAyJzC,MAAM,CAAC,sBAAsB,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;QACjE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACnC,QAAQ,EAAE,OAAO,CAAC;KACnB;IAyBD,OAAO,CAAC,MAAM,CAAC,sBAAsB;CAMtC"}

package/dist/processors/CompatibilityUpgrader.js

@@ -10,7 +10,13 @@ class CompatibilityUpgrader {
         const selfClosingCompat = /<w:compat\s*\/>/.exec(settingsXml);
         if (!compatBlockMatch && !selfClosingCompat) {
             const modernBlock = CompatibilityUpgrader.buildModernCompatBlock(legacyCompatFlags_js_1.MODERN_COMPAT_SETTINGS);
-            const xml = settingsXml.replace(/<\/w:settings>/, modernBlock + '\n</w:settings>');
+            const followingSibling = /<(?:w:rsids|m:mathPr|w:themeFontLang|w:clrSchemeMapping|w:shapeDefaults|w:decimalSymbol|w:listSeparator)[\s/>]/.exec(settingsXml);
+            const xml = followingSibling
+                ? settingsXml.slice(0, followingSibling.index) +
+                    modernBlock +
+                    '\n  ' +
+                    settingsXml.slice(followingSibling.index)
+                : settingsXml.replace(/<\/w:settings>/, modernBlock + '\n</w:settings>');
             for (const s of legacyCompatFlags_js_1.MODERN_COMPAT_SETTINGS) {
                 addedSettings.push(s.name);
             }

package/dist/processors/CompatibilityUpgrader.js.map

@@ -1 +1 @@
-{"version":3,"file":"CompatibilityUpgrader.js","sourceRoot":"","sources":["../../src/processors/CompatibilityUpgrader.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * CompatibilityUpgrader — Upgrades w:compat block in settings.xml to modern format.\n *\n * Equivalent to Word's File > Info > Convert operation for the compatibility\n * settings portion. Removes legacy boolean compat flags, updates compatSetting\n * entries, and manages modern namespaces.\n *\n * @module\n */\n\nimport {\n  LEGACY_COMPAT_ELEMENT_NAMES,\n  MODERN_COMPAT_SETTINGS,\n  MS_WORD_COMPAT_URI,\n} from '../constants/legacyCompatFlags.js';\nimport type { CompatSetting } from '../types/compatibility-types.js';\n\n/**\n * Report of what changed during an upgrade operation.\n */\nexport interface UpgradeReport {\n  /** Previous compatibility mode value (11, 12, 14, or 15) */\n  previousMode: number;\n\n  /** New compatibility mode (always 15 after upgrade) */\n  newMode: number;\n\n  /** Legacy compat flags that were removed (without w: prefix) */\n  removedFlags: string[];\n\n  /** Modern settings that were added (setting names) */\n  addedSettings: string[];\n\n  /** Whether namespaces were expanded */\n  namespacesExpanded: boolean;\n\n  /** Whether any changes were actually made (false if already mode 15 with no legacy flags) */\n  changed: boolean;\n}\n\n/**\n * Upgrades w:compat blocks in settings.xml to modern Word 2013+ format.\n */\nexport class CompatibilityUpgrader {\n  /**\n   * Upgrades the w:compat block in settings.xml to mode 15.\n   *\n   * Operations performed:\n   * 1. Remove all legacy boolean compat elements\n   * 2. Remove existing Microsoft-URI w:compatSetting entries\n   * 3. Insert modern w:compatSetting entries\n   * 4. Preserve non-Microsoft w:compatSetting entries (custom URIs)\n   *\n   * @param settingsXml - The raw settings.xml content\n   * @param previousMode - The current compatibility mode value (for the report)\n   * @returns Object with upgraded XML and an UpgradeReport\n   */\n  static upgradeCompatBlock(\n    settingsXml: string,\n    previousMode = 12\n  ): { xml: string; report: UpgradeReport } {\n    const removedFlags: string[] = [];\n    const addedSettings: string[] = [];\n\n    // Check if already mode 15 with no legacy flags\n    const compatBlockMatch = /<w:compat>([\\s\\S]*?)<\\/w:compat>/.exec(settingsXml);\n    const selfClosingCompat = /<w:compat\\s*\\/>/.exec(settingsXml);\n\n    if (!compatBlockMatch && !selfClosingCompat) {\n      // No w:compat block — insert a full modern block before </w:settings>\n      const modernBlock = CompatibilityUpgrader.buildModernCompatBlock(MODERN_COMPAT_SETTINGS);\n      const xml = settingsXml.replace(/<\\/w:settings>/, modernBlock + '\\n</w:settings>');\n\n      for (const s of MODERN_COMPAT_SETTINGS) {\n        addedSettings.push(s.name);\n      }\n\n      return {\n        xml,\n        report: {\n          previousMode,\n          newMode: 15,\n          removedFlags,\n          addedSettings,\n          namespacesExpanded: false,\n          changed: true,\n        },\n      };\n    }\n\n    // Handle self-closing <w:compat/>\n    if (selfClosingCompat) {\n      const modernBlock = CompatibilityUpgrader.buildModernCompatBlock(MODERN_COMPAT_SETTINGS);\n      const xml = settingsXml.replace(/<w:compat\\s*\\/>/, modernBlock);\n\n      for (const s of MODERN_COMPAT_SETTINGS) {\n        addedSettings.push(s.name);\n      }\n\n      return {\n        xml,\n        report: {\n          previousMode,\n          newMode: 15,\n          removedFlags,\n          addedSettings,\n          namespacesExpanded: false,\n          changed: true,\n        },\n      };\n    }\n\n    // Process existing w:compat block\n    const compatBlock = compatBlockMatch![1] ?? '';\n\n    // 1. Find and record legacy flags that will be removed\n    const legacyFlagRegex = /<w:(\\w+)(?:\\s[^>]*)?\\/?>/g;\n    let flagMatch;\n    while ((flagMatch = legacyFlagRegex.exec(compatBlock)) !== null) {\n      const tagName = flagMatch[1];\n      if (tagName && tagName !== 'compatSetting' && LEGACY_COMPAT_ELEMENT_NAMES.has(tagName)) {\n        removedFlags.push(tagName);\n      }\n    }\n\n    // 2. Collect non-Microsoft compatSetting entries to preserve\n    const preservedSettings: CompatSetting[] = [];\n    const settingRegex = /<w:compatSetting\\s+([^>]*)\\/?\\s*>/g;\n    let settingMatch;\n    while ((settingMatch = settingRegex.exec(compatBlock)) !== null) {\n      const attrs = settingMatch[1] ?? '';\n      const nameMatch = /w:name\\s*=\\s*\"([^\"]*)\"/.exec(attrs);\n      const uriMatch = /w:uri\\s*=\\s*\"([^\"]*)\"/.exec(attrs);\n      const valMatch = /w:val\\s*=\\s*\"([^\"]*)\"/.exec(attrs);\n\n      if (nameMatch?.[1] && uriMatch?.[1] && valMatch?.[1]) {\n        // Preserve settings with non-Microsoft URIs\n        if (uriMatch[1] !== MS_WORD_COMPAT_URI) {\n          preservedSettings.push({\n            name: nameMatch[1],\n            uri: uriMatch[1],\n            val: valMatch[1],\n          });\n        }\n      }\n    }\n\n    // 3. Determine which modern settings are actually new\n    const existingMsSettings = new Set<string>();\n    const existingSettingRegex = /<w:compatSetting\\s+([^>]*)\\/?\\s*>/g;\n    let existingMatch;\n    while ((existingMatch = existingSettingRegex.exec(compatBlock)) !== null) {\n      const attrs = existingMatch[1] ?? '';\n      const nameMatch = /w:name\\s*=\\s*\"([^\"]*)\"/.exec(attrs);\n      const uriMatch = /w:uri\\s*=\\s*\"([^\"]*)\"/.exec(attrs);\n      if (nameMatch?.[1] && uriMatch?.[1] && uriMatch[1] === MS_WORD_COMPAT_URI) {\n        existingMsSettings.add(nameMatch[1]);\n      }\n    }\n\n    for (const s of MODERN_COMPAT_SETTINGS) {\n      if (!existingMsSettings.has(s.name)) {\n        addedSettings.push(s.name);\n      }\n    }\n    // compatibilityMode value change counts as \"added\" if it existed but with different val\n    if (existingMsSettings.has('compatibilityMode') && previousMode !== 15) {\n      if (!addedSettings.includes('compatibilityMode')) {\n        addedSettings.push('compatibilityMode');\n      }\n    }\n\n    // 4. Build the new compat block\n    const allSettings = [...MODERN_COMPAT_SETTINGS, ...preservedSettings];\n    const modernBlock = CompatibilityUpgrader.buildModernCompatBlock(allSettings);\n\n    // 5. Replace the old block\n    const changed = removedFlags.length > 0 || addedSettings.length > 0 || previousMode !== 15;\n    const xml = settingsXml.replace(/<w:compat>[\\s\\S]*?<\\/w:compat>/, modernBlock);\n\n    return {\n      xml,\n      report: {\n        previousMode,\n        newMode: 15,\n        removedFlags,\n        addedSettings,\n        namespacesExpanded: false,\n        changed,\n      },\n    };\n  }\n\n  /**\n   * Ensures namespace declarations include all modern extended namespaces\n   * (w14, w15, w16se, w16cid, etc.) and returns the expanded set.\n   *\n   * @param namespaces - Current namespace record from document\n   * @returns Updated namespace record with modern namespaces added\n   */\n  static ensureModernNamespaces(namespaces: Record<string, string>): {\n    namespaces: Record<string, string>;\n    expanded: boolean;\n  } {\n    const result = { ...namespaces };\n    let expanded = false;\n\n    const modernNamespaces: Record<string, string> = {\n      'xmlns:w14': 'http://schemas.microsoft.com/office/word/2010/wordml',\n      'xmlns:w15': 'http://schemas.microsoft.com/office/word/2012/wordml',\n      'xmlns:w16se': 'http://schemas.microsoft.com/office/word/2015/wordml/symex',\n      'xmlns:w16cid': 'http://schemas.microsoft.com/office/word/2016/wordml/cid',\n    };\n\n    for (const [key, value] of Object.entries(modernNamespaces)) {\n      if (!result[key]) {\n        result[key] = value;\n        expanded = true;\n      }\n    }\n\n    return { namespaces: result, expanded };\n  }\n\n  /**\n   * Builds a <w:compat> block XML string from an array of compat settings.\n   * Does not include legacy boolean flags (they are stripped during upgrade).\n   */\n  private static buildModernCompatBlock(settings: CompatSetting[]): string {\n    const entries = settings.map(\n      (s) => `    <w:compatSetting w:name=\"${s.name}\" w:uri=\"${s.uri}\" w:val=\"${s.val}\"/>`\n    );\n    return `<w:compat>\\n${entries.join('\\n')}\\n  </w:compat>`;\n  }\n}\n"]}
+{"version":3,"file":"CompatibilityUpgrader.js","sourceRoot":"","sources":["../../src/processors/CompatibilityUpgrader.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * CompatibilityUpgrader — Upgrades w:compat block in settings.xml to modern format.\n *\n * Equivalent to Word's File > Info > Convert operation for the compatibility\n * settings portion. Removes legacy boolean compat flags, updates compatSetting\n * entries, and manages modern namespaces.\n *\n * @module\n */\n\nimport {\n  LEGACY_COMPAT_ELEMENT_NAMES,\n  MODERN_COMPAT_SETTINGS,\n  MS_WORD_COMPAT_URI,\n} from '../constants/legacyCompatFlags.js';\nimport type { CompatSetting } from '../types/compatibility-types.js';\n\n/**\n * Report of what changed during an upgrade operation.\n */\nexport interface UpgradeReport {\n  /** Previous compatibility mode value (11, 12, 14, or 15) */\n  previousMode: number;\n\n  /** New compatibility mode (always 15 after upgrade) */\n  newMode: number;\n\n  /** Legacy compat flags that were removed (without w: prefix) */\n  removedFlags: string[];\n\n  /** Modern settings that were added (setting names) */\n  addedSettings: string[];\n\n  /** Whether namespaces were expanded */\n  namespacesExpanded: boolean;\n\n  /** Whether any changes were actually made (false if already mode 15 with no legacy flags) */\n  changed: boolean;\n}\n\n/**\n * Upgrades w:compat blocks in settings.xml to modern Word 2013+ format.\n */\nexport class CompatibilityUpgrader {\n  /**\n   * Upgrades the w:compat block in settings.xml to mode 15.\n   *\n   * Operations performed:\n   * 1. Remove all legacy boolean compat elements\n   * 2. Remove existing Microsoft-URI w:compatSetting entries\n   * 3. Insert modern w:compatSetting entries\n   * 4. Preserve non-Microsoft w:compatSetting entries (custom URIs)\n   *\n   * @param settingsXml - The raw settings.xml content\n   * @param previousMode - The current compatibility mode value (for the report)\n   * @returns Object with upgraded XML and an UpgradeReport\n   */\n  static upgradeCompatBlock(\n    settingsXml: string,\n    previousMode = 12\n  ): { xml: string; report: UpgradeReport } {\n    const removedFlags: string[] = [];\n    const addedSettings: string[] = [];\n\n    // Check if already mode 15 with no legacy flags\n    const compatBlockMatch = /<w:compat>([\\s\\S]*?)<\\/w:compat>/.exec(settingsXml);\n    const selfClosingCompat = /<w:compat\\s*\\/>/.exec(settingsXml);\n\n    if (!compatBlockMatch && !selfClosingCompat) {\n      // No w:compat block — insert a full modern block. CT_Settings is an\n      // xsd:sequence where w:compat must precede rsids, mathPr, themeFontLang,\n      // clrSchemeMapping, shapeDefaults, decimalSymbol, and listSeparator, so\n      // anchor before the earliest of those; append before </w:settings> only\n      // when none are present.\n      const modernBlock = CompatibilityUpgrader.buildModernCompatBlock(MODERN_COMPAT_SETTINGS);\n      const followingSibling =\n        /<(?:w:rsids|m:mathPr|w:themeFontLang|w:clrSchemeMapping|w:shapeDefaults|w:decimalSymbol|w:listSeparator)[\\s/>]/.exec(\n          settingsXml\n        );\n      const xml = followingSibling\n        ? settingsXml.slice(0, followingSibling.index) +\n          modernBlock +\n          '\\n  ' +\n          settingsXml.slice(followingSibling.index)\n        : settingsXml.replace(/<\\/w:settings>/, modernBlock + '\\n</w:settings>');\n\n      for (const s of MODERN_COMPAT_SETTINGS) {\n        addedSettings.push(s.name);\n      }\n\n      return {\n        xml,\n        report: {\n          previousMode,\n          newMode: 15,\n          removedFlags,\n          addedSettings,\n          namespacesExpanded: false,\n          changed: true,\n        },\n      };\n    }\n\n    // Handle self-closing <w:compat/>\n    if (selfClosingCompat) {\n      const modernBlock = CompatibilityUpgrader.buildModernCompatBlock(MODERN_COMPAT_SETTINGS);\n      const xml = settingsXml.replace(/<w:compat\\s*\\/>/, modernBlock);\n\n      for (const s of MODERN_COMPAT_SETTINGS) {\n        addedSettings.push(s.name);\n      }\n\n      return {\n        xml,\n        report: {\n          previousMode,\n          newMode: 15,\n          removedFlags,\n          addedSettings,\n          namespacesExpanded: false,\n          changed: true,\n        },\n      };\n    }\n\n    // Process existing w:compat block\n    const compatBlock = compatBlockMatch![1] ?? '';\n\n    // 1. Find and record legacy flags that will be removed\n    const legacyFlagRegex = /<w:(\\w+)(?:\\s[^>]*)?\\/?>/g;\n    let flagMatch;\n    while ((flagMatch = legacyFlagRegex.exec(compatBlock)) !== null) {\n      const tagName = flagMatch[1];\n      if (tagName && tagName !== 'compatSetting' && LEGACY_COMPAT_ELEMENT_NAMES.has(tagName)) {\n        removedFlags.push(tagName);\n      }\n    }\n\n    // 2. Collect non-Microsoft compatSetting entries to preserve\n    const preservedSettings: CompatSetting[] = [];\n    const settingRegex = /<w:compatSetting\\s+([^>]*)\\/?\\s*>/g;\n    let settingMatch;\n    while ((settingMatch = settingRegex.exec(compatBlock)) !== null) {\n      const attrs = settingMatch[1] ?? '';\n      const nameMatch = /w:name\\s*=\\s*\"([^\"]*)\"/.exec(attrs);\n      const uriMatch = /w:uri\\s*=\\s*\"([^\"]*)\"/.exec(attrs);\n      const valMatch = /w:val\\s*=\\s*\"([^\"]*)\"/.exec(attrs);\n\n      if (nameMatch?.[1] && uriMatch?.[1] && valMatch?.[1]) {\n        // Preserve settings with non-Microsoft URIs\n        if (uriMatch[1] !== MS_WORD_COMPAT_URI) {\n          preservedSettings.push({\n            name: nameMatch[1],\n            uri: uriMatch[1],\n            val: valMatch[1],\n          });\n        }\n      }\n    }\n\n    // 3. Determine which modern settings are actually new\n    const existingMsSettings = new Set<string>();\n    const existingSettingRegex = /<w:compatSetting\\s+([^>]*)\\/?\\s*>/g;\n    let existingMatch;\n    while ((existingMatch = existingSettingRegex.exec(compatBlock)) !== null) {\n      const attrs = existingMatch[1] ?? '';\n      const nameMatch = /w:name\\s*=\\s*\"([^\"]*)\"/.exec(attrs);\n      const uriMatch = /w:uri\\s*=\\s*\"([^\"]*)\"/.exec(attrs);\n      if (nameMatch?.[1] && uriMatch?.[1] && uriMatch[1] === MS_WORD_COMPAT_URI) {\n        existingMsSettings.add(nameMatch[1]);\n      }\n    }\n\n    for (const s of MODERN_COMPAT_SETTINGS) {\n      if (!existingMsSettings.has(s.name)) {\n        addedSettings.push(s.name);\n      }\n    }\n    // compatibilityMode value change counts as \"added\" if it existed but with different val\n    if (existingMsSettings.has('compatibilityMode') && previousMode !== 15) {\n      if (!addedSettings.includes('compatibilityMode')) {\n        addedSettings.push('compatibilityMode');\n      }\n    }\n\n    // 4. Build the new compat block\n    const allSettings = [...MODERN_COMPAT_SETTINGS, ...preservedSettings];\n    const modernBlock = CompatibilityUpgrader.buildModernCompatBlock(allSettings);\n\n    // 5. Replace the old block\n    const changed = removedFlags.length > 0 || addedSettings.length > 0 || previousMode !== 15;\n    const xml = settingsXml.replace(/<w:compat>[\\s\\S]*?<\\/w:compat>/, modernBlock);\n\n    return {\n      xml,\n      report: {\n        previousMode,\n        newMode: 15,\n        removedFlags,\n        addedSettings,\n        namespacesExpanded: false,\n        changed,\n      },\n    };\n  }\n\n  /**\n   * Ensures namespace declarations include all modern extended namespaces\n   * (w14, w15, w16se, w16cid, etc.) and returns the expanded set.\n   *\n   * @param namespaces - Current namespace record from document\n   * @returns Updated namespace record with modern namespaces added\n   */\n  static ensureModernNamespaces(namespaces: Record<string, string>): {\n    namespaces: Record<string, string>;\n    expanded: boolean;\n  } {\n    const result = { ...namespaces };\n    let expanded = false;\n\n    const modernNamespaces: Record<string, string> = {\n      'xmlns:w14': 'http://schemas.microsoft.com/office/word/2010/wordml',\n      'xmlns:w15': 'http://schemas.microsoft.com/office/word/2012/wordml',\n      'xmlns:w16se': 'http://schemas.microsoft.com/office/word/2015/wordml/symex',\n      'xmlns:w16cid': 'http://schemas.microsoft.com/office/word/2016/wordml/cid',\n    };\n\n    for (const [key, value] of Object.entries(modernNamespaces)) {\n      if (!result[key]) {\n        result[key] = value;\n        expanded = true;\n      }\n    }\n\n    return { namespaces: result, expanded };\n  }\n\n  /**\n   * Builds a <w:compat> block XML string from an array of compat settings.\n   * Does not include legacy boolean flags (they are stripped during upgrade).\n   */\n  private static buildModernCompatBlock(settings: CompatSetting[]): string {\n    const entries = settings.map(\n      (s) => `    <w:compatSetting w:name=\"${s.name}\" w:uri=\"${s.uri}\" w:val=\"${s.val}\"/>`\n    );\n    return `<w:compat>\\n${entries.join('\\n')}\\n  </w:compat>`;\n  }\n}\n"]}

package/dist/processors/InMemoryRevisionAcceptor.d.ts

@@ -18,6 +18,7 @@ export interface AcceptRevisionsResult {
 }
 export declare function stripRevisionsFromXml(xml: string): string;
 export declare function acceptRevisionsInMemory(doc: Document, options?: AcceptRevisionsOptions): AcceptRevisionsResult;
+export declare function mergeParagraphsWithDeletedMarks(doc: Document, marked: Set<Paragraph>): void;
 export declare function paragraphHasRevisions(paragraph: Paragraph): boolean;
 export declare function getRevisionsFromParagraph(paragraph: Paragraph): Revision[];
 export declare function countRevisionsByType(doc: Document): Map<RevisionType, number>;

package/dist/processors/InMemoryRevisionAcceptor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InMemoryRevisionAcceptor.d.ts","sourceRoot":"","sources":["../../src/processors/InMemoryRevisionAcceptor.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAErD,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAoBjE,MAAM,WAAW,sBAAsB;IAErC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAKD,MAAM,WAAW,qBAAqB;IAEpC,kBAAkB,EAAE,MAAM,CAAC;IAE3B,iBAAiB,EAAE,MAAM,CAAC;IAE1B,aAAa,EAAE,MAAM,CAAC;IAEtB,uBAAuB,EAAE,MAAM,CAAC;IAEhC,aAAa,EAAE,MAAM,CAAC;IAEtB,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AA+BD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAkEzD;AAaD,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,QAAQ,EACb,OAAO,GAAE,sBAA2B,GACnC,qBAAqB,CAwUvB;AA8LD,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAWnE;AAKD,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,SAAS,GAAG,QAAQ,EAAE,CAG1E;AAKD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,QAAQ,GAAG,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,CAa7E"}
+{"version":3,"file":"InMemoryRevisionAcceptor.d.ts","sourceRoot":"","sources":["../../src/processors/InMemoryRevisionAcceptor.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAErD,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAsBjE,MAAM,WAAW,sBAAsB;IAErC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAKD,MAAM,WAAW,qBAAqB;IAEpC,kBAAkB,EAAE,MAAM,CAAC;IAE3B,iBAAiB,EAAE,MAAM,CAAC;IAE1B,aAAa,EAAE,MAAM,CAAC;IAEtB,uBAAuB,EAAE,MAAM,CAAC;IAEhC,aAAa,EAAE,MAAM,CAAC;IAEtB,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AA2DD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAwEzD;AAaD,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,QAAQ,EACb,OAAO,GAAE,sBAA2B,GACnC,qBAAqB,CAgWvB;AA+ND,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,SAAS,CAAC,GAAG,IAAI,CAkC3F;AA0DD,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAWnE;AAKD,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,SAAS,GAAG,QAAQ,EAAE,CAG1E;AAKD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,QAAQ,GAAG,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,CAa7E"}

package/dist/processors/InMemoryRevisionAcceptor.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stripRevisionsFromXml = stripRevisionsFromXml;
 exports.acceptRevisionsInMemory = acceptRevisionsInMemory;
+exports.mergeParagraphsWithDeletedMarks = mergeParagraphsWithDeletedMarks;
 exports.paragraphHasRevisions = paragraphHasRevisions;
 exports.getRevisionsFromParagraph = getRevisionsFromParagraph;
 exports.countRevisionsByType = countRevisionsByType;
@@ -9,6 +10,8 @@ const Paragraph_js_1 = require("../elements/Paragraph.js");
 const Revision_js_1 = require("../elements/Revision.js");
 const RevisionContent_js_1 = require("../elements/RevisionContent.js");
 const Field_js_1 = require("../elements/Field.js");
+const RangeMarker_js_1 = require("../elements/RangeMarker.js");
+const PreservedElement_js_1 = require("../elements/PreservedElement.js");
 const Table_js_1 = require("../elements/Table.js");
 const logger_js_1 = require("../utils/logger.js");
 function getLogger() {
@@ -24,6 +27,24 @@ const PROPERTY_REVISION_TYPES = [
     'sectionPropertiesChange',
     'numberingChange',
 ];
+const MOVE_RANGE_MARKER_TYPES = new Set([
+    'moveFromRangeStart',
+    'moveFromRangeEnd',
+    'moveToRangeStart',
+    'moveToRangeEnd',
+    'customXmlMoveFromRangeStart',
+    'customXmlMoveFromRangeEnd',
+    'customXmlMoveToRangeStart',
+    'customXmlMoveToRangeEnd',
+]);
+const INS_RANGE_MARKER_TYPES = new Set([
+    'customXmlInsRangeStart',
+    'customXmlInsRangeEnd',
+]);
+const DEL_RANGE_MARKER_TYPES = new Set([
+    'customXmlDelRangeStart',
+    'customXmlDelRangeEnd',
+]);
 function stripRevisionsFromXml(xml) {
     let result = xml;
     const rangePatterns = [
@@ -53,18 +74,18 @@ function stripRevisionsFromXml(xml) {
     for (const pattern of propChangePatterns) {
         result = result.replace(pattern, '');
     }
+    result = result.replace(/<w:del\b[^>]*\/>/g, '');
     let prevLen = 0;
     while (result.length !== prevLen) {
         prevLen = result.length;
         result = result.replace(/<w:del\b[^>]*>[\s\S]*?<\/w:del>/g, '');
     }
-    result = result.replace(/<w:del\b[^>]*\/>/g, '');
+    result = result.replace(/<w:moveFrom\b[^>]*\/>/g, '');
     prevLen = 0;
     while (result.length !== prevLen) {
         prevLen = result.length;
         result = result.replace(/<w:moveFrom\b[^>]*>[\s\S]*?<\/w:moveFrom>/g, '');
     }
-    result = result.replace(/<w:moveFrom\b[^>]*\/>/g, '');
     result = result.replace(/<\/w:moveTo>/g, '');
     result = result.replace(/<w:moveTo\b[^>]*>/g, '');
     result = result.replace(/<\/w:ins>/g, '');
@@ -93,6 +114,7 @@ function acceptRevisionsInMemory(doc, options = {}) {
         emptyTablesRemoved: 0,
     };
     logger.info('Accepting revisions in-memory', { options: opts });
+    const acceptedMarkDeletions = [];
     if (opts.acceptMoves) {
         const revisionManager = doc.getRevisionManager();
         if (revisionManager) {
@@ -111,7 +133,7 @@ function acceptRevisionsInMemory(doc, options = {}) {
     }
     const paragraphs = doc.getAllParagraphs();
     for (const paragraph of paragraphs) {
-        const paragraphResult = acceptRevisionsInParagraph(paragraph, opts);
+        const paragraphResult = acceptRevisionsInParagraph(paragraph, opts, acceptedMarkDeletions);
         result.insertionsAccepted += paragraphResult.insertionsAccepted;
         result.deletionsAccepted += paragraphResult.deletionsAccepted;
         result.movesAccepted += paragraphResult.movesAccepted;
@@ -167,7 +189,7 @@ function acceptRevisionsInMemory(doc, options = {}) {
                     }
                 }
                 for (const paragraph of cell.getParagraphs()) {
-                    const paragraphResult = acceptRevisionsInParagraph(paragraph, opts);
+                    const paragraphResult = acceptRevisionsInParagraph(paragraph, opts, acceptedMarkDeletions);
                     result.insertionsAccepted += paragraphResult.insertionsAccepted;
                     result.deletionsAccepted += paragraphResult.deletionsAccepted;
                     result.movesAccepted += paragraphResult.movesAccepted;
@@ -202,7 +224,7 @@ function acceptRevisionsInMemory(doc, options = {}) {
             const elements = headerEntry.header.getElements();
             for (const element of elements) {
                 if (element instanceof Paragraph_js_1.Paragraph) {
-                    const paragraphResult = acceptRevisionsInParagraph(element, opts);
+                    const paragraphResult = acceptRevisionsInParagraph(element, opts, acceptedMarkDeletions);
                     result.insertionsAccepted += paragraphResult.insertionsAccepted;
                     result.deletionsAccepted += paragraphResult.deletionsAccepted;
                     result.movesAccepted += paragraphResult.movesAccepted;
@@ -212,7 +234,7 @@ function acceptRevisionsInMemory(doc, options = {}) {
                     for (const row of element.getRows()) {
                         for (const cell of row.getCells()) {
                             for (const paragraph of cell.getParagraphs()) {
-                                const paragraphResult = acceptRevisionsInParagraph(paragraph, opts);
+                                const paragraphResult = acceptRevisionsInParagraph(paragraph, opts, acceptedMarkDeletions);
                                 result.insertionsAccepted += paragraphResult.insertionsAccepted;
                                 result.deletionsAccepted += paragraphResult.deletionsAccepted;
                                 result.movesAccepted += paragraphResult.movesAccepted;
@@ -241,7 +263,7 @@ function acceptRevisionsInMemory(doc, options = {}) {
             const elements = footerEntry.footer.getElements();
             for (const element of elements) {
                 if (element instanceof Paragraph_js_1.Paragraph) {
-                    const paragraphResult = acceptRevisionsInParagraph(element, opts);
+                    const paragraphResult = acceptRevisionsInParagraph(element, opts, acceptedMarkDeletions);
                     result.insertionsAccepted += paragraphResult.insertionsAccepted;
                     result.deletionsAccepted += paragraphResult.deletionsAccepted;
                     result.movesAccepted += paragraphResult.movesAccepted;
@@ -251,7 +273,7 @@ function acceptRevisionsInMemory(doc, options = {}) {
                     for (const row of element.getRows()) {
                         for (const cell of row.getCells()) {
                             for (const paragraph of cell.getParagraphs()) {
-                                const paragraphResult = acceptRevisionsInParagraph(paragraph, opts);
+                                const paragraphResult = acceptRevisionsInParagraph(paragraph, opts, acceptedMarkDeletions);
                                 result.insertionsAccepted += paragraphResult.insertionsAccepted;
                                 result.deletionsAccepted += paragraphResult.deletionsAccepted;
                                 result.movesAccepted += paragraphResult.movesAccepted;
@@ -280,7 +302,7 @@ function acceptRevisionsInMemory(doc, options = {}) {
     if (footnoteManager) {
         for (const fn of footnoteManager.getAllFootnotes()) {
             for (const paragraph of fn.getParagraphs()) {
-                const paragraphResult = acceptRevisionsInParagraph(paragraph, opts);
+                const paragraphResult = acceptRevisionsInParagraph(paragraph, opts, acceptedMarkDeletions);
                 result.insertionsAccepted += paragraphResult.insertionsAccepted;
                 result.deletionsAccepted += paragraphResult.deletionsAccepted;
                 result.movesAccepted += paragraphResult.movesAccepted;
@@ -292,7 +314,7 @@ function acceptRevisionsInMemory(doc, options = {}) {
     if (endnoteManager) {
         for (const en of endnoteManager.getAllEndnotes()) {
             for (const paragraph of en.getParagraphs()) {
-                const paragraphResult = acceptRevisionsInParagraph(paragraph, opts);
+                const paragraphResult = acceptRevisionsInParagraph(paragraph, opts, acceptedMarkDeletions);
                 result.insertionsAccepted += paragraphResult.insertionsAccepted;
                 result.deletionsAccepted += paragraphResult.deletionsAccepted;
                 result.movesAccepted += paragraphResult.movesAccepted;
@@ -312,6 +334,9 @@ function acceptRevisionsInMemory(doc, options = {}) {
         revisionManager.clear();
     }
     doc.disableTrackChanges();
+    if (acceptedMarkDeletions.length > 0) {
+        mergeParagraphsWithDeletedMarks(doc, new Set(acceptedMarkDeletions));
+    }
     if (opts.cleanupEmptyTables) {
         result.emptyTablesRemoved = cleanupEmptyTables(doc, logger);
     }
@@ -330,7 +355,7 @@ function acceptRevisionsInMemory(doc, options = {}) {
     });
     return result;
 }
-function acceptRevisionsInParagraph(paragraph, options) {
+function acceptRevisionsInParagraph(paragraph, options, acceptedMarkDeletions) {
     const result = {
         insertionsAccepted: 0,
         deletionsAccepted: 0,
@@ -431,6 +456,15 @@ function acceptRevisionsInParagraph(paragraph, options) {
             }
             newContent.push(item);
         }
+        else if (item instanceof RangeMarker_js_1.RangeMarker) {
+            const markerType = item.getType();
+            if ((options.acceptMoves && MOVE_RANGE_MARKER_TYPES.has(markerType)) ||
+                (options.acceptInsertions && INS_RANGE_MARKER_TYPES.has(markerType)) ||
+                (options.acceptDeletions && DEL_RANGE_MARKER_TYPES.has(markerType))) {
+                continue;
+            }
+            newContent.push(item);
+        }
         else {
             newContent.push(item);
         }
@@ -452,6 +486,7 @@ function acceptRevisionsInParagraph(paragraph, options) {
         if (formatting.paragraphMarkDeletion) {
             paragraph.clearParagraphMarkDeletion();
             result.deletionsAccepted++;
+            acceptedMarkDeletions?.push(paragraph);
         }
     }
     if (options.acceptInsertions) {
@@ -463,6 +498,56 @@ function acceptRevisionsInParagraph(paragraph, options) {
     }
     return result;
 }
+function mergeParagraphsWithDeletedMarks(doc, marked) {
+    if (marked.size === 0) {
+        return;
+    }
+    mergeMarkedSequence(doc.getBodyElements(), marked, (para) => {
+        doc.removeElement(para);
+    });
+    for (const table of doc.getTables()) {
+        for (const row of table.getRows()) {
+            for (const cell of row.getCells()) {
+                const blockedBoundaries = new Set(cell.getRawNestedContent().map((item) => item.position));
+                mergeMarkedSequence(cell.getParagraphs(), marked, (para) => {
+                    const index = cell.getParagraphs().indexOf(para);
+                    if (index !== -1) {
+                        cell.removeParagraph(index);
+                    }
+                }, (index) => blockedBoundaries.has(index));
+            }
+        }
+    }
+}
+function mergeMarkedSequence(sequence, marked, removeParagraph, blockedBefore) {
+    let chain = [];
+    for (let i = 0; i < sequence.length; i++) {
+        const element = sequence[i];
+        if (!(element instanceof Paragraph_js_1.Paragraph)) {
+            chain = [];
+            continue;
+        }
+        if (blockedBefore?.(i)) {
+            chain = [];
+        }
+        if (marked.has(element)) {
+            chain.push(element);
+            continue;
+        }
+        if (chain.length > 0) {
+            const inherited = [];
+            for (const para of chain) {
+                inherited.push(...para.getContent());
+            }
+            element.setContent([...inherited, ...element.getContent()]);
+            for (const para of chain) {
+                para.setContent([]);
+                removeParagraph(para);
+            }
+            chain = [];
+        }
+    }
+}
 function paragraphHasRevisions(paragraph) {
     const content = paragraph.getContent();
     if (content.some((item) => item instanceof Revision_js_1.Revision)) {
@@ -490,6 +575,40 @@ function countRevisionsByType(doc) {
     }
     return counts;
 }
+const MARKER_PRESERVED_ELEMENT_TYPES = new Set([
+    'w:proofErr',
+    'w:permStart',
+    'w:permEnd',
+    'w:commentRangeStart',
+    'w:commentRangeEnd',
+]);
+function paragraphHasVisibleContent(para) {
+    if (para.getText().trim().length > 0) {
+        return true;
+    }
+    for (const item of para.getContent()) {
+        if (!item)
+            continue;
+        if (item instanceof Revision_js_1.Revision) {
+            return true;
+        }
+        if (item instanceof PreservedElement_js_1.PreservedElement) {
+            if (!MARKER_PRESERVED_ELEMENT_TYPES.has(item.getElementType())) {
+                return true;
+            }
+            continue;
+        }
+        const candidate = item;
+        if (typeof candidate.getImageElement === 'function' ||
+            typeof candidate.getShapeType === 'function' ||
+            typeof candidate.getTextContent === 'function' ||
+            typeof candidate.getUrl === 'function' ||
+            typeof candidate.getInstruction === 'function') {
+            return true;
+        }
+    }
+    return false;
+}
 function cleanupEmptyTables(doc, logger) {
     const tables = doc.getTables();
     let removedCount = 0;
@@ -503,10 +622,13 @@ function cleanupEmptyTables(doc, logger) {
         for (const row of rows) {
             const cells = row.getCells();
             for (const cell of cells) {
+                if (cell.hasRawNestedContent()) {
+                    hasContent = true;
+                    break;
+                }
                 const paragraphs = cell.getParagraphs();
                 for (const para of paragraphs) {
-                    const text = para.getText().trim();
-                    if (text.length > 0) {
+                    if (paragraphHasVisibleContent(para)) {
                         hasContent = true;
                         break;
                     }