docxmlater 7.1.0 → 7.1.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/core/DocumentParser.d.ts.map +1 -1
- package/dist/core/DocumentParser.js +57 -1
- package/dist/core/DocumentParser.js.map +1 -1
- package/dist/elements/Field.d.ts +6 -0
- package/dist/elements/Field.d.ts.map +1 -1
- package/dist/elements/Field.js +17 -0
- package/dist/elements/Field.js.map +1 -1
- package/dist/elements/FieldHelpers.d.ts +11 -0
- package/dist/elements/FieldHelpers.d.ts.map +1 -1
- package/dist/elements/FieldHelpers.js +73 -0
- package/dist/elements/FieldHelpers.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -2
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DocumentParser.d.ts","sourceRoot":"","sources":["../../src/core/DocumentParser.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,SAAS,EAAyC,MAAM,uBAAuB,CAAC;AAGzF,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;AAcxE,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;YAsFY,iBAAiB;IAoH/B,OAAO,CAAC,WAAW;IAmCnB,OAAO,CAAC,mBAAmB;IAkC3B,OAAO,CAAC,qBAAqB;IAoB7B,OAAO,CAAC,oBAAoB;IAuB5B,OAAO,CAAC,qBAAqB;YAwEf,uBAAuB;YA4FvB,6BAA6B;YAsQ7B,oBAAoB;YAkHpB,wBAAwB;IAsKtC,OAAO,CAAC,kCAAkC;
|
|
1
|
+
{"version":3,"file":"DocumentParser.d.ts","sourceRoot":"","sources":["../../src/core/DocumentParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1039,6 +1039,7 @@ class DocumentParser {
|
|
|
1039
1039
|
const content = paragraph.getContent();
|
|
1040
1040
|
const groupedContent = [];
|
|
1041
1041
|
let fieldRuns = [];
|
|
1042
|
+
let fieldRevisions = [];
|
|
1042
1043
|
let fieldState = null;
|
|
1043
1044
|
for (let i = 0; i < content.length; i++) {
|
|
1044
1045
|
const item = content[i];
|
|
@@ -1062,11 +1063,18 @@ class DocumentParser {
|
|
|
1062
1063
|
const complexField = this.createComplexFieldFromRuns(fieldRuns);
|
|
1063
1064
|
if (complexField) {
|
|
1064
1065
|
groupedContent.push(complexField);
|
|
1066
|
+
for (const revision of fieldRevisions) {
|
|
1067
|
+
groupedContent.push(revision);
|
|
1068
|
+
}
|
|
1065
1069
|
}
|
|
1066
1070
|
else {
|
|
1067
1071
|
fieldRuns.forEach((run) => groupedContent.push(run));
|
|
1072
|
+
for (const revision of fieldRevisions) {
|
|
1073
|
+
groupedContent.push(revision);
|
|
1074
|
+
}
|
|
1068
1075
|
}
|
|
1069
1076
|
fieldRuns = [];
|
|
1077
|
+
fieldRevisions = [];
|
|
1070
1078
|
fieldState = null;
|
|
1071
1079
|
}
|
|
1072
1080
|
break;
|
|
@@ -1079,23 +1087,63 @@ class DocumentParser {
|
|
|
1079
1087
|
}
|
|
1080
1088
|
}
|
|
1081
1089
|
else {
|
|
1082
|
-
if (
|
|
1090
|
+
if (fieldState === "separate" || fieldState === "result") {
|
|
1091
|
+
fieldRuns.push(item);
|
|
1092
|
+
fieldState = "result";
|
|
1093
|
+
}
|
|
1094
|
+
else if (fieldRuns.length > 0) {
|
|
1083
1095
|
fieldRuns.forEach((run) => groupedContent.push(run));
|
|
1096
|
+
for (const revision of fieldRevisions) {
|
|
1097
|
+
groupedContent.push(revision);
|
|
1098
|
+
}
|
|
1084
1099
|
fieldRuns = [];
|
|
1100
|
+
fieldRevisions = [];
|
|
1101
|
+
fieldState = null;
|
|
1102
|
+
groupedContent.push(item);
|
|
1103
|
+
}
|
|
1104
|
+
else {
|
|
1105
|
+
groupedContent.push(item);
|
|
1106
|
+
}
|
|
1107
|
+
}
|
|
1108
|
+
}
|
|
1109
|
+
else if (item instanceof Revision_1.Revision) {
|
|
1110
|
+
if (fieldState === "separate" || fieldState === "result") {
|
|
1111
|
+
fieldRevisions.push(item);
|
|
1112
|
+
fieldState = "result";
|
|
1113
|
+
logger_1.defaultLogger.debug(`Found revision inside complex field result: type=${item.getType()}, id=${item.getId()}`);
|
|
1114
|
+
}
|
|
1115
|
+
else if (fieldRuns.length > 0) {
|
|
1116
|
+
fieldRuns.forEach((run) => groupedContent.push(run));
|
|
1117
|
+
for (const revision of fieldRevisions) {
|
|
1118
|
+
groupedContent.push(revision);
|
|
1085
1119
|
}
|
|
1120
|
+
fieldRuns = [];
|
|
1121
|
+
fieldRevisions = [];
|
|
1122
|
+
fieldState = null;
|
|
1123
|
+
groupedContent.push(item);
|
|
1124
|
+
}
|
|
1125
|
+
else {
|
|
1086
1126
|
groupedContent.push(item);
|
|
1087
1127
|
}
|
|
1088
1128
|
}
|
|
1089
1129
|
else {
|
|
1090
1130
|
if (fieldRuns.length > 0) {
|
|
1091
1131
|
fieldRuns.forEach((run) => groupedContent.push(run));
|
|
1132
|
+
for (const revision of fieldRevisions) {
|
|
1133
|
+
groupedContent.push(revision);
|
|
1134
|
+
}
|
|
1092
1135
|
fieldRuns = [];
|
|
1136
|
+
fieldRevisions = [];
|
|
1137
|
+
fieldState = null;
|
|
1093
1138
|
}
|
|
1094
1139
|
groupedContent.push(item);
|
|
1095
1140
|
}
|
|
1096
1141
|
}
|
|
1097
1142
|
if (fieldRuns.length > 0) {
|
|
1098
1143
|
fieldRuns.forEach((run) => groupedContent.push(run));
|
|
1144
|
+
for (const revision of fieldRevisions) {
|
|
1145
|
+
groupedContent.push(revision);
|
|
1146
|
+
}
|
|
1099
1147
|
}
|
|
1100
1148
|
paragraph.setContent(groupedContent);
|
|
1101
1149
|
logger_1.defaultLogger.debug(`Assembled ${groupedContent.length - content.length} complex fields in paragraph`);
|
|
@@ -1507,6 +1555,14 @@ class DocumentParser {
|
|
|
1507
1555
|
const relationship = relationshipManager.getRelationship(relationshipId);
|
|
1508
1556
|
if (relationship) {
|
|
1509
1557
|
url = relationship.getTarget();
|
|
1558
|
+
if (url) {
|
|
1559
|
+
try {
|
|
1560
|
+
url = decodeURIComponent(url);
|
|
1561
|
+
}
|
|
1562
|
+
catch {
|
|
1563
|
+
logger_1.defaultLogger.debug(`[DocumentParser] Failed to decode URL: ${url}`);
|
|
1564
|
+
}
|
|
1565
|
+
}
|
|
1510
1566
|
}
|
|
1511
1567
|
}
|
|
1512
1568
|
let displayText = text || url || "[Link]";
|