docxmlater 10.2.2 → 10.2.3
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/core/DocumentParser.d.ts.map +1 -1
- package/dist/core/DocumentParser.js +44 -0
- package/dist/core/DocumentParser.js.map +1 -1
- package/dist/elements/Field.d.ts.map +1 -1
- package/dist/elements/Field.js +6 -4
- package/dist/elements/Field.js.map +1 -1
- package/dist/utils/InMemoryRevisionAcceptor.d.ts.map +1 -1
- package/dist/utils/InMemoryRevisionAcceptor.js +24 -4
- package/dist/utils/InMemoryRevisionAcceptor.js.map +1 -1
- package/package.json +1 -1
- package/src/core/DocumentParser.ts +50 -1
- package/src/elements/Field.ts +10 -7
- package/src/utils/InMemoryRevisionAcceptor.ts +31 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DocumentParser.d.ts","sourceRoot":"","sources":["../../src/core/DocumentParser.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"DocumentParser.d.ts","sourceRoot":"","sources":["../../src/core/DocumentParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1917,6 +1917,7 @@ class DocumentParser {
|
|
|
1917
1917
|
let fieldRuns = [];
|
|
1918
1918
|
let fieldRevisions = [];
|
|
1919
1919
|
let instructionRevisions = [];
|
|
1920
|
+
let orderedResultItems = [];
|
|
1920
1921
|
let fieldState = null;
|
|
1921
1922
|
let nestingDepth = 0;
|
|
1922
1923
|
let hasNestedFields = false;
|
|
@@ -1961,6 +1962,7 @@ class DocumentParser {
|
|
|
1961
1962
|
fieldRuns = [];
|
|
1962
1963
|
instructionRevisions = [];
|
|
1963
1964
|
fieldRevisions = [];
|
|
1965
|
+
orderedResultItems = [];
|
|
1964
1966
|
fieldState = null;
|
|
1965
1967
|
hasNestedFields = false;
|
|
1966
1968
|
fieldStartIndex = -1;
|
|
@@ -2001,6 +2003,7 @@ class DocumentParser {
|
|
|
2001
2003
|
fieldRuns = [];
|
|
2002
2004
|
instructionRevisions = [];
|
|
2003
2005
|
fieldRevisions = [];
|
|
2006
|
+
orderedResultItems = [];
|
|
2004
2007
|
fieldState = null;
|
|
2005
2008
|
break;
|
|
2006
2009
|
}
|
|
@@ -2031,6 +2034,35 @@ class DocumentParser {
|
|
|
2031
2034
|
if (fieldRevisions.length > 0) {
|
|
2032
2035
|
const complexField = this.createComplexFieldFromRuns(fieldRuns);
|
|
2033
2036
|
if (complexField) {
|
|
2037
|
+
if (orderedResultItems.length > 0) {
|
|
2038
|
+
const orderedContent = [];
|
|
2039
|
+
for (const resultItem of orderedResultItems) {
|
|
2040
|
+
if (resultItem instanceof Run_1.Run) {
|
|
2041
|
+
orderedContent.push(resultItem.toXML());
|
|
2042
|
+
}
|
|
2043
|
+
else if (resultItem instanceof Revision_1.Revision) {
|
|
2044
|
+
const xml = resultItem.toXML();
|
|
2045
|
+
if (xml)
|
|
2046
|
+
orderedContent.push(xml);
|
|
2047
|
+
}
|
|
2048
|
+
}
|
|
2049
|
+
let acceptedText = '';
|
|
2050
|
+
for (const resultItem of orderedResultItems) {
|
|
2051
|
+
if (resultItem instanceof Run_1.Run) {
|
|
2052
|
+
acceptedText += resultItem.getText() || '';
|
|
2053
|
+
}
|
|
2054
|
+
else if (resultItem instanceof Revision_1.Revision &&
|
|
2055
|
+
resultItem.getType() === 'insert') {
|
|
2056
|
+
for (const child of resultItem.getRuns()) {
|
|
2057
|
+
acceptedText += child.getText() || '';
|
|
2058
|
+
}
|
|
2059
|
+
}
|
|
2060
|
+
}
|
|
2061
|
+
complexField.setResult(acceptedText || complexField.getResult() || '');
|
|
2062
|
+
for (const xmlEl of orderedContent) {
|
|
2063
|
+
complexField.addResultContent(xmlEl);
|
|
2064
|
+
}
|
|
2065
|
+
}
|
|
2034
2066
|
for (const rev of fieldRevisions) {
|
|
2035
2067
|
rev.setFieldContext({
|
|
2036
2068
|
field: complexField,
|
|
@@ -2050,6 +2082,7 @@ class DocumentParser {
|
|
|
2050
2082
|
fieldRuns = [];
|
|
2051
2083
|
instructionRevisions = [];
|
|
2052
2084
|
fieldRevisions = [];
|
|
2085
|
+
orderedResultItems = [];
|
|
2053
2086
|
fieldState = null;
|
|
2054
2087
|
break;
|
|
2055
2088
|
}
|
|
@@ -2092,6 +2125,7 @@ class DocumentParser {
|
|
|
2092
2125
|
fieldRuns = [];
|
|
2093
2126
|
instructionRevisions = [];
|
|
2094
2127
|
fieldRevisions = [];
|
|
2128
|
+
orderedResultItems = [];
|
|
2095
2129
|
fieldState = null;
|
|
2096
2130
|
break;
|
|
2097
2131
|
}
|
|
@@ -2106,6 +2140,7 @@ class DocumentParser {
|
|
|
2106
2140
|
fieldRuns = [];
|
|
2107
2141
|
instructionRevisions = [];
|
|
2108
2142
|
fieldRevisions = [];
|
|
2143
|
+
orderedResultItems = [];
|
|
2109
2144
|
fieldState = null;
|
|
2110
2145
|
break;
|
|
2111
2146
|
}
|
|
@@ -2133,6 +2168,7 @@ class DocumentParser {
|
|
|
2133
2168
|
fieldRuns = [];
|
|
2134
2169
|
instructionRevisions = [];
|
|
2135
2170
|
fieldRevisions = [];
|
|
2171
|
+
orderedResultItems = [];
|
|
2136
2172
|
fieldState = null;
|
|
2137
2173
|
}
|
|
2138
2174
|
break;
|
|
@@ -2147,9 +2183,13 @@ class DocumentParser {
|
|
|
2147
2183
|
else {
|
|
2148
2184
|
if (nestingDepth > 0) {
|
|
2149
2185
|
fieldRuns.push(item);
|
|
2186
|
+
if (nestingDepth === 1 && (fieldState === 'separate' || fieldState === 'result')) {
|
|
2187
|
+
orderedResultItems.push(item);
|
|
2188
|
+
}
|
|
2150
2189
|
}
|
|
2151
2190
|
else if (fieldState === 'separate' || fieldState === 'result') {
|
|
2152
2191
|
fieldRuns.push(item);
|
|
2192
|
+
orderedResultItems.push(item);
|
|
2153
2193
|
fieldState = 'result';
|
|
2154
2194
|
}
|
|
2155
2195
|
else if (fieldState === 'begin' || fieldState === 'instruction') {
|
|
@@ -2166,6 +2206,7 @@ class DocumentParser {
|
|
|
2166
2206
|
fieldRuns = [];
|
|
2167
2207
|
instructionRevisions = [];
|
|
2168
2208
|
fieldRevisions = [];
|
|
2209
|
+
orderedResultItems = [];
|
|
2169
2210
|
fieldState = null;
|
|
2170
2211
|
groupedContent.push(item);
|
|
2171
2212
|
}
|
|
@@ -2181,6 +2222,7 @@ class DocumentParser {
|
|
|
2181
2222
|
else if (fieldState === 'separate' || fieldState === 'result') {
|
|
2182
2223
|
item.setFieldContext({ position: 'result' });
|
|
2183
2224
|
fieldRevisions.push(item);
|
|
2225
|
+
orderedResultItems.push(item);
|
|
2184
2226
|
fieldState = 'result';
|
|
2185
2227
|
logger_1.defaultLogger.debug(`Found revision inside complex field result: type=${item.getType()}, id=${item.getId()}`);
|
|
2186
2228
|
}
|
|
@@ -2201,6 +2243,7 @@ class DocumentParser {
|
|
|
2201
2243
|
fieldRuns = [];
|
|
2202
2244
|
instructionRevisions = [];
|
|
2203
2245
|
fieldRevisions = [];
|
|
2246
|
+
orderedResultItems = [];
|
|
2204
2247
|
fieldState = null;
|
|
2205
2248
|
groupedContent.push(item);
|
|
2206
2249
|
}
|
|
@@ -2223,6 +2266,7 @@ class DocumentParser {
|
|
|
2223
2266
|
fieldRuns = [];
|
|
2224
2267
|
instructionRevisions = [];
|
|
2225
2268
|
fieldRevisions = [];
|
|
2269
|
+
orderedResultItems = [];
|
|
2226
2270
|
fieldState = null;
|
|
2227
2271
|
}
|
|
2228
2272
|
groupedContent.push(item);
|