@payloadcms/db-mongodb 3.2.2-canary.b072173 → 3.2.2-canary.d2399ed

package/dist/updateVersion.js

@@ -1,7 +1,7 @@
 import { buildVersionCollectionFields } from 'payload';
+import { getSession } from './getSession.js';
 import { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js';
-import { sanitizeRelationshipIDs } from './utilities/sanitizeRelationshipIDs.js';
-import { withSession } from './withSession.js';
+import { transform } from './utilities/transform.js';
 export const updateVersion = async function updateVersion({ id, collection, locale, options: optionsArgs = {}, req = {}, select, versionData, where }) {
     const VersionModel = this.versions[collection];
     const whereToUse = where || {
@@ -9,37 +9,39 @@ export const updateVersion = async function updateVersion({ id, collection, loca
             equals: id
         }
     };
-    const fields = buildVersionCollectionFields(this.payload.config, this.payload.collections[collection].config);
-    const options = {
-        ...optionsArgs,
-        ...await withSession(this, req),
-        lean: true,
-        new: true,
-        projection: buildProjectionFromSelect({
-            adapter: this,
-            fields: buildVersionCollectionFields(this.payload.config, this.payload.collections[collection].config, true),
-            select
-        })
-    };
+    const fields = buildVersionCollectionFields(this.payload.config, this.payload.collections[collection].config, true);
+    const session = await getSession(this, req);
     const query = await VersionModel.buildQuery({
         locale,
         payload: this.payload,
+        session,
         where: whereToUse
     });
-    const sanitizedData = sanitizeRelationshipIDs({
-        config: this.payload.config,
+    transform({
+        adapter: this,
         data: versionData,
-        fields
+        fields,
+        operation: 'update'
+    });
+    const doc = await VersionModel.collection.findOneAndUpdate(query, {
+        $set: versionData
+    }, {
+        ...optionsArgs,
+        projection: buildProjectionFromSelect({
+            adapter: this,
+            fields: buildVersionCollectionFields(this.payload.config, this.payload.collections[collection].config, true),
+            select
+        }),
+        returnDocument: 'after',
+        session
+    });
+    transform({
+        adapter: this,
+        data: doc,
+        fields,
+        operation: 'read'
     });
-    const doc = await VersionModel.findOneAndUpdate(query, sanitizedData, options);
-    const result = JSON.parse(JSON.stringify(doc));
-    const verificationToken = doc._verificationToken;
-    // custom id type reset
-    result.id = result._id;
-    if (verificationToken) {
-        result._verificationToken = verificationToken;
-    }
-    return result;
+    return doc;
 };
 
 //# sourceMappingURL=updateVersion.js.map

package/dist/updateVersion.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/updateVersion.ts"],"sourcesContent":["import type { QueryOptions } from 'mongoose'\n\nimport { buildVersionCollectionFields, type PayloadRequest, type UpdateVersion } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { sanitizeRelationshipIDs } from './utilities/sanitizeRelationshipIDs.js'\nimport { withSession } from './withSession.js'\n\nexport const updateVersion: UpdateVersion = async function updateVersion(\n  this: MongooseAdapter,\n  {\n    id,\n    collection,\n    locale,\n    options: optionsArgs = {},\n    req = {} as PayloadRequest,\n    select,\n    versionData,\n    where,\n  },\n) {\n  const VersionModel = this.versions[collection]\n  const whereToUse = where || { id: { equals: id } }\n  const fields = buildVersionCollectionFields(\n    this.payload.config,\n    this.payload.collections[collection].config,\n  )\n\n  const options: QueryOptions = {\n    ...optionsArgs,\n    ...(await withSession(this, req)),\n    lean: true,\n    new: true,\n    projection: buildProjectionFromSelect({\n      adapter: this,\n      fields: buildVersionCollectionFields(\n        this.payload.config,\n        this.payload.collections[collection].config,\n        true,\n      ),\n      select,\n    }),\n  }\n\n  const query = await VersionModel.buildQuery({\n    locale,\n    payload: this.payload,\n    where: whereToUse,\n  })\n\n  const sanitizedData = sanitizeRelationshipIDs({\n    config: this.payload.config,\n    data: versionData,\n    fields,\n  })\n\n  const doc = await VersionModel.findOneAndUpdate(query, sanitizedData, options)\n\n  const result = JSON.parse(JSON.stringify(doc))\n\n  const verificationToken = doc._verificationToken\n\n  // custom id type reset\n  result.id = result._id\n  if (verificationToken) {\n    result._verificationToken = verificationToken\n  }\n  return result\n}\n"],"names":["buildVersionCollectionFields","buildProjectionFromSelect","sanitizeRelationshipIDs","withSession","updateVersion","id","collection","locale","options","optionsArgs","req","select","versionData","where","VersionModel","versions","whereToUse","equals","fields","payload","config","collections","lean","new","projection","adapter","query","buildQuery","sanitizedData","data","doc","findOneAndUpdate","result","JSON","parse","stringify","verificationToken","_verificationToken","_id"],"mappings":"AAEA,SAASA,4BAA4B,QAAiD,UAAS;AAI/F,SAASC,yBAAyB,QAAQ,2CAA0C;AACpF,SAASC,uBAAuB,QAAQ,yCAAwC;AAChF,SAASC,WAAW,QAAQ,mBAAkB;AAE9C,OAAO,MAAMC,gBAA+B,eAAeA,cAEzD,EACEC,EAAE,EACFC,UAAU,EACVC,MAAM,EACNC,SAASC,cAAc,CAAC,CAAC,EACzBC,MAAM,CAAC,CAAmB,EAC1BC,MAAM,EACNC,WAAW,EACXC,KAAK,EACN;IAED,MAAMC,eAAe,IAAI,CAACC,QAAQ,CAACT,WAAW;IAC9C,MAAMU,aAAaH,SAAS;QAAER,IAAI;YAAEY,QAAQZ;QAAG;IAAE;IACjD,MAAMa,SAASlB,6BACb,IAAI,CAACmB,OAAO,CAACC,MAAM,EACnB,IAAI,CAACD,OAAO,CAACE,WAAW,CAACf,WAAW,CAACc,MAAM;IAG7C,MAAMZ,UAAwB;QAC5B,GAAGC,WAAW;QACd,GAAI,MAAMN,YAAY,IAAI,EAAEO,IAAI;QAChCY,MAAM;QACNC,KAAK;QACLC,YAAYvB,0BAA0B;YACpCwB,SAAS,IAAI;YACbP,QAAQlB,6BACN,IAAI,CAACmB,OAAO,CAACC,MAAM,EACnB,IAAI,CAACD,OAAO,CAACE,WAAW,CAACf,WAAW,CAACc,MAAM,EAC3C;YAEFT;QACF;IACF;IAEA,MAAMe,QAAQ,MAAMZ,aAAaa,UAAU,CAAC;QAC1CpB;QACAY,SAAS,IAAI,CAACA,OAAO;QACrBN,OAAOG;IACT;IAEA,MAAMY,gBAAgB1B,wBAAwB;QAC5CkB,QAAQ,IAAI,CAACD,OAAO,CAACC,MAAM;QAC3BS,MAAMjB;QACNM;IACF;IAEA,MAAMY,MAAM,MAAMhB,aAAaiB,gBAAgB,CAACL,OAAOE,eAAepB;IAEtE,MAAMwB,SAASC,KAAKC,KAAK,CAACD,KAAKE,SAAS,CAACL;IAEzC,MAAMM,oBAAoBN,IAAIO,kBAAkB;IAEhD,uBAAuB;IACvBL,OAAO3B,EAAE,GAAG2B,OAAOM,GAAG;IACtB,IAAIF,mBAAmB;QACrBJ,OAAOK,kBAAkB,GAAGD;IAC9B;IACA,OAAOJ;AACT,EAAC"}
+{"version":3,"sources":["../src/updateVersion.ts"],"sourcesContent":["import { buildVersionCollectionFields, type PayloadRequest, type UpdateVersion } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { getSession } from './getSession.js'\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { transform } from './utilities/transform.js'\n\nexport const updateVersion: UpdateVersion = async function updateVersion(\n  this: MongooseAdapter,\n  {\n    id,\n    collection,\n    locale,\n    options: optionsArgs = {},\n    req = {} as PayloadRequest,\n    select,\n    versionData,\n    where,\n  },\n) {\n  const VersionModel = this.versions[collection]\n  const whereToUse = where || { id: { equals: id } }\n  const fields = buildVersionCollectionFields(\n    this.payload.config,\n    this.payload.collections[collection].config,\n    true,\n  )\n\n  const session = await getSession(this, req)\n\n  const query = await VersionModel.buildQuery({\n    locale,\n    payload: this.payload,\n    session,\n    where: whereToUse,\n  })\n\n  transform({\n    adapter: this,\n    data: versionData,\n    fields,\n    operation: 'update',\n  })\n\n  const doc = await VersionModel.collection.findOneAndUpdate(\n    query,\n    { $set: versionData },\n    {\n      ...optionsArgs,\n      projection: buildProjectionFromSelect({\n        adapter: this,\n        fields: buildVersionCollectionFields(\n          this.payload.config,\n          this.payload.collections[collection].config,\n          true,\n        ),\n        select,\n      }),\n      returnDocument: 'after',\n      session,\n    },\n  )\n\n  transform({\n    adapter: this,\n    data: doc,\n    fields,\n    operation: 'read',\n  })\n\n  return doc as any\n}\n"],"names":["buildVersionCollectionFields","getSession","buildProjectionFromSelect","transform","updateVersion","id","collection","locale","options","optionsArgs","req","select","versionData","where","VersionModel","versions","whereToUse","equals","fields","payload","config","collections","session","query","buildQuery","adapter","data","operation","doc","findOneAndUpdate","$set","projection","returnDocument"],"mappings":"AAAA,SAASA,4BAA4B,QAAiD,UAAS;AAI/F,SAASC,UAAU,QAAQ,kBAAiB;AAC5C,SAASC,yBAAyB,QAAQ,2CAA0C;AACpF,SAASC,SAAS,QAAQ,2BAA0B;AAEpD,OAAO,MAAMC,gBAA+B,eAAeA,cAEzD,EACEC,EAAE,EACFC,UAAU,EACVC,MAAM,EACNC,SAASC,cAAc,CAAC,CAAC,EACzBC,MAAM,CAAC,CAAmB,EAC1BC,MAAM,EACNC,WAAW,EACXC,KAAK,EACN;IAED,MAAMC,eAAe,IAAI,CAACC,QAAQ,CAACT,WAAW;IAC9C,MAAMU,aAAaH,SAAS;QAAER,IAAI;YAAEY,QAAQZ;QAAG;IAAE;IACjD,MAAMa,SAASlB,6BACb,IAAI,CAACmB,OAAO,CAACC,MAAM,EACnB,IAAI,CAACD,OAAO,CAACE,WAAW,CAACf,WAAW,CAACc,MAAM,EAC3C;IAGF,MAAME,UAAU,MAAMrB,WAAW,IAAI,EAAES;IAEvC,MAAMa,QAAQ,MAAMT,aAAaU,UAAU,CAAC;QAC1CjB;QACAY,SAAS,IAAI,CAACA,OAAO;QACrBG;QACAT,OAAOG;IACT;IAEAb,UAAU;QACRsB,SAAS,IAAI;QACbC,MAAMd;QACNM;QACAS,WAAW;IACb;IAEA,MAAMC,MAAM,MAAMd,aAAaR,UAAU,CAACuB,gBAAgB,CACxDN,OACA;QAAEO,MAAMlB;IAAY,GACpB;QACE,GAAGH,WAAW;QACdsB,YAAY7B,0BAA0B;YACpCuB,SAAS,IAAI;YACbP,QAAQlB,6BACN,IAAI,CAACmB,OAAO,CAACC,MAAM,EACnB,IAAI,CAACD,OAAO,CAACE,WAAW,CAACf,WAAW,CAACc,MAAM,EAC3C;YAEFT;QACF;QACAqB,gBAAgB;QAChBV;IACF;IAGFnB,UAAU;QACRsB,SAAS,IAAI;QACbC,MAAME;QACNV;QACAS,WAAW;IACb;IAEA,OAAOC;AACT,EAAC"}

package/dist/utilities/buildJoinAggregation.d.ts

@@ -1,18 +1,18 @@
+import type { ClientSession } from 'mongodb';
 import type { PipelineStage } from 'mongoose';
-import type { CollectionSlug, JoinQuery, SanitizedCollectionConfig, Where } from 'payload';
+import type { CollectionSlug, JoinQuery, SanitizedCollectionConfig } from 'payload';
 import type { MongooseAdapter } from '../index.js';
 type BuildJoinAggregationArgs = {
     adapter: MongooseAdapter;
     collection: CollectionSlug;
     collectionConfig: SanitizedCollectionConfig;
     joins: JoinQuery;
-    limit?: number;
     locale: string;
     projection?: Record<string, true>;
-    query?: Where;
+    session?: ClientSession;
     /** whether the query is from drafts */
     versions?: boolean;
 };
-export declare const buildJoinAggregation: ({ adapter, collection, collectionConfig, joins, limit, locale, projection, query, versions, }: BuildJoinAggregationArgs) => Promise<PipelineStage[] | undefined>;
+export declare const buildJoinAggregation: ({ adapter, collection, collectionConfig, joins, locale, projection, session, versions, }: BuildJoinAggregationArgs) => Promise<PipelineStage[] | undefined>;
 export {};
 //# sourceMappingURL=buildJoinAggregation.d.ts.map

package/dist/utilities/buildJoinAggregation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildJoinAggregation.d.ts","sourceRoot":"","sources":["../../src/utilities/buildJoinAggregation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,yBAAyB,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE1F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAIlD,KAAK,wBAAwB,GAAG;IAC9B,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,cAAc,CAAA;IAC1B,gBAAgB,EAAE,yBAAyB,CAAA;IAC3C,KAAK,EAAE,SAAS,CAAA;IAEhB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IAEjC,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,uCAAuC;IACvC,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,oBAAoB,kGAU9B,wBAAwB,KAAG,OAAO,CAAC,aAAa,EAAE,GAAG,SAAS,CA+JhE,CAAA"}
+{"version":3,"file":"buildJoinAggregation.d.ts","sourceRoot":"","sources":["../../src/utilities/buildJoinAggregation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,yBAAyB,EAAS,MAAM,SAAS,CAAA;AAE1F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAIlD,KAAK,wBAAwB,GAAG;IAC9B,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,cAAc,CAAA;IAC1B,gBAAgB,EAAE,yBAAyB,CAAA;IAC3C,KAAK,EAAE,SAAS,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACjC,OAAO,CAAC,EAAE,aAAa,CAAA;IACvB,uCAAuC;IACvC,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,oBAAoB,6FAS9B,wBAAwB,KAAG,OAAO,CAAC,aAAa,EAAE,GAAG,SAAS,CA8IhE,CAAA"}

package/dist/utilities/buildJoinAggregation.js

@@ -1,26 +1,10 @@
 import { buildSortParam } from '../queries/buildSortParam.js';
-export const buildJoinAggregation = async ({ adapter, collection, collectionConfig, joins, limit, locale, projection, query, versions })=>{
+export const buildJoinAggregation = async ({ adapter, collection, collectionConfig, joins, locale, projection, session, versions })=>{
     if (Object.keys(collectionConfig.joins).length === 0 || joins === false) {
         return;
     }
     const joinConfig = adapter.payload.collections[collection].config.joins;
-    const aggregate = [
-        {
-            $sort: {
-                createdAt: -1
-            }
-        }
-    ];
-    if (query) {
-        aggregate.push({
-            $match: query
-        });
-    }
-    if (limit) {
-        aggregate.push({
-            $limit: limit
-        });
-    }
+    const aggregate = [];
     for (const slug of Object.keys(joinConfig)){
         for (const join of joinConfig[slug]){
             const joinModel = adapter.collections[join.field.collection];
@@ -31,18 +15,17 @@ export const buildJoinAggregation = async ({ adapter, collection, collectionConf
                 continue;
             }
             const { limit: limitJoin = join.field.defaultLimit ?? 10, sort: sortJoin = join.field.defaultSort || collectionConfig.defaultSort, where: whereJoin } = joins?.[join.joinPath] || {};
-            const sort = buildSortParam({
+            const $sort = buildSortParam({
                 config: adapter.payload.config,
                 fields: adapter.payload.collections[slug].config.flattenedFields,
                 locale,
                 sort: sortJoin,
                 timestamps: true
             });
-            const sortProperty = Object.keys(sort)[0];
-            const sortDirection = sort[sortProperty] === 'asc' ? 1 : -1;
             const $match = await joinModel.buildQuery({
                 locale,
                 payload: adapter.payload,
+                session,
                 where: whereJoin
             });
             const pipeline = [
@@ -50,9 +33,7 @@ export const buildJoinAggregation = async ({ adapter, collection, collectionConf
                     $match
                 },
                 {
-                    $sort: {
-                        [sortProperty]: sortDirection
-                    }
+                    $sort
                 }
             ];
             if (limitJoin > 0) {
@@ -148,10 +129,8 @@ export const buildJoinAggregation = async ({ adapter, collection, collectionConf
             }
         }
     }
-    if (projection) {
-        aggregate.push({
-            $project: projection
-        });
+    if (!aggregate.length) {
+        return;
     }
     return aggregate;
 };

package/dist/utilities/buildJoinAggregation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/buildJoinAggregation.ts"],"sourcesContent":["import type { PipelineStage } from 'mongoose'\nimport type { CollectionSlug, JoinQuery, SanitizedCollectionConfig, Where } from 'payload'\n\nimport type { MongooseAdapter } from '../index.js'\n\nimport { buildSortParam } from '../queries/buildSortParam.js'\n\ntype BuildJoinAggregationArgs = {\n  adapter: MongooseAdapter\n  collection: CollectionSlug\n  collectionConfig: SanitizedCollectionConfig\n  joins: JoinQuery\n  // the number of docs to get at the top collection level\n  limit?: number\n  locale: string\n  projection?: Record<string, true>\n  // the where clause for the top collection\n  query?: Where\n  /** whether the query is from drafts */\n  versions?: boolean\n}\n\nexport const buildJoinAggregation = async ({\n  adapter,\n  collection,\n  collectionConfig,\n  joins,\n  limit,\n  locale,\n  projection,\n  query,\n  versions,\n}: BuildJoinAggregationArgs): Promise<PipelineStage[] | undefined> => {\n  if (Object.keys(collectionConfig.joins).length === 0 || joins === false) {\n    return\n  }\n\n  const joinConfig = adapter.payload.collections[collection].config.joins\n  const aggregate: PipelineStage[] = [\n    {\n      $sort: { createdAt: -1 },\n    },\n  ]\n\n  if (query) {\n    aggregate.push({\n      $match: query,\n    })\n  }\n\n  if (limit) {\n    aggregate.push({\n      $limit: limit,\n    })\n  }\n\n  for (const slug of Object.keys(joinConfig)) {\n    for (const join of joinConfig[slug]) {\n      const joinModel = adapter.collections[join.field.collection]\n\n      if (projection && !projection[join.joinPath]) {\n        continue\n      }\n\n      if (joins?.[join.joinPath] === false) {\n        continue\n      }\n\n      const {\n        limit: limitJoin = join.field.defaultLimit ?? 10,\n        sort: sortJoin = join.field.defaultSort || collectionConfig.defaultSort,\n        where: whereJoin,\n      } = joins?.[join.joinPath] || {}\n\n      const sort = buildSortParam({\n        config: adapter.payload.config,\n        fields: adapter.payload.collections[slug].config.flattenedFields,\n        locale,\n        sort: sortJoin,\n        timestamps: true,\n      })\n      const sortProperty = Object.keys(sort)[0]\n      const sortDirection = sort[sortProperty] === 'asc' ? 1 : -1\n\n      const $match = await joinModel.buildQuery({\n        locale,\n        payload: adapter.payload,\n        where: whereJoin,\n      })\n\n      const pipeline: Exclude<PipelineStage, PipelineStage.Merge | PipelineStage.Out>[] = [\n        { $match },\n        {\n          $sort: { [sortProperty]: sortDirection },\n        },\n      ]\n\n      if (limitJoin > 0) {\n        pipeline.push({\n          $limit: limitJoin + 1,\n        })\n      }\n\n      if (adapter.payload.config.localization && locale === 'all') {\n        adapter.payload.config.localization.localeCodes.forEach((code) => {\n          const as = `${versions ? `version.${join.joinPath}` : join.joinPath}${code}`\n\n          aggregate.push(\n            {\n              $lookup: {\n                as: `${as}.docs`,\n                foreignField: `${join.field.on}${code}`,\n                from: adapter.collections[slug].collection.name,\n                localField: versions ? 'parent' : '_id',\n                pipeline,\n              },\n            },\n            {\n              $addFields: {\n                [`${as}.docs`]: {\n                  $map: {\n                    as: 'doc',\n                    in: '$$doc._id',\n                    input: `$${as}.docs`,\n                  },\n                }, // Slicing the docs to match the limit\n                [`${as}.hasNextPage`]: limitJoin\n                  ? { $gt: [{ $size: `$${as}.docs` }, limitJoin] }\n                  : false,\n                // Boolean indicating if more docs than limit\n              },\n            },\n          )\n          if (limitJoin > 0) {\n            aggregate.push({\n              $addFields: {\n                [`${as}.docs`]: {\n                  $slice: [`$${as}.docs`, limitJoin],\n                },\n              },\n            })\n          }\n        })\n      } else {\n        const localeSuffix =\n          join.field.localized && adapter.payload.config.localization && locale ? `.${locale}` : ''\n        const as = `${versions ? `version.${join.joinPath}` : join.joinPath}${localeSuffix}`\n\n        aggregate.push(\n          {\n            $lookup: {\n              as: `${as}.docs`,\n              foreignField: `${join.field.on}${localeSuffix}`,\n              from: adapter.collections[slug].collection.name,\n              localField: versions ? 'parent' : '_id',\n              pipeline,\n            },\n          },\n          {\n            $addFields: {\n              [`${as}.docs`]: {\n                $map: {\n                  as: 'doc',\n                  in: '$$doc._id',\n                  input: `$${as}.docs`,\n                },\n              }, // Slicing the docs to match the limit\n              [`${as}.hasNextPage`]: {\n                $gt: [{ $size: `$${as}.docs` }, limitJoin || Number.MAX_VALUE],\n              }, // Boolean indicating if more docs than limit\n            },\n          },\n        )\n        if (limitJoin > 0) {\n          aggregate.push({\n            $addFields: {\n              [`${as}.docs`]: {\n                $slice: [`$${as}.docs`, limitJoin],\n              },\n            },\n          })\n        }\n      }\n    }\n  }\n\n  if (projection) {\n    aggregate.push({ $project: projection })\n  }\n\n  return aggregate\n}\n"],"names":["buildSortParam","buildJoinAggregation","adapter","collection","collectionConfig","joins","limit","locale","projection","query","versions","Object","keys","length","joinConfig","payload","collections","config","aggregate","$sort","createdAt","push","$match","$limit","slug","join","joinModel","field","joinPath","limitJoin","defaultLimit","sort","sortJoin","defaultSort","where","whereJoin","fields","flattenedFields","timestamps","sortProperty","sortDirection","buildQuery","pipeline","localization","localeCodes","forEach","code","as","$lookup","foreignField","on","from","name","localField","$addFields","$map","in","input","$gt","$size","$slice","localeSuffix","localized","Number","MAX_VALUE","$project"],"mappings":"AAKA,SAASA,cAAc,QAAQ,+BAA8B;AAiB7D,OAAO,MAAMC,uBAAuB,OAAO,EACzCC,OAAO,EACPC,UAAU,EACVC,gBAAgB,EAChBC,KAAK,EACLC,KAAK,EACLC,MAAM,EACNC,UAAU,EACVC,KAAK,EACLC,QAAQ,EACiB;IACzB,IAAIC,OAAOC,IAAI,CAACR,iBAAiBC,KAAK,EAAEQ,MAAM,KAAK,KAAKR,UAAU,OAAO;QACvE;IACF;IAEA,MAAMS,aAAaZ,QAAQa,OAAO,CAACC,WAAW,CAACb,WAAW,CAACc,MAAM,CAACZ,KAAK;IACvE,MAAMa,YAA6B;QACjC;YACEC,OAAO;gBAAEC,WAAW,CAAC;YAAE;QACzB;KACD;IAED,IAAIX,OAAO;QACTS,UAAUG,IAAI,CAAC;YACbC,QAAQb;QACV;IACF;IAEA,IAAIH,OAAO;QACTY,UAAUG,IAAI,CAAC;YACbE,QAAQjB;QACV;IACF;IAEA,KAAK,MAAMkB,QAAQb,OAAOC,IAAI,CAACE,YAAa;QAC1C,KAAK,MAAMW,QAAQX,UAAU,CAACU,KAAK,CAAE;YACnC,MAAME,YAAYxB,QAAQc,WAAW,CAACS,KAAKE,KAAK,CAACxB,UAAU,CAAC;YAE5D,IAAIK,cAAc,CAACA,UAAU,CAACiB,KAAKG,QAAQ,CAAC,EAAE;gBAC5C;YACF;YAEA,IAAIvB,OAAO,CAACoB,KAAKG,QAAQ,CAAC,KAAK,OAAO;gBACpC;YACF;YAEA,MAAM,EACJtB,OAAOuB,YAAYJ,KAAKE,KAAK,CAACG,YAAY,IAAI,EAAE,EAChDC,MAAMC,WAAWP,KAAKE,KAAK,CAACM,WAAW,IAAI7B,iBAAiB6B,WAAW,EACvEC,OAAOC,SAAS,EACjB,GAAG9B,OAAO,CAACoB,KAAKG,QAAQ,CAAC,IAAI,CAAC;YAE/B,MAAMG,OAAO/B,eAAe;gBAC1BiB,QAAQf,QAAQa,OAAO,CAACE,MAAM;gBAC9BmB,QAAQlC,QAAQa,OAAO,CAACC,WAAW,CAACQ,KAAK,CAACP,MAAM,CAACoB,eAAe;gBAChE9B;gBACAwB,MAAMC;gBACNM,YAAY;YACd;YACA,MAAMC,eAAe5B,OAAOC,IAAI,CAACmB,KAAK,CAAC,EAAE;YACzC,MAAMS,gBAAgBT,IAAI,CAACQ,aAAa,KAAK,QAAQ,IAAI,CAAC;YAE1D,MAAMjB,SAAS,MAAMI,UAAUe,UAAU,CAAC;gBACxClC;gBACAQ,SAASb,QAAQa,OAAO;gBACxBmB,OAAOC;YACT;YAEA,MAAMO,WAA8E;gBAClF;oBAAEpB;gBAAO;gBACT;oBACEH,OAAO;wBAAE,CAACoB,aAAa,EAAEC;oBAAc;gBACzC;aACD;YAED,IAAIX,YAAY,GAAG;gBACjBa,SAASrB,IAAI,CAAC;oBACZE,QAAQM,YAAY;gBACtB;YACF;YAEA,IAAI3B,QAAQa,OAAO,CAACE,MAAM,CAAC0B,YAAY,IAAIpC,WAAW,OAAO;gBAC3DL,QAAQa,OAAO,CAACE,MAAM,CAAC0B,YAAY,CAACC,WAAW,CAACC,OAAO,CAAC,CAACC;oBACvD,MAAMC,KAAK,CAAC,EAAErC,WAAW,CAAC,QAAQ,EAAEe,KAAKG,QAAQ,CAAC,CAAC,GAAGH,KAAKG,QAAQ,CAAC,EAAEkB,KAAK,CAAC;oBAE5E5B,UAAUG,IAAI,CACZ;wBACE2B,SAAS;4BACPD,IAAI,CAAC,EAAEA,GAAG,KAAK,CAAC;4BAChBE,cAAc,CAAC,EAAExB,KAAKE,KAAK,CAACuB,EAAE,CAAC,EAAEJ,KAAK,CAAC;4BACvCK,MAAMjD,QAAQc,WAAW,CAACQ,KAAK,CAACrB,UAAU,CAACiD,IAAI;4BAC/CC,YAAY3C,WAAW,WAAW;4BAClCgC;wBACF;oBACF,GACA;wBACEY,YAAY;4BACV,CAAC,CAAC,EAAEP,GAAG,KAAK,CAAC,CAAC,EAAE;gCACdQ,MAAM;oCACJR,IAAI;oCACJS,IAAI;oCACJC,OAAO,CAAC,CAAC,EAAEV,GAAG,KAAK,CAAC;gCACtB;4BACF;4BACA,CAAC,CAAC,EAAEA,GAAG,YAAY,CAAC,CAAC,EAAElB,YACnB;gCAAE6B,KAAK;oCAAC;wCAAEC,OAAO,CAAC,CAAC,EAAEZ,GAAG,KAAK,CAAC;oCAAC;oCAAGlB;iCAAU;4BAAC,IAC7C;wBAEN;oBACF;oBAEF,IAAIA,YAAY,GAAG;wBACjBX,UAAUG,IAAI,CAAC;4BACbiC,YAAY;gCACV,CAAC,CAAC,EAAEP,GAAG,KAAK,CAAC,CAAC,EAAE;oCACda,QAAQ;wCAAC,CAAC,CAAC,EAAEb,GAAG,KAAK,CAAC;wCAAElB;qCAAU;gCACpC;4BACF;wBACF;oBACF;gBACF;YACF,OAAO;gBACL,MAAMgC,eACJpC,KAAKE,KAAK,CAACmC,SAAS,IAAI5D,QAAQa,OAAO,CAACE,MAAM,CAAC0B,YAAY,IAAIpC,SAAS,CAAC,CAAC,EAAEA,OAAO,CAAC,GAAG;gBACzF,MAAMwC,KAAK,CAAC,EAAErC,WAAW,CAAC,QAAQ,EAAEe,KAAKG,QAAQ,CAAC,CAAC,GAAGH,KAAKG,QAAQ,CAAC,EAAEiC,aAAa,CAAC;gBAEpF3C,UAAUG,IAAI,CACZ;oBACE2B,SAAS;wBACPD,IAAI,CAAC,EAAEA,GAAG,KAAK,CAAC;wBAChBE,cAAc,CAAC,EAAExB,KAAKE,KAAK,CAACuB,EAAE,CAAC,EAAEW,aAAa,CAAC;wBAC/CV,MAAMjD,QAAQc,WAAW,CAACQ,KAAK,CAACrB,UAAU,CAACiD,IAAI;wBAC/CC,YAAY3C,WAAW,WAAW;wBAClCgC;oBACF;gBACF,GACA;oBACEY,YAAY;wBACV,CAAC,CAAC,EAAEP,GAAG,KAAK,CAAC,CAAC,EAAE;4BACdQ,MAAM;gCACJR,IAAI;gCACJS,IAAI;gCACJC,OAAO,CAAC,CAAC,EAAEV,GAAG,KAAK,CAAC;4BACtB;wBACF;wBACA,CAAC,CAAC,EAAEA,GAAG,YAAY,CAAC,CAAC,EAAE;4BACrBW,KAAK;gCAAC;oCAAEC,OAAO,CAAC,CAAC,EAAEZ,GAAG,KAAK,CAAC;gCAAC;gCAAGlB,aAAakC,OAAOC,SAAS;6BAAC;wBAChE;oBACF;gBACF;gBAEF,IAAInC,YAAY,GAAG;oBACjBX,UAAUG,IAAI,CAAC;wBACbiC,YAAY;4BACV,CAAC,CAAC,EAAEP,GAAG,KAAK,CAAC,CAAC,EAAE;gCACda,QAAQ;oCAAC,CAAC,CAAC,EAAEb,GAAG,KAAK,CAAC;oCAAElB;iCAAU;4BACpC;wBACF;oBACF;gBACF;YACF;QACF;IACF;IAEA,IAAIrB,YAAY;QACdU,UAAUG,IAAI,CAAC;YAAE4C,UAAUzD;QAAW;IACxC;IAEA,OAAOU;AACT,EAAC"}
+{"version":3,"sources":["../../src/utilities/buildJoinAggregation.ts"],"sourcesContent":["import type { ClientSession } from 'mongodb'\nimport type { PipelineStage } from 'mongoose'\nimport type { CollectionSlug, JoinQuery, SanitizedCollectionConfig, Where } from 'payload'\n\nimport type { MongooseAdapter } from '../index.js'\n\nimport { buildSortParam } from '../queries/buildSortParam.js'\n\ntype BuildJoinAggregationArgs = {\n  adapter: MongooseAdapter\n  collection: CollectionSlug\n  collectionConfig: SanitizedCollectionConfig\n  joins: JoinQuery\n  locale: string\n  projection?: Record<string, true>\n  session?: ClientSession\n  /** whether the query is from drafts */\n  versions?: boolean\n}\n\nexport const buildJoinAggregation = async ({\n  adapter,\n  collection,\n  collectionConfig,\n  joins,\n  locale,\n  projection,\n  session,\n  versions,\n}: BuildJoinAggregationArgs): Promise<PipelineStage[] | undefined> => {\n  if (Object.keys(collectionConfig.joins).length === 0 || joins === false) {\n    return\n  }\n\n  const joinConfig = adapter.payload.collections[collection].config.joins\n  const aggregate: PipelineStage[] = []\n\n  for (const slug of Object.keys(joinConfig)) {\n    for (const join of joinConfig[slug]) {\n      const joinModel = adapter.collections[join.field.collection]\n\n      if (projection && !projection[join.joinPath]) {\n        continue\n      }\n\n      if (joins?.[join.joinPath] === false) {\n        continue\n      }\n\n      const {\n        limit: limitJoin = join.field.defaultLimit ?? 10,\n        sort: sortJoin = join.field.defaultSort || collectionConfig.defaultSort,\n        where: whereJoin,\n      } = joins?.[join.joinPath] || {}\n\n      const $sort = buildSortParam({\n        config: adapter.payload.config,\n        fields: adapter.payload.collections[slug].config.flattenedFields,\n        locale,\n        sort: sortJoin,\n        timestamps: true,\n      })\n\n      const $match = await joinModel.buildQuery({\n        locale,\n        payload: adapter.payload,\n        session,\n        where: whereJoin,\n      })\n\n      const pipeline: Exclude<PipelineStage, PipelineStage.Merge | PipelineStage.Out>[] = [\n        { $match },\n        {\n          $sort,\n        },\n      ]\n\n      if (limitJoin > 0) {\n        pipeline.push({\n          $limit: limitJoin + 1,\n        })\n      }\n\n      if (adapter.payload.config.localization && locale === 'all') {\n        adapter.payload.config.localization.localeCodes.forEach((code) => {\n          const as = `${versions ? `version.${join.joinPath}` : join.joinPath}${code}`\n\n          aggregate.push(\n            {\n              $lookup: {\n                as: `${as}.docs`,\n                foreignField: `${join.field.on}${code}`,\n                from: adapter.collections[slug].collection.name,\n                localField: versions ? 'parent' : '_id',\n                pipeline,\n              },\n            },\n            {\n              $addFields: {\n                [`${as}.docs`]: {\n                  $map: {\n                    as: 'doc',\n                    in: '$$doc._id',\n                    input: `$${as}.docs`,\n                  },\n                }, // Slicing the docs to match the limit\n                [`${as}.hasNextPage`]: limitJoin\n                  ? { $gt: [{ $size: `$${as}.docs` }, limitJoin] }\n                  : false,\n                // Boolean indicating if more docs than limit\n              },\n            },\n          )\n          if (limitJoin > 0) {\n            aggregate.push({\n              $addFields: {\n                [`${as}.docs`]: {\n                  $slice: [`$${as}.docs`, limitJoin],\n                },\n              },\n            })\n          }\n        })\n      } else {\n        const localeSuffix =\n          join.field.localized && adapter.payload.config.localization && locale ? `.${locale}` : ''\n        const as = `${versions ? `version.${join.joinPath}` : join.joinPath}${localeSuffix}`\n\n        aggregate.push(\n          {\n            $lookup: {\n              as: `${as}.docs`,\n              foreignField: `${join.field.on}${localeSuffix}`,\n              from: adapter.collections[slug].collection.name,\n              localField: versions ? 'parent' : '_id',\n              pipeline,\n            },\n          },\n          {\n            $addFields: {\n              [`${as}.docs`]: {\n                $map: {\n                  as: 'doc',\n                  in: '$$doc._id',\n                  input: `$${as}.docs`,\n                },\n              }, // Slicing the docs to match the limit\n              [`${as}.hasNextPage`]: {\n                $gt: [{ $size: `$${as}.docs` }, limitJoin || Number.MAX_VALUE],\n              }, // Boolean indicating if more docs than limit\n            },\n          },\n        )\n        if (limitJoin > 0) {\n          aggregate.push({\n            $addFields: {\n              [`${as}.docs`]: {\n                $slice: [`$${as}.docs`, limitJoin],\n              },\n            },\n          })\n        }\n      }\n    }\n  }\n\n  if (!aggregate.length) {\n    return\n  }\n\n  return aggregate\n}\n"],"names":["buildSortParam","buildJoinAggregation","adapter","collection","collectionConfig","joins","locale","projection","session","versions","Object","keys","length","joinConfig","payload","collections","config","aggregate","slug","join","joinModel","field","joinPath","limit","limitJoin","defaultLimit","sort","sortJoin","defaultSort","where","whereJoin","$sort","fields","flattenedFields","timestamps","$match","buildQuery","pipeline","push","$limit","localization","localeCodes","forEach","code","as","$lookup","foreignField","on","from","name","localField","$addFields","$map","in","input","$gt","$size","$slice","localeSuffix","localized","Number","MAX_VALUE"],"mappings":"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"}

package/dist/utilities/buildProjectionFromSelect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildProjectionFromSelect.d.ts","sourceRoot":"","sources":["../../src/utilities/buildProjectionFromSelect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAsB,cAAc,EAAc,UAAU,EAAE,MAAM,SAAS,CAAA;AAIzF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AA8KlD,eAAO,MAAM,yBAAyB,iCAInC;IACD,OAAO,EAAE,eAAe,CAAA;IACxB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,MAAM,CAAC,EAAE,UAAU,CAAA;CACpB,KAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,SAmB1B,CAAA"}
+{"version":3,"file":"buildProjectionFromSelect.d.ts","sourceRoot":"","sources":["../../src/utilities/buildProjectionFromSelect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA6B,cAAc,EAAc,UAAU,EAAE,MAAM,SAAS,CAAA;AAIhG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAiMlD,eAAO,MAAM,yBAAyB,iCAInC;IACD,OAAO,EAAE,eAAe,CAAA;IACxB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,MAAM,CAAC,EAAE,UAAU,CAAA;CACpB,KAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,SAmB1B,CAAA"}

package/dist/utilities/buildProjectionFromSelect.js

@@ -10,6 +10,10 @@ const addFieldToProjection = ({ adapter, databaseSchemaPath, field, projection,
         projection[`${databaseSchemaPath}${field.name}`] = true;
     }
 };
+const blockTypeField = {
+    name: 'blockType',
+    type: 'text'
+};
 const traverseFields = ({ adapter, databaseSchemaPath = '', fields, projection, select, selectAllOnCurrentLevel = false, selectMode, withinLocalizedField = false })=>{
     for (const field of fields){
         if (fieldAffectsData(field)) {
@@ -78,6 +82,13 @@ const traverseFields = ({ adapter, databaseSchemaPath = '', fields, projection,
                     const blocksSelect = select[field.name];
                     for (const block of field.blocks){
                         if (selectMode === 'include' && blocksSelect[block.slug] === true || selectMode === 'exclude' && typeof blocksSelect[block.slug] === 'undefined') {
+                            addFieldToProjection({
+                                adapter,
+                                databaseSchemaPath: fieldDatabaseSchemaPath,
+                                field: blockTypeField,
+                                projection,
+                                withinLocalizedField: fieldWithinLocalizedField
+                            });
                             traverseFields({
                                 adapter,
                                 databaseSchemaPath: fieldDatabaseSchemaPath,
@@ -99,7 +110,13 @@ const traverseFields = ({ adapter, databaseSchemaPath = '', fields, projection,
                         }
                         if (blockSelectMode === 'include') {
                             blocksSelect[block.slug]['id'] = true;
-                            blocksSelect[block.slug]['blockType'] = true;
+                            addFieldToProjection({
+                                adapter,
+                                databaseSchemaPath: fieldDatabaseSchemaPath,
+                                field: blockTypeField,
+                                projection,
+                                withinLocalizedField: fieldWithinLocalizedField
+                            });
                         }
                         traverseFields({
                             adapter,

package/dist/utilities/buildProjectionFromSelect.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/buildProjectionFromSelect.ts"],"sourcesContent":["import type { FieldAffectingData, FlattenedField, SelectMode, SelectType } from 'payload'\n\nimport { deepCopyObjectSimple, fieldAffectsData, getSelectMode } from 'payload/shared'\n\nimport type { MongooseAdapter } from '../index.js'\n\nconst addFieldToProjection = ({\n  adapter,\n  databaseSchemaPath,\n  field,\n  projection,\n  withinLocalizedField,\n}: {\n  adapter: MongooseAdapter\n  databaseSchemaPath: string\n  field: FieldAffectingData\n  projection: Record<string, true>\n  withinLocalizedField: boolean\n}) => {\n  const { config } = adapter.payload\n\n  if (withinLocalizedField && config.localization) {\n    for (const locale of config.localization.localeCodes) {\n      const localeDatabaseSchemaPath = databaseSchemaPath.replace('<locale>', locale)\n      projection[`${localeDatabaseSchemaPath}${field.name}`] = true\n    }\n  } else {\n    projection[`${databaseSchemaPath}${field.name}`] = true\n  }\n}\n\nconst traverseFields = ({\n  adapter,\n  databaseSchemaPath = '',\n  fields,\n  projection,\n  select,\n  selectAllOnCurrentLevel = false,\n  selectMode,\n  withinLocalizedField = false,\n}: {\n  adapter: MongooseAdapter\n  databaseSchemaPath?: string\n  fields: FlattenedField[]\n  projection: Record<string, true>\n  select: SelectType\n  selectAllOnCurrentLevel?: boolean\n  selectMode: SelectMode\n  withinLocalizedField?: boolean\n}) => {\n  for (const field of fields) {\n    if (fieldAffectsData(field)) {\n      if (selectMode === 'include') {\n        if (select[field.name] === true || selectAllOnCurrentLevel) {\n          addFieldToProjection({\n            adapter,\n            databaseSchemaPath,\n            field,\n            projection,\n            withinLocalizedField,\n          })\n          continue\n        }\n\n        if (!select[field.name]) {\n          continue\n        }\n      }\n\n      if (selectMode === 'exclude') {\n        if (typeof select[field.name] === 'undefined') {\n          addFieldToProjection({\n            adapter,\n            databaseSchemaPath,\n            field,\n            projection,\n            withinLocalizedField,\n          })\n          continue\n        }\n\n        if (select[field.name] === false) {\n          continue\n        }\n      }\n    }\n\n    let fieldDatabaseSchemaPath = databaseSchemaPath\n    let fieldWithinLocalizedField = withinLocalizedField\n\n    if (fieldAffectsData(field)) {\n      fieldDatabaseSchemaPath = `${databaseSchemaPath}${field.name}.`\n\n      if (field.localized) {\n        fieldDatabaseSchemaPath = `${fieldDatabaseSchemaPath}<locale>.`\n        fieldWithinLocalizedField = true\n      }\n    }\n\n    switch (field.type) {\n      case 'array':\n      case 'group':\n      case 'tab': {\n        const fieldSelect = select[field.name] as SelectType\n\n        if (field.type === 'array' && selectMode === 'include') {\n          fieldSelect['id'] = true\n        }\n\n        traverseFields({\n          adapter,\n          databaseSchemaPath: fieldDatabaseSchemaPath,\n          fields: field.flattenedFields,\n          projection,\n          select: fieldSelect,\n          selectMode,\n          withinLocalizedField: fieldWithinLocalizedField,\n        })\n\n        break\n      }\n\n      case 'blocks': {\n        const blocksSelect = select[field.name] as SelectType\n\n        for (const block of field.blocks) {\n          if (\n            (selectMode === 'include' && blocksSelect[block.slug] === true) ||\n            (selectMode === 'exclude' && typeof blocksSelect[block.slug] === 'undefined')\n          ) {\n            traverseFields({\n              adapter,\n              databaseSchemaPath: fieldDatabaseSchemaPath,\n              fields: block.flattenedFields,\n              projection,\n              select: {},\n              selectAllOnCurrentLevel: true,\n              selectMode: 'include',\n              withinLocalizedField: fieldWithinLocalizedField,\n            })\n            continue\n          }\n\n          let blockSelectMode = selectMode\n\n          if (selectMode === 'exclude' && blocksSelect[block.slug] === false) {\n            blockSelectMode = 'include'\n          }\n\n          if (typeof blocksSelect[block.slug] !== 'object') {\n            blocksSelect[block.slug] = {}\n          }\n\n          if (blockSelectMode === 'include') {\n            blocksSelect[block.slug]['id'] = true\n            blocksSelect[block.slug]['blockType'] = true\n          }\n\n          traverseFields({\n            adapter,\n            databaseSchemaPath: fieldDatabaseSchemaPath,\n            fields: block.flattenedFields,\n            projection,\n            select: blocksSelect[block.slug] as SelectType,\n            selectMode: blockSelectMode,\n            withinLocalizedField: fieldWithinLocalizedField,\n          })\n        }\n\n        break\n      }\n\n      default:\n        break\n    }\n  }\n}\n\nexport const buildProjectionFromSelect = ({\n  adapter,\n  fields,\n  select,\n}: {\n  adapter: MongooseAdapter\n  fields: FlattenedField[]\n  select?: SelectType\n}): Record<string, true> | undefined => {\n  if (!select) {\n    return\n  }\n\n  const projection: Record<string, true> = {\n    _id: true,\n  }\n\n  traverseFields({\n    adapter,\n    fields,\n    projection,\n    // Clone to safely mutate it later\n    select: deepCopyObjectSimple(select),\n    selectMode: getSelectMode(select),\n  })\n\n  return projection\n}\n"],"names":["deepCopyObjectSimple","fieldAffectsData","getSelectMode","addFieldToProjection","adapter","databaseSchemaPath","field","projection","withinLocalizedField","config","payload","localization","locale","localeCodes","localeDatabaseSchemaPath","replace","name","traverseFields","fields","select","selectAllOnCurrentLevel","selectMode","fieldDatabaseSchemaPath","fieldWithinLocalizedField","localized","type","fieldSelect","flattenedFields","blocksSelect","block","blocks","slug","blockSelectMode","buildProjectionFromSelect","_id"],"mappings":"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"}
+{"version":3,"sources":["../../src/utilities/buildProjectionFromSelect.ts"],"sourcesContent":["import type { Field, FieldAffectingData, FlattenedField, SelectMode, SelectType } from 'payload'\n\nimport { deepCopyObjectSimple, fieldAffectsData, getSelectMode } from 'payload/shared'\n\nimport type { MongooseAdapter } from '../index.js'\n\nconst addFieldToProjection = ({\n  adapter,\n  databaseSchemaPath,\n  field,\n  projection,\n  withinLocalizedField,\n}: {\n  adapter: MongooseAdapter\n  databaseSchemaPath: string\n  field: FieldAffectingData\n  projection: Record<string, true>\n  withinLocalizedField: boolean\n}) => {\n  const { config } = adapter.payload\n\n  if (withinLocalizedField && config.localization) {\n    for (const locale of config.localization.localeCodes) {\n      const localeDatabaseSchemaPath = databaseSchemaPath.replace('<locale>', locale)\n      projection[`${localeDatabaseSchemaPath}${field.name}`] = true\n    }\n  } else {\n    projection[`${databaseSchemaPath}${field.name}`] = true\n  }\n}\n\nconst blockTypeField: Field = {\n  name: 'blockType',\n  type: 'text',\n}\n\nconst traverseFields = ({\n  adapter,\n  databaseSchemaPath = '',\n  fields,\n  projection,\n  select,\n  selectAllOnCurrentLevel = false,\n  selectMode,\n  withinLocalizedField = false,\n}: {\n  adapter: MongooseAdapter\n  databaseSchemaPath?: string\n  fields: FlattenedField[]\n  projection: Record<string, true>\n  select: SelectType\n  selectAllOnCurrentLevel?: boolean\n  selectMode: SelectMode\n  withinLocalizedField?: boolean\n}) => {\n  for (const field of fields) {\n    if (fieldAffectsData(field)) {\n      if (selectMode === 'include') {\n        if (select[field.name] === true || selectAllOnCurrentLevel) {\n          addFieldToProjection({\n            adapter,\n            databaseSchemaPath,\n            field,\n            projection,\n            withinLocalizedField,\n          })\n          continue\n        }\n\n        if (!select[field.name]) {\n          continue\n        }\n      }\n\n      if (selectMode === 'exclude') {\n        if (typeof select[field.name] === 'undefined') {\n          addFieldToProjection({\n            adapter,\n            databaseSchemaPath,\n            field,\n            projection,\n            withinLocalizedField,\n          })\n          continue\n        }\n\n        if (select[field.name] === false) {\n          continue\n        }\n      }\n    }\n\n    let fieldDatabaseSchemaPath = databaseSchemaPath\n    let fieldWithinLocalizedField = withinLocalizedField\n\n    if (fieldAffectsData(field)) {\n      fieldDatabaseSchemaPath = `${databaseSchemaPath}${field.name}.`\n\n      if (field.localized) {\n        fieldDatabaseSchemaPath = `${fieldDatabaseSchemaPath}<locale>.`\n        fieldWithinLocalizedField = true\n      }\n    }\n\n    switch (field.type) {\n      case 'array':\n      case 'group':\n      case 'tab': {\n        const fieldSelect = select[field.name] as SelectType\n\n        if (field.type === 'array' && selectMode === 'include') {\n          fieldSelect['id'] = true\n        }\n\n        traverseFields({\n          adapter,\n          databaseSchemaPath: fieldDatabaseSchemaPath,\n          fields: field.flattenedFields,\n          projection,\n          select: fieldSelect,\n          selectMode,\n          withinLocalizedField: fieldWithinLocalizedField,\n        })\n\n        break\n      }\n\n      case 'blocks': {\n        const blocksSelect = select[field.name] as SelectType\n\n        for (const block of field.blocks) {\n          if (\n            (selectMode === 'include' && blocksSelect[block.slug] === true) ||\n            (selectMode === 'exclude' && typeof blocksSelect[block.slug] === 'undefined')\n          ) {\n            addFieldToProjection({\n              adapter,\n              databaseSchemaPath: fieldDatabaseSchemaPath,\n              field: blockTypeField,\n              projection,\n              withinLocalizedField: fieldWithinLocalizedField,\n            })\n\n            traverseFields({\n              adapter,\n              databaseSchemaPath: fieldDatabaseSchemaPath,\n              fields: block.flattenedFields,\n              projection,\n              select: {},\n              selectAllOnCurrentLevel: true,\n              selectMode: 'include',\n              withinLocalizedField: fieldWithinLocalizedField,\n            })\n            continue\n          }\n\n          let blockSelectMode = selectMode\n\n          if (selectMode === 'exclude' && blocksSelect[block.slug] === false) {\n            blockSelectMode = 'include'\n          }\n\n          if (typeof blocksSelect[block.slug] !== 'object') {\n            blocksSelect[block.slug] = {}\n          }\n\n          if (blockSelectMode === 'include') {\n            blocksSelect[block.slug]['id'] = true\n            addFieldToProjection({\n              adapter,\n              databaseSchemaPath: fieldDatabaseSchemaPath,\n              field: blockTypeField,\n              projection,\n              withinLocalizedField: fieldWithinLocalizedField,\n            })\n          }\n\n          traverseFields({\n            adapter,\n            databaseSchemaPath: fieldDatabaseSchemaPath,\n            fields: block.flattenedFields,\n            projection,\n            select: blocksSelect[block.slug] as SelectType,\n            selectMode: blockSelectMode,\n            withinLocalizedField: fieldWithinLocalizedField,\n          })\n        }\n\n        break\n      }\n\n      default:\n        break\n    }\n  }\n}\n\nexport const buildProjectionFromSelect = ({\n  adapter,\n  fields,\n  select,\n}: {\n  adapter: MongooseAdapter\n  fields: FlattenedField[]\n  select?: SelectType\n}): Record<string, true> | undefined => {\n  if (!select) {\n    return\n  }\n\n  const projection: Record<string, true> = {\n    _id: true,\n  }\n\n  traverseFields({\n    adapter,\n    fields,\n    projection,\n    // Clone to safely mutate it later\n    select: deepCopyObjectSimple(select),\n    selectMode: getSelectMode(select),\n  })\n\n  return projection\n}\n"],"names":["deepCopyObjectSimple","fieldAffectsData","getSelectMode","addFieldToProjection","adapter","databaseSchemaPath","field","projection","withinLocalizedField","config","payload","localization","locale","localeCodes","localeDatabaseSchemaPath","replace","name","blockTypeField","type","traverseFields","fields","select","selectAllOnCurrentLevel","selectMode","fieldDatabaseSchemaPath","fieldWithinLocalizedField","localized","fieldSelect","flattenedFields","blocksSelect","block","blocks","slug","blockSelectMode","buildProjectionFromSelect","_id"],"mappings":"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"}

package/dist/utilities/findMany.d.ts

@@ -0,0 +1,20 @@
+import type { ClientSession, CollationOptions, Collection } from 'mongodb';
+import type { PipelineStage } from 'mongoose';
+import type { PaginatedDocs } from 'payload';
+import type { MongooseAdapter } from '../index.js';
+export declare const findMany: ({ adapter, collation, collection, joinAgreggation, limit, page, pagination, projection, query, session, skip, sort, useEstimatedCount, }: {
+    adapter: MongooseAdapter;
+    collation?: CollationOptions;
+    collection: Collection;
+    joinAgreggation?: PipelineStage[];
+    limit?: number;
+    page?: number;
+    pagination?: boolean;
+    projection?: Record<string, unknown>;
+    query?: Record<string, unknown>;
+    session?: ClientSession;
+    skip?: number;
+    sort?: Record<string, -1 | 1>;
+    useEstimatedCount?: boolean;
+}) => Promise<PaginatedDocs>;
+//# sourceMappingURL=findMany.d.ts.map

package/dist/utilities/findMany.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"findMany.d.ts","sourceRoot":"","sources":["../../src/utilities/findMany.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,UAAU,EAAY,MAAM,SAAS,CAAA;AACpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAE5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAElD,eAAO,MAAM,QAAQ,6IAclB;IACD,OAAO,EAAE,eAAe,CAAA;IACxB,SAAS,CAAC,EAAE,gBAAgB,CAAA;IAC5B,UAAU,EAAE,UAAU,CAAA;IACtB,eAAe,CAAC,EAAE,aAAa,EAAE,CAAA;IACjC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,OAAO,CAAC,EAAE,aAAa,CAAA;IACvB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAC5B,KAAG,OAAO,CAAC,aAAa,CA6FxB,CAAA"}

package/dist/utilities/findMany.js

@@ -0,0 +1,84 @@
+export const findMany = async ({ adapter, collation, collection, joinAgreggation, limit, page = 1, pagination, projection, query = {}, session, skip, sort, useEstimatedCount })=>{
+    if (!skip) {
+        skip = (page - 1) * (limit ?? 0);
+    }
+    let docsPromise;
+    let countPromise = Promise.resolve(null);
+    if (joinAgreggation) {
+        const cursor = collection.aggregate([
+            {
+                $match: query
+            }
+        ], {
+            collation,
+            session
+        });
+        if (sort) {
+            cursor.sort(sort);
+        }
+        if (skip) {
+            cursor.skip(skip);
+        }
+        if (limit) {
+            cursor.limit(limit);
+        }
+        for (const stage of joinAgreggation){
+            cursor.addStage(stage);
+        }
+        if (projection) {
+            cursor.project(projection);
+        }
+        docsPromise = cursor.toArray();
+    } else {
+        docsPromise = collection.find(query, {
+            collation,
+            limit,
+            projection,
+            session,
+            skip,
+            sort
+        }).toArray();
+    }
+    if (pagination !== false && limit) {
+        if (useEstimatedCount) {
+            countPromise = collection.estimatedDocumentCount();
+        } else {
+            // Improve the performance of the countDocuments query which is used if useEstimatedCount is set to false by adding
+            // a hint. By default, if no hint is provided, MongoDB does not use an indexed field to count the returned documents,
+            // which makes queries very slow. This only happens when no query (filter) is provided. If one is provided, it uses
+            // the correct indexed field
+            const hint = adapter.disableIndexHints !== true ? {
+                _id: 1
+            } : undefined;
+            countPromise = collection.countDocuments(query, {
+                collation,
+                hint,
+                session
+            });
+        }
+    }
+    const [docs, countResult] = await Promise.all([
+        docsPromise,
+        countPromise
+    ]);
+    const count = countResult === null ? docs.length : countResult;
+    const totalPages = pagination !== false && typeof limit === 'number' && limit !== 0 ? Math.ceil(count / limit) : 1;
+    const hasPrevPage = pagination !== false && page > 1;
+    const hasNextPage = pagination !== false && totalPages > page;
+    const pagingCounter = pagination !== false && typeof limit === 'number' ? (page - 1) * limit + 1 : 1;
+    const result = {
+        docs,
+        hasNextPage,
+        hasPrevPage,
+        limit,
+        nextPage: hasNextPage ? page + 1 : null,
+        page,
+        pagingCounter,
+        prevPage: hasPrevPage ? page - 1 : null,
+        totalDocs: count,
+        totalPages
+    };
+    return result;
+};
+
+//# sourceMappingURL=findMany.js.map

package/dist/utilities/findMany.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utilities/findMany.ts"],"sourcesContent":["import type { ClientSession, CollationOptions, Collection, Document } from 'mongodb'\nimport type { PipelineStage } from 'mongoose'\nimport type { PaginatedDocs } from 'payload'\n\nimport type { MongooseAdapter } from '../index.js'\n\nexport const findMany = async ({\n  adapter,\n  collation,\n  collection,\n  joinAgreggation,\n  limit,\n  page = 1,\n  pagination,\n  projection,\n  query = {},\n  session,\n  skip,\n  sort,\n  useEstimatedCount,\n}: {\n  adapter: MongooseAdapter\n  collation?: CollationOptions\n  collection: Collection\n  joinAgreggation?: PipelineStage[]\n  limit?: number\n  page?: number\n  pagination?: boolean\n  projection?: Record<string, unknown>\n  query?: Record<string, unknown>\n  session?: ClientSession\n  skip?: number\n  sort?: Record<string, -1 | 1>\n  useEstimatedCount?: boolean\n}): Promise<PaginatedDocs> => {\n  if (!skip) {\n    skip = (page - 1) * (limit ?? 0)\n  }\n\n  let docsPromise: Promise<Document[]>\n  let countPromise: Promise<null | number> = Promise.resolve(null)\n\n  if (joinAgreggation) {\n    const cursor = collection.aggregate(\n      [\n        {\n          $match: query,\n        },\n      ],\n      { collation, session },\n    )\n\n    if (sort) {\n      cursor.sort(sort)\n    }\n\n    if (skip) {\n      cursor.skip(skip)\n    }\n\n    if (limit) {\n      cursor.limit(limit)\n    }\n\n    for (const stage of joinAgreggation) {\n      cursor.addStage(stage)\n    }\n\n    if (projection) {\n      cursor.project(projection)\n    }\n\n    docsPromise = cursor.toArray()\n  } else {\n    docsPromise = collection\n      .find(query, {\n        collation,\n        limit,\n        projection,\n        session,\n        skip,\n        sort,\n      })\n      .toArray()\n  }\n\n  if (pagination !== false && limit) {\n    if (useEstimatedCount) {\n      countPromise = collection.estimatedDocumentCount()\n    } else {\n      // Improve the performance of the countDocuments query which is used if useEstimatedCount is set to false by adding\n      // a hint. By default, if no hint is provided, MongoDB does not use an indexed field to count the returned documents,\n      // which makes queries very slow. This only happens when no query (filter) is provided. If one is provided, it uses\n      // the correct indexed field\n\n      const hint = adapter.disableIndexHints !== true ? { _id: 1 } : undefined\n\n      countPromise = collection.countDocuments(query, { collation, hint, session })\n    }\n  }\n\n  const [docs, countResult] = await Promise.all([docsPromise, countPromise])\n\n  const count = countResult === null ? docs.length : countResult\n\n  const totalPages =\n    pagination !== false && typeof limit === 'number' && limit !== 0 ? Math.ceil(count / limit) : 1\n\n  const hasPrevPage = pagination !== false && page > 1\n  const hasNextPage = pagination !== false && totalPages > page\n  const pagingCounter =\n    pagination !== false && typeof limit === 'number' ? (page - 1) * limit + 1 : 1\n\n  const result = {\n    docs,\n    hasNextPage,\n    hasPrevPage,\n    limit,\n    nextPage: hasNextPage ? page + 1 : null,\n    page,\n    pagingCounter,\n    prevPage: hasPrevPage ? page - 1 : null,\n    totalDocs: count,\n    totalPages,\n  } as PaginatedDocs<Record<string, unknown>>\n\n  return result\n}\n"],"names":["findMany","adapter","collation","collection","joinAgreggation","limit","page","pagination","projection","query","session","skip","sort","useEstimatedCount","docsPromise","countPromise","Promise","resolve","cursor","aggregate","$match","stage","addStage","project","toArray","find","estimatedDocumentCount","hint","disableIndexHints","_id","undefined","countDocuments","docs","countResult","all","count","length","totalPages","Math","ceil","hasPrevPage","hasNextPage","pagingCounter","result","nextPage","prevPage","totalDocs"],"mappings":"AAMA,OAAO,MAAMA,WAAW,OAAO,EAC7BC,OAAO,EACPC,SAAS,EACTC,UAAU,EACVC,eAAe,EACfC,KAAK,EACLC,OAAO,CAAC,EACRC,UAAU,EACVC,UAAU,EACVC,QAAQ,CAAC,CAAC,EACVC,OAAO,EACPC,IAAI,EACJC,IAAI,EACJC,iBAAiB,EAelB;IACC,IAAI,CAACF,MAAM;QACTA,OAAO,AAACL,CAAAA,OAAO,CAAA,IAAMD,CAAAA,SAAS,CAAA;IAChC;IAEA,IAAIS;IACJ,IAAIC,eAAuCC,QAAQC,OAAO,CAAC;IAE3D,IAAIb,iBAAiB;QACnB,MAAMc,SAASf,WAAWgB,SAAS,CACjC;YACE;gBACEC,QAAQX;YACV;SACD,EACD;YAAEP;YAAWQ;QAAQ;QAGvB,IAAIE,MAAM;YACRM,OAAON,IAAI,CAACA;QACd;QAEA,IAAID,MAAM;YACRO,OAAOP,IAAI,CAACA;QACd;QAEA,IAAIN,OAAO;YACTa,OAAOb,KAAK,CAACA;QACf;QAEA,KAAK,MAAMgB,SAASjB,gBAAiB;YACnCc,OAAOI,QAAQ,CAACD;QAClB;QAEA,IAAIb,YAAY;YACdU,OAAOK,OAAO,CAACf;QACjB;QAEAM,cAAcI,OAAOM,OAAO;IAC9B,OAAO;QACLV,cAAcX,WACXsB,IAAI,CAAChB,OAAO;YACXP;YACAG;YACAG;YACAE;YACAC;YACAC;QACF,GACCY,OAAO;IACZ;IAEA,IAAIjB,eAAe,SAASF,OAAO;QACjC,IAAIQ,mBAAmB;YACrBE,eAAeZ,WAAWuB,sBAAsB;QAClD,OAAO;YACL,mHAAmH;YACnH,qHAAqH;YACrH,mHAAmH;YACnH,4BAA4B;YAE5B,MAAMC,OAAO1B,QAAQ2B,iBAAiB,KAAK,OAAO;gBAAEC,KAAK;YAAE,IAAIC;YAE/Df,eAAeZ,WAAW4B,cAAc,CAACtB,OAAO;gBAAEP;gBAAWyB;gBAAMjB;YAAQ;QAC7E;IACF;IAEA,MAAM,CAACsB,MAAMC,YAAY,GAAG,MAAMjB,QAAQkB,GAAG,CAAC;QAACpB;QAAaC;KAAa;IAEzE,MAAMoB,QAAQF,gBAAgB,OAAOD,KAAKI,MAAM,GAAGH;IAEnD,MAAMI,aACJ9B,eAAe,SAAS,OAAOF,UAAU,YAAYA,UAAU,IAAIiC,KAAKC,IAAI,CAACJ,QAAQ9B,SAAS;IAEhG,MAAMmC,cAAcjC,eAAe,SAASD,OAAO;IACnD,MAAMmC,cAAclC,eAAe,SAAS8B,aAAa/B;IACzD,MAAMoC,gBACJnC,eAAe,SAAS,OAAOF,UAAU,WAAW,AAACC,CAAAA,OAAO,CAAA,IAAKD,QAAQ,IAAI;IAE/E,MAAMsC,SAAS;QACbX;QACAS;QACAD;QACAnC;QACAuC,UAAUH,cAAcnC,OAAO,IAAI;QACnCA;QACAoC;QACAG,UAAUL,cAAclC,OAAO,IAAI;QACnCwC,WAAWX;QACXE;IACF;IAEA,OAAOM;AACT,EAAC"}

package/dist/utilities/getHasNearConstraint.d.ts

@@ -0,0 +1,3 @@
+import type { Where } from 'payload';
+export declare const getHasNearConstraint: (where?: Where) => boolean;
+//# sourceMappingURL=getHasNearConstraint.d.ts.map

package/dist/utilities/getHasNearConstraint.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getHasNearConstraint.d.ts","sourceRoot":"","sources":["../../src/utilities/getHasNearConstraint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAEpC,eAAO,MAAM,oBAAoB,WAAY,KAAK,KAAG,OAwBpD,CAAA"}

package/dist/utilities/getHasNearConstraint.js

@@ -0,0 +1,26 @@
+export const getHasNearConstraint = (where)=>{
+    if (!where) {
+        return false;
+    }
+    for(const key in where){
+        const value = where[key];
+        if (Array.isArray(value) && [
+            'AND',
+            'OR'
+        ].includes(key.toUpperCase())) {
+            for (const where of value){
+                if (getHasNearConstraint(where)) {
+                    return true;
+                }
+            }
+        }
+        for(const key in value){
+            if (key === 'near') {
+                return true;
+            }
+        }
+    }
+    return false;
+};
+
+//# sourceMappingURL=getHasNearConstraint.js.map

package/dist/utilities/getHasNearConstraint.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utilities/getHasNearConstraint.ts"],"sourcesContent":["import type { Where } from 'payload'\n\nexport const getHasNearConstraint = (where?: Where): boolean => {\n  if (!where) {\n    return false\n  }\n\n  for (const key in where) {\n    const value = where[key]\n\n    if (Array.isArray(value) && ['AND', 'OR'].includes(key.toUpperCase())) {\n      for (const where of value) {\n        if (getHasNearConstraint(where)) {\n          return true\n        }\n      }\n    }\n\n    for (const key in value) {\n      if (key === 'near') {\n        return true\n      }\n    }\n  }\n\n  return false\n}\n"],"names":["getHasNearConstraint","where","key","value","Array","isArray","includes","toUpperCase"],"mappings":"AAEA,OAAO,MAAMA,uBAAuB,CAACC;IACnC,IAAI,CAACA,OAAO;QACV,OAAO;IACT;IAEA,IAAK,MAAMC,OAAOD,MAAO;QACvB,MAAME,QAAQF,KAAK,CAACC,IAAI;QAExB,IAAIE,MAAMC,OAAO,CAACF,UAAU;YAAC;YAAO;SAAK,CAACG,QAAQ,CAACJ,IAAIK,WAAW,KAAK;YACrE,KAAK,MAAMN,SAASE,MAAO;gBACzB,IAAIH,qBAAqBC,QAAQ;oBAC/B,OAAO;gBACT;YACF;QACF;QAEA,IAAK,MAAMC,OAAOC,MAAO;YACvB,IAAID,QAAQ,QAAQ;gBAClB,OAAO;YACT;QACF;IACF;IAEA,OAAO;AACT,EAAC"}

package/dist/utilities/transform.d.ts

@@ -0,0 +1,17 @@
+import type { FlattenedField } from 'payload';
+import type { MongooseAdapter } from '../index.js';
+type Args = {
+    adapter: MongooseAdapter;
+    data: Record<string, unknown> | Record<string, unknown>[];
+    fields: FlattenedField[];
+    globalSlug?: string;
+    operation: 'create' | 'read' | 'update';
+    /**
+     * Throw errors on invalid relationships
+     * @default true
+     */
+    validateRelationships?: boolean;
+};
+export declare const transform: ({ adapter, data, fields, globalSlug, operation, validateRelationships, }: Args) => void;
+export {};
+//# sourceMappingURL=transform.d.ts.map

package/dist/utilities/transform.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../src/utilities/transform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,cAAc,EAMf,MAAM,SAAS,CAAA;AAMhB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAElD,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,eAAe,CAAA;IACxB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAA;IACzD,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,QAAQ,GAAG,MAAM,GAAG,QAAQ,CAAA;IACvC;;;OAGG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAChC,CAAA;AAwMD,eAAO,MAAM,SAAS,6EAOnB,IAAI,SA0IN,CAAA"}