@payloadcms/db-mongodb 3.10.0 → 3.11.0

package/dist/updateVersion.js

@@ -1,7 +1,7 @@
 import { buildVersionCollectionFields } from 'payload';
 import { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js';
 import { getSession } from './utilities/getSession.js';
-import { transform } from './utilities/transform.js';
+import { sanitizeRelationshipIDs } from './utilities/sanitizeRelationshipIDs.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,40 +9,37 @@ export const updateVersion = async function updateVersion({ id, collection, loca
             equals: id
         }
     };
-    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
-    });
-    transform({
-        adapter: this,
-        data: versionData,
-        fields,
-        operation: 'update',
-        timestamps: optionsArgs.timestamps !== false
-    });
-    const doc = await VersionModel.collection.findOneAndUpdate(query, {
-        $set: versionData
-    }, {
+    const fields = buildVersionCollectionFields(this.payload.config, this.payload.collections[collection].config);
+    const options = {
         ...optionsArgs,
+        lean: true,
+        new: true,
         projection: buildProjectionFromSelect({
             adapter: this,
             fields: buildVersionCollectionFields(this.payload.config, this.payload.collections[collection].config, true),
             select
         }),
-        returnDocument: 'after',
-        session
+        session: await getSession(this, req)
+    };
+    const query = await VersionModel.buildQuery({
+        locale,
+        payload: this.payload,
+        where: whereToUse
     });
-    transform({
-        adapter: this,
-        data: doc,
-        fields,
-        operation: 'read'
+    const sanitizedData = sanitizeRelationshipIDs({
+        config: this.payload.config,
+        data: versionData,
+        fields
     });
-    return doc;
+    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;
 };
 
 //# sourceMappingURL=updateVersion.js.map

package/dist/updateVersion.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/updateVersion.ts"],"sourcesContent":["import { buildVersionCollectionFields, type UpdateVersion } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { getSession } from './utilities/getSession.js'\nimport { transform } from './utilities/transform.js'\n\nexport const updateVersion: UpdateVersion = async function updateVersion(\n  this: MongooseAdapter,\n  { id, collection, locale, options: optionsArgs = {}, req, select, versionData, where },\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    timestamps: optionsArgs.timestamps !== false,\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","buildProjectionFromSelect","getSession","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","timestamps","doc","findOneAndUpdate","$set","projection","returnDocument"],"mappings":"AAAA,SAASA,4BAA4B,QAA4B,UAAS;AAI1E,SAASC,yBAAyB,QAAQ,2CAA0C;AACpF,SAASC,UAAU,QAAQ,4BAA2B;AACtD,SAASC,SAAS,QAAQ,2BAA0B;AAEpD,OAAO,MAAMC,gBAA+B,eAAeA,cAEzD,EAAEC,EAAE,EAAEC,UAAU,EAAEC,MAAM,EAAEC,SAASC,cAAc,CAAC,CAAC,EAAEC,GAAG,EAAEC,MAAM,EAAEC,WAAW,EAAEC,KAAK,EAAE;IAEtF,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,MAAMpB,WAAW,IAAI,EAAEQ;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;QACXC,YAAYnB,YAAYmB,UAAU,KAAK;IACzC;IAEA,MAAMC,MAAM,MAAMf,aAAaR,UAAU,CAACwB,gBAAgB,CACxDP,OACA;QAAEQ,MAAMnB;IAAY,GACpB;QACE,GAAGH,WAAW;QACduB,YAAY/B,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;QACAsB,gBAAgB;QAChBX;IACF;IAGFnB,UAAU;QACRsB,SAAS,IAAI;QACbC,MAAMG;QACNX;QACAS,WAAW;IACb;IAEA,OAAOE;AACT,EAAC"}
+{"version":3,"sources":["../src/updateVersion.ts"],"sourcesContent":["import type { QueryOptions } from 'mongoose'\n\nimport { buildVersionCollectionFields, type UpdateVersion } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { getSession } from './utilities/getSession.js'\nimport { sanitizeRelationshipIDs } from './utilities/sanitizeRelationshipIDs.js'\n\nexport const updateVersion: UpdateVersion = async function updateVersion(\n  this: MongooseAdapter,\n  { id, collection, locale, options: optionsArgs = {}, req, select, versionData, where },\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    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    session: await getSession(this, req),\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","getSession","sanitizeRelationshipIDs","updateVersion","id","collection","locale","options","optionsArgs","req","select","versionData","where","VersionModel","versions","whereToUse","equals","fields","payload","config","collections","lean","new","projection","adapter","session","query","buildQuery","sanitizedData","data","doc","findOneAndUpdate","result","JSON","parse","stringify","verificationToken","_verificationToken","_id"],"mappings":"AAEA,SAASA,4BAA4B,QAA4B,UAAS;AAI1E,SAASC,yBAAyB,QAAQ,2CAA0C;AACpF,SAASC,UAAU,QAAQ,4BAA2B;AACtD,SAASC,uBAAuB,QAAQ,yCAAwC;AAEhF,OAAO,MAAMC,gBAA+B,eAAeA,cAEzD,EAAEC,EAAE,EAAEC,UAAU,EAAEC,MAAM,EAAEC,SAASC,cAAc,CAAC,CAAC,EAAEC,GAAG,EAAEC,MAAM,EAAEC,WAAW,EAAEC,KAAK,EAAE;IAEtF,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;QACda,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;QACAe,SAAS,MAAMxB,WAAW,IAAI,EAAEQ;IAClC;IAEA,MAAMiB,QAAQ,MAAMb,aAAac,UAAU,CAAC;QAC1CrB;QACAY,SAAS,IAAI,CAACA,OAAO;QACrBN,OAAOG;IACT;IAEA,MAAMa,gBAAgB1B,wBAAwB;QAC5CiB,QAAQ,IAAI,CAACD,OAAO,CAACC,MAAM;QAC3BU,MAAMlB;QACNM;IACF;IAEA,MAAMa,MAAM,MAAMjB,aAAakB,gBAAgB,CAACL,OAAOE,eAAerB;IAEtE,MAAMyB,SAASC,KAAKC,KAAK,CAACD,KAAKE,SAAS,CAACL;IAEzC,MAAMM,oBAAoBN,IAAIO,kBAAkB;IAEhD,uBAAuB;IACvBL,OAAO5B,EAAE,GAAG4B,OAAOM,GAAG;IACtB,IAAIF,mBAAmB;QACrBJ,OAAOK,kBAAkB,GAAGD;IAC9B;IACA,OAAOJ;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 } from 'payload';
+import type { CollectionSlug, JoinQuery, SanitizedCollectionConfig, Where } 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>;
-    session?: ClientSession;
+    query?: Where;
     /** whether the query is from drafts */
     versions?: boolean;
 };
-export declare const buildJoinAggregation: ({ adapter, collection, collectionConfig, joins, locale, projection, session, versions, }: BuildJoinAggregationArgs) => Promise<PipelineStage[] | undefined>;
+export declare const buildJoinAggregation: ({ adapter, collection, collectionConfig, joins, limit, locale, projection, query, 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,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,CAmJhE,CAAA"}
+{"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,CAoKhE,CAAA"}

package/dist/utilities/buildJoinAggregation.js

@@ -1,10 +1,26 @@
 import { buildSortParam } from '../queries/buildSortParam.js';
-export const buildJoinAggregation = async ({ adapter, collection, collectionConfig, joins, locale, projection, session, versions })=>{
+export const buildJoinAggregation = async ({ adapter, collection, collectionConfig, joins, limit, locale, projection, query, versions })=>{
     if (Object.keys(collectionConfig.joins).length === 0 || joins === false) {
         return;
     }
     const joinConfig = adapter.payload.collections[collection].config.joins;
-    const aggregate = [];
+    const aggregate = [
+        {
+            $sort: {
+                createdAt: -1
+            }
+        }
+    ];
+    if (query) {
+        aggregate.push({
+            $match: query
+        });
+    }
+    if (limit) {
+        aggregate.push({
+            $limit: limit
+        });
+    }
     for (const slug of Object.keys(joinConfig)){
         for (const join of joinConfig[slug]){
             const joinModel = adapter.collections[join.field.collection];
@@ -15,17 +31,18 @@ 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 = [
@@ -33,7 +50,9 @@ export const buildJoinAggregation = async ({ adapter, collection, collectionConf
                     $match
                 },
                 {
-                    $sort
+                    $sort: {
+                        [sortProperty]: sortDirection
+                    }
                 }
             ];
             if (limitJoin > 0) {
@@ -133,8 +152,10 @@ export const buildJoinAggregation = async ({ adapter, collection, collectionConf
             }
         }
     }
-    if (!aggregate.length) {
-        return;
+    if (projection) {
+        aggregate.push({
+            $project: projection
+        });
     }
     return aggregate;
 };

package/dist/utilities/buildJoinAggregation.js.map

@@ -1 +1 @@
-{"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      let polymorphicSuffix = ''\n      if (Array.isArray(join.targetField.relationTo)) {\n        polymorphicSuffix = '.value'\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}${polymorphicSuffix}`,\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}${polymorphicSuffix}`,\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","polymorphicSuffix","Array","isArray","targetField","relationTo","localization","localeCodes","forEach","code","as","$lookup","foreignField","on","from","name","localField","$addFields","$map","in","input","$gt","$size","$slice","localeSuffix","localized","Number","MAX_VALUE"],"mappings":"AAMA,SAASA,cAAc,QAAQ,+BAA8B;AAc7D,OAAO,MAAMC,uBAAuB,OAAO,EACzCC,OAAO,EACPC,UAAU,EACVC,gBAAgB,EAChBC,KAAK,EACLC,MAAM,EACNC,UAAU,EACVC,OAAO,EACPC,QAAQ,EACiB;IACzB,IAAIC,OAAOC,IAAI,CAACP,iBAAiBC,KAAK,EAAEO,MAAM,KAAK,KAAKP,UAAU,OAAO;QACvE;IACF;IAEA,MAAMQ,aAAaX,QAAQY,OAAO,CAACC,WAAW,CAACZ,WAAW,CAACa,MAAM,CAACX,KAAK;IACvE,MAAMY,YAA6B,EAAE;IAErC,KAAK,MAAMC,QAAQR,OAAOC,IAAI,CAACE,YAAa;QAC1C,KAAK,MAAMM,QAAQN,UAAU,CAACK,KAAK,CAAE;YACnC,MAAME,YAAYlB,QAAQa,WAAW,CAACI,KAAKE,KAAK,CAAClB,UAAU,CAAC;YAE5D,IAAII,cAAc,CAACA,UAAU,CAACY,KAAKG,QAAQ,CAAC,EAAE;gBAC5C;YACF;YAEA,IAAIjB,OAAO,CAACc,KAAKG,QAAQ,CAAC,KAAK,OAAO;gBACpC;YACF;YAEA,MAAM,EACJC,OAAOC,YAAYL,KAAKE,KAAK,CAACI,YAAY,IAAI,EAAE,EAChDC,MAAMC,WAAWR,KAAKE,KAAK,CAACO,WAAW,IAAIxB,iBAAiBwB,WAAW,EACvEC,OAAOC,SAAS,EACjB,GAAGzB,OAAO,CAACc,KAAKG,QAAQ,CAAC,IAAI,CAAC;YAE/B,MAAMS,QAAQ/B,eAAe;gBAC3BgB,QAAQd,QAAQY,OAAO,CAACE,MAAM;gBAC9BgB,QAAQ9B,QAAQY,OAAO,CAACC,WAAW,CAACG,KAAK,CAACF,MAAM,CAACiB,eAAe;gBAChE3B;gBACAoB,MAAMC;gBACNO,YAAY;YACd;YAEA,MAAMC,SAAS,MAAMf,UAAUgB,UAAU,CAAC;gBACxC9B;gBACAQ,SAASZ,QAAQY,OAAO;gBACxBN;gBACAqB,OAAOC;YACT;YAEA,MAAMO,WAA8E;gBAClF;oBAAEF;gBAAO;gBACT;oBACEJ;gBACF;aACD;YAED,IAAIP,YAAY,GAAG;gBACjBa,SAASC,IAAI,CAAC;oBACZC,QAAQf,YAAY;gBACtB;YACF;YAEA,IAAIgB,oBAAoB;YACxB,IAAIC,MAAMC,OAAO,CAACvB,KAAKwB,WAAW,CAACC,UAAU,GAAG;gBAC9CJ,oBAAoB;YACtB;YAEA,IAAItC,QAAQY,OAAO,CAACE,MAAM,CAAC6B,YAAY,IAAIvC,WAAW,OAAO;gBAC3DJ,QAAQY,OAAO,CAACE,MAAM,CAAC6B,YAAY,CAACC,WAAW,CAACC,OAAO,CAAC,CAACC;oBACvD,MAAMC,KAAK,GAAGxC,WAAW,CAAC,QAAQ,EAAEU,KAAKG,QAAQ,EAAE,GAAGH,KAAKG,QAAQ,GAAG0B,MAAM;oBAE5E/B,UAAUqB,IAAI,CACZ;wBACEY,SAAS;4BACPD,IAAI,GAAGA,GAAG,KAAK,CAAC;4BAChBE,cAAc,GAAGhC,KAAKE,KAAK,CAAC+B,EAAE,GAAGJ,OAAOR,mBAAmB;4BAC3Da,MAAMnD,QAAQa,WAAW,CAACG,KAAK,CAACf,UAAU,CAACmD,IAAI;4BAC/CC,YAAY9C,WAAW,WAAW;4BAClC4B;wBACF;oBACF,GACA;wBACEmB,YAAY;4BACV,CAAC,GAAGP,GAAG,KAAK,CAAC,CAAC,EAAE;gCACdQ,MAAM;oCACJR,IAAI;oCACJS,IAAI;oCACJC,OAAO,CAAC,CAAC,EAAEV,GAAG,KAAK,CAAC;gCACtB;4BACF;4BACA,CAAC,GAAGA,GAAG,YAAY,CAAC,CAAC,EAAEzB,YACnB;gCAAEoC,KAAK;oCAAC;wCAAEC,OAAO,CAAC,CAAC,EAAEZ,GAAG,KAAK,CAAC;oCAAC;oCAAGzB;iCAAU;4BAAC,IAC7C;wBAEN;oBACF;oBAEF,IAAIA,YAAY,GAAG;wBACjBP,UAAUqB,IAAI,CAAC;4BACbkB,YAAY;gCACV,CAAC,GAAGP,GAAG,KAAK,CAAC,CAAC,EAAE;oCACda,QAAQ;wCAAC,CAAC,CAAC,EAAEb,GAAG,KAAK,CAAC;wCAAEzB;qCAAU;gCACpC;4BACF;wBACF;oBACF;gBACF;YACF,OAAO;gBACL,MAAMuC,eACJ5C,KAAKE,KAAK,CAAC2C,SAAS,IAAI9D,QAAQY,OAAO,CAACE,MAAM,CAAC6B,YAAY,IAAIvC,SAAS,CAAC,CAAC,EAAEA,QAAQ,GAAG;gBACzF,MAAM2C,KAAK,GAAGxC,WAAW,CAAC,QAAQ,EAAEU,KAAKG,QAAQ,EAAE,GAAGH,KAAKG,QAAQ,GAAGyC,cAAc;gBAEpF9C,UAAUqB,IAAI,CACZ;oBACEY,SAAS;wBACPD,IAAI,GAAGA,GAAG,KAAK,CAAC;wBAChBE,cAAc,GAAGhC,KAAKE,KAAK,CAAC+B,EAAE,GAAGW,eAAevB,mBAAmB;wBACnEa,MAAMnD,QAAQa,WAAW,CAACG,KAAK,CAACf,UAAU,CAACmD,IAAI;wBAC/CC,YAAY9C,WAAW,WAAW;wBAClC4B;oBACF;gBACF,GACA;oBACEmB,YAAY;wBACV,CAAC,GAAGP,GAAG,KAAK,CAAC,CAAC,EAAE;4BACdQ,MAAM;gCACJR,IAAI;gCACJS,IAAI;gCACJC,OAAO,CAAC,CAAC,EAAEV,GAAG,KAAK,CAAC;4BACtB;wBACF;wBACA,CAAC,GAAGA,GAAG,YAAY,CAAC,CAAC,EAAE;4BACrBW,KAAK;gCAAC;oCAAEC,OAAO,CAAC,CAAC,EAAEZ,GAAG,KAAK,CAAC;gCAAC;gCAAGzB,aAAayC,OAAOC,SAAS;6BAAC;wBAChE;oBACF;gBACF;gBAEF,IAAI1C,YAAY,GAAG;oBACjBP,UAAUqB,IAAI,CAAC;wBACbkB,YAAY;4BACV,CAAC,GAAGP,GAAG,KAAK,CAAC,CAAC,EAAE;gCACda,QAAQ;oCAAC,CAAC,CAAC,EAAEb,GAAG,KAAK,CAAC;oCAAEzB;iCAAU;4BACpC;wBACF;oBACF;gBACF;YACF;QACF;IACF;IAEA,IAAI,CAACP,UAAUL,MAAM,EAAE;QACrB;IACF;IAEA,OAAOK;AACT,EAAC"}
+{"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      let polymorphicSuffix = ''\n      if (Array.isArray(join.targetField.relationTo)) {\n        polymorphicSuffix = '.value'\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}${polymorphicSuffix}`,\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}${polymorphicSuffix}`,\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","polymorphicSuffix","Array","isArray","targetField","relationTo","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":"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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,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"}
+{"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"}

package/dist/utilities/buildProjectionFromSelect.js

@@ -10,10 +10,6 @@ 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)) {
@@ -82,13 +78,6 @@ 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,
@@ -110,13 +99,7 @@ const traverseFields = ({ adapter, databaseSchemaPath = '', fields, projection,
                         }
                         if (blockSelectMode === 'include') {
                             blocksSelect[block.slug]['id'] = true;
-                            addFieldToProjection({
-                                adapter,
-                                databaseSchemaPath: fieldDatabaseSchemaPath,
-                                field: blockTypeField,
-                                projection,
-                                withinLocalizedField: fieldWithinLocalizedField
-                            });
+                            blocksSelect[block.slug]['blockType'] = true;
                         }
                         traverseFields({
                             adapter,

package/dist/utilities/buildProjectionFromSelect.js.map

@@ -1 +1 @@
-{"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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"}
+{"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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"}

package/dist/utilities/sanitizeInternalFields.d.ts

@@ -0,0 +1,2 @@
+export declare const sanitizeInternalFields: <T extends Record<string, unknown>>(incomingDoc: T) => T;
+//# sourceMappingURL=sanitizeInternalFields.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"sanitizeInternalFields.d.ts","sourceRoot":"","sources":["../../src/utilities/sanitizeInternalFields.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,sBAAsB,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,KAAG,CAiB9E,CAAA"}

package/dist/utilities/sanitizeInternalFields.js

@@ -0,0 +1,20 @@
+const internalFields = [
+    '__v'
+];
+export const sanitizeInternalFields = (incomingDoc)=>Object.entries(incomingDoc).reduce((newDoc, [key, val])=>{
+        if (key === '_id') {
+            return {
+                ...newDoc,
+                id: val
+            };
+        }
+        if (internalFields.indexOf(key) > -1) {
+            return newDoc;
+        }
+        return {
+            ...newDoc,
+            [key]: val
+        };
+    }, {});
+
+//# sourceMappingURL=sanitizeInternalFields.js.map

package/dist/utilities/sanitizeInternalFields.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utilities/sanitizeInternalFields.ts"],"sourcesContent":["const internalFields = ['__v']\n\nexport const sanitizeInternalFields = <T extends Record<string, unknown>>(incomingDoc: T): T =>\n  Object.entries(incomingDoc).reduce((newDoc, [key, val]): T => {\n    if (key === '_id') {\n      return {\n        ...newDoc,\n        id: val,\n      }\n    }\n\n    if (internalFields.indexOf(key) > -1) {\n      return newDoc\n    }\n\n    return {\n      ...newDoc,\n      [key]: val,\n    }\n  }, {} as T)\n"],"names":["internalFields","sanitizeInternalFields","incomingDoc","Object","entries","reduce","newDoc","key","val","id","indexOf"],"mappings":"AAAA,MAAMA,iBAAiB;IAAC;CAAM;AAE9B,OAAO,MAAMC,yBAAyB,CAAoCC,cACxEC,OAAOC,OAAO,CAACF,aAAaG,MAAM,CAAC,CAACC,QAAQ,CAACC,KAAKC,IAAI;QACpD,IAAID,QAAQ,OAAO;YACjB,OAAO;gBACL,GAAGD,MAAM;gBACTG,IAAID;YACN;QACF;QAEA,IAAIR,eAAeU,OAAO,CAACH,OAAO,CAAC,GAAG;YACpC,OAAOD;QACT;QAEA,OAAO;YACL,GAAGA,MAAM;YACT,CAACC,IAAI,EAAEC;QACT;IACF,GAAG,CAAC,GAAO"}

package/dist/utilities/sanitizeRelationshipIDs.d.ts

@@ -0,0 +1,9 @@
+import type { Field, SanitizedConfig } from 'payload';
+type Args = {
+    config: SanitizedConfig;
+    data: Record<string, unknown>;
+    fields: Field[];
+};
+export declare const sanitizeRelationshipIDs: ({ config, data, fields, }: Args) => Record<string, unknown>;
+export {};
+//# sourceMappingURL=sanitizeRelationshipIDs.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"sanitizeRelationshipIDs.d.ts","sourceRoot":"","sources":["../../src/utilities/sanitizeRelationshipIDs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAoB,KAAK,EAAE,eAAe,EAA0B,MAAM,SAAS,CAAA;AAM/F,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC7B,MAAM,EAAE,KAAK,EAAE,CAAA;CAChB,CAAA;AAoGD,eAAO,MAAM,uBAAuB,8BAIjC,IAAI,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAyC/B,CAAA"}

package/dist/utilities/sanitizeRelationshipIDs.js

@@ -0,0 +1,125 @@
+import { Types } from 'mongoose';
+import { traverseFields } from 'payload';
+import { fieldAffectsData } from 'payload/shared';
+function isValidRelationObject(value) {
+    return typeof value === 'object' && value !== null && 'relationTo' in value && 'value' in value;
+}
+const convertValue = ({ relatedCollection, value })=>{
+    const customIDField = relatedCollection.fields.find((field)=>fieldAffectsData(field) && field.name === 'id');
+    if (customIDField) {
+        return value;
+    }
+    try {
+        return new Types.ObjectId(value);
+    } catch  {
+        return value;
+    }
+};
+const sanitizeRelationship = ({ config, field, locale, ref, value })=>{
+    let relatedCollection;
+    let result = value;
+    const hasManyRelations = typeof field.relationTo !== 'string';
+    if (!hasManyRelations) {
+        relatedCollection = config.collections?.find(({ slug })=>slug === field.relationTo);
+    }
+    if (Array.isArray(value)) {
+        result = value.map((val)=>{
+            // Handle has many
+            if (relatedCollection && val && (typeof val === 'string' || typeof val === 'number')) {
+                return convertValue({
+                    relatedCollection,
+                    value: val
+                });
+            }
+            // Handle has many - polymorphic
+            if (isValidRelationObject(val)) {
+                const relatedCollectionForSingleValue = config.collections?.find(({ slug })=>slug === val.relationTo);
+                if (relatedCollectionForSingleValue) {
+                    return {
+                        relationTo: val.relationTo,
+                        value: convertValue({
+                            relatedCollection: relatedCollectionForSingleValue,
+                            value: val.value
+                        })
+                    };
+                }
+            }
+            return val;
+        });
+    }
+    // Handle has one - polymorphic
+    if (isValidRelationObject(value)) {
+        relatedCollection = config.collections?.find(({ slug })=>slug === value.relationTo);
+        if (relatedCollection) {
+            result = {
+                relationTo: value.relationTo,
+                value: convertValue({
+                    relatedCollection,
+                    value: value.value
+                })
+            };
+        }
+    }
+    // Handle has one
+    if (relatedCollection && value && (typeof value === 'string' || typeof value === 'number')) {
+        result = convertValue({
+            relatedCollection,
+            value
+        });
+    }
+    if (locale) {
+        ref[locale] = result;
+    } else {
+        ref[field.name] = result;
+    }
+};
+export const sanitizeRelationshipIDs = ({ config, data, fields })=>{
+    const sanitize = ({ field, ref })=>{
+        if (!ref || typeof ref !== 'object') {
+            return;
+        }
+        if (field.type === 'relationship' || field.type === 'upload') {
+            if (!ref[field.name]) {
+                return;
+            }
+            // handle localized relationships
+            if (config.localization && field.localized) {
+                const locales = config.localization.locales;
+                const fieldRef = ref[field.name];
+                if (typeof fieldRef !== 'object') {
+                    return;
+                }
+                for (const { code } of locales){
+                    const value = ref[field.name][code];
+                    if (value) {
+                        sanitizeRelationship({
+                            config,
+                            field,
+                            locale: code,
+                            ref: fieldRef,
+                            value
+                        });
+                    }
+                }
+            } else {
+                // handle non-localized relationships
+                sanitizeRelationship({
+                    config,
+                    field,
+                    locale: undefined,
+                    ref,
+                    value: ref[field.name]
+                });
+            }
+        }
+    };
+    traverseFields({
+        callback: sanitize,
+        fields,
+        fillEmpty: false,
+        ref: data
+    });
+    return data;
+};
+
+//# sourceMappingURL=sanitizeRelationshipIDs.js.map

package/dist/utilities/sanitizeRelationshipIDs.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utilities/sanitizeRelationshipIDs.ts"],"sourcesContent":["import type { CollectionConfig, Field, SanitizedConfig, TraverseFieldsCallback } from 'payload'\n\nimport { Types } from 'mongoose'\nimport { APIError, traverseFields } from 'payload'\nimport { fieldAffectsData } from 'payload/shared'\n\ntype Args = {\n  config: SanitizedConfig\n  data: Record<string, unknown>\n  fields: Field[]\n}\n\ninterface RelationObject {\n  relationTo: string\n  value: number | string\n}\n\nfunction isValidRelationObject(value: unknown): value is RelationObject {\n  return typeof value === 'object' && value !== null && 'relationTo' in value && 'value' in value\n}\n\nconst convertValue = ({\n  relatedCollection,\n  value,\n}: {\n  relatedCollection: CollectionConfig\n  value: number | string\n}): number | string | Types.ObjectId => {\n  const customIDField = relatedCollection.fields.find(\n    (field) => fieldAffectsData(field) && field.name === 'id',\n  )\n\n  if (customIDField) {\n    return value\n  }\n\n  try {\n    return new Types.ObjectId(value)\n  } catch {\n    return value\n  }\n}\n\nconst sanitizeRelationship = ({ config, field, locale, ref, value }) => {\n  let relatedCollection: CollectionConfig | undefined\n  let result = value\n\n  const hasManyRelations = typeof field.relationTo !== 'string'\n\n  if (!hasManyRelations) {\n    relatedCollection = config.collections?.find(({ slug }) => slug === field.relationTo)\n  }\n\n  if (Array.isArray(value)) {\n    result = value.map((val) => {\n      // Handle has many\n      if (relatedCollection && val && (typeof val === 'string' || typeof val === 'number')) {\n        return convertValue({\n          relatedCollection,\n          value: val,\n        })\n      }\n\n      // Handle has many - polymorphic\n      if (isValidRelationObject(val)) {\n        const relatedCollectionForSingleValue = config.collections?.find(\n          ({ slug }) => slug === val.relationTo,\n        )\n\n        if (relatedCollectionForSingleValue) {\n          return {\n            relationTo: val.relationTo,\n            value: convertValue({\n              relatedCollection: relatedCollectionForSingleValue,\n              value: val.value,\n            }),\n          }\n        }\n      }\n\n      return val\n    })\n  }\n\n  // Handle has one - polymorphic\n  if (isValidRelationObject(value)) {\n    relatedCollection = config.collections?.find(({ slug }) => slug === value.relationTo)\n\n    if (relatedCollection) {\n      result = {\n        relationTo: value.relationTo,\n        value: convertValue({ relatedCollection, value: value.value }),\n      }\n    }\n  }\n\n  // Handle has one\n  if (relatedCollection && value && (typeof value === 'string' || typeof value === 'number')) {\n    result = convertValue({\n      relatedCollection,\n      value,\n    })\n  }\n  if (locale) {\n    ref[locale] = result\n  } else {\n    ref[field.name] = result\n  }\n}\n\nexport const sanitizeRelationshipIDs = ({\n  config,\n  data,\n  fields,\n}: Args): Record<string, unknown> => {\n  const sanitize: TraverseFieldsCallback = ({ field, ref }) => {\n    if (!ref || typeof ref !== 'object') {\n      return\n    }\n\n    if (field.type === 'relationship' || field.type === 'upload') {\n      if (!ref[field.name]) {\n        return\n      }\n\n      // handle localized relationships\n      if (config.localization && field.localized) {\n        const locales = config.localization.locales\n        const fieldRef = ref[field.name]\n        if (typeof fieldRef !== 'object') {\n          return\n        }\n\n        for (const { code } of locales) {\n          const value = ref[field.name][code]\n          if (value) {\n            sanitizeRelationship({ config, field, locale: code, ref: fieldRef, value })\n          }\n        }\n      } else {\n        // handle non-localized relationships\n        sanitizeRelationship({\n          config,\n          field,\n          locale: undefined,\n          ref,\n          value: ref[field.name],\n        })\n      }\n    }\n  }\n\n  traverseFields({ callback: sanitize, fields, fillEmpty: false, ref: data })\n\n  return data\n}\n"],"names":["Types","traverseFields","fieldAffectsData","isValidRelationObject","value","convertValue","relatedCollection","customIDField","fields","find","field","name","ObjectId","sanitizeRelationship","config","locale","ref","result","hasManyRelations","relationTo","collections","slug","Array","isArray","map","val","relatedCollectionForSingleValue","sanitizeRelationshipIDs","data","sanitize","type","localization","localized","locales","fieldRef","code","undefined","callback","fillEmpty"],"mappings":"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"}

package/dist/utilities/{transform.spec.js → sanitizeRelationshipIDs.spec.js}

@@ -1,6 +1,5 @@
-import { flattenAllFields } from 'payload';
 import { Types } from 'mongoose';
-import { transform } from './transform.js';
+import { sanitizeRelationshipIDs } from './sanitizeRelationshipIDs.js';
 const flattenRelationshipValues = (obj, prefix = '')=>{
     return Object.keys(obj).reduce((acc, key)=>{
         const fullKey = prefix ? `${prefix}.${key}` : key;
@@ -292,8 +291,8 @@ const relsData = {
         ]
     }
 };
-describe('transform', ()=>{
-    it('should sanitize relationships with transform write', ()=>{
+describe('sanitizeRelationshipIDs', ()=>{
+    it('should sanitize relationships', ()=>{
         const data = {
             ...relsData,
             array: [
@@ -410,32 +409,17 @@ describe('transform', ()=>{
             }
         };
         const flattenValuesBefore = Object.values(flattenRelationshipValues(data));
-        const mockAdapter = {
-            payload: {
-                config
-            }
-        };
-        const fields = flattenAllFields({
-            fields: config.collections[0].fields
-        });
-        transform({
-            type: 'write',
-            adapter: mockAdapter,
+        sanitizeRelationshipIDs({
+            config,
             data,
-            fields
+            fields: config.collections[0].fields
         });
         const flattenValuesAfter = Object.values(flattenRelationshipValues(data));
         flattenValuesAfter.forEach((value, i)=>{
             expect(value).toBeInstanceOf(Types.ObjectId);
             expect(flattenValuesBefore[i]).toBe(value.toHexString());
         });
-        transform({
-            type: 'read',
-            adapter: mockAdapter,
-            data,
-            fields
-        });
     });
 });
 
-//# sourceMappingURL=transform.spec.js.map
+//# sourceMappingURL=sanitizeRelationshipIDs.spec.js.map