@usejunior/docx-core 0.18.0 → 0.20.1
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.
- package/dist/.tsbuildinfo +1 -1
- package/dist/core-types.d.ts +1 -139
- package/dist/core-types.d.ts.map +1 -1
- package/dist/core-types.js +1 -3
- package/dist/core-types.js.map +1 -1
- package/dist/generation/emit/borders.d.ts +14 -0
- package/dist/generation/emit/borders.d.ts.map +1 -0
- package/dist/generation/emit/borders.js +45 -0
- package/dist/generation/emit/borders.js.map +1 -0
- package/dist/generation/emit/properties.d.ts +1 -1
- package/dist/generation/emit/properties.d.ts.map +1 -1
- package/dist/generation/emit/properties.js +4 -0
- package/dist/generation/emit/properties.js.map +1 -1
- package/dist/generation/emit/table.d.ts.map +1 -1
- package/dist/generation/emit/table.js +3 -31
- package/dist/generation/emit/table.js.map +1 -1
- package/dist/generation/index.d.ts +1 -1
- package/dist/generation/index.d.ts.map +1 -1
- package/dist/generation/types.d.ts +9 -0
- package/dist/generation/types.d.ts.map +1 -1
- package/dist/generation/types.js.map +1 -1
- package/dist/generation/validate-spec.d.ts.map +1 -1
- package/dist/generation/validate-spec.js +2 -0
- package/dist/generation/validate-spec.js.map +1 -1
- package/dist/index.d.ts +3 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +11 -0
- package/dist/index.js.map +1 -1
- package/dist/integration/generation-probes.d.ts +36 -2
- package/dist/integration/generation-probes.d.ts.map +1 -1
- package/dist/integration/generation-probes.js +137 -15
- package/dist/integration/generation-probes.js.map +1 -1
- package/dist/integration/libreoffice-oracle.js +1 -1
- package/dist/integration/synthetic-docx-fixture.d.ts.map +1 -1
- package/dist/integration/synthetic-docx-fixture.js +37 -20
- package/dist/integration/synthetic-docx-fixture.js.map +1 -1
- package/dist/primitives/accept_ai_edits.js +14 -2
- package/dist/primitives/accept_ai_edits.js.map +1 -1
- package/dist/primitives/accept_changes.d.ts +7 -0
- package/dist/primitives/accept_changes.d.ts.map +1 -1
- package/dist/primitives/accept_changes.js +92 -4
- package/dist/primitives/accept_changes.js.map +1 -1
- package/dist/primitives/bookmarks.d.ts +1 -0
- package/dist/primitives/bookmarks.d.ts.map +1 -1
- package/dist/primitives/bookmarks.js +1 -1
- package/dist/primitives/bookmarks.js.map +1 -1
- package/dist/primitives/comments.d.ts +31 -4
- package/dist/primitives/comments.d.ts.map +1 -1
- package/dist/primitives/comments.js +111 -12
- package/dist/primitives/comments.js.map +1 -1
- package/dist/primitives/document.d.ts +47 -1
- package/dist/primitives/document.d.ts.map +1 -1
- package/dist/primitives/document.js +198 -13
- package/dist/primitives/document.js.map +1 -1
- package/dist/primitives/document_view-headings.d.ts +3 -1
- package/dist/primitives/document_view-headings.d.ts.map +1 -1
- package/dist/primitives/document_view-headings.js +5 -5
- package/dist/primitives/document_view-headings.js.map +1 -1
- package/dist/primitives/document_view.d.ts +2 -0
- package/dist/primitives/document_view.d.ts.map +1 -1
- package/dist/primitives/document_view.js +18 -4
- package/dist/primitives/document_view.js.map +1 -1
- package/dist/primitives/field_evaluation.d.ts +70 -0
- package/dist/primitives/field_evaluation.d.ts.map +1 -0
- package/dist/primitives/field_evaluation.js +462 -0
- package/dist/primitives/field_evaluation.js.map +1 -0
- package/dist/primitives/footnotes.d.ts +17 -3
- package/dist/primitives/footnotes.d.ts.map +1 -1
- package/dist/primitives/footnotes.js +64 -17
- package/dist/primitives/footnotes.js.map +1 -1
- package/dist/primitives/formatting_tags.js +2 -2
- package/dist/primitives/formatting_tags.js.map +1 -1
- package/dist/primitives/index.d.ts +8 -1
- package/dist/primitives/index.d.ts.map +1 -1
- package/dist/primitives/index.js +8 -1
- package/dist/primitives/index.js.map +1 -1
- package/dist/primitives/merge_runs.d.ts +3 -1
- package/dist/primitives/merge_runs.d.ts.map +1 -1
- package/dist/primitives/merge_runs.js +12 -2
- package/dist/primitives/merge_runs.js.map +1 -1
- package/dist/primitives/namespaces.d.ts +12 -2
- package/dist/primitives/namespaces.d.ts.map +1 -1
- package/dist/primitives/namespaces.js +13 -2
- package/dist/primitives/namespaces.js.map +1 -1
- package/dist/primitives/note_conversion.d.ts +11 -0
- package/dist/primitives/note_conversion.d.ts.map +1 -0
- package/dist/primitives/note_conversion.js +12 -0
- package/dist/primitives/note_conversion.js.map +1 -0
- package/dist/primitives/opc-target.d.ts +24 -0
- package/dist/primitives/opc-target.d.ts.map +1 -0
- package/dist/primitives/opc-target.js +99 -0
- package/dist/primitives/opc-target.js.map +1 -0
- package/dist/primitives/paragraph_numbering.d.ts +40 -0
- package/dist/primitives/paragraph_numbering.d.ts.map +1 -0
- package/dist/primitives/paragraph_numbering.js +198 -0
- package/dist/primitives/paragraph_numbering.js.map +1 -0
- package/dist/primitives/reject_changes.d.ts +7 -0
- package/dist/primitives/reject_changes.d.ts.map +1 -1
- package/dist/primitives/reject_changes.js +133 -10
- package/dist/primitives/reject_changes.js.map +1 -1
- package/dist/primitives/sectPrAudit.d.ts +18 -1
- package/dist/primitives/sectPrAudit.d.ts.map +1 -1
- package/dist/primitives/sectPrAudit.js +120 -34
- package/dist/primitives/sectPrAudit.js.map +1 -1
- package/dist/primitives/sections.d.ts +134 -0
- package/dist/primitives/sections.d.ts.map +1 -0
- package/dist/primitives/sections.js +644 -0
- package/dist/primitives/sections.js.map +1 -0
- package/dist/primitives/serialize_html.d.ts.map +1 -1
- package/dist/primitives/serialize_html.js +18 -7
- package/dist/primitives/serialize_html.js.map +1 -1
- package/dist/primitives/styles.d.ts +60 -0
- package/dist/primitives/styles.d.ts.map +1 -1
- package/dist/primitives/styles.js +206 -25
- package/dist/primitives/styles.js.map +1 -1
- package/dist/primitives/symbol_run_content.d.ts +42 -0
- package/dist/primitives/symbol_run_content.d.ts.map +1 -0
- package/dist/primitives/symbol_run_content.js +79 -0
- package/dist/primitives/symbol_run_content.js.map +1 -0
- package/dist/primitives/text.d.ts +29 -0
- package/dist/primitives/text.d.ts.map +1 -1
- package/dist/primitives/text.js +354 -44
- package/dist/primitives/text.js.map +1 -1
- package/dist/primitives/track-changes-emitter.d.ts +9 -0
- package/dist/primitives/track-changes-emitter.d.ts.map +1 -1
- package/dist/primitives/track-changes-emitter.js +40 -2
- package/dist/primitives/track-changes-emitter.js.map +1 -1
- package/dist/primitives/validate_document.d.ts.map +1 -1
- package/dist/primitives/validate_document.js +22 -1
- package/dist/primitives/validate_document.js.map +1 -1
- package/dist/shared/docx/DocxArchive.d.ts.map +1 -1
- package/dist/shared/docx/DocxArchive.js +7 -0
- package/dist/shared/docx/DocxArchive.js.map +1 -1
- package/dist/shared/field-semantics.d.ts +26 -0
- package/dist/shared/field-semantics.d.ts.map +1 -0
- package/dist/shared/field-semantics.js +232 -0
- package/dist/shared/field-semantics.js.map +1 -0
- package/dist/shared/field-structure.d.ts +14 -0
- package/dist/shared/field-structure.d.ts.map +1 -1
- package/dist/shared/field-structure.js +98 -7
- package/dist/shared/field-structure.js.map +1 -1
- package/package.json +3 -5
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { parseXml, serializeXml } from './xml.js';
|
|
2
2
|
import { childElements, createWmlElement, renameElement } from './dom-helpers.js';
|
|
3
|
-
import { OOXML } from './namespaces.js';
|
|
3
|
+
import { OOXML, W } from './namespaces.js';
|
|
4
4
|
const SYNTHETIC_DOC = parseXml('<root xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"/>');
|
|
5
5
|
const EXCLUDED_PPR_CHANGE_CHILDREN = new Set(['w:rPr', 'w:rPrChange', 'w:pPrChange', 'w:sectPr']);
|
|
6
6
|
const EXCLUDED_TRPR_CHANGE_CHILDREN = new Set(['w:trPrChange', 'w:ins', 'w:del']);
|
|
@@ -9,6 +9,17 @@ const EXCLUDED_TRPR_CHANGE_CHILDREN = new Set(['w:trPrChange', 'w:ins', 'w:del']
|
|
|
9
9
|
// change-of-a-change marker w:tcPrChange itself is excluded. See:
|
|
10
10
|
// https://learn.microsoft.com/en-us/dotnet/api/documentformat.openxml.wordprocessing.previoustablecellproperties
|
|
11
11
|
const EXCLUDED_TCPR_CHANGE_CHILDREN = new Set(['w:tcPrChange']);
|
|
12
|
+
const EXCLUDED_SECTPR_CHANGE_CHILDREN = new Set([
|
|
13
|
+
'w:headerReference',
|
|
14
|
+
'w:footerReference',
|
|
15
|
+
'w:sectPrChange',
|
|
16
|
+
]);
|
|
17
|
+
const SECTPR_BASE_ATTRIBUTE_NAMES = new Set([
|
|
18
|
+
'rsidRPr',
|
|
19
|
+
'rsidDel',
|
|
20
|
+
'rsidR',
|
|
21
|
+
'rsidSect',
|
|
22
|
+
]);
|
|
12
23
|
/**
|
|
13
24
|
* Create a revision ID allocator.
|
|
14
25
|
*
|
|
@@ -162,6 +173,33 @@ export function buildTcPrChangeElement(oldTcPr, ctx) {
|
|
|
162
173
|
tcPrChange.appendChild(previousTcPr);
|
|
163
174
|
return tcPrChange;
|
|
164
175
|
}
|
|
176
|
+
/**
|
|
177
|
+
* Build a `<w:sectPrChange>` wrapper containing the previous section
|
|
178
|
+
* properties. A prior change record is excluded from the nested snapshot so
|
|
179
|
+
* the emitter never authors a change-of-a-change.
|
|
180
|
+
*
|
|
181
|
+
* @conformance ECMA-376 edition 5, Part 1 § 17.13.5.32
|
|
182
|
+
* @see #654
|
|
183
|
+
*/
|
|
184
|
+
export function buildSectPrChangeElement(oldSectPr, ctx) {
|
|
185
|
+
const sectPrChange = createWmlElement(getOwnerDocument(oldSectPr), 'sectPrChange', revisionAttributes(ctx));
|
|
186
|
+
const previousSectPr = createWmlElement(getOwnerDocument(oldSectPr), W.sectPr);
|
|
187
|
+
for (let i = 0; i < oldSectPr.attributes.length; i++) {
|
|
188
|
+
const attribute = oldSectPr.attributes.item(i);
|
|
189
|
+
if (attribute
|
|
190
|
+
&& attribute.namespaceURI === OOXML.W_NS
|
|
191
|
+
&& SECTPR_BASE_ATTRIBUTE_NAMES.has(attribute.localName)) {
|
|
192
|
+
previousSectPr.setAttributeNS(OOXML.W_NS, `w:${attribute.localName}`, attribute.value);
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
for (const child of childElements(oldSectPr)) {
|
|
196
|
+
if (!EXCLUDED_SECTPR_CHANGE_CHILDREN.has(child.tagName)) {
|
|
197
|
+
previousSectPr.appendChild(child.cloneNode(true));
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
sectPrChange.appendChild(previousSectPr);
|
|
201
|
+
return sectPrChange;
|
|
202
|
+
}
|
|
165
203
|
/**
|
|
166
204
|
* Build a `<w:rPrChange>` wrapper containing the previous run properties.
|
|
167
205
|
*
|
|
@@ -277,7 +315,7 @@ function createRevisionWrapperElement(doc, tag, ctx) {
|
|
|
277
315
|
}
|
|
278
316
|
function createSerializedRevisionOpenTag(tagName, ctx) {
|
|
279
317
|
const id = allocateRevisionId(ctx.idState);
|
|
280
|
-
return `<${tagName} w:id="${id}" w:author="${escapeXmlAttr(ctx.author)}" w:date="${ctx.date}">`;
|
|
318
|
+
return `<${tagName} w:id="${id}" w:author="${escapeXmlAttr(ctx.author)}" w:date="${escapeXmlAttr(ctx.date)}">`;
|
|
281
319
|
}
|
|
282
320
|
function normalizeDeletionElement(element) {
|
|
283
321
|
for (const child of childElements(element)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"track-changes-emitter.js","sourceRoot":"","sources":["../../src/primitives/track-changes-emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAClF,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"track-changes-emitter.js","sourceRoot":"","sources":["../../src/primitives/track-changes-emitter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate_document.d.ts","sourceRoot":"","sources":["../../src/primitives/validate_document.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,sEAAsE;IACtE,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;
|
|
1
|
+
{"version":3,"file":"validate_document.d.ts","sourceRoot":"","sources":["../../src/primitives/validate_document.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,sEAAsE;IACtE,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAiKF;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,QAAQ,GAAG,sBAAsB,CActE"}
|
|
@@ -55,6 +55,27 @@ function checkOrphanedBookmarks(body) {
|
|
|
55
55
|
// ── Check: malformed tracked-change wrappers ──────────────────────────
|
|
56
56
|
const TC_LOCALS = ['ins', 'del', 'moveFrom', 'moveTo'];
|
|
57
57
|
const REQUIRED_TC_ATTRS = ['id', 'author', 'date'];
|
|
58
|
+
/**
|
|
59
|
+
* Paragraph-mark revisions are empty marker elements under w:p/w:pPr/w:rPr,
|
|
60
|
+
* not wrappers around child content.
|
|
61
|
+
*
|
|
62
|
+
* @conformance ECMA-376 edition 5, Part 1 § 17.13.5.15
|
|
63
|
+
* @see https://github.com/UseJunior/safe-docx/issues/741
|
|
64
|
+
*/
|
|
65
|
+
function isParagraphMarkTrackedChange(el) {
|
|
66
|
+
const rPr = el.parentNode;
|
|
67
|
+
const pPr = rPr?.parentNode;
|
|
68
|
+
const paragraph = pPr?.parentNode;
|
|
69
|
+
return (rPr?.nodeType === 1 &&
|
|
70
|
+
rPr.namespaceURI === OOXML.W_NS &&
|
|
71
|
+
rPr.localName === W.rPr &&
|
|
72
|
+
pPr?.nodeType === 1 &&
|
|
73
|
+
pPr.namespaceURI === OOXML.W_NS &&
|
|
74
|
+
pPr.localName === W.pPr &&
|
|
75
|
+
paragraph?.nodeType === 1 &&
|
|
76
|
+
paragraph.namespaceURI === OOXML.W_NS &&
|
|
77
|
+
paragraph.localName === W.p);
|
|
78
|
+
}
|
|
58
79
|
function checkTrackedChangeWrappers(body) {
|
|
59
80
|
const warnings = [];
|
|
60
81
|
for (const local of TC_LOCALS) {
|
|
@@ -81,7 +102,7 @@ function checkTrackedChangeWrappers(body) {
|
|
|
81
102
|
}
|
|
82
103
|
c = c.nextSibling;
|
|
83
104
|
}
|
|
84
|
-
if (!hasChildElement) {
|
|
105
|
+
if (!hasChildElement && !isParagraphMarkTrackedChange(el)) {
|
|
85
106
|
const tcId = getWAttr(el, 'id') ?? '?';
|
|
86
107
|
warnings.push({
|
|
87
108
|
code: 'EMPTY_TRACKED_CHANGE',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate_document.js","sourceRoot":"","sources":["../../src/primitives/validate_document.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"validate_document.js","sourceRoot":"","sources":["../../src/primitives/validate_document.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DocxArchive.d.ts","sourceRoot":"","sources":["../../../src/shared/docx/DocxArchive.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,2CAA2C;AAC3C,eAAO,MAAM,UAAU;;;;;;;;;;CAUb,CAAC;AAEX;;;;GAIG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,GAAG,CAAQ;IACnB,OAAO,CAAC,QAAQ,CAA0B;IAE1C,OAAO;IAIP;;;;;OAKG;WACU,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAcvD;;;;OAIG;WACU,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC;IAmC3C;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAQvC;;OAEG;IACH,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAKjC;;;;;OAKG;IACG,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAQnD,+EAA+E;IACzE,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAMzD;;;;;OAKG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAKrD;;OAEG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI9B;;OAEG;IACH,SAAS,IAAI,MAAM,EAAE;IAQrB;;OAEG;IACG,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAI5C;;OAEG;IACG,eAAe,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAI/C;;;;OAIG;IACG,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"DocxArchive.d.ts","sourceRoot":"","sources":["../../../src/shared/docx/DocxArchive.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,2CAA2C;AAC3C,eAAO,MAAM,UAAU;;;;;;;;;;CAUb,CAAC;AAEX;;;;GAIG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,GAAG,CAAQ;IACnB,OAAO,CAAC,QAAQ,CAA0B;IAE1C,OAAO;IAIP;;;;;OAKG;WACU,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAcvD;;;;OAIG;WACU,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC;IAmC3C;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAQvC;;OAEG;IACH,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAKjC;;;;;OAKG;IACG,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAQnD,+EAA+E;IACzE,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAMzD;;;;;OAKG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAKrD;;OAEG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI9B;;OAEG;IACH,SAAS,IAAI,MAAM,EAAE;IAQrB;;OAEG;IACG,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAI5C;;OAEG;IACG,eAAe,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAI/C;;;;OAIG;IACG,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC;IAe7B;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,WAAW,CAAC;IAKnC;;OAEG;IACH,gBAAgB,IAAI,MAAM,EAAE;CAG7B"}
|
|
@@ -152,6 +152,13 @@ export class DocxArchive {
|
|
|
152
152
|
* @returns The DOCX file as a Buffer
|
|
153
153
|
*/
|
|
154
154
|
async save() {
|
|
155
|
+
// OPC packages address parts by file name and do not need directory records.
|
|
156
|
+
// JSZip may synthesize folder objects while adding nested paths; remove only
|
|
157
|
+
// those objects before serialization without deleting their child parts.
|
|
158
|
+
for (const entry of Object.values(this.zip.files)) {
|
|
159
|
+
if (entry.dir)
|
|
160
|
+
delete this.zip.files[entry.name];
|
|
161
|
+
}
|
|
155
162
|
const content = await this.zip.generateAsync({
|
|
156
163
|
type: 'nodebuffer',
|
|
157
164
|
compression: 'DEFLATE',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DocxArchive.js","sourceRoot":"","sources":["../../../src/shared/docx/DocxArchive.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"DocxArchive.js","sourceRoot":"","sources":["../../../src/shared/docx/DocxArchive.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
export type WordFieldKind = 'PAGE' | 'NUMPAGES' | 'REF' | 'PAGEREF' | 'TOC' | 'SEQ' | 'UNKNOWN';
|
|
2
|
+
export type FieldEvaluationClass = 'deterministic-ref' | 'layout-dependent' | 'recognized-unsupported' | 'unknown';
|
|
3
|
+
export interface FieldInstructionClassification {
|
|
4
|
+
kind: WordFieldKind;
|
|
5
|
+
evaluationClass: FieldEvaluationClass;
|
|
6
|
+
normalizedInstruction: string;
|
|
7
|
+
target?: string;
|
|
8
|
+
switches: string[];
|
|
9
|
+
unsupportedSwitches: string[];
|
|
10
|
+
preservationSupported: boolean;
|
|
11
|
+
reason?: string;
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* Classify the Word field instruction subset understood by Safe Docx.
|
|
15
|
+
*
|
|
16
|
+
* This parser is intentionally switch-aware: recognizing the leading keyword
|
|
17
|
+
* alone is not enough to claim that a field can be evaluated safely.
|
|
18
|
+
*
|
|
19
|
+
* @conformance ECMA-376 edition 5, Part 1 § 17.16.5.51
|
|
20
|
+
* @conformance ECMA-376 edition 5, Part 1 § 17.16.5.45
|
|
21
|
+
* @conformance ECMA-376 edition 5, Part 1 § 17.16.5.44
|
|
22
|
+
* @conformance ECMA-376 edition 5, Part 1 § 17.16.5.42
|
|
23
|
+
* @see https://github.com/UseJunior/safe-docx/issues/762
|
|
24
|
+
*/
|
|
25
|
+
export declare function classifyFieldInstruction(instructionText: string): FieldInstructionClassification;
|
|
26
|
+
//# sourceMappingURL=field-semantics.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"field-semantics.d.ts","sourceRoot":"","sources":["../../src/shared/field-semantics.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,aAAa,GACrB,MAAM,GACN,UAAU,GACV,KAAK,GACL,SAAS,GACT,KAAK,GACL,KAAK,GACL,SAAS,CAAC;AAEd,MAAM,MAAM,oBAAoB,GAC5B,mBAAmB,GACnB,kBAAkB,GAClB,wBAAwB,GACxB,SAAS,CAAC;AAEd,MAAM,WAAW,8BAA8B;IAC7C,IAAI,EAAE,aAAa,CAAC;IACpB,eAAe,EAAE,oBAAoB,CAAC;IACtC,qBAAqB,EAAE,MAAM,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AA6DD;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CACtC,eAAe,EAAE,MAAM,GACtB,8BAA8B,CAiLhC"}
|
|
@@ -0,0 +1,232 @@
|
|
|
1
|
+
function tokenizeFieldInstruction(instructionText) {
|
|
2
|
+
const tokens = [];
|
|
3
|
+
let value = '';
|
|
4
|
+
let quoted = false;
|
|
5
|
+
let tokenQuoted = false;
|
|
6
|
+
let quoteClosed = false;
|
|
7
|
+
const push = () => {
|
|
8
|
+
if (value.length > 0 || tokenQuoted) {
|
|
9
|
+
tokens.push({ value, quoted: tokenQuoted });
|
|
10
|
+
value = '';
|
|
11
|
+
tokenQuoted = false;
|
|
12
|
+
quoteClosed = false;
|
|
13
|
+
}
|
|
14
|
+
};
|
|
15
|
+
for (let index = 0; index < instructionText.length; index += 1) {
|
|
16
|
+
const character = instructionText[index];
|
|
17
|
+
if (character === '"') {
|
|
18
|
+
if (!quoted && value.length > 0)
|
|
19
|
+
return null;
|
|
20
|
+
quoted = !quoted;
|
|
21
|
+
tokenQuoted = true;
|
|
22
|
+
quoteClosed = !quoted;
|
|
23
|
+
}
|
|
24
|
+
else if (/\s/u.test(character) && !quoted) {
|
|
25
|
+
push();
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
if (quoteClosed)
|
|
29
|
+
return null;
|
|
30
|
+
value += character;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
if (quoted)
|
|
34
|
+
return null;
|
|
35
|
+
push();
|
|
36
|
+
return tokens;
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Render tokens back to a canonical instruction string.
|
|
40
|
+
*
|
|
41
|
+
* The escape must cover the escape character itself, not just the quote.
|
|
42
|
+
* Escaping only `"` lets `a\` and `a` normalize to strings that differ by a
|
|
43
|
+
* trailing backslash the reader cannot attribute, and comparison uses this
|
|
44
|
+
* rendering as a cache identity — an ambiguous identity silently merges two
|
|
45
|
+
* instructions that are not the same.
|
|
46
|
+
*/
|
|
47
|
+
function normalizeTokens(tokens) {
|
|
48
|
+
return tokens
|
|
49
|
+
.map(({ value, quoted }) => quoted || /\s/u.test(value)
|
|
50
|
+
? `"${value.replace(/[\\"]/gu, (character) => `\\${character}`)}"`
|
|
51
|
+
: value)
|
|
52
|
+
.join(' ');
|
|
53
|
+
}
|
|
54
|
+
/**
|
|
55
|
+
* Classify the Word field instruction subset understood by Safe Docx.
|
|
56
|
+
*
|
|
57
|
+
* This parser is intentionally switch-aware: recognizing the leading keyword
|
|
58
|
+
* alone is not enough to claim that a field can be evaluated safely.
|
|
59
|
+
*
|
|
60
|
+
* @conformance ECMA-376 edition 5, Part 1 § 17.16.5.51
|
|
61
|
+
* @conformance ECMA-376 edition 5, Part 1 § 17.16.5.45
|
|
62
|
+
* @conformance ECMA-376 edition 5, Part 1 § 17.16.5.44
|
|
63
|
+
* @conformance ECMA-376 edition 5, Part 1 § 17.16.5.42
|
|
64
|
+
* @see https://github.com/UseJunior/safe-docx/issues/762
|
|
65
|
+
*/
|
|
66
|
+
export function classifyFieldInstruction(instructionText) {
|
|
67
|
+
const tokens = tokenizeFieldInstruction(instructionText);
|
|
68
|
+
if (!tokens) {
|
|
69
|
+
return {
|
|
70
|
+
kind: 'UNKNOWN',
|
|
71
|
+
evaluationClass: 'unknown',
|
|
72
|
+
normalizedInstruction: instructionText.trim().replace(/\s+/gu, ' '),
|
|
73
|
+
switches: [],
|
|
74
|
+
unsupportedSwitches: [],
|
|
75
|
+
preservationSupported: false,
|
|
76
|
+
reason: 'malformed-field-instruction',
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
const keyword = tokens[0]?.value.toUpperCase() ?? '';
|
|
80
|
+
const canonicalTokens = tokens.map((token, index) => ({
|
|
81
|
+
...token,
|
|
82
|
+
value: index === 0
|
|
83
|
+
? keyword
|
|
84
|
+
: token.value.startsWith('\\')
|
|
85
|
+
? token.value.toLowerCase()
|
|
86
|
+
: tokens[index - 1]?.value.toLowerCase() === '\\*'
|
|
87
|
+
? token.value.toUpperCase()
|
|
88
|
+
: token.value,
|
|
89
|
+
}));
|
|
90
|
+
const normalizedInstruction = normalizeTokens(canonicalTokens);
|
|
91
|
+
const knownKinds = new Set([
|
|
92
|
+
'PAGE',
|
|
93
|
+
'NUMPAGES',
|
|
94
|
+
'REF',
|
|
95
|
+
'PAGEREF',
|
|
96
|
+
'TOC',
|
|
97
|
+
'SEQ',
|
|
98
|
+
]);
|
|
99
|
+
const kind = knownKinds.has(keyword)
|
|
100
|
+
? keyword
|
|
101
|
+
: 'UNKNOWN';
|
|
102
|
+
const switches = [];
|
|
103
|
+
const switchArguments = [];
|
|
104
|
+
const unsupportedSwitches = [];
|
|
105
|
+
const parseSwitchTail = (start, allowed, argumentSwitches) => {
|
|
106
|
+
for (let index = start; index < tokens.length; index += 1) {
|
|
107
|
+
const token = tokens[index].value.toLowerCase();
|
|
108
|
+
if (!/^\\.$/u.test(token))
|
|
109
|
+
return false;
|
|
110
|
+
const name = token.slice(1);
|
|
111
|
+
switches.push(token);
|
|
112
|
+
switchArguments.push(undefined);
|
|
113
|
+
if (!allowed.has(name)) {
|
|
114
|
+
unsupportedSwitches.push(token);
|
|
115
|
+
return false;
|
|
116
|
+
}
|
|
117
|
+
if (argumentSwitches.has(name)) {
|
|
118
|
+
const argument = tokens[index + 1]?.value;
|
|
119
|
+
if (!argument || argument.startsWith('\\'))
|
|
120
|
+
return false;
|
|
121
|
+
switchArguments[switchArguments.length - 1] = argument;
|
|
122
|
+
index += 1;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
return true;
|
|
126
|
+
};
|
|
127
|
+
if (kind === 'PAGE' || kind === 'NUMPAGES') {
|
|
128
|
+
const valid = parseSwitchTail(1, new Set(['*', '#']), new Set(['*', '#']));
|
|
129
|
+
return {
|
|
130
|
+
kind,
|
|
131
|
+
evaluationClass: valid ? 'layout-dependent' : 'recognized-unsupported',
|
|
132
|
+
normalizedInstruction,
|
|
133
|
+
switches,
|
|
134
|
+
unsupportedSwitches,
|
|
135
|
+
preservationSupported: valid,
|
|
136
|
+
reason: valid ? undefined : 'unsupported-field-instruction',
|
|
137
|
+
};
|
|
138
|
+
}
|
|
139
|
+
if (kind === 'PAGEREF') {
|
|
140
|
+
const target = tokens[1]?.value;
|
|
141
|
+
const valid = Boolean(target && !target.startsWith('\\')) &&
|
|
142
|
+
parseSwitchTail(2, new Set(['h', 'p', '*']), new Set(['*']));
|
|
143
|
+
return {
|
|
144
|
+
kind,
|
|
145
|
+
evaluationClass: valid ? 'layout-dependent' : 'recognized-unsupported',
|
|
146
|
+
normalizedInstruction,
|
|
147
|
+
target,
|
|
148
|
+
switches,
|
|
149
|
+
unsupportedSwitches,
|
|
150
|
+
preservationSupported: valid,
|
|
151
|
+
reason: valid ? undefined : 'unsupported-field-instruction',
|
|
152
|
+
};
|
|
153
|
+
}
|
|
154
|
+
if (kind === 'TOC') {
|
|
155
|
+
return {
|
|
156
|
+
kind,
|
|
157
|
+
evaluationClass: 'layout-dependent',
|
|
158
|
+
normalizedInstruction,
|
|
159
|
+
switches: tokens
|
|
160
|
+
.slice(1)
|
|
161
|
+
.filter((token) => token.value.startsWith('\\'))
|
|
162
|
+
.map((token) => token.value.toLowerCase()),
|
|
163
|
+
unsupportedSwitches: [],
|
|
164
|
+
preservationSupported: true,
|
|
165
|
+
};
|
|
166
|
+
}
|
|
167
|
+
if (kind === 'REF') {
|
|
168
|
+
const target = tokens[1]?.value;
|
|
169
|
+
if (!target || target.startsWith('\\')) {
|
|
170
|
+
return {
|
|
171
|
+
kind,
|
|
172
|
+
evaluationClass: 'recognized-unsupported',
|
|
173
|
+
normalizedInstruction,
|
|
174
|
+
switches,
|
|
175
|
+
unsupportedSwitches,
|
|
176
|
+
preservationSupported: false,
|
|
177
|
+
reason: 'missing-ref-target',
|
|
178
|
+
};
|
|
179
|
+
}
|
|
180
|
+
const valid = parseSwitchTail(2, new Set(['d', 'f', 'h', 'n', 'p', 'r', 't', 'w', '*']), new Set(['d', '*']));
|
|
181
|
+
if (!valid) {
|
|
182
|
+
return {
|
|
183
|
+
kind,
|
|
184
|
+
evaluationClass: 'recognized-unsupported',
|
|
185
|
+
normalizedInstruction,
|
|
186
|
+
target,
|
|
187
|
+
switches,
|
|
188
|
+
unsupportedSwitches,
|
|
189
|
+
preservationSupported: false,
|
|
190
|
+
reason: 'unsupported-ref-switch',
|
|
191
|
+
};
|
|
192
|
+
}
|
|
193
|
+
const deterministic = switches.every((fieldSwitch, index) => {
|
|
194
|
+
if (fieldSwitch === '\\h')
|
|
195
|
+
return true;
|
|
196
|
+
if (fieldSwitch !== '\\*')
|
|
197
|
+
return false;
|
|
198
|
+
return switchArguments[index]?.toUpperCase() === 'MERGEFORMAT';
|
|
199
|
+
});
|
|
200
|
+
if (!deterministic) {
|
|
201
|
+
return {
|
|
202
|
+
kind,
|
|
203
|
+
evaluationClass: 'recognized-unsupported',
|
|
204
|
+
normalizedInstruction,
|
|
205
|
+
target,
|
|
206
|
+
switches,
|
|
207
|
+
unsupportedSwitches: switches.filter((fieldSwitch) => fieldSwitch !== '\\h'),
|
|
208
|
+
preservationSupported: true,
|
|
209
|
+
reason: 'unsupported-ref-switch',
|
|
210
|
+
};
|
|
211
|
+
}
|
|
212
|
+
return {
|
|
213
|
+
kind,
|
|
214
|
+
evaluationClass: 'deterministic-ref',
|
|
215
|
+
normalizedInstruction,
|
|
216
|
+
target,
|
|
217
|
+
switches,
|
|
218
|
+
unsupportedSwitches,
|
|
219
|
+
preservationSupported: true,
|
|
220
|
+
};
|
|
221
|
+
}
|
|
222
|
+
return {
|
|
223
|
+
kind,
|
|
224
|
+
evaluationClass: kind === 'UNKNOWN' ? 'unknown' : 'recognized-unsupported',
|
|
225
|
+
normalizedInstruction,
|
|
226
|
+
switches,
|
|
227
|
+
unsupportedSwitches,
|
|
228
|
+
preservationSupported: false,
|
|
229
|
+
reason: kind === 'UNKNOWN' ? 'unknown-field-kind' : 'field-kind-not-evaluated',
|
|
230
|
+
};
|
|
231
|
+
}
|
|
232
|
+
//# sourceMappingURL=field-semantics.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"field-semantics.js","sourceRoot":"","sources":["../../src/shared/field-semantics.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,13 +8,27 @@ export type FieldStructureIssue = {
|
|
|
8
8
|
story?: string;
|
|
9
9
|
element?: string;
|
|
10
10
|
};
|
|
11
|
+
/**
|
|
12
|
+
* @deprecated `w:fldChar` inside `<w:del>` is valid, so a `true` result is not a
|
|
13
|
+
* defect. Word and Aspose both emit it. Retained only so existing callers keep
|
|
14
|
+
* compiling; do not gate on it. See {@link collectFieldStructureIssues}.
|
|
15
|
+
*/
|
|
11
16
|
export declare function hasFldCharInsideDel(documentXml: string): boolean;
|
|
12
17
|
/**
|
|
13
18
|
* Reports structural complex-field violations without evaluating field codes.
|
|
14
19
|
*
|
|
15
20
|
* @conformance ECMA-376 edition 5, Part 1 § 17.16.18
|
|
16
21
|
* @ooxmlSpec ooxml.ecma376.5ed.part1.fields.complex-field-characters
|
|
22
|
+
* @see https://github.com/UseJunior/safe-docx/issues/645
|
|
17
23
|
*/
|
|
18
24
|
export declare function collectFieldStructureIssues(input: string | FieldStory[]): FieldStructureIssue[];
|
|
19
25
|
export declare function validateFieldStructure(input: string | FieldStory[]): boolean;
|
|
26
|
+
/**
|
|
27
|
+
* Reports strict runtime field-story violations without changing the
|
|
28
|
+
* pinned `validateFieldStructure` predicate.
|
|
29
|
+
*
|
|
30
|
+
* @conformance ECMA-376 edition 5, Part 1 § 17.16.18
|
|
31
|
+
*/
|
|
32
|
+
export declare function collectStrictFieldStructureIssues(input: string | FieldStory[]): FieldStructureIssue[];
|
|
33
|
+
export declare function validateStrictFieldStructure(input: string | FieldStory[]): boolean;
|
|
20
34
|
//# sourceMappingURL=field-structure.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"field-structure.d.ts","sourceRoot":"","sources":["../../src/shared/field-structure.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAcF,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CA2BhE;AAED
|
|
1
|
+
{"version":3,"file":"field-structure.d.ts","sourceRoot":"","sources":["../../src/shared/field-structure.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAcF;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CA2BhE;AAED;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,EAAE,GAAG,mBAAmB,EAAE,CAU/F;AAaD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,EAAE,GAAG,OAAO,CAI5E;AA4DD;;;;;GAKG;AACH,wBAAgB,iCAAiC,CAC/C,KAAK,EAAE,MAAM,GAAG,UAAU,EAAE,GAC3B,mBAAmB,EAAE,CAUvB;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,EAAE,GAAG,OAAO,CAIlF"}
|