payload 1.6.15 → 1.6.16

package/dist/uploads/generateFileData.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateFileData.js","sourceRoot":"","sources":["../../src/uploads/generateFileData.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generateFileData.js","sourceRoot":"","sources":["../../src/uploads/generateFileData.ts"],"names":[],"mappings":"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"}

package/dist/versions/drafts/queryDrafts.js

@@ -35,17 +35,21 @@ const queryDrafts = async ({ accessResult, collection, locale, payload, paginati
         // Filter based on incoming query
         { $match: versionQuery },
     ]);
-    const paginationSort = Object.entries(paginationOptions.sort).reduce((sort, [key, order]) => {
-        return {
-            ...sort,
-            [key]: order === 'asc' ? 1 : -1,
-        };
-    }, {});
-    const result = await VersionModel.aggregatePaginate(aggregate, {
+    const aggregatePaginateOptions = {
         ...paginationOptions,
-        sort: paginationSort,
         useFacet: (_a = payload.mongoOptions) === null || _a === void 0 ? void 0 : _a.useFacet,
-    });
+        sort: Object.entries(paginationOptions.sort).reduce((sort, [incomingSortKey, order]) => {
+            let key = incomingSortKey;
+            if (!['createdAt', 'updatedAt', '_id'].includes(incomingSortKey)) {
+                key = `version.${incomingSortKey}`;
+            }
+            return {
+                ...sort,
+                [key]: order === 'asc' ? 1 : -1,
+            };
+        }, {})
+    };
+    const result = await VersionModel.aggregatePaginate(aggregate, aggregatePaginateOptions);
     return {
         ...result,
         docs: result.docs.map((doc) => ({

package/dist/versions/drafts/queryDrafts.js.map

@@ -1 +1 @@
-{"version":3,"file":"queryDrafts.js","sourceRoot":"","sources":["../../../src/versions/drafts/queryDrafts.ts"],"names":[],"mappings":";;;AAMA,qCAAkD;AAClD,uEAAoE;AAkB7D,MAAM,WAAW,GAAG,KAAK,EAAwB,EACtD,YAAY,EACZ,UAAU,EACV,MAAM,EACN,OAAO,EACP,iBAAiB,EACjB,KAAK,EAAE,aAAa,GACf,EAA6B,EAAE;;IACpC,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAoB,CAAC;IAEjF,MAAM,KAAK,GAAG,IAAA,iDAAuB,EAAC,aAAa,IAAI,EAAE,CAAC,CAAC;IAE3D,MAAM,mBAAmB,GAAqB;QAC5C,KAAK,EAAE;YACL,GAAG,KAAK;YACR,GAAG,EAAE;gBACH,GAAG,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,GAAG,KAAI,EAAE;aACpB;SACF;KACF,CAAC;IAEF,IAAI,IAAA,2BAAoB,EAAC,YAAY,CAAC,EAAE;QACtC,MAAM,mBAAmB,GAAG,IAAA,iDAAuB,EAAC,YAAY,CAAC,CAAC;QAClE,mBAAmB,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;KACzD;IAED,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,UAAU,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;IAEhF,MAAM,SAAS,GAAG,YAAY,CAAC,SAAS,CAAsB;QAC5D,gCAAgC;QAChC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE;QAC5B,iDAAiD;QACjD;YACE,MAAM,EAAE;gBACN,GAAG,EAAE,SAAS;gBACd,OAAO,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE;gBAC/B,SAAS,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE;gBACnC,SAAS,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE;aACpC;SACF;QACD,iCAAiC;QACjC,EAAE,MAAM,EAAE,YAAY,EAAE;KACzB,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC1F,OAAO;YACL,GAAG,IAAI;YACP,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAChC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,iBAAiB,CAAC,SAAS,EAAE;QAC7D,GAAG,iBAAiB;QACpB,IAAI,EAAE,cAAc;QACpB,QAAQ,EAAE,MAAA,OAAO,CAAC,YAAY,0CAAE,QAAQ;KACtB,CAAC,CAAC;IAEtB,OAAO;QACL,GAAG,MAAM;QACT,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC9B,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,GAAG,GAAG,CAAC,OAAO;YACd,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,SAAS,EAAE,GAAG,CAAC,SAAS;SACzB,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC,CAAC;AAlEW,QAAA,WAAW,eAkEtB"}
+{"version":3,"file":"queryDrafts.js","sourceRoot":"","sources":["../../../src/versions/drafts/queryDrafts.ts"],"names":[],"mappings":";;;AAMA,qCAAkD;AAClD,uEAAoE;AAkB7D,MAAM,WAAW,GAAG,KAAK,EAAwB,EACtD,YAAY,EACZ,UAAU,EACV,MAAM,EACN,OAAO,EACP,iBAAiB,EACjB,KAAK,EAAE,aAAa,GACf,EAA6B,EAAE;;IACpC,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAoB,CAAC;IAEjF,MAAM,KAAK,GAAG,IAAA,iDAAuB,EAAC,aAAa,IAAI,EAAE,CAAC,CAAC;IAE3D,MAAM,mBAAmB,GAAqB;QAC5C,KAAK,EAAE;YACL,GAAG,KAAK;YACR,GAAG,EAAE;gBACH,GAAG,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,GAAG,KAAI,EAAE;aACpB;SACF;KACF,CAAC;IAEF,IAAI,IAAA,2BAAoB,EAAC,YAAY,CAAC,EAAE;QACtC,MAAM,mBAAmB,GAAG,IAAA,iDAAuB,EAAC,YAAY,CAAC,CAAC;QAClE,mBAAmB,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;KACzD;IAED,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,UAAU,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;IAEhF,MAAM,SAAS,GAAG,YAAY,CAAC,SAAS,CAAsB;QAC5D,gCAAgC;QAChC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE;QAC5B,iDAAiD;QACjD;YACE,MAAM,EAAE;gBACN,GAAG,EAAE,SAAS;gBACd,OAAO,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE;gBAC/B,SAAS,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE;gBACnC,SAAS,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE;aACpC;SACF;QACD,iCAAiC;QACjC,EAAE,MAAM,EAAE,YAAY,EAAE;KACzB,CAAC,CAAC;IAEH,MAAM,wBAAwB,GAAG;QAC/B,GAAG,iBAAiB;QACpB,QAAQ,EAAE,MAAA,OAAO,CAAC,YAAY,0CAAE,QAAQ;QACxC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,eAAe,EAAE,KAAK,CAAC,EAAE,EAAE;YACrF,IAAI,GAAG,GAAG,eAAe,CAAC;YAE1B,IAAI,CAAC,CAAC,WAAW,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE;gBAChE,GAAG,GAAG,WAAW,eAAe,EAAE,CAAA;aACnC;YAED,OAAO;gBACL,GAAG,IAAI;gBACP,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aAChC,CAAC;QACJ,CAAC,EAAE,EAAE,CAAC;KACP,CAAA;IAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,iBAAiB,CAAC,SAAS,EAAE,wBAAwB,CAAC,CAAC;IAEzF,OAAO;QACL,GAAG,MAAM;QACT,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC9B,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,GAAG,GAAG,CAAC,OAAO;YACd,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,SAAS,EAAE,GAAG,CAAC,SAAS;SACzB,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC,CAAC;AAxEW,QAAA,WAAW,eAwEtB"}

package/dist/versions/getLatestCollectionVersion.d.ts

@@ -1,20 +1,12 @@
 import { Payload } from '../payload';
 import { CollectionModel, SanitizedCollectionConfig, TypeWithID } from '../collections/config/types';
-import { GlobalModel, SanitizedGlobalConfig } from '../globals/config/types';
 type Args = {
     payload: Payload;
     query: Record<string, unknown>;
     lean?: boolean;
-} & ({
-    entityType: 'global';
-    id?: never;
-    Model: GlobalModel;
-    config: SanitizedGlobalConfig;
-} | {
-    entityType?: 'collection';
     id: string | number;
     Model: CollectionModel;
     config: SanitizedCollectionConfig;
-});
-export declare const getLatestEntityVersion: <T extends TypeWithID = any>({ payload, entityType, config, Model, query, id, lean, }: Args) => Promise<T>;
+};
+export declare const getLatestCollectionVersion: <T extends TypeWithID = any>({ payload, config, Model, query, id, lean, }: Args) => Promise<T>;
 export {};

package/dist/versions/getLatestCollectionVersion.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLatestEntityVersion = void 0;
+exports.getLatestCollectionVersion = void 0;
 const types_1 = require("../types");
-const getLatestEntityVersion = async ({ payload, entityType = 'collection', config, Model, query, id, lean = true, }) => {
+const getLatestCollectionVersion = async ({ payload, config, Model, query, id, lean = true, }) => {
     var _a;
     let latestVersion;
     if ((_a = config.versions) === null || _a === void 0 ? void 0 : _a.drafts) {
@@ -15,10 +15,7 @@ const getLatestEntityVersion = async ({ payload, entityType = 'collection', conf
     }
     const doc = await Model.findOne(query, {}, { lean });
     if (!latestVersion || ((0, types_1.docHasTimestamps)(doc) && latestVersion.updatedAt < doc.updatedAt)) {
-        if (entityType === 'collection') {
-            doc.id = doc._id;
-            return doc;
-        }
+        doc.id = doc._id;
         return doc;
     }
     return {
@@ -28,5 +25,5 @@ const getLatestEntityVersion = async ({ payload, entityType = 'collection', conf
         createdAt: latestVersion.createdAt,
     };
 };
-exports.getLatestEntityVersion = getLatestEntityVersion;
+exports.getLatestCollectionVersion = getLatestCollectionVersion;
 //# sourceMappingURL=getLatestCollectionVersion.js.map

package/dist/versions/getLatestCollectionVersion.js.map

@@ -1 +1 @@
-{"version":3,"file":"getLatestCollectionVersion.js","sourceRoot":"","sources":["../../src/versions/getLatestCollectionVersion.ts"],"names":[],"mappings":";;;AAAA,oCAAsD;AAqB/C,MAAM,sBAAsB,GAAG,KAAK,EAA8B,EACvE,OAAO,EACP,UAAU,GAAG,YAAY,EACzB,MAAM,EACN,KAAK,EACL,KAAK,EACL,EAAE,EACF,IAAI,GAAG,IAAI,GACN,EAAc,EAAE;;IACrB,IAAI,aAAa,CAAC;IAElB,IAAI,MAAA,MAAM,CAAC,QAAQ,0CAAE,MAAM,EAAE;QAC3B,aAAa,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;YAC1D,MAAM,EAAE,EAAE;SACX,EAAE,EAAE,EAAE;YACL,IAAI,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE;YAC3B,IAAI;SACL,CAAC,CAAC;KACJ;IAED,MAAM,GAAG,GAAG,MAAO,KAAa,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,CAAa,CAAC;IAE1E,IAAI,CAAC,aAAa,IAAI,CAAC,IAAA,wBAAgB,EAAC,GAAG,CAAC,IAAI,aAAa,CAAC,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC,EAAE;QACxF,IAAI,UAAU,KAAK,YAAY,EAAE;YAC/B,GAAG,CAAC,EAAE,GAAG,GAAG,CAAC,GAAG,CAAC;YACjB,OAAO,GAAG,CAAC;SACZ;QACD,OAAO,GAAG,CAAC;KACZ;IAED,OAAO;QACL,GAAG,aAAa,CAAC,OAAO;QACxB,EAAE;QACF,SAAS,EAAE,aAAa,CAAC,SAAS;QAClC,SAAS,EAAE,aAAa,CAAC,SAAS;KACnC,CAAC;AACJ,CAAC,CAAC;AApCW,QAAA,sBAAsB,0BAoCjC"}
+{"version":3,"file":"getLatestCollectionVersion.js","sourceRoot":"","sources":["../../src/versions/getLatestCollectionVersion.ts"],"names":[],"mappings":";;;AAAA,oCAA4C;AAarC,MAAM,0BAA0B,GAAG,KAAK,EAA8B,EAC3E,OAAO,EACP,MAAM,EACN,KAAK,EACL,KAAK,EACL,EAAE,EACF,IAAI,GAAG,IAAI,GACN,EAAc,EAAE;;IACrB,IAAI,aAAa,CAAC;IAElB,IAAI,MAAA,MAAM,CAAC,QAAQ,0CAAE,MAAM,EAAE;QAC3B,aAAa,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;YAC1D,MAAM,EAAE,EAAE;SACX,EAAE,EAAE,EAAE;YACL,IAAI,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE;YAC3B,IAAI;SACL,CAAC,CAAC;KACJ;IAED,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAErD,IAAI,CAAC,aAAa,IAAI,CAAC,IAAA,wBAAgB,EAAC,GAAG,CAAC,IAAI,aAAa,CAAC,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC,EAAE;QACxF,GAAG,CAAC,EAAE,GAAG,GAAG,CAAC,GAAG,CAAC;QACjB,OAAO,GAAG,CAAC;KACZ;IAED,OAAO;QACL,GAAG,aAAa,CAAC,OAAO;QACxB,EAAE;QACF,SAAS,EAAE,aAAa,CAAC,SAAS;QAClC,SAAS,EAAE,aAAa,CAAC,SAAS;KACnC,CAAC;AACJ,CAAC,CAAC;AAhCW,QAAA,0BAA0B,8BAgCrC"}

package/dist/versions/getLatestGlobalVersion.d.ts

@@ -0,0 +1,15 @@
+import { Payload } from '../payload';
+import { Document } from '../types';
+import { GlobalModel, SanitizedGlobalConfig } from '../globals/config/types';
+type Args = {
+    payload: Payload;
+    query: Record<string, unknown>;
+    lean?: boolean;
+    Model: GlobalModel;
+    config: SanitizedGlobalConfig;
+};
+export declare const getLatestGlobalVersion: ({ payload, config, Model, query, lean, }: Args) => Promise<{
+    global: Document;
+    globalExists: boolean;
+}>;
+export {};

package/dist/versions/getLatestGlobalVersion.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLatestGlobalVersion = void 0;
+const types_1 = require("../types");
+const getLatestGlobalVersion = async ({ payload, config, Model, query, lean = true, }) => {
+    var _a;
+    let latestVersion;
+    if ((_a = config.versions) === null || _a === void 0 ? void 0 : _a.drafts) {
+        latestVersion = await payload.versions[config.slug].findOne({}, {}, {
+            sort: { updatedAt: 'desc' },
+            lean,
+        });
+    }
+    const global = await Model.findOne(query, {}, { lean });
+    const globalExists = Boolean(global);
+    if (!latestVersion || ((0, types_1.docHasTimestamps)(global) && latestVersion.updatedAt < global.updatedAt)) {
+        return {
+            global,
+            globalExists,
+        };
+    }
+    return {
+        global: {
+            ...latestVersion.version,
+            updatedAt: latestVersion.updatedAt,
+            createdAt: latestVersion.createdAt,
+        },
+        globalExists,
+    };
+};
+exports.getLatestGlobalVersion = getLatestGlobalVersion;
+//# sourceMappingURL=getLatestGlobalVersion.js.map

package/dist/versions/getLatestGlobalVersion.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getLatestGlobalVersion.js","sourceRoot":"","sources":["../../src/versions/getLatestGlobalVersion.ts"],"names":[],"mappings":";;;AACA,oCAAsD;AAW/C,MAAM,sBAAsB,GAAG,KAAK,EAAE,EAC3C,OAAO,EACP,MAAM,EACN,KAAK,EACL,KAAK,EACL,IAAI,GAAG,IAAI,GACN,EAAsD,EAAE;;IAC7D,IAAI,aAAa,CAAC;IAElB,IAAI,MAAA,MAAM,CAAC,QAAQ,0CAAE,MAAM,EAAE;QAC3B,aAAa,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE;YAClE,IAAI,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE;YAC3B,IAAI;SACL,CAAC,CAAC;KACJ;IAED,MAAM,MAAM,GAAG,MAAO,KAAa,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,CAAa,CAAC;IAC7E,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAErC,IAAI,CAAC,aAAa,IAAI,CAAC,IAAA,wBAAgB,EAAC,MAAM,CAAC,IAAI,aAAa,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,EAAE;QAC9F,OAAO;YACL,MAAM;YACN,YAAY;SACb,CAAC;KACH;IAED,OAAO;QACL,MAAM,EAAE;YACN,GAAG,aAAa,CAAC,OAAO;YACxB,SAAS,EAAE,aAAa,CAAC,SAAS;YAClC,SAAS,EAAE,aAAa,CAAC,SAAS;SACnC;QACD,YAAY;KACb,CAAC;AACJ,CAAC,CAAC;AAlCW,QAAA,sBAAsB,0BAkCjC"}

package/docs/queries/overview.mdx

@@ -105,6 +105,18 @@ const query = {
 
 Written in plain English, if the above query were passed to a `find` operation, it would translate to finding posts where either the `color` is `mint` OR the `color` is `white` AND `featured` is set to false.
 
+### Nested properties
+
+When working with nested properties, which can happen when using relational fields, it is possible to use the dot notation to access the nested property. For example, when working with a `Song` collection that has a `artists` field which is related to an `Artists` collection using the `name: 'artists'`. You can access a property within the collection `Artists` like so:
+
+```js
+const query = {
+  'artists.featured': { // nested property name to filter on
+    exists: true, // operator to use and boolean value that needs to be true
+  },
+}
+```
+
 ### GraphQL Find Queries
 
 All GraphQL `find` queries support the `where` argument, which accepts queries exactly as detailed above.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payload",
-  "version": "1.6.15",
+  "version": "1.6.16",
   "description": "Node, React and MongoDB Headless CMS and Application Framework",
   "license": "MIT",
   "engines": {
@@ -161,7 +161,6 @@
     "qs-middleware": "^1.0.3",
     "react": "^18.2.0",
     "react-animate-height": "^2.1.2",
-    "react-beautiful-dnd": "^13.1.1",
     "react-datepicker": "^4.10.0",
     "react-diff-viewer": "^3.1.1",
     "react-dom": "^18.2.0",
@@ -244,7 +243,6 @@
     "@types/qs": "^6.9.7",
     "@types/qs-middleware": "^1.0.1",
     "@types/react": "^18.0.26",
-    "@types/react-beautiful-dnd": "^13.1.3",
     "@types/react-datepicker": "^4.8.0",
     "@types/react-dom": "^18.0.10",
     "@types/react-helmet": "^6.1.6",

package/dist/admin/components/views/collections/List/getInitialColumns.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getInitialColumns.js","sourceRoot":"","sources":["../../../../../../src/admin/components/views/collections/List/getInitialColumns.ts"],"names":[],"mappings":";;AAAA,8DAA4G;AAE5G,MAAM,mBAAmB,GAAG,CAAC,MAAe,EAAE,UAAkB,EAAY,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;IAChH,IAAI,IAAA,wBAAgB,EAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE;QACxD,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,CAAC,IAAA,wBAAgB,EAAC,KAAK,CAAC,IAAI,IAAA,yBAAiB,EAAC,KAAK,CAAC,EAAE;QACxD,OAAO;YACL,GAAG,SAAS;YACZ,GAAG,mBAAmB,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC;SACjD,CAAC;KACH;IAED,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE;QACzB,OAAO;YACL,GAAG,SAAS;YACZ,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,GAAG,EAAE,EAAE,CAAC;gBAC7C,GAAG,eAAe;gBAClB,GAAG,CAAC,IAAA,kBAAU,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;aAChF,EAAE,EAAE,CAAC;SACP,CAAC;KACH;IAED,OAAO;QACL,GAAG,SAAS;QACZ,KAAK,CAAC,IAAI;KACX,CAAC;AACJ,CAAC,EAAE,EAAE,CAAC,CAAC;AAEP,MAAM,qBAAqB,GAAG,CAAC,MAAe,EAAE,UAAkB,EAAE,cAAwB,EAAY,EAAE;IACxG,IAAI,cAAc,GAAG,EAAE,CAAC;IAExB,IAAI,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,cAAc,CAAC,MAAM,IAAI,CAAC,EAAE;QAC/D,OAAO,cAAc,CAAC;KACvB;IAGD,IAAI,UAAU,EAAE;QACd,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;KACjC;IAED,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAEjE,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACzD,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAE5C,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAGF,kBAAe,qBAAqB,CAAC"}