docxmlater 10.2.5 → 10.2.7

package/dist/elements/RevisionContent.d.ts

@@ -1,8 +1,7 @@
 import type { Run } from './Run';
 import type { Hyperlink } from './Hyperlink';
 import type { ImageRun } from './ImageRun';
-import type { ComplexField } from './Field';
-export type RevisionContent = Run | ImageRun | Hyperlink | ComplexField;
+export type RevisionContent = Run | ImageRun | Hyperlink;
 export declare function isRunContent(content: RevisionContent): content is Run;
 export declare function isHyperlinkContent(content: RevisionContent): content is Hyperlink;
 export declare function isImageRunContent(content: RevisionContent): content is ImageRun;

package/dist/elements/RevisionContent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RevisionContent.d.ts","sourceRoot":"","sources":["../../src/elements/RevisionContent.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAW5C,MAAM,MAAM,eAAe,GAAG,GAAG,GAAG,QAAQ,GAAG,SAAS,GAAG,YAAY,CAAC;AAUxE,wBAAgB,YAAY,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,IAAI,GAAG,CAQrE;AAUD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,IAAI,SAAS,CAKjF;AAWD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,IAAI,QAAQ,CAK/E"}
+{"version":3,"file":"RevisionContent.d.ts","sourceRoot":"","sources":["../../src/elements/RevisionContent.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAU3C,MAAM,MAAM,eAAe,GAAG,GAAG,GAAG,QAAQ,GAAG,SAAS,CAAC;AAUzD,wBAAgB,YAAY,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,IAAI,GAAG,CAQrE;AAUD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,IAAI,SAAS,CAKjF;AAWD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,IAAI,QAAQ,CAK/E"}

package/dist/elements/RevisionContent.js.map

@@ -1 +1 @@
-{"version":3,"file":"RevisionContent.js","sourceRoot":"","sources":["../../src/elements/RevisionContent.ts"],"names":[],"mappings":";;AAmCA,oCAQC;AAUD,gDAKC;AAWD,8CAKC;AAvCD,SAAgB,YAAY,CAAC,OAAwB;IACnD,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAG1D,MAAM,UAAU,GAAG,OAAQ,OAAe,CAAC,OAAO,KAAK,UAAU,CAAC;IAClE,MAAM,SAAS,GAAG,OAAQ,OAAe,CAAC,MAAM,KAAK,UAAU,CAAC;IAEhE,OAAO,UAAU,IAAI,CAAC,SAAS,CAAC;AAClC,CAAC;AAUD,SAAgB,kBAAkB,CAAC,OAAwB;IACzD,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAG1D,OAAO,OAAQ,OAAe,CAAC,MAAM,KAAK,UAAU,CAAC;AACvD,CAAC;AAWD,SAAgB,iBAAiB,CAAC,OAAwB;IACxD,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAG1D,OAAO,OAAQ,OAAe,CAAC,eAAe,KAAK,UAAU,CAAC;AAChE,CAAC","sourcesContent":["/**\n * RevisionContent - Defines valid content types for tracked changes (revisions)\n *\n * Per ECMA-376, w:ins and w:del elements can contain:\n * - w:r (runs) - Text with formatting\n * - w:r with w:drawing (image runs) - Images embedded in runs\n * - w:hyperlink - Hyperlinks with nested runs\n *\n * This module provides the type definitions and type guards for revision content.\n */\n\nimport type { Run } from './Run';\nimport type { Hyperlink } from './Hyperlink';\nimport type { ImageRun } from './ImageRun';\nimport type { ComplexField } from './Field';\n\n/**\n * Content types valid within a revision (tracked change)\n *\n * Per ECMA-376 Part 1 section 17.13.5, revision elements can contain:\n * - Run elements (w:r) - the most common case\n * - ImageRun elements (w:r with w:drawing) - for tracked image changes\n * - Hyperlink elements (w:hyperlink) - for tracked hyperlink changes\n * - ComplexField elements (w:fldChar sequences) - for tracked field code changes\n */\nexport type RevisionContent = Run | ImageRun | Hyperlink | ComplexField;\n\n/**\n * Type guard to check if content is a Run\n * @param content - The content to check\n * @returns true if content is a Run instance\n *\n * Note: Uses duck typing instead of constructor.name to handle minified builds.\n * Run objects have getText() but NOT getUrl() or getAnchor() methods.\n */\nexport function isRunContent(content: RevisionContent): content is Run {\n  if (!content || typeof content !== 'object') return false;\n\n  // Duck typing: Runs have getText but no getUrl\n  const hasGetText = typeof (content as any).getText === 'function';\n  const hasGetUrl = typeof (content as any).getUrl === 'function';\n\n  return hasGetText && !hasGetUrl;\n}\n\n/**\n * Type guard to check if content is a Hyperlink\n * @param content - The content to check\n * @returns true if content is a Hyperlink instance\n *\n * Note: Uses duck typing instead of constructor.name to handle minified builds.\n * Hyperlink objects have getUrl() method which Runs don't have.\n */\nexport function isHyperlinkContent(content: RevisionContent): content is Hyperlink {\n  if (!content || typeof content !== 'object') return false;\n\n  // Duck typing: Hyperlinks have getUrl method\n  return typeof (content as any).getUrl === 'function';\n}\n\n/**\n * Type guard to check if content is an ImageRun\n * @param content - The content to check\n * @returns true if content is an ImageRun instance\n *\n * Note: Uses duck typing instead of constructor.name to handle minified builds.\n * ImageRun objects have getImageElement() method which regular Runs don't have.\n * This check should be performed BEFORE isRunContent() since ImageRun extends Run.\n */\nexport function isImageRunContent(content: RevisionContent): content is ImageRun {\n  if (!content || typeof content !== 'object') return false;\n\n  // Duck typing: ImageRun has getImageElement method which regular Run doesn't have\n  return typeof (content as any).getImageElement === 'function';\n}\n"]}
+{"version":3,"file":"RevisionContent.js","sourceRoot":"","sources":["../../src/elements/RevisionContent.ts"],"names":[],"mappings":";;AAiCA,oCAQC;AAUD,gDAKC;AAWD,8CAKC;AAvCD,SAAgB,YAAY,CAAC,OAAwB;IACnD,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAG1D,MAAM,UAAU,GAAG,OAAQ,OAAe,CAAC,OAAO,KAAK,UAAU,CAAC;IAClE,MAAM,SAAS,GAAG,OAAQ,OAAe,CAAC,MAAM,KAAK,UAAU,CAAC;IAEhE,OAAO,UAAU,IAAI,CAAC,SAAS,CAAC;AAClC,CAAC;AAUD,SAAgB,kBAAkB,CAAC,OAAwB;IACzD,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAG1D,OAAO,OAAQ,OAAe,CAAC,MAAM,KAAK,UAAU,CAAC;AACvD,CAAC;AAWD,SAAgB,iBAAiB,CAAC,OAAwB;IACxD,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAG1D,OAAO,OAAQ,OAAe,CAAC,eAAe,KAAK,UAAU,CAAC;AAChE,CAAC","sourcesContent":["/**\n * RevisionContent - Defines valid content types for tracked changes (revisions)\n *\n * Per ECMA-376, w:ins and w:del elements can contain:\n * - w:r (runs) — Text with formatting\n * - w:r with w:drawing (image runs) — Images embedded in runs\n * - w:hyperlink — Hyperlinks with nested runs\n *\n * This module provides the type definitions and type guards for revision content.\n */\n\nimport type { Run } from './Run';\nimport type { Hyperlink } from './Hyperlink';\nimport type { ImageRun } from './ImageRun';\n\n/**\n * Content types valid within a revision (tracked change)\n *\n * Per ECMA-376 Part 1 section 17.13.5, revision elements can contain:\n * - Run elements (w:r) - the most common case\n * - ImageRun elements (w:r with w:drawing) - for tracked image changes\n * - Hyperlink elements (w:hyperlink) - for tracked hyperlink changes\n */\nexport type RevisionContent = Run | ImageRun | Hyperlink;\n\n/**\n * Type guard to check if content is a Run\n * @param content - The content to check\n * @returns true if content is a Run instance\n *\n * Note: Uses duck typing instead of constructor.name to handle minified builds.\n * Run objects have getText() but NOT getUrl() or getAnchor() methods.\n */\nexport function isRunContent(content: RevisionContent): content is Run {\n  if (!content || typeof content !== 'object') return false;\n\n  // Duck typing: Runs have getText but no getUrl\n  const hasGetText = typeof (content as any).getText === 'function';\n  const hasGetUrl = typeof (content as any).getUrl === 'function';\n\n  return hasGetText && !hasGetUrl;\n}\n\n/**\n * Type guard to check if content is a Hyperlink\n * @param content - The content to check\n * @returns true if content is a Hyperlink instance\n *\n * Note: Uses duck typing instead of constructor.name to handle minified builds.\n * Hyperlink objects have getUrl() method which Runs don't have.\n */\nexport function isHyperlinkContent(content: RevisionContent): content is Hyperlink {\n  if (!content || typeof content !== 'object') return false;\n\n  // Duck typing: Hyperlinks have getUrl method\n  return typeof (content as any).getUrl === 'function';\n}\n\n/**\n * Type guard to check if content is an ImageRun\n * @param content - The content to check\n * @returns true if content is an ImageRun instance\n *\n * Note: Uses duck typing instead of constructor.name to handle minified builds.\n * ImageRun objects have getImageElement() method which regular Runs don't have.\n * This check should be performed BEFORE isRunContent() since ImageRun extends Run.\n */\nexport function isImageRunContent(content: RevisionContent): content is ImageRun {\n  if (!content || typeof content !== 'object') return false;\n\n  // Duck typing: ImageRun has getImageElement method which regular Run doesn't have\n  return typeof (content as any).getImageElement === 'function';\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docxmlater",
-  "version": "10.2.5",
+  "version": "10.2.7",
   "description": "A comprehensive DOCX editing framework for creating, reading, and manipulating Microsoft Word documents",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/core/DocumentParser.ts

@@ -3089,8 +3089,17 @@ export class DocumentParser {
           fieldState = null;
           groupedContent.push(item);
         } else {
-          // Normal revision outside of any field
-          groupedContent.push(item);
+          // Normal revision outside of any field — check if it contains a complete
+          // field code sequence (Scenario A: entire HYPERLINK fldChar sequence inside w:ins).
+          // parseRevisionFromXml() creates individual Runs from the fldChar/instrText/result
+          // elements, but assembleComplexFields() only sees the Revision wrapper.
+          // Promote complete field code sequences to ComplexField at the paragraph level.
+          const promoted = this.tryPromoteRevisionFieldCode(item);
+          if (promoted) {
+            groupedContent.push(promoted);
+          } else {
+            groupedContent.push(item);
+          }
         }
       } else {
         // Non-run content (hyperlinks, images, etc.)
@@ -3547,6 +3556,49 @@ export class DocumentParser {
     );
   }
 
+  /**
+   * Checks if a Revision contains a complete field code sequence (fldChar begin → instrText →
+   * fldChar separate → result text → fldChar end) and promotes it to a ComplexField.
+   *
+   * This handles the case where an entire HYPERLINK field code is inside a tracked change
+   * (w:ins), producing Runs with fldChar tokens inside the Revision. Since assembleComplexFields()
+   * only sees the Revision wrapper (not the Runs inside), the field code is never assembled.
+   *
+   * @returns ComplexField if promotion succeeded, null otherwise
+   */
+  private tryPromoteRevisionFieldCode(revision: Revision): ComplexField | null {
+    const content = revision.getContent();
+
+    // Quick check: need at least 3 runs (begin, instr/separate, end)
+    const runs = content.filter((c): c is Run => c instanceof Run);
+    if (runs.length < 3) return null;
+
+    // Check if the runs contain a complete field code sequence
+    let hasBegin = false;
+    let hasEnd = false;
+    for (const run of runs) {
+      const rc = run.getContent();
+      const fc = rc.find((c) => c.type === 'fieldChar');
+      if (fc?.fieldCharType === 'begin') hasBegin = true;
+      if (fc?.fieldCharType === 'end') hasEnd = true;
+    }
+    if (!hasBegin || !hasEnd) return null;
+
+    // Assemble the field from the revision's runs
+    const complexField = this.createComplexFieldFromRuns(runs);
+    if (!complexField) return null;
+
+    // Only promote HYPERLINK fields — other field types inside revisions
+    // are uncommon and preserving the revision wrapper is safer
+    if (!complexField.isHyperlinkField()) return null;
+
+    defaultLogger.debug(
+      `Promoted HYPERLINK field code from inside ${revision.getType()} revision (id=${revision.getId()}) to ComplexField`
+    );
+
+    return complexField;
+  }
+
   /**
    * NEW: Create ComplexField from sequence of field runs
    * Extracts instruction from instrText runs and result from text runs

package/src/elements/RevisionContent.ts

@@ -2,9 +2,9 @@
  * RevisionContent - Defines valid content types for tracked changes (revisions)
  *
  * Per ECMA-376, w:ins and w:del elements can contain:
- * - w:r (runs) - Text with formatting
- * - w:r with w:drawing (image runs) - Images embedded in runs
- * - w:hyperlink - Hyperlinks with nested runs
+ * - w:r (runs) — Text with formatting
+ * - w:r with w:drawing (image runs) — Images embedded in runs
+ * - w:hyperlink — Hyperlinks with nested runs
  *
  * This module provides the type definitions and type guards for revision content.
  */
@@ -12,7 +12,6 @@
 import type { Run } from './Run';
 import type { Hyperlink } from './Hyperlink';
 import type { ImageRun } from './ImageRun';
-import type { ComplexField } from './Field';
 
 /**
  * Content types valid within a revision (tracked change)
@@ -21,9 +20,8 @@ import type { ComplexField } from './Field';
  * - Run elements (w:r) - the most common case
  * - ImageRun elements (w:r with w:drawing) - for tracked image changes
  * - Hyperlink elements (w:hyperlink) - for tracked hyperlink changes
- * - ComplexField elements (w:fldChar sequences) - for tracked field code changes
  */
-export type RevisionContent = Run | ImageRun | Hyperlink | ComplexField;
+export type RevisionContent = Run | ImageRun | Hyperlink;
 
 /**
  * Type guard to check if content is a Run