docxmlater 10.2.1 → 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.
@@ -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
  }
@@ -2028,6 +2031,61 @@ class DocumentParser {
2028
2031
  if ((0, FieldHelpers_1.isHyperlinkInstruction)(instruction)) {
2029
2032
  const parsed = (0, FieldHelpers_1.parseHyperlinkInstruction)(instruction);
2030
2033
  if (parsed && resultText) {
2034
+ if (fieldRevisions.length > 0) {
2035
+ const complexField = this.createComplexFieldFromRuns(fieldRuns);
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
+ }
2066
+ for (const rev of fieldRevisions) {
2067
+ rev.setFieldContext({
2068
+ field: complexField,
2069
+ instruction: complexField.getInstruction(),
2070
+ position: 'result',
2071
+ });
2072
+ }
2073
+ complexField.setResultRevisions(fieldRevisions);
2074
+ groupedContent.push(complexField);
2075
+ }
2076
+ else {
2077
+ fieldRuns.forEach((run) => groupedContent.push(run));
2078
+ for (const revision of fieldRevisions) {
2079
+ groupedContent.push(revision);
2080
+ }
2081
+ }
2082
+ fieldRuns = [];
2083
+ instructionRevisions = [];
2084
+ fieldRevisions = [];
2085
+ orderedResultItems = [];
2086
+ fieldState = null;
2087
+ break;
2088
+ }
2031
2089
  let hyperlink;
2032
2090
  if (parsed.url && parsed.url.trim() !== '') {
2033
2091
  hyperlink = Hyperlink_1.Hyperlink.createExternal(parsed.fullUrl, resultText, {
@@ -2067,6 +2125,7 @@ class DocumentParser {
2067
2125
  fieldRuns = [];
2068
2126
  instructionRevisions = [];
2069
2127
  fieldRevisions = [];
2128
+ orderedResultItems = [];
2070
2129
  fieldState = null;
2071
2130
  break;
2072
2131
  }
@@ -2081,6 +2140,7 @@ class DocumentParser {
2081
2140
  fieldRuns = [];
2082
2141
  instructionRevisions = [];
2083
2142
  fieldRevisions = [];
2143
+ orderedResultItems = [];
2084
2144
  fieldState = null;
2085
2145
  break;
2086
2146
  }
@@ -2108,6 +2168,7 @@ class DocumentParser {
2108
2168
  fieldRuns = [];
2109
2169
  instructionRevisions = [];
2110
2170
  fieldRevisions = [];
2171
+ orderedResultItems = [];
2111
2172
  fieldState = null;
2112
2173
  }
2113
2174
  break;
@@ -2122,9 +2183,13 @@ class DocumentParser {
2122
2183
  else {
2123
2184
  if (nestingDepth > 0) {
2124
2185
  fieldRuns.push(item);
2186
+ if (nestingDepth === 1 && (fieldState === 'separate' || fieldState === 'result')) {
2187
+ orderedResultItems.push(item);
2188
+ }
2125
2189
  }
2126
2190
  else if (fieldState === 'separate' || fieldState === 'result') {
2127
2191
  fieldRuns.push(item);
2192
+ orderedResultItems.push(item);
2128
2193
  fieldState = 'result';
2129
2194
  }
2130
2195
  else if (fieldState === 'begin' || fieldState === 'instruction') {
@@ -2141,6 +2206,7 @@ class DocumentParser {
2141
2206
  fieldRuns = [];
2142
2207
  instructionRevisions = [];
2143
2208
  fieldRevisions = [];
2209
+ orderedResultItems = [];
2144
2210
  fieldState = null;
2145
2211
  groupedContent.push(item);
2146
2212
  }
@@ -2156,6 +2222,7 @@ class DocumentParser {
2156
2222
  else if (fieldState === 'separate' || fieldState === 'result') {
2157
2223
  item.setFieldContext({ position: 'result' });
2158
2224
  fieldRevisions.push(item);
2225
+ orderedResultItems.push(item);
2159
2226
  fieldState = 'result';
2160
2227
  logger_1.defaultLogger.debug(`Found revision inside complex field result: type=${item.getType()}, id=${item.getId()}`);
2161
2228
  }
@@ -2176,6 +2243,7 @@ class DocumentParser {
2176
2243
  fieldRuns = [];
2177
2244
  instructionRevisions = [];
2178
2245
  fieldRevisions = [];
2246
+ orderedResultItems = [];
2179
2247
  fieldState = null;
2180
2248
  groupedContent.push(item);
2181
2249
  }
@@ -2198,6 +2266,7 @@ class DocumentParser {
2198
2266
  fieldRuns = [];
2199
2267
  instructionRevisions = [];
2200
2268
  fieldRevisions = [];
2269
+ orderedResultItems = [];
2201
2270
  fieldState = null;
2202
2271
  }
2203
2272
  groupedContent.push(item);