@paroicms/server 1.78.1 → 1.79.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.
- package/dist/common/child-ordering-query.d.ts +2 -3
- package/dist/common/child-ordering-query.js +14 -18
- package/dist/common/child-ordering-query.js.map +1 -1
- package/dist/helpers/running-instance-connector.js +2 -7
- package/dist/helpers/running-instance-connector.js.map +1 -1
- package/dist/modules/core/account/account.queries.js +53 -90
- package/dist/modules/core/account/account.queries.js.map +1 -1
- package/dist/modules/core/document/load-documents.queries.js +33 -47
- package/dist/modules/core/document/load-documents.queries.js.map +1 -1
- package/dist/modules/core/document/save-documents.queries.js +78 -168
- package/dist/modules/core/document/save-documents.queries.js.map +1 -1
- package/dist/modules/core/fields/load-fields-of.queries.js +8 -10
- package/dist/modules/core/fields/load-fields-of.queries.js.map +1 -1
- package/dist/modules/core/fields/load-fields.queries.js +12 -24
- package/dist/modules/core/fields/load-fields.queries.js.map +1 -1
- package/dist/modules/core/fields/save-fields.queries.js +22 -34
- package/dist/modules/core/fields/save-fields.queries.js.map +1 -1
- package/dist/modules/core/labeling/labeling.queries.js +21 -27
- package/dist/modules/core/labeling/labeling.queries.js.map +1 -1
- package/dist/modules/core/node/node.queries.d.ts +1 -1
- package/dist/modules/core/node/node.queries.js +37 -66
- package/dist/modules/core/node/node.queries.js.map +1 -1
- package/dist/modules/core/node/ordered-node.queries.js +12 -24
- package/dist/modules/core/node/ordered-node.queries.js.map +1 -1
- package/dist/modules/core/nodel/nodel-wrap.resolver.js +7 -12
- package/dist/modules/core/nodel/nodel-wrap.resolver.js.map +1 -1
- package/dist/modules/core/nodel/nodel.queries.d.ts +2 -2
- package/dist/modules/core/nodel/nodel.queries.js +54 -66
- package/dist/modules/core/nodel/nodel.queries.js.map +1 -1
- package/dist/modules/core/part/part-node.queries.d.ts +4 -4
- package/dist/modules/core/part/part-node.queries.js +26 -47
- package/dist/modules/core/part/part-node.queries.js.map +1 -1
- package/dist/modules/core/part/part.queries.js +86 -105
- package/dist/modules/core/part/part.queries.js.map +1 -1
- package/dist/modules/public-api/password-reset/password-reset.service.js +19 -17
- package/dist/modules/public-api/password-reset/password-reset.service.js.map +1 -1
- package/dist/modules/public-api/search-text/search-text.queries.js +53 -31
- package/dist/modules/public-api/search-text/search-text.queries.js.map +1 -1
- package/dist/modules/public-site/feed/feed-generator.js +25 -18
- package/dist/modules/public-site/feed/feed-generator.js.map +1 -1
- package/dist/modules/public-site/public-route/make-url.js +44 -30
- package/dist/modules/public-site/public-route/make-url.js.map +1 -1
- package/dist/modules/public-site/public-route/raw-document-payload.js +50 -40
- package/dist/modules/public-site/public-route/raw-document-payload.js.map +1 -1
- package/dist/public-payload/doc-values.queries.d.ts +2 -2
- package/dist/public-payload/doc-values.queries.js +32 -33
- package/dist/public-payload/doc-values.queries.js.map +1 -1
- package/dist/public-payload/excerpt.queries.js +9 -8
- package/dist/public-payload/excerpt.queries.js.map +1 -1
- package/dist/public-payload/get-siblings.queries.js +38 -47
- package/dist/public-payload/get-siblings.queries.js.map +1 -1
- package/dist/public-payload/parts.queries.js +34 -38
- package/dist/public-payload/parts.queries.js.map +1 -1
- package/dist/public-payload/taxonomies.queries.js +17 -15
- package/dist/public-payload/taxonomies.queries.js.map +1 -1
- package/dist/public-payload/translations.queries.js +5 -7
- package/dist/public-payload/translations.queries.js.map +1 -1
- package/dist/site-context/site-context.types.d.ts +2 -2
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +11 -11
|
@@ -13,7 +13,12 @@ export class CreateDocumentValues {
|
|
|
13
13
|
}
|
|
14
14
|
export async function updateDocument(siteContext, documentId, values) {
|
|
15
15
|
const { cn } = siteContext;
|
|
16
|
-
await cn
|
|
16
|
+
await cn("PaDocument")
|
|
17
|
+
.where({
|
|
18
|
+
nodeId: documentId.nodeId,
|
|
19
|
+
language: documentId.language,
|
|
20
|
+
})
|
|
21
|
+
.update(values);
|
|
17
22
|
await invalidateDocumentInCache(siteContext, {
|
|
18
23
|
documentId,
|
|
19
24
|
perimeter: "slug" in values ? "slug" : undefined,
|
|
@@ -79,45 +84,19 @@ export async function deleteNodeAndDocuments(siteContext, nodeId) {
|
|
|
79
84
|
const { cn, mediaStorage } = siteContext;
|
|
80
85
|
const parentDocumentIds = await getParentDocumentIdsOf(siteContext, { nodeId });
|
|
81
86
|
const { partNodeIds } = await cn.transaction(async (tx) => {
|
|
82
|
-
const nodeRows = await tx
|
|
83
|
-
.
|
|
84
|
-
.
|
|
85
|
-
.
|
|
86
|
-
.
|
|
87
|
-
|
|
88
|
-
.getRawMany();
|
|
87
|
+
const nodeRows = await tx("PaNode as l")
|
|
88
|
+
.select("l.id as id")
|
|
89
|
+
.whereRaw("l.parentId = ?", [nodeId])
|
|
90
|
+
.whereNotExists(function () {
|
|
91
|
+
this.select(1).from("PaDocument as d").where("d.nodeId", "l.id");
|
|
92
|
+
});
|
|
89
93
|
const partNodeIds = nodeRows.map((r) => strVal(r.id));
|
|
90
94
|
await fullDeleteParts(partNodeIds, tx);
|
|
91
|
-
await tx
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
.execute();
|
|
97
|
-
await tx
|
|
98
|
-
.createQueryBuilder()
|
|
99
|
-
.delete()
|
|
100
|
-
.from("PaFieldText")
|
|
101
|
-
.where("nodeId = :nodeId", { nodeId })
|
|
102
|
-
.execute();
|
|
103
|
-
await tx
|
|
104
|
-
.createQueryBuilder()
|
|
105
|
-
.delete()
|
|
106
|
-
.from("PaDocument")
|
|
107
|
-
.where("nodeId = :nodeId", { nodeId })
|
|
108
|
-
.execute();
|
|
109
|
-
await tx
|
|
110
|
-
.createQueryBuilder()
|
|
111
|
-
.delete()
|
|
112
|
-
.from("PaNodel")
|
|
113
|
-
.where("nodeId = :nodeId", { nodeId })
|
|
114
|
-
.execute();
|
|
115
|
-
await tx
|
|
116
|
-
.createQueryBuilder()
|
|
117
|
-
.delete()
|
|
118
|
-
.from("PaNode")
|
|
119
|
-
.where("id = :nodeId", { nodeId })
|
|
120
|
-
.execute();
|
|
95
|
+
await tx("PaFieldVarchar").where("nodeId", nodeId).delete();
|
|
96
|
+
await tx("PaFieldText").where("nodeId", nodeId).delete();
|
|
97
|
+
await tx("PaDocument").where("nodeId", nodeId).delete();
|
|
98
|
+
await tx("PaNodel").where("nodeId", nodeId).delete();
|
|
99
|
+
await tx("PaNode").where("id", nodeId).delete();
|
|
121
100
|
return { partNodeIds };
|
|
122
101
|
});
|
|
123
102
|
await mediaStorage.deleteMedias({
|
|
@@ -133,77 +112,48 @@ export async function deleteDocument(siteContext, documentId) {
|
|
|
133
112
|
const { cn, mediaStorage } = siteContext;
|
|
134
113
|
const { nodeId, language } = documentId;
|
|
135
114
|
const parentId = await getParentNodelIdOf(siteContext, documentId);
|
|
136
|
-
const
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
115
|
+
const countRow = await cn("PaNodel as s")
|
|
116
|
+
.count("s.nodeId as cnt")
|
|
117
|
+
.where("s.nodeId", nodeId)
|
|
118
|
+
.andWhereNot("language", documentId.language)
|
|
119
|
+
.first();
|
|
120
|
+
const count = nbVal(countRow?.cnt);
|
|
121
|
+
const shouldDeleteNode = count === 0;
|
|
122
|
+
const { partNodeIds } = await cn.transaction(async (tx) => {
|
|
123
|
+
const nodeRows = await tx("PaNode as l")
|
|
124
|
+
.select("l.id as id")
|
|
125
|
+
.whereRaw("l.parentId = ?", [nodeId])
|
|
126
|
+
.whereNotExists(function () {
|
|
127
|
+
this.select(1).from("PaDocument as d").where("d.nodeId", "l.id");
|
|
128
|
+
});
|
|
144
129
|
const partNodeIds = nodeRows.map((r) => strVal(r.id));
|
|
145
130
|
await deleteParts({
|
|
146
131
|
language,
|
|
147
132
|
nodeIdList: partNodeIds,
|
|
148
133
|
cn: tx,
|
|
149
134
|
});
|
|
150
|
-
await tx
|
|
151
|
-
.
|
|
152
|
-
.
|
|
153
|
-
.
|
|
154
|
-
|
|
155
|
-
.
|
|
156
|
-
.
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
.
|
|
160
|
-
.
|
|
161
|
-
.
|
|
162
|
-
|
|
163
|
-
.
|
|
164
|
-
|
|
165
|
-
.
|
|
166
|
-
.delete()
|
|
167
|
-
.from("PaDocument")
|
|
168
|
-
.where("nodeId = :nodeId", { nodeId: documentId.nodeId })
|
|
169
|
-
.andWhere("language = :language", { language: documentId.language })
|
|
170
|
-
.execute();
|
|
171
|
-
await tx
|
|
172
|
-
.createQueryBuilder()
|
|
173
|
-
.delete()
|
|
174
|
-
.from("PaNodel")
|
|
175
|
-
.where("nodeId = :nodeId", { nodeId: documentId.nodeId })
|
|
176
|
-
.andWhere("language = :language", { language: documentId.language })
|
|
177
|
-
.execute();
|
|
178
|
-
const remainingNodelCount = await tx
|
|
179
|
-
.createQueryBuilder()
|
|
180
|
-
.select("count(s.nodeId)", "cnt")
|
|
181
|
-
.from("PaNodel", "s")
|
|
182
|
-
.where("s.nodeId = :nodeId", { nodeId })
|
|
183
|
-
.getRawOne();
|
|
184
|
-
const count = nbVal(remainingNodelCount?.cnt);
|
|
185
|
-
const shouldDeleteNode = count === 0;
|
|
135
|
+
await tx("PaFieldVarchar")
|
|
136
|
+
.where("nodeId", documentId.nodeId)
|
|
137
|
+
.andWhere("language", documentId.language)
|
|
138
|
+
.delete();
|
|
139
|
+
await tx("PaFieldText")
|
|
140
|
+
.where("nodeId", documentId.nodeId)
|
|
141
|
+
.andWhere("language", documentId.language)
|
|
142
|
+
.delete();
|
|
143
|
+
await tx("PaDocument")
|
|
144
|
+
.where("nodeId", documentId.nodeId)
|
|
145
|
+
.andWhere("language", documentId.language)
|
|
146
|
+
.delete();
|
|
147
|
+
await tx("PaNodel")
|
|
148
|
+
.where("nodeId", documentId.nodeId)
|
|
149
|
+
.andWhere("language", documentId.language)
|
|
150
|
+
.delete();
|
|
186
151
|
if (shouldDeleteNode) {
|
|
187
|
-
await tx
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
.from("PaFieldVarchar")
|
|
191
|
-
.where("nodeId = :nodeId", { nodeId })
|
|
192
|
-
.execute();
|
|
193
|
-
await tx
|
|
194
|
-
.createQueryBuilder()
|
|
195
|
-
.delete()
|
|
196
|
-
.from("PaFieldText")
|
|
197
|
-
.where("nodeId = :nodeId", { nodeId })
|
|
198
|
-
.execute();
|
|
199
|
-
await tx
|
|
200
|
-
.createQueryBuilder()
|
|
201
|
-
.delete()
|
|
202
|
-
.from("PaNode")
|
|
203
|
-
.where("id = :nodeId", { nodeId })
|
|
204
|
-
.execute();
|
|
152
|
+
await tx("PaFieldVarchar").where("nodeId", nodeId).delete();
|
|
153
|
+
await tx("PaFieldText").where("nodeId", nodeId).delete();
|
|
154
|
+
await tx("PaNode").where("id", nodeId).delete();
|
|
205
155
|
}
|
|
206
|
-
return { partNodeIds
|
|
156
|
+
return { partNodeIds };
|
|
207
157
|
});
|
|
208
158
|
await invalidateDocumentInCache(siteContext, { documentId, fully: true, parentId });
|
|
209
159
|
if (shouldDeleteNode) {
|
|
@@ -214,83 +164,43 @@ export async function deleteDocument(siteContext, documentId) {
|
|
|
214
164
|
}
|
|
215
165
|
}
|
|
216
166
|
async function deleteParts({ nodeIdList, cn, language, }) {
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
.from("PaNodel")
|
|
221
|
-
.andWhere("nodeId in (:...nodeIdList)", { nodeIdList })
|
|
222
|
-
.andWhere("language = :language", { language })
|
|
223
|
-
.execute();
|
|
167
|
+
if (nodeIdList.length === 0)
|
|
168
|
+
return;
|
|
169
|
+
await cn("PaNodel").whereIn("nodeId", nodeIdList).andWhere("language", language).delete();
|
|
224
170
|
for (const nodeId of nodeIdList) {
|
|
225
|
-
const countRow = await cn
|
|
226
|
-
.
|
|
227
|
-
.
|
|
228
|
-
.
|
|
229
|
-
.andWhere("nl.nodeId = :nodeId", { nodeId })
|
|
230
|
-
.getRawOne();
|
|
171
|
+
const countRow = await cn("PaNodel as nl")
|
|
172
|
+
.count("nl.nodeId as cnt")
|
|
173
|
+
.where("nl.nodeId", nodeId)
|
|
174
|
+
.first();
|
|
231
175
|
if (!countRow)
|
|
232
176
|
continue;
|
|
233
177
|
if (nbVal(countRow.cnt) === 0) {
|
|
234
|
-
await cn
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
.from("PaFieldVarchar")
|
|
238
|
-
.where("nodeId = :nodeId", { nodeId })
|
|
239
|
-
.execute();
|
|
240
|
-
await cn
|
|
241
|
-
.createQueryBuilder()
|
|
242
|
-
.delete()
|
|
243
|
-
.from("PaFieldText")
|
|
244
|
-
.where("nodeId = :nodeId", { nodeId })
|
|
245
|
-
.execute();
|
|
246
|
-
await cn
|
|
247
|
-
.createQueryBuilder()
|
|
248
|
-
.delete()
|
|
249
|
-
.from("PaNode")
|
|
250
|
-
.where("id = :nodeId", { nodeId })
|
|
251
|
-
.execute();
|
|
178
|
+
await cn("PaFieldVarchar").where("nodeId", nodeId).delete();
|
|
179
|
+
await cn("PaFieldText").where("nodeId", nodeId).delete();
|
|
180
|
+
await cn("PaNode").where("id", nodeId).delete();
|
|
252
181
|
}
|
|
253
182
|
}
|
|
254
183
|
}
|
|
255
184
|
async function fullDeleteParts(nodeIdList, cn) {
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
await cn
|
|
263
|
-
.createQueryBuilder()
|
|
264
|
-
.delete()
|
|
265
|
-
.from("PaFieldVarchar")
|
|
266
|
-
.andWhere("nodeId in (:...nodeIdList)", { nodeIdList })
|
|
267
|
-
.execute();
|
|
268
|
-
await cn
|
|
269
|
-
.createQueryBuilder()
|
|
270
|
-
.delete()
|
|
271
|
-
.from("PaNodel")
|
|
272
|
-
.andWhere("nodeId in (:...nodeIdList)", { nodeIdList })
|
|
273
|
-
.execute();
|
|
274
|
-
await cn
|
|
275
|
-
.createQueryBuilder()
|
|
276
|
-
.delete()
|
|
277
|
-
.from("PaNode")
|
|
278
|
-
.andWhere("id in (:...nodeIdList)", { nodeIdList })
|
|
279
|
-
.execute();
|
|
185
|
+
if (nodeIdList.length === 0)
|
|
186
|
+
return;
|
|
187
|
+
await cn("PaFieldText").whereIn("nodeId", nodeIdList).delete();
|
|
188
|
+
await cn("PaFieldVarchar").whereIn("nodeId", nodeIdList).delete();
|
|
189
|
+
await cn("PaNodel").whereIn("nodeId", nodeIdList).delete();
|
|
190
|
+
await cn("PaNode").whereIn("id", nodeIdList).delete();
|
|
280
191
|
}
|
|
281
192
|
async function createDocumentWithManager({ language, nodeId, values, ready, cn, }) {
|
|
282
|
-
await cn
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
.execute();
|
|
193
|
+
await cn("PaNodel").insert({
|
|
194
|
+
language,
|
|
195
|
+
nodeId,
|
|
196
|
+
ready: !!ready,
|
|
197
|
+
});
|
|
198
|
+
await cn("PaDocument").insert({
|
|
199
|
+
language,
|
|
200
|
+
nodeId,
|
|
201
|
+
slug: values?.slug,
|
|
202
|
+
title: values?.title,
|
|
203
|
+
});
|
|
294
204
|
return { language, nodeId };
|
|
295
205
|
}
|
|
296
206
|
//# sourceMappingURL=save-documents.queries.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"save-documents.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/document/save-documents.queries.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"save-documents.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/document/save-documents.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAGxE,OAAO,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAChE,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EACL,yBAAyB,EACzB,+BAA+B,EAC/B,kCAAkC,GACnC,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAkBzF,MAAM,OAAO,oBAAoB;IAC/B,IAAI,CAAU;IACd,KAAK,CAAU;CAChB;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,WAAwB,EACxB,UAAyB,EACzB,MAA4D;IAE5D,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,CAAC;IAE3B,MAAM,EAAE,CAAC,YAAY,CAAC;SACnB,KAAK,CAAC;QACL,MAAM,EAAE,UAAU,CAAC,MAAM;QACzB,QAAQ,EAAE,UAAU,CAAC,QAAQ;KAC9B,CAAC;SACD,MAAM,CAAC,MAAM,CAAC,CAAC;IAElB,MAAM,yBAAyB,CAAC,WAAW,EAAE;QAC3C,UAAU;QACV,SAAS,EAAE,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;KACjD,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,WAAwB,EACxB,EACE,QAAQ,EACR,MAAM,EACN,MAAM,EACN,UAAU,GACgF;IAE5F,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,CAAC;IAC3B,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,EAAE,EAAE,EAAE,WAAW,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;IACrE,MAAM,KAAK,GAAG,UAAU,IAAI,qBAAqB,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAEpF,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,WAAW,CAAgB,KAAK,EAAE,EAAE,EAAE,EAAE;QAClE,OAAO,MAAM,yBAAyB,CAAC;YACrC,QAAQ;YACR,MAAM;YACN,EAAE,EAAE,EAAE;YACN,MAAM;YACN,KAAK;SACN,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QACnE,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,+BAA+B,CAAC,WAAW,EAAE;gBACjD,UAAU,EAAE,QAAQ;gBACpB,QAAQ,EAAE,UAAU;aACrB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,WAAwB,EACxB,EACE,QAAQ,EACR,MAAM,EACN,UAAU,GAKX;IAED,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IACpD,MAAM,KAAK,GAAG,UAAU,IAAI,qBAAqB,CAAC,WAAW,CAAC,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE3F,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IACtE,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,WAAW,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IACzF,IAAI,kBAAkB,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QAChD,MAAM,KAAK,GAAG,MAAM,mBAAmB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QACnE,IAAI,KAAK,IAAI,kBAAkB,CAAC,UAAU;YACxC,MAAM,IAAI,QAAQ,CAAC,0BAA0B,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,EAAE,CAAC,WAAW,CAAgB,KAAK,EAAE,EAAE,EAAE,EAAE;QAC9E,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE,EAAE;YAClE,QAAQ,EAAE,YAAY;YACtB,QAAQ,EAAE,MAAM,CAAC,QAAQ;SAC1B,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,MAAM,yBAAyB,CAAC;YAC5C,QAAQ;YACR,MAAM;YACN,MAAM;YACN,EAAE,EAAE,EAAE;YACN,KAAK;SACN,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,+BAA+B,CAAC,WAAW,EAAE;YACjD,UAAU,EAAE,QAAQ;YACpB,QAAQ,EAAE,UAAU;SACrB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,WAAwB,EAAE,MAAc;IACnF,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,WAAW,CAAC;IACzC,MAAM,iBAAiB,GAAG,MAAM,sBAAsB,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEhF,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,EAAE,CAAC,WAAW,CAA4B,KAAK,EAAE,EAAE,EAAE,EAAE;QACnF,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC;aACrC,MAAM,CAAC,YAAY,CAAC;aACpB,QAAQ,CAAC,gBAAgB,EAAE,CAAC,MAAM,CAAC,CAAC;aACpC,cAAc,CAAC;YACd,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEL,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEtD,MAAM,eAAe,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAEvC,MAAM,EAAE,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;QAC5D,MAAM,EAAE,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;QACzD,MAAM,EAAE,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;QACxD,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;QACrD,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;QAEhD,OAAO,EAAE,WAAW,EAAE,CAAC;IACzB,CAAC,CAAC,CAAC;IAEH,MAAM,YAAY,CAAC,YAAY,CAAC;QAC9B,OAAO,EAAE,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,wBAAwB,CAAC,EAAE,wBAAwB,CAAC,MAAM,CAAC,CAAC;KAC1F,CAAC,CAAC;IAEH,MAAM,kCAAkC,CAAC,WAAW,EAAE;QACpD,MAAM;QACN,SAAS,EAAE,iBAAiB;QAC5B,KAAK,EAAE,IAAI;KACZ,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,WAAwB,EACxB,UAAgD;IAEhD,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,WAAW,CAAC;IACzC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC;IAExC,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAEnE,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,cAAc,CAAC;SACtC,KAAK,CAAC,iBAAiB,CAAC;SACxB,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC;SACzB,WAAW,CAAC,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC;SAC5C,KAAK,EAAE,CAAC;IACX,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACnC,MAAM,gBAAgB,GAAG,KAAK,KAAK,CAAC,CAAC;IAErC,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,EAAE,CAAC,WAAW,CAEzC,KAAK,EAAE,EAAE,EAAE,EAAE;QACd,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC;aACrC,MAAM,CAAC,YAAY,CAAC;aACpB,QAAQ,CAAC,gBAAgB,EAAE,CAAC,MAAM,CAAC,CAAC;aACpC,cAAc,CAAC;YACd,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEL,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEtD,MAAM,WAAW,CAAC;YAChB,QAAQ;YACR,UAAU,EAAE,WAAW;YACvB,EAAE,EAAE,EAAE;SACP,CAAC,CAAC;QAEH,MAAM,EAAE,CAAC,gBAAgB,CAAC;aACvB,KAAK,CAAC,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC;aAClC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC;aACzC,MAAM,EAAE,CAAC;QAEZ,MAAM,EAAE,CAAC,aAAa,CAAC;aACpB,KAAK,CAAC,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC;aAClC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC;aACzC,MAAM,EAAE,CAAC;QAEZ,MAAM,EAAE,CAAC,YAAY,CAAC;aACnB,KAAK,CAAC,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC;aAClC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC;aACzC,MAAM,EAAE,CAAC;QAEZ,MAAM,EAAE,CAAC,SAAS,CAAC;aAChB,KAAK,CAAC,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC;aAClC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC;aACzC,MAAM,EAAE,CAAC;QAEZ,IAAI,gBAAgB,EAAE,CAAC;YACrB,MAAM,EAAE,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;YAC5D,MAAM,EAAE,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;YACzD,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;QAClD,CAAC;QAED,OAAO,EAAE,WAAW,EAAE,CAAC;IACzB,CAAC,CAAC,CAAC;IAEH,MAAM,yBAAyB,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEpF,IAAI,gBAAgB,EAAE,CAAC;QACrB,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;QAC1D,OAAO,CAAC,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC,CAAC;QAC/C,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QACjE,MAAM,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;IACtE,CAAC;AACH,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,EACzB,UAAU,EACV,EAAE,EACF,QAAQ,GAKT;IACC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAEpC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC;IAE1F,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE,CAAC;QAChC,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,eAAe,CAAC;aACvC,KAAK,CAAC,kBAAkB,CAAC;aACzB,KAAK,CAAC,WAAW,EAAE,MAAM,CAAC;aAC1B,KAAK,EAAE,CAAC;QAEX,IAAI,CAAC,QAAQ;YAAE,SAAS;QACxB,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9B,MAAM,EAAE,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;YAC5D,MAAM,EAAE,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;YACzD,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;QAClD,CAAC;IACH,CAAC;AACH,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,UAAoB,EAAE,EAAoB;IACvE,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAEpC,MAAM,EAAE,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,MAAM,EAAE,CAAC;IAC/D,MAAM,EAAE,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,MAAM,EAAE,CAAC;IAClE,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,MAAM,EAAE,CAAC;IAC3D,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,MAAM,EAAE,CAAC;AACxD,CAAC;AAED,KAAK,UAAU,yBAAyB,CAAC,EACvC,QAAQ,EACR,MAAM,EACN,MAAM,EACN,KAAK,EACL,EAAE,GAOH;IACC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;QACzB,QAAQ;QACR,MAAM;QACN,KAAK,EAAE,CAAC,CAAC,KAAK;KACf,CAAC,CAAC;IAEH,MAAM,EAAE,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC;QAC5B,QAAQ;QACR,MAAM;QACN,IAAI,EAAE,MAAM,EAAE,IAAI;QAClB,KAAK,EAAE,MAAM,EAAE,KAAK;KACrB,CAAC,CAAC;IAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;AAC9B,CAAC"}
|
|
@@ -68,16 +68,14 @@ export async function getFieldValuesOfOneList(siteContext, options) {
|
|
|
68
68
|
async function getFieldValuesOfList(siteContext, options) {
|
|
69
69
|
const { parentNodelId, listType, fieldNames, preprocess } = options;
|
|
70
70
|
const { nodeId: parentNodeId, language } = parseNodelId(parentNodelId);
|
|
71
|
-
const rows = await siteContext
|
|
72
|
-
.
|
|
73
|
-
.
|
|
74
|
-
.
|
|
75
|
-
.innerJoin("
|
|
76
|
-
.
|
|
77
|
-
.
|
|
78
|
-
.
|
|
79
|
-
.andWhere("s.language = :language", { language })
|
|
80
|
-
.getRawMany();
|
|
71
|
+
const rows = await siteContext
|
|
72
|
+
.cn("PaNode as l")
|
|
73
|
+
.select("l.id as nodeId")
|
|
74
|
+
.innerJoin("PaPartNode as p", "p.nodeId", "l.id")
|
|
75
|
+
.innerJoin("PaNodel as s", "s.nodeId", "l.id")
|
|
76
|
+
.where("l.parentId", parentNodeId)
|
|
77
|
+
.where("p.listName", listType.listName)
|
|
78
|
+
.where("s.language", language);
|
|
81
79
|
const partNodeIds = rows.map((row) => strVal(row.nodeId));
|
|
82
80
|
const result = new Map();
|
|
83
81
|
for (const nodeId of partNodeIds) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-fields-of.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/fields/load-fields-of.queries.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"load-fields-of.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/fields/load-fields-of.queries.ts"],"names":[],"mappings":"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"}
|
|
@@ -98,18 +98,12 @@ async function loadVarcharFieldValues(siteContext, options) {
|
|
|
98
98
|
if (fieldTypes.length === 0)
|
|
99
99
|
return values;
|
|
100
100
|
const typeMap = new Map(fieldTypes.map((item) => [item.name, item]));
|
|
101
|
-
const
|
|
102
|
-
.
|
|
103
|
-
.select("f.field", "
|
|
104
|
-
.
|
|
105
|
-
.
|
|
106
|
-
.
|
|
107
|
-
.andWhere("f.nodeId = :nodeId", { nodeId })
|
|
108
|
-
.andWhere("f.field in (:...fieldNames)", {
|
|
109
|
-
fieldNames: [...typeMap.keys()],
|
|
110
|
-
})
|
|
111
|
-
.andWhere("f.language = :language", { language: language ?? dbAnyLanguage });
|
|
112
|
-
const rows = await query.getRawMany();
|
|
101
|
+
const rows = await siteContext
|
|
102
|
+
.cn("PaFieldVarchar as f")
|
|
103
|
+
.select(["f.field as field", "f.val as val", "f.dataType as dataType"])
|
|
104
|
+
.where("f.nodeId", nodeId)
|
|
105
|
+
.whereIn("f.field", [...typeMap.keys()])
|
|
106
|
+
.where("f.language", language ?? dbAnyLanguage);
|
|
113
107
|
for (const row of rows) {
|
|
114
108
|
const fieldName = strVal(row.field);
|
|
115
109
|
const dataType = strVal(row.dataType);
|
|
@@ -130,18 +124,12 @@ async function loadTextFieldValues(siteContext, options) {
|
|
|
130
124
|
if (fieldTypes.length === 0)
|
|
131
125
|
return values;
|
|
132
126
|
const typeMap = new Map(fieldTypes.map((item) => [item.name, item]));
|
|
133
|
-
const
|
|
134
|
-
.
|
|
135
|
-
.select("f.field", "
|
|
136
|
-
.
|
|
137
|
-
.
|
|
138
|
-
.
|
|
139
|
-
.andWhere("f.nodeId = :nodeId", { nodeId })
|
|
140
|
-
.andWhere("f.field in (:...fieldNames)", {
|
|
141
|
-
fieldNames: Array.from(typeMap.keys()),
|
|
142
|
-
})
|
|
143
|
-
.andWhere("f.language = :language", { language: language ?? dbAnyLanguage });
|
|
144
|
-
const rows = await query.getRawMany();
|
|
127
|
+
const rows = await siteContext
|
|
128
|
+
.cn("PaFieldText as f")
|
|
129
|
+
.select(["f.field as field", "f.val as val", "f.dataType as dataType"])
|
|
130
|
+
.where("f.nodeId", nodeId)
|
|
131
|
+
.whereIn("f.field", Array.from(typeMap.keys()))
|
|
132
|
+
.where("f.language", language ?? dbAnyLanguage);
|
|
145
133
|
for (const row of rows) {
|
|
146
134
|
const fieldName = strVal(row.field);
|
|
147
135
|
const dataType = strVal(row.dataType);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-fields.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/fields/load-fields.queries.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"load-fields.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/fields/load-fields.queries.ts"],"names":[],"mappings":"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"}
|
|
@@ -99,31 +99,25 @@ async function saveVarcharFieldValue(cn, options) {
|
|
|
99
99
|
const dbLanguage = languageIfNodel(options.language, fieldType) ?? dbAnyLanguage;
|
|
100
100
|
const val = fieldValueToDbString(value, fieldType.dataType);
|
|
101
101
|
if (val === null) {
|
|
102
|
-
|
|
103
|
-
.
|
|
104
|
-
.
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
.
|
|
109
|
-
await query.execute();
|
|
102
|
+
await cn("PaFieldVarchar")
|
|
103
|
+
.where({
|
|
104
|
+
field: fieldType.name,
|
|
105
|
+
nodeId: nodeId,
|
|
106
|
+
language: dbLanguage,
|
|
107
|
+
})
|
|
108
|
+
.delete();
|
|
110
109
|
}
|
|
111
110
|
else {
|
|
112
|
-
await cn
|
|
113
|
-
.
|
|
114
|
-
.insert()
|
|
115
|
-
.into("PaFieldVarchar")
|
|
116
|
-
.values({
|
|
111
|
+
await cn("PaFieldVarchar")
|
|
112
|
+
.insert({
|
|
117
113
|
field: fieldType.name,
|
|
118
114
|
nodeId,
|
|
119
115
|
language: dbLanguage,
|
|
120
116
|
dataType: fieldType.dataType,
|
|
121
117
|
val,
|
|
122
118
|
})
|
|
123
|
-
.
|
|
124
|
-
|
|
125
|
-
})
|
|
126
|
-
.execute();
|
|
119
|
+
.onConflict(["field", "nodeId", "language"])
|
|
120
|
+
.merge(["dataType", "val"]);
|
|
127
121
|
}
|
|
128
122
|
}
|
|
129
123
|
async function saveTextFieldValue(cn, options) {
|
|
@@ -131,21 +125,17 @@ async function saveTextFieldValue(cn, options) {
|
|
|
131
125
|
const dbLanguage = languageIfNodel(options.language, fieldType) ?? dbAnyLanguage;
|
|
132
126
|
const val = fieldValueToDbString(value, fieldType.dataType);
|
|
133
127
|
if (val === null) {
|
|
134
|
-
|
|
135
|
-
.
|
|
136
|
-
.
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
.
|
|
141
|
-
await query.execute();
|
|
128
|
+
await cn("PaFieldText")
|
|
129
|
+
.where({
|
|
130
|
+
field: fieldType.name,
|
|
131
|
+
nodeId: nodeId,
|
|
132
|
+
language: dbLanguage,
|
|
133
|
+
})
|
|
134
|
+
.delete();
|
|
142
135
|
}
|
|
143
136
|
else {
|
|
144
|
-
await cn
|
|
145
|
-
.
|
|
146
|
-
.insert()
|
|
147
|
-
.into("PaFieldText")
|
|
148
|
-
.values({
|
|
137
|
+
await cn("PaFieldText")
|
|
138
|
+
.insert({
|
|
149
139
|
field: fieldType.name,
|
|
150
140
|
nodeId,
|
|
151
141
|
language: dbLanguage,
|
|
@@ -153,10 +143,8 @@ async function saveTextFieldValue(cn, options) {
|
|
|
153
143
|
val,
|
|
154
144
|
excerpt: excerpts[fieldType.name],
|
|
155
145
|
})
|
|
156
|
-
.
|
|
157
|
-
|
|
158
|
-
})
|
|
159
|
-
.execute();
|
|
146
|
+
.onConflict(["field", "nodeId", "language"])
|
|
147
|
+
.merge(["dataType", "val", "excerpt"]);
|
|
160
148
|
}
|
|
161
149
|
}
|
|
162
150
|
function fieldValueToDbString(value, dataType) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"save-fields.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/fields/save-fields.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3F,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"save-fields.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/fields/save-fields.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3F,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAStF,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,OAAO,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAChE,OAAO,EAAE,kCAAkC,EAAE,MAAM,+BAA+B,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,iEAAiE,CAAC;AAE3G,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,UAAU,gBAAgB,CAAC,OAAe;IAC9C,IAAI,CAAC;QACH,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAgB,CAAC;IACpD,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,QAAQ,CAAC,qBAAqB,EAAE;YACxC,MAAM,EAAE,GAAG;SACZ,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,WAAwB,EACxB,OAOC;IAED,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACrC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAErE,MAAM,uBAAuB,CAAC,WAAW,EAAE;QACzC,GAAG,OAAO;QACV,QAAQ;KACT,CAAC,CAAC;IAEH,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAE7B,MAAM,kCAAkC,CAAC,WAAW,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC,CAAC;IACpF,CAAC;SAAM,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAExC,MAAM,kCAAkC,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IACpE,CAAC;SAAM,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACpC,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;IAC9C,CAAC;AACH,CAAC;AAED,KAAK,UAAU,uBAAuB,CACpC,WAAwB,EACxB,OAMC;IAED,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAC9D,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC;IACzC,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAErE,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAE7E,MAAM,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QAC5C,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACxD,IAAI,KAAK,KAAK,SAAS;gBAAE,SAAS;YAClC,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACzC,IAAI,CAAC,SAAS;gBAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,SAAS,GAAG,CAAC,CAAC;YAChF,IAAI,CAAC,KAAK,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;gBACjC,MAAM,IAAI,KAAK,CAAC,+BAA+B,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;YACnE,CAAC;YAED,QAAQ,SAAS,CAAC,QAAQ,EAAE,CAAC;gBAC3B,KAAK,SAAS;oBACZ,MAAM,qBAAqB,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;oBACxE,MAAM;gBACR,KAAK,MAAM;oBACT,MAAM,kBAAkB,CAAC,EAAE,EAAE;wBAC3B,MAAM;wBACN,QAAQ;wBACR,SAAS;wBACT,KAAK;wBACL,QAAQ;qBACT,CAAC,CAAC;oBACH,MAAM;gBACR,KAAK,aAAa;oBAChB,MAAM,IAAI,KAAK,CACb,sBAAsB,SAAS,CAAC,QAAQ,YAAY,SAAS,cAAc,CAC5E,CAAC;gBACJ;oBACE,MAAM,IAAI,KAAK,CAAC,uBAAwB,SAAyB,CAAC,QAAQ,GAAG,CAAC,CAAC;YACnF,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAUD,KAAK,UAAU,mBAAmB,CAChC,WAAwB,EACxB,OAGC;IAED,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,gBAAgB,GAAG,wBAAwB,EAAE,CAAC;IACpD,MAAM,QAAQ,GAAgB,EAAE,CAAC;IAEjC,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACxD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;YAAE,SAAS;QACpD,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACzC,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,SAAS,GAAG,CAAC,CAAC;QAChF,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY;YAAE,SAAS;QAEtE,IAAI,SAAS,GAAG,aAAa,CAC3B,MAAM,eAAe,CAAC,WAAW,EAAE,gBAAgB,EAAE,KAAK,EAAE,SAAS,EAAE;YACrE,UAAU,EAAE,WAAW;SACxB,CAAC,CACH,CAAC;QACF,IAAI,SAAS,CAAC,QAAQ,KAAK,MAAM,IAAI,SAAS,KAAK,KAAK,EAAE,CAAC;YACzD,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC;QACtE,CAAC;QACD,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,kBAAkB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC3E,QAAQ,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC;IAChC,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAKD,KAAK,UAAU,qBAAqB,CAClC,EAA2B,EAC3B,OAKC;IAED,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAC7C,MAAM,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,IAAI,aAAa,CAAC;IACjF,MAAM,GAAG,GAAG,oBAAoB,CAAC,KAAK,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAE5D,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QACjB,MAAM,EAAE,CAAC,gBAAgB,CAAC;aACvB,KAAK,CAAC;YACL,KAAK,EAAE,SAAS,CAAC,IAAI;YACrB,MAAM,EAAE,MAAM;YACd,QAAQ,EAAE,UAAU;SACrB,CAAC;aACD,MAAM,EAAE,CAAC;IACd,CAAC;SAAM,CAAC;QACN,MAAM,EAAE,CAAC,gBAAgB,CAAC;aACvB,MAAM,CAAC;YACN,KAAK,EAAE,SAAS,CAAC,IAAI;YACrB,MAAM;YACN,QAAQ,EAAE,UAAU;YACpB,QAAQ,EAAE,SAAS,CAAC,QAAQ;YAC5B,GAAG;SACJ,CAAC;aACD,UAAU,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;aAC3C,KAAK,CAAC,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC;IAChC,CAAC;AACH,CAAC;AAKD,KAAK,UAAU,kBAAkB,CAC/B,EAA2B,EAC3B,OAMC;IAED,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACvD,MAAM,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,IAAI,aAAa,CAAC;IACjF,MAAM,GAAG,GAAG,oBAAoB,CAAC,KAAK,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAE5D,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QACjB,MAAM,EAAE,CAAC,aAAa,CAAC;aACpB,KAAK,CAAC;YACL,KAAK,EAAE,SAAS,CAAC,IAAI;YACrB,MAAM,EAAE,MAAM;YACd,QAAQ,EAAE,UAAU;SACrB,CAAC;aACD,MAAM,EAAE,CAAC;IACd,CAAC;SAAM,CAAC;QACN,MAAM,EAAE,CAAC,aAAa,CAAC;aACpB,MAAM,CAAC;YACN,KAAK,EAAE,SAAS,CAAC,IAAI;YACrB,MAAM;YACN,QAAQ,EAAE,UAAU;YACpB,QAAQ,EAAE,SAAS,CAAC,QAAQ;YAC5B,GAAG;YACH,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC;SAClC,CAAC;aACD,UAAU,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;aAC3C,KAAK,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;IAC3C,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAiB,EAAE,QAAyB;IACxE,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IACjC,IAAI,QAAQ,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IACvD,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAC9D,IAAI,QAAQ,KAAK,MAAM;QAAE,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9C,IAAI,QAAQ,KAAK,MAAM;QAAE,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9C,IAAI,QAAQ,KAAK,UAAU;QAAE,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IAClD,IAAI,QAAQ,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IAChD,IAAI,QAAQ,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC,SAAS,CAAE,KAAa,CAAC,KAAK,CAAC,CAAC;IACrE,IAAI,QAAQ,KAAK,YAAY;QAAE,OAAO,IAAI,CAAC,SAAS,CAAE,KAAa,CAAC,KAAK,CAAC,CAAC;IAC3E,IAAI,QAAQ,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,IAAI,KAAK,CAAC,qBAAqB,QAAQ,GAAG,CAAC,CAAC;AACpD,CAAC"}
|