docxmlater 5.7.3 → 6.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (66) hide show
  1. package/README.md +29 -2
  2. package/dist/core/Document.d.ts +15 -2
  3. package/dist/core/Document.d.ts.map +1 -1
  4. package/dist/core/Document.js +163 -7
  5. package/dist/core/Document.js.map +1 -1
  6. package/dist/core/DocumentGenerator.d.ts +4 -1
  7. package/dist/core/DocumentGenerator.d.ts.map +1 -1
  8. package/dist/core/DocumentGenerator.js +46 -42
  9. package/dist/core/DocumentGenerator.js.map +1 -1
  10. package/dist/core/DocumentParser.d.ts.map +1 -1
  11. package/dist/core/DocumentParser.js +33 -16
  12. package/dist/core/DocumentParser.js.map +1 -1
  13. package/dist/elements/Hyperlink.d.ts +8 -1
  14. package/dist/elements/Hyperlink.d.ts.map +1 -1
  15. package/dist/elements/Hyperlink.js +33 -0
  16. package/dist/elements/Hyperlink.js.map +1 -1
  17. package/dist/elements/Image.d.ts +1 -1
  18. package/dist/elements/Image.d.ts.map +1 -1
  19. package/dist/elements/Image.js +51 -8
  20. package/dist/elements/Image.js.map +1 -1
  21. package/dist/elements/Paragraph.d.ts +1 -0
  22. package/dist/elements/Paragraph.d.ts.map +1 -1
  23. package/dist/elements/Paragraph.js +15 -3
  24. package/dist/elements/Paragraph.js.map +1 -1
  25. package/dist/elements/RevisionManager.d.ts +33 -0
  26. package/dist/elements/RevisionManager.d.ts.map +1 -1
  27. package/dist/elements/RevisionManager.js +149 -0
  28. package/dist/elements/RevisionManager.js.map +1 -1
  29. package/dist/formatting/NumberingManager.d.ts +3 -0
  30. package/dist/formatting/NumberingManager.d.ts.map +1 -1
  31. package/dist/formatting/NumberingManager.js +9 -0
  32. package/dist/formatting/NumberingManager.js.map +1 -1
  33. package/dist/formatting/StylesManager.d.ts +3 -0
  34. package/dist/formatting/StylesManager.d.ts.map +1 -1
  35. package/dist/formatting/StylesManager.js +8 -0
  36. package/dist/formatting/StylesManager.js.map +1 -1
  37. package/dist/index.d.ts +5 -2
  38. package/dist/index.d.ts.map +1 -1
  39. package/dist/index.js +7 -1
  40. package/dist/index.js.map +1 -1
  41. package/dist/utils/ChangelogGenerator.d.ts +82 -0
  42. package/dist/utils/ChangelogGenerator.d.ts.map +1 -0
  43. package/dist/utils/ChangelogGenerator.js +422 -0
  44. package/dist/utils/ChangelogGenerator.js.map +1 -0
  45. package/dist/utils/RevisionAwareProcessor.d.ts +60 -0
  46. package/dist/utils/RevisionAwareProcessor.d.ts.map +1 -0
  47. package/dist/utils/RevisionAwareProcessor.js +237 -0
  48. package/dist/utils/RevisionAwareProcessor.js.map +1 -0
  49. package/dist/utils/SelectiveRevisionAcceptor.d.ts +34 -0
  50. package/dist/utils/SelectiveRevisionAcceptor.d.ts.map +1 -0
  51. package/dist/utils/SelectiveRevisionAcceptor.js +175 -0
  52. package/dist/utils/SelectiveRevisionAcceptor.js.map +1 -0
  53. package/dist/utils/acceptRevisions.d.ts +22 -0
  54. package/dist/utils/acceptRevisions.d.ts.map +1 -0
  55. package/dist/utils/acceptRevisions.js +211 -0
  56. package/dist/utils/acceptRevisions.js.map +1 -0
  57. package/dist/utils/corruptionDetection.js +1 -1
  58. package/dist/utils/corruptionDetection.js.map +1 -1
  59. package/dist/utils/stripTrackedChanges.d.ts +22 -0
  60. package/dist/utils/stripTrackedChanges.d.ts.map +1 -0
  61. package/dist/utils/stripTrackedChanges.js +196 -0
  62. package/dist/utils/stripTrackedChanges.js.map +1 -0
  63. package/dist/xml/XMLParser.d.ts.map +1 -1
  64. package/dist/xml/XMLParser.js +7 -0
  65. package/dist/xml/XMLParser.js.map +1 -1
  66. package/package.json +1 -1
@@ -17,7 +17,10 @@ export declare class DocumentGenerator {
17
17
  generateCoreProps(properties: DocumentProperties): string;
18
18
  generateAppProps(properties?: DocumentProperties): string;
19
19
  generateCustomProps(customProps: Record<string, string | number | boolean | Date>): string;
20
- generateContentTypesWithImagesHeadersFootersAndComments(imageManager: ImageManager, headerFooterManager: HeaderFooterManager, commentManager: CommentManager, zipHandler: any, fontManager?: FontManager, hasCustomProperties?: boolean): string;
20
+ generateContentTypesWithImagesHeadersFootersAndComments(imageManager: ImageManager, headerFooterManager: HeaderFooterManager, commentManager: CommentManager, zipHandler: any, fontManager?: FontManager, hasCustomProperties?: boolean, originalContentTypes?: {
21
+ defaults: Set<string>;
22
+ overrides: Set<string>;
23
+ }): string;
21
24
  private clearOrphanedHyperlinkRelationships;
22
25
  processHyperlinks(bodyElements: BodyElement[], headerFooterManager: HeaderFooterManager, relationshipManager: RelationshipManager): void;
23
26
  private processHyperlinksInParagraph;
@@ -1 +1 @@
1
- {"version":3,"file":"DocumentGenerator.d.ts","sourceRoot":"","sources":["../../src/core/DocumentGenerator.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAE5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAK5D,KAAK,WAAW,GACZ,SAAS,GACT,KAAK,GACL,sBAAsB,GACtB,qBAAqB,CAAC;AAK1B,qBAAa,iBAAiB;IAI5B,oBAAoB,IAAI,MAAM;IAmB9B,YAAY,IAAI,MAAM;IAYtB,mBAAmB,CACjB,YAAY,EAAE,WAAW,EAAE,EAC3B,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACjC,MAAM;IAwBT,iBAAiB,CAAC,UAAU,EAAE,kBAAkB,GAAG,MAAM;IA8DzD,gBAAgB,CAAC,UAAU,GAAE,kBAAuB,GAAG,MAAM;IA4B7D,mBAAmB,CACjB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC,GAC5D,MAAM;IAsDT,uDAAuD,CACrD,YAAY,EAAE,YAAY,EAC1B,mBAAmB,EAAE,mBAAmB,EACxC,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,GAAG,EACf,WAAW,CAAC,EAAE,WAAW,EACzB,mBAAmB,GAAE,OAAe,GACnC,MAAM;IAiHT,OAAO,CAAC,mCAAmC;IAyF3C,iBAAiB,CACf,YAAY,EAAE,WAAW,EAAE,EAC3B,mBAAmB,EAAE,mBAAmB,EACxC,mBAAmB,EAAE,mBAAmB,GACvC,IAAI;IAiDP,OAAO,CAAC,4BAA4B;IAmCpC,iBAAiB,IAAI,MAAM;IAsD3B,gBAAgB,CAAC,oBAAoB,CAAC,EAAE;QACtC,mBAAmB,CAAC,EAAE,OAAO,CAAC;QAC9B,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,YAAY,CAAC,EAAE;YACb,0BAA0B,EAAE,OAAO,CAAC;YACpC,cAAc,EAAE,OAAO,CAAC;YACxB,kBAAkB,EAAE,OAAO,CAAC;SAC7B,CAAC;QACF,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QACjB,kBAAkB,CAAC,EAAE;YACnB,IAAI,EAAE,UAAU,GAAG,UAAU,GAAG,gBAAgB,GAAG,OAAO,CAAC;YAC3D,WAAW,EAAE,OAAO,CAAC;YACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;YAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAC;YAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC;YAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;YAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;YACxB,IAAI,CAAC,EAAE,MAAM,CAAC;YACd,IAAI,CAAC,EAAE,MAAM,CAAC;SACf,CAAC;KACH,GAAG,MAAM;IA6FV,aAAa,IAAI,MAAM;CAyFxB"}
1
+ {"version":3,"file":"DocumentGenerator.d.ts","sourceRoot":"","sources":["../../src/core/DocumentGenerator.ts"],"names":[],"mappings":"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"}
@@ -128,78 +128,82 @@ class DocumentGenerator {
128
128
  ${properties}
129
129
  </Properties>`;
130
130
  }
131
- generateContentTypesWithImagesHeadersFootersAndComments(imageManager, headerFooterManager, commentManager, zipHandler, fontManager, hasCustomProperties = false) {
131
+ generateContentTypesWithImagesHeadersFootersAndComments(imageManager, headerFooterManager, commentManager, zipHandler, fontManager, hasCustomProperties = false, originalContentTypes) {
132
132
  const images = imageManager.getAllImages();
133
133
  const headers = headerFooterManager.getAllHeaders();
134
134
  const footers = headerFooterManager.getAllFooters();
135
135
  const hasComments = commentManager.getCount() > 0;
136
- const extensions = new Set();
136
+ const generatedDefaults = new Set();
137
+ const generatedOverrides = new Set();
138
+ generatedDefaults.add('rels|application/vnd.openxmlformats-package.relationships+xml');
139
+ generatedDefaults.add('xml|application/xml');
137
140
  for (const entry of images) {
138
- extensions.add(entry.image.getExtension());
139
- }
140
- let xml = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n';
141
- xml +=
142
- '<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">\n';
143
- xml +=
144
- ' <Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>\n';
145
- xml += ' <Default Extension="xml" ContentType="application/xml"/>\n';
146
- for (const ext of extensions) {
141
+ const ext = entry.image.getExtension();
147
142
  const mimeType = ImageManager_1.ImageManager.getMimeType(ext);
148
- xml += ` <Default Extension="${ext}" ContentType="${mimeType}"/>\n`;
143
+ generatedDefaults.add(`${ext}|${mimeType}`);
149
144
  }
150
145
  if (fontManager && fontManager.getCount() > 0) {
151
146
  const fontEntries = fontManager.generateContentTypeEntries();
152
147
  for (const entry of fontEntries) {
153
- xml += entry + "\n";
148
+ const extMatch = entry.match(/Extension="([^"]+)"/);
149
+ const typeMatch = entry.match(/ContentType="([^"]+)"/);
150
+ if (extMatch && typeMatch) {
151
+ generatedDefaults.add(`${extMatch[1]}|${typeMatch[1]}`);
152
+ }
154
153
  }
155
154
  }
156
155
  const files = zipHandler.getFilePaths?.() || [];
157
156
  const hasTtfFonts = files.some((f) => f.endsWith(".ttf"));
158
157
  if (hasTtfFonts) {
159
- xml +=
160
- ' <Default Extension="ttf" ContentType="application/x-font-ttf"/>\n';
158
+ generatedDefaults.add('ttf|application/x-font-ttf');
161
159
  }
162
- xml +=
163
- ' <Override PartName="/word/document.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"/>\n';
164
- xml +=
165
- ' <Override PartName="/word/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml"/>\n';
166
- xml +=
167
- ' <Override PartName="/word/numbering.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml"/>\n';
168
- xml +=
169
- ' <Override PartName="/word/fontTable.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml"/>\n';
170
- xml +=
171
- ' <Override PartName="/word/settings.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml"/>\n';
172
- xml +=
173
- ' <Override PartName="/word/theme/theme1.xml" ContentType="application/vnd.openxmlformats-officedocument.theme+xml"/>\n';
160
+ generatedOverrides.add('/word/document.xml|application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml');
161
+ generatedOverrides.add('/word/styles.xml|application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml');
162
+ generatedOverrides.add('/word/numbering.xml|application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml');
163
+ generatedOverrides.add('/word/fontTable.xml|application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml');
164
+ generatedOverrides.add('/word/settings.xml|application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml');
165
+ generatedOverrides.add('/word/theme/theme1.xml|application/vnd.openxmlformats-officedocument.theme+xml');
174
166
  for (const entry of headers) {
175
- xml += ` <Override PartName="/word/${entry.filename}" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml"/>\n`;
167
+ generatedOverrides.add(`/word/${entry.filename}|application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml`);
176
168
  }
177
169
  for (const entry of footers) {
178
- xml += ` <Override PartName="/word/${entry.filename}" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml"/>\n`;
170
+ generatedOverrides.add(`/word/${entry.filename}|application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml`);
179
171
  }
180
172
  if (hasComments) {
181
- xml +=
182
- ' <Override PartName="/word/comments.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml"/>\n';
173
+ generatedOverrides.add('/word/comments.xml|application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml');
183
174
  }
184
- xml +=
185
- ' <Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/>\n';
175
+ generatedOverrides.add('/docProps/core.xml|application/vnd.openxmlformats-package.core-properties+xml');
186
176
  if (zipHandler.hasFile?.("docProps/app.xml")) {
187
- xml +=
188
- ' <Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/>\n';
177
+ generatedOverrides.add('/docProps/app.xml|application/vnd.openxmlformats-officedocument.extended-properties+xml');
189
178
  }
190
179
  if (zipHandler.hasFile?.("docProps/custom.xml") || hasCustomProperties) {
191
- xml +=
192
- ' <Override PartName="/docProps/custom.xml" ContentType="application/vnd.openxmlformats-officedocument.custom-properties+xml"/>\n';
180
+ generatedOverrides.add('/docProps/custom.xml|application/vnd.openxmlformats-officedocument.custom-properties+xml');
193
181
  }
194
182
  if (zipHandler.hasFile?.("customXML/item1.xml")) {
195
- xml +=
196
- ' <Override PartName="/customXML/item1.xml" ContentType="application/xml"/>\n';
183
+ generatedOverrides.add('/customXML/item1.xml|application/xml');
197
184
  }
198
185
  if (zipHandler.hasFile?.("customXML/itemProps1.xml")) {
199
- xml +=
200
- ' <Override PartName="/customXML/itemProps1.xml" ContentType="application/vnd.openxmlformats-officedocument.customXmlProperties+xml"/>\n';
186
+ generatedOverrides.add('/customXML/itemProps1.xml|application/vnd.openxmlformats-officedocument.customXmlProperties+xml');
187
+ }
188
+ const allDefaults = new Set([
189
+ ...generatedDefaults,
190
+ ...(originalContentTypes?.defaults || [])
191
+ ]);
192
+ const allOverrides = new Set([
193
+ ...generatedOverrides,
194
+ ...(originalContentTypes?.overrides || [])
195
+ ]);
196
+ let xml = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n';
197
+ xml += '<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">\n';
198
+ for (const entry of allDefaults) {
199
+ const [ext, contentType] = entry.split('|');
200
+ xml += ` <Default Extension="${ext}" ContentType="${contentType}"/>\n`;
201
+ }
202
+ for (const entry of allOverrides) {
203
+ const [partName, contentType] = entry.split('|');
204
+ xml += ` <Override PartName="${partName}" ContentType="${contentType}"/>\n`;
201
205
  }
202
- xml += "</Types>";
206
+ xml += '</Types>';
203
207
  return xml;
204
208
  }
205
209
  clearOrphanedHyperlinkRelationships(bodyElements, headerFooterManager, relationshipManager) {
@@ -1 +1 @@
1
- {"version":3,"file":"DocumentGenerator.js","sourceRoot":"","sources":["../../src/core/DocumentGenerator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DocumentGenerator.js","sourceRoot":"","sources":["../../src/core/DocumentGenerator.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"DocumentParser.d.ts","sourceRoot":"","sources":["../../src/core/DocumentParser.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,SAAS,EAAuB,MAAM,uBAAuB,CAAC;AAGvE,OAAO,EAEL,OAAO,EAGR,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAE5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,KAAK,EAA8B,MAAM,qBAAqB,CAAC;AASxE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAK5D,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,KAAK,CAAC;CACd;AAKD,KAAK,WAAW,GACZ,SAAS,GACT,KAAK,GACL,sBAAsB,GACtB,qBAAqB,CAAC;AAK1B,qBAAa,cAAc;IACzB,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,aAAa,CAAU;gBAEnB,aAAa,GAAE,OAAe;IAO1C,cAAc,IAAI,UAAU,EAAE;IAO9B,gBAAgB,IAAI,IAAI;IAWlB,aAAa,CACjB,UAAU,EAAE,UAAU,EACtB,mBAAmB,EAAE,mBAAmB,EACxC,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC;QACT,YAAY,EAAE,WAAW,EAAE,CAAC;QAC5B,UAAU,EAAE,kBAAkB,CAAC;QAC/B,mBAAmB,EAAE,mBAAmB,CAAC;QACzC,MAAM,EAAE,KAAK,EAAE,CAAC;QAChB,kBAAkB,EAAE,iBAAiB,EAAE,CAAC;QACxC,kBAAkB,EAAE,iBAAiB,EAAE,CAAC;QACxC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;QACxB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KACpC,CAAC;YAyDY,iBAAiB;IAiH/B,OAAO,CAAC,WAAW;IAmCnB,OAAO,CAAC,mBAAmB;IAkC3B,OAAO,CAAC,qBAAqB;IAoB7B,OAAO,CAAC,oBAAoB;IAuB5B,OAAO,CAAC,qBAAqB;YAwEf,uBAAuB;YAuFvB,6BAA6B;IA8N3C,OAAO,CAAC,oBAAoB;YA4Ed,wBAAwB;IAsKtC,OAAO,CAAC,kCAAkC;IAsU1C,OAAO,CAAC,qBAAqB;IAuH7B,OAAO,CAAC,0BAA0B;IAmHlC,OAAO,CAAC,kBAAkB;IAsN1B,OAAO,CAAC,wBAAwB;IAiGhC,OAAO,CAAC,0BAA0B;IAiIlC,OAAO,CAAC,8BAA8B;IActC,OAAO,CAAC,0BAA0B;IAwClC,OAAO,CAAC,4BAA4B;YAmLtB,sBAAsB;IAwLpC,OAAO,CAAC,iBAAiB;IA2CzB,OAAO,CAAC,kBAAkB;IA6D1B,OAAO,CAAC,cAAc;IAmBtB,OAAO,CAAC,iBAAiB;YAuBX,oBAAoB;IAsElC,OAAO,CAAC,8BAA8B;YAuFxB,uBAAuB;IAoErC,OAAO,CAAC,iCAAiC;IAyDzC,OAAO,CAAC,sCAAsC;IA4D9C,OAAO,CAAC,2BAA2B;YAgCrB,wBAAwB;YA2MxB,kBAAkB;IAqPhC,OAAO,CAAC,6BAA6B;IAwCrC,OAAO,CAAC,4BAA4B;IA6JpC,OAAO,CAAC,4BAA4B;IA8FpC,OAAO,CAAC,sBAAsB;IAmI9B,OAAO,CAAC,cAAc;IA2BtB,OAAO,CAAC,WAAW;IAgHnB,OAAO,CAAC,kBAAkB;IAoB1B,OAAO,CAAC,eAAe;IAuEvB,OAAO,CAAC,qBAAqB;IA8D7B,OAAO,CAAC,WAAW;IA8CnB,OAAO,CAAC,cAAc;IAqEtB,OAAO,CAAC,sBAAsB;IAoP9B,OAAO,CAAC,UAAU;IAgLlB,OAAO,CAAC,+BAA+B;IA4GvC,OAAO,CAAC,yBAAyB;IAyJjC,OAAO,CAAC,yBAAyB;IA+EjC,OAAO,CAAC,2BAA2B;IAqEnC,OAAO,CAAC,+BAA+B;IAmDvC,OAAO,CAAC,8BAA8B;IA8CtC,OAAO,CAAC,iCAAiC;IA6FzC,OAAO,CAAC,mBAAmB;IAqF3B,OAAO,CAAC,mBAAmB;IAqB3B,OAAO,CAAC,uBAAuB;IA6B/B,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IA+BzE,MAAM,CAAC,SAAS,CACd,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,OAAO;IAwBV,MAAM,CAAC,gBAAgB,CACrB,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,MAAM,GACf,KAAK,CAAC;QACP,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;IA6DF,OAAO,CAAC,eAAe;IAkCjB,sBAAsB,CAC1B,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,GAAG,IAAI,EACvB,mBAAmB,EAAE,mBAAmB,EACxC,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC;QACT,OAAO,EAAE,KAAK,CAAC;YACb,MAAM,EAAE,OAAO,oBAAoB,EAAE,MAAM,CAAC;YAC5C,cAAc,EAAE,MAAM,CAAC;YACvB,QAAQ,EAAE,MAAM,CAAC;SAClB,CAAC,CAAC;QACH,OAAO,EAAE,KAAK,CAAC;YACb,MAAM,EAAE,OAAO,oBAAoB,EAAE,MAAM,CAAC;YAC5C,cAAc,EAAE,MAAM,CAAC;YACvB,QAAQ,EAAE,MAAM,CAAC;SAClB,CAAC,CAAC;KACJ,CAAC;YA4FY,WAAW;YA8DX,WAAW;CAoD1B"}
1
+ {"version":3,"file":"DocumentParser.d.ts","sourceRoot":"","sources":["../../src/core/DocumentParser.ts"],"names":[],"mappings":"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"}
@@ -309,6 +309,16 @@ class DocumentParser {
309
309
  let delIndex = 0;
310
310
  let moveFromIndex = 0;
311
311
  let moveToIndex = 0;
312
+ const findClosingTagEnd = (content, tagName, startPos) => {
313
+ const closingTag = `</${tagName}>`;
314
+ const closingPos = content.indexOf(closingTag, startPos);
315
+ if (closingPos === -1)
316
+ return startPos;
317
+ return closingPos + closingTag.length;
318
+ };
319
+ const isSelfClosing = (tagContent) => {
320
+ return tagContent.endsWith("/");
321
+ };
312
322
  let searchPos = 0;
313
323
  while (searchPos < paraContent.length) {
314
324
  const tagStart = paraContent.indexOf("<", searchPos);
@@ -319,9 +329,10 @@ class DocumentParser {
319
329
  break;
320
330
  const tagContent = paraContent.substring(tagStart + 1, tagEnd);
321
331
  const tagName = tagContent.split(/[\s\/>]/)[0];
332
+ const selfClosing = isSelfClosing(tagContent);
322
333
  if (tagName === "w:r") {
323
334
  children.push({ type: "w:r", pos: tagStart, index: runIndex++ });
324
- searchPos = tagEnd + 1;
335
+ searchPos = selfClosing ? tagEnd + 1 : findClosingTagEnd(paraContent, "w:r", tagEnd);
325
336
  }
326
337
  else if (tagName === "w:hyperlink") {
327
338
  children.push({
@@ -329,7 +340,7 @@ class DocumentParser {
329
340
  pos: tagStart,
330
341
  index: hyperlinkIndex++,
331
342
  });
332
- searchPos = tagEnd + 1;
343
+ searchPos = selfClosing ? tagEnd + 1 : findClosingTagEnd(paraContent, "w:hyperlink", tagEnd);
333
344
  }
334
345
  else if (tagName === "w:fldSimple") {
335
346
  children.push({
@@ -337,7 +348,7 @@ class DocumentParser {
337
348
  pos: tagStart,
338
349
  index: fieldIndex++,
339
350
  });
340
- searchPos = tagEnd + 1;
351
+ searchPos = selfClosing ? tagEnd + 1 : findClosingTagEnd(paraContent, "w:fldSimple", tagEnd);
341
352
  }
342
353
  else if (tagName === "w:ins") {
343
354
  children.push({
@@ -345,7 +356,7 @@ class DocumentParser {
345
356
  pos: tagStart,
346
357
  index: insIndex++,
347
358
  });
348
- searchPos = tagEnd + 1;
359
+ searchPos = selfClosing ? tagEnd + 1 : findClosingTagEnd(paraContent, "w:ins", tagEnd);
349
360
  }
350
361
  else if (tagName === "w:del") {
351
362
  children.push({
@@ -353,7 +364,7 @@ class DocumentParser {
353
364
  pos: tagStart,
354
365
  index: delIndex++,
355
366
  });
356
- searchPos = tagEnd + 1;
367
+ searchPos = selfClosing ? tagEnd + 1 : findClosingTagEnd(paraContent, "w:del", tagEnd);
357
368
  }
358
369
  else if (tagName === "w:moveFrom") {
359
370
  children.push({
@@ -361,7 +372,7 @@ class DocumentParser {
361
372
  pos: tagStart,
362
373
  index: moveFromIndex++,
363
374
  });
364
- searchPos = tagEnd + 1;
375
+ searchPos = selfClosing ? tagEnd + 1 : findClosingTagEnd(paraContent, "w:moveFrom", tagEnd);
365
376
  }
366
377
  else if (tagName === "w:moveTo") {
367
378
  children.push({
@@ -369,7 +380,7 @@ class DocumentParser {
369
380
  pos: tagStart,
370
381
  index: moveToIndex++,
371
382
  });
372
- searchPos = tagEnd + 1;
383
+ searchPos = selfClosing ? tagEnd + 1 : findClosingTagEnd(paraContent, "w:moveTo", tagEnd);
373
384
  }
374
385
  else {
375
386
  searchPos = tagEnd + 1;
@@ -1614,9 +1625,14 @@ class DocumentParser {
1614
1625
  const docPrObj = imageObj["wp:docPr"];
1615
1626
  let name = "image";
1616
1627
  let description = "Image";
1628
+ let docPrId = 1;
1617
1629
  if (docPrObj) {
1618
1630
  name = docPrObj["@_name"] || "image";
1619
1631
  description = docPrObj["@_descr"] || "Image";
1632
+ const idAttr = docPrObj["@_id"];
1633
+ if (idAttr) {
1634
+ docPrId = parseInt(String(idAttr), 10);
1635
+ }
1620
1636
  }
1621
1637
  let wrap = undefined;
1622
1638
  if (isFloating) {
@@ -1657,7 +1673,7 @@ class DocumentParser {
1657
1673
  if (!blipObj) {
1658
1674
  return null;
1659
1675
  }
1660
- const crop = this.parseImageCrop(blipObj);
1676
+ const crop = this.parseImageCrop(blipFillObj);
1661
1677
  const effects = this.parseImageEffects(blipObj);
1662
1678
  const relationshipId = blipObj["@_r:embed"];
1663
1679
  if (!relationshipId) {
@@ -1696,6 +1712,7 @@ class DocumentParser {
1696
1712
  });
1697
1713
  imageManager.registerImage(image, relationshipId);
1698
1714
  image.setRelationshipId(relationshipId);
1715
+ image.setDocPrId(docPrId);
1699
1716
  return new ImageRun_1.ImageRun(image);
1700
1717
  }
1701
1718
  catch (error) {
@@ -1727,17 +1744,17 @@ class DocumentParser {
1727
1744
  return {
1728
1745
  type,
1729
1746
  side: wrapObj["@_wrapText"] || "bothSides",
1730
- distanceTop: anchorObj["@_distT"]
1731
- ? parseInt(anchorObj["@_distT"], 10)
1747
+ distanceTop: wrapObj["@_distT"]
1748
+ ? parseInt(wrapObj["@_distT"], 10)
1732
1749
  : undefined,
1733
- distanceBottom: anchorObj["@_distB"]
1734
- ? parseInt(anchorObj["@_distB"], 10)
1750
+ distanceBottom: wrapObj["@_distB"]
1751
+ ? parseInt(wrapObj["@_distB"], 10)
1735
1752
  : undefined,
1736
- distanceLeft: anchorObj["@_distL"]
1737
- ? parseInt(anchorObj["@_distL"], 10)
1753
+ distanceLeft: wrapObj["@_distL"]
1754
+ ? parseInt(wrapObj["@_distL"], 10)
1738
1755
  : undefined,
1739
- distanceRight: anchorObj["@_distR"]
1740
- ? parseInt(anchorObj["@_distR"], 10)
1756
+ distanceRight: wrapObj["@_distR"]
1757
+ ? parseInt(wrapObj["@_distR"], 10)
1741
1758
  : undefined,
1742
1759
  };
1743
1760
  }