@paroicms/server 1.84.0 → 1.84.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/public-api/search-text/search-text.queries.js +3 -4
- package/dist/public-api/search-text/search-text.queries.js.map +1 -1
- package/dist/public-payload/parts.queries.js +6 -6
- package/dist/public-payload/parts.queries.js.map +1 -1
- package/dist/public-payload/site-payload.js +1 -1
- package/dist/public-payload/site-payload.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +7 -7
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { nbVal } from "@paroi/data-formatters-lib";
|
|
1
2
|
import { dbAnyLanguage } from "../../context.js";
|
|
2
3
|
import { formatDocValues, querySelectDocValues } from "../../public-payload/doc-values.queries.js";
|
|
3
4
|
export async function searchText(siteContext, options) {
|
|
@@ -27,11 +28,9 @@ export async function searchText(siteContext, options) {
|
|
|
27
28
|
language,
|
|
28
29
|
words,
|
|
29
30
|
onlyPublished,
|
|
30
|
-
})
|
|
31
|
-
.distinct()
|
|
32
|
-
.count("* as count");
|
|
31
|
+
}).countDistinct("l.id as cnt");
|
|
33
32
|
const countResult = await countQuery.first();
|
|
34
|
-
total = countResult ? countResult.
|
|
33
|
+
total = countResult ? nbVal(countResult.cnt) : 0;
|
|
35
34
|
}
|
|
36
35
|
return {
|
|
37
36
|
rows: rows.map((row) => formatDocValues(row, { language })),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-text.queries.js","sourceRoot":"","sources":["../../../src/public-api/search-text/search-text.queries.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"search-text.queries.js","sourceRoot":"","sources":["../../../src/public-api/search-text/search-text.queries.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,9 @@ import { mainDbSchemaName } from "@paroicms/connector";
|
|
|
3
3
|
import { getPartTypeByName, sortParts } from "@paroicms/internal-anywhere-lib";
|
|
4
4
|
import { encodeNodelId, } from "@paroicms/public-anywhere-lib";
|
|
5
5
|
export async function loadPartsOf(siteContext, tracker, documentId, listType) {
|
|
6
|
-
const
|
|
7
|
-
const
|
|
8
|
-
|
|
6
|
+
const { siteSchema, cn } = siteContext;
|
|
7
|
+
const listNames = [...getRecursiveListNames(siteSchema, listType)];
|
|
8
|
+
const rows = await cn("PaNode as l")
|
|
9
9
|
.select([
|
|
10
10
|
"l.id as nodeId",
|
|
11
11
|
"l.relativeId as relativeId",
|
|
@@ -19,13 +19,13 @@ export async function loadPartsOf(siteContext, tracker, documentId, listType) {
|
|
|
19
19
|
.innerJoin("PaPartNode as p", "p.nodeId", "l.id")
|
|
20
20
|
.leftJoin("PaNodel as s", {
|
|
21
21
|
"s.nodeId": "l.id",
|
|
22
|
-
"s.language":
|
|
22
|
+
"s.language": cn.raw("?", [documentId.language]),
|
|
23
|
+
"s.ready": cn.raw("?", [1]),
|
|
23
24
|
})
|
|
24
25
|
.leftJoin("PaOrderedNode as o", "o.nodeId", "l.id")
|
|
25
26
|
.where("p.documentNodeId", documentId.nodeId)
|
|
26
27
|
.whereIn("p.listName", listNames)
|
|
27
|
-
.whereRaw("l.publishDate <= current_timestamp")
|
|
28
|
-
.where("s.ready", 1);
|
|
28
|
+
.whereRaw("l.publishDate <= current_timestamp");
|
|
29
29
|
tracker.trackAccess(mainDbSchemaName, "PaPartNode", "read");
|
|
30
30
|
const oneLanguageItems = rows.map((row) => {
|
|
31
31
|
const inRightLanguage = strValOrUndef(row.tNodeId) !== undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parts.queries.js","sourceRoot":"","sources":["../../src/public-payload/parts.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACpG,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAE/E,OAAO,EAIL,aAAa,GACd,MAAM,+BAA+B,CAAC;AA+BvC,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,WAAwB,EACxB,OAAgB,EAChB,UAAyB,EACzB,QAAoB;IAEpB,MAAM,SAAS,GAAG,CAAC,GAAG,qBAAqB,CAAC,
|
|
1
|
+
{"version":3,"file":"parts.queries.js","sourceRoot":"","sources":["../../src/public-payload/parts.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACpG,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAE/E,OAAO,EAIL,aAAa,GACd,MAAM,+BAA+B,CAAC;AA+BvC,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,WAAwB,EACxB,OAAgB,EAChB,UAAyB,EACzB,QAAoB;IAEpB,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,GAAG,WAAW,CAAC;IACvC,MAAM,SAAS,GAAG,CAAC,GAAG,qBAAqB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;IAEnE,MAAM,IAAI,GAAU,MAAM,EAAE,CAAC,aAAa,CAAC;SACxC,MAAM,CAAC;QACN,gBAAgB;QAChB,4BAA4B;QAC5B,8BAA8B;QAC9B,wBAAwB;QACxB,4BAA4B;QAC5B,wBAAwB;QACxB,wBAAwB;QACxB,qBAAqB;KACtB,CAAC;SACD,SAAS,CAAC,iBAAiB,EAAE,UAAU,EAAE,MAAM,CAAC;SAEhD,QAAQ,CAAC,cAAc,EAAE;QACxB,UAAU,EAAE,MAAM;QAClB,YAAY,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAChD,SAAS,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;KAC5B,CAAC;SACD,QAAQ,CAAC,oBAAoB,EAAE,UAAU,EAAE,MAAM,CAAC;SAClD,KAAK,CAAC,kBAAkB,EAAE,UAAU,CAAC,MAAM,CAAC;SAC5C,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC;SAChC,QAAQ,CAAC,oCAAoC,CAAC,CAAC;IAElD,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IAE5D,MAAM,gBAAgB,GAAe,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACpD,MAAM,eAAe,GAAG,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,SAAS,CAAC;QACjE,MAAM,YAAY,GAAG;YACnB,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;YAC1B,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;YAClC,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC9B,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC;YACtC,QAAQ,EAAE,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC;YACpC,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC9B,KAAK,EAAE,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC;YAC/B,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,WAAW,EAAE;SACpD,CAAC;QACF,OAAO,eAAe;YACpB,CAAC,CAAC;gBACE,GAAG,YAAY;gBACf,eAAe;gBACf,QAAQ,EAAE,UAAU,CAAC,QAAQ;aAC9B;YACH,CAAC,CAAC;gBACE,GAAG,YAAY;gBACf,eAAe;gBACf,QAAQ,EAAE,SAAS;aACpB,CAAC;IACR,CAAC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,MAAM,2BAA2B,CAAC,WAAW,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAE5F,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA+B,CAAC;IACxD,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,MAAM,GAAG,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,GAAG,EAAE,CAAC;YACV,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC1B,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,IAAgD;IAClF,OAAO,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,WAAwB,EACxB,IAAyB,EACzB,QAAoB;IAEpB,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC1B,MAAM,aAAa,GAAG,IAAI,GAAG,EAAkB,CAAC;IAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACxC,MAAM,YAAY,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QACjE,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAC/C,OAAO,gBAAgB,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IACH,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,gBAAgB,CACvB,WAA4C,EAC5C,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAoE;IAE/F,OAAO;QACL,IAAI,EAAE,IAAI,CAAC,QAAQ;QACnB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,MAAM,EAAE,KAAK,GAAG,CAAC;QACjB,YAAY;QACZ,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC;KACpE,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,2BAA2B,CACxC,WAAwB,EACxB,OAAgB,EAChB,IAAgB;IAEhB,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/F,IAAI,kBAUS,CAAC;IAEd,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAU,MAAM,WAAW;aAClC,EAAE,CAAC,cAAc,CAAC;aAClB,MAAM,CAAC,CAAC,oBAAoB,EAAE,wBAAwB,EAAE,wBAAwB,CAAC,CAAC;aAClF,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,CAAC;aAC5C,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QACvC,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAEzD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACjC,OAAO;gBACL,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAC9B,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;gBAC1B,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;aAC/B,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,kBAAkB,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IACrF,CAAC;IAED,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACvB,IAAI,IAAI,CAAC,eAAe;YAAE,OAAO,IAAI,CAAC;QACtC,KAAK,MAAM,QAAQ,IAAI,WAAW,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;YACxD,MAAM,KAAK,GAAG,kBAAkB,EAAE,GAAG,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;YACxF,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO;oBACL,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;oBAC/B,QAAQ;oBACR,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,eAAe,EAAE,KAAK;oBACtB,KAAK,EAAE,KAAK,CAAC,KAAK;oBAClB,WAAW,EAAE,IAAI,CAAC,WAAW;iBAC9B,CAAC;YACJ,CAAC;QACH,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,0BAA0B,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,WAAwB,EACxB,OAAgB,EAChB,QAAuB,EACvB,QAAsC;IAEtC,MAAM,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;IAC9B,MAAM,MAAM,GAAG,MAAM,WAAW;SAC7B,EAAE,CAAC,aAAa,CAAC;SACjB,KAAK,CAAC,UAAU,CAAC;SACjB,SAAS,CAAC,iBAAiB,EAAE,UAAU,EAAE,MAAM,CAAC;SAChD,KAAK,CAAC,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC;SACpC,KAAK,CAAC,YAAY,EAAE,QAAQ,CAAC;SAC7B,KAAK,EAAE,CAAC;IACX,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IAE5D,OAAO,YAAY,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;AACxC,CAAC;AAED,SAAS,qBAAqB,CAAC,UAAwB,EAAE,IAAgB;IACvE,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3C,MAAM,kBAAkB,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3C,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,aAAa,GAAG,kBAAkB,CAAC,KAAK,EAAE,CAAC;QACjD,IAAI,CAAC,aAAa;YAAE,MAAM;QAC1B,MAAM,KAAK,GAAG,iBAAiB,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;QAC3D,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtD,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACnC,kBAAkB,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -18,7 +18,7 @@ export function makeSitePayload(siteContext, renderingContext, language) {
|
|
|
18
18
|
language,
|
|
19
19
|
languageLabel: siteContext.siteSchema.languageLabels[language],
|
|
20
20
|
get recaptchaKey() {
|
|
21
|
-
siteContext.logger.warn(
|
|
21
|
+
siteContext.logger.warn("Property 'site.recaptchaKey' is deprecated, it can probably be removed from your code");
|
|
22
22
|
return appConf.googleRecaptcha?.siteKey;
|
|
23
23
|
},
|
|
24
24
|
configuration: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"site-payload.js","sourceRoot":"","sources":["../../src/public-payload/site-payload.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAErE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAG7D,MAAM,UAAU,eAAe,CAC7B,WAAwB,EACxB,gBAAkC,EAClC,QAAgB;IAEhB,MAAM,OAAO,GAAG,+BAA+B,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACvF,OAAO;QACL,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,GAAG,EAAE,WAAW,CAAC,OAAO;QACxB,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC;QACxC,KAAK,EAAE,wBAAwB,CAAC,WAAW,EAAE,gBAAgB,EAAE,QAAQ,CAAC;QACxE,MAAM,EAAE,wBAAwB,CAAC,WAAW,EAAE,gBAAgB,EAAE,QAAQ,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;QAC/F,IAAI,EAAE;YACJ,GAAG,EAAE,UAAU,CAAC,WAAW,EAAE,QAAQ,CAAC;YACtC,GAAG,OAAO;SACX;QACD,QAAQ;QACR,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC;QAC9D,IAAI,YAAY;YACd,WAAW,CAAC,MAAM,CAAC,IAAI,CACrB,
|
|
1
|
+
{"version":3,"file":"site-payload.js","sourceRoot":"","sources":["../../src/public-payload/site-payload.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAErE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAG7D,MAAM,UAAU,eAAe,CAC7B,WAAwB,EACxB,gBAAkC,EAClC,QAAgB;IAEhB,MAAM,OAAO,GAAG,+BAA+B,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACvF,OAAO;QACL,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,GAAG,EAAE,WAAW,CAAC,OAAO;QACxB,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC;QACxC,KAAK,EAAE,wBAAwB,CAAC,WAAW,EAAE,gBAAgB,EAAE,QAAQ,CAAC;QACxE,MAAM,EAAE,wBAAwB,CAAC,WAAW,EAAE,gBAAgB,EAAE,QAAQ,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;QAC/F,IAAI,EAAE;YACJ,GAAG,EAAE,UAAU,CAAC,WAAW,EAAE,QAAQ,CAAC;YACtC,GAAG,OAAO;SACX;QACD,QAAQ;QACR,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC;QAC9D,IAAI,YAAY;YACd,WAAW,CAAC,MAAM,CAAC,IAAI,CACrB,uFAAuF,CACxF,CAAC;YACF,OAAO,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC;QAC1C,CAAC;QACD,aAAa,EAAE;YACb,kBAAkB,EAAE,OAAO,CAAC,eAAe,EAAE,OAAO;SACrD;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,+BAA+B,CAC7C,GAAe,EACf,QAAgB;IAEhB,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACvC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,sBAAsB,GAAG,CAAC,QAAQ,gBAAgB,QAAQ,GAAG,CAAC,CAAC;IACjF,CAAC;IACD,MAAM,SAAS,GAA4C;QACzD,EAAE,EAAE,OAAO;KACZ,CAAC;IACF,KAAK,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,CAAC;QAC3E,SAAS,CAAC,aAAa,CAAC,GAAG,+BAA+B,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACjF,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
|