@payloadcms/db-mongodb 3.0.0-canary.a78fca3 → 3.0.0-canary.ab70b75

package/dist/utilities/buildJoinAggregation.d.ts

@@ -0,0 +1,17 @@
+import type { PipelineStage } from 'mongoose';
+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;
+    query?: Where;
+    /** whether the query is from drafts */
+    versions?: boolean;
+};
+export declare const buildJoinAggregation: ({ adapter, collection, collectionConfig, joins, limit, locale, query, versions, }: BuildJoinAggregationArgs) => Promise<PipelineStage[] | undefined>;
+export {};
+//# sourceMappingURL=buildJoinAggregation.d.ts.map

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

@@ -0,0 +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;IAEd,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,uCAAuC;IACvC,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,oBAAoB,sFAS9B,wBAAwB,KAAG,OAAO,CAAC,aAAa,EAAE,GAAG,SAAS,CAmJhE,CAAA"}

package/dist/utilities/buildJoinAggregation.js

@@ -0,0 +1,148 @@
+import { buildSortParam } from '../queries/buildSortParam.js';
+export const buildJoinAggregation = async ({ adapter, collection, collectionConfig, joins, limit, locale, query, 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
+        });
+    }
+    for (const slug of Object.keys(joinConfig)){
+        for (const join of joinConfig[slug]){
+            const joinModel = adapter.collections[join.field.collection];
+            const { limit: limitJoin = 10, sort: sortJoin, where: whereJoin } = joins?.[join.schemaPath] || {};
+            const sort = buildSortParam({
+                config: adapter.payload.config,
+                fields: adapter.payload.collections[slug].config.fields,
+                locale,
+                sort: sortJoin || collectionConfig.defaultSort,
+                timestamps: true
+            });
+            const sortProperty = Object.keys(sort)[0];
+            const sortDirection = sort[sortProperty] === 'asc' ? 1 : -1;
+            const $match = await joinModel.buildQuery({
+                locale,
+                payload: adapter.payload,
+                where: whereJoin
+            });
+            const pipeline = [
+                {
+                    $match
+                },
+                {
+                    $sort: {
+                        [sortProperty]: sortDirection
+                    }
+                }
+            ];
+            if (limitJoin > 0) {
+                pipeline.push({
+                    $limit: limitJoin + 1
+                });
+            }
+            if (adapter.payload.config.localization && locale === 'all') {
+                adapter.payload.config.localization.localeCodes.forEach((code)=>{
+                    const as = `${versions ? `version.${join.schemaPath}` : join.schemaPath}${code}`;
+                    aggregate.push({
+                        $lookup: {
+                            as: `${as}.docs`,
+                            foreignField: `${join.field.on}${code}`,
+                            from: slug,
+                            localField: versions ? 'parent' : '_id',
+                            pipeline
+                        }
+                    }, {
+                        $addFields: {
+                            [`${as}.docs`]: {
+                                $map: {
+                                    as: 'doc',
+                                    in: '$$doc._id',
+                                    input: `$${as}.docs`
+                                }
+                            },
+                            [`${as}.hasNextPage`]: limitJoin ? {
+                                $gt: [
+                                    {
+                                        $size: `$${as}.docs`
+                                    },
+                                    limitJoin
+                                ]
+                            } : false
+                        }
+                    });
+                    if (limitJoin > 0) {
+                        aggregate.push({
+                            $addFields: {
+                                [`${as}.docs`]: {
+                                    $slice: [
+                                        `$${as}.docs`,
+                                        limitJoin
+                                    ]
+                                }
+                            }
+                        });
+                    }
+                });
+            } else {
+                const localeSuffix = join.field.localized && adapter.payload.config.localization && locale ? `.${locale}` : '';
+                const as = `${versions ? `version.${join.schemaPath}` : join.schemaPath}${localeSuffix}`;
+                aggregate.push({
+                    $lookup: {
+                        as: `${as}.docs`,
+                        foreignField: `${join.field.on}${localeSuffix}`,
+                        from: slug,
+                        localField: versions ? 'parent' : '_id',
+                        pipeline
+                    }
+                }, {
+                    $addFields: {
+                        [`${as}.docs`]: {
+                            $map: {
+                                as: 'doc',
+                                in: '$$doc._id',
+                                input: `$${as}.docs`
+                            }
+                        },
+                        [`${as}.hasNextPage`]: {
+                            $gt: [
+                                {
+                                    $size: `$${as}.docs`
+                                },
+                                limitJoin || Number.MAX_VALUE
+                            ]
+                        }
+                    }
+                });
+                if (limitJoin > 0) {
+                    aggregate.push({
+                        $addFields: {
+                            [`${as}.docs`]: {
+                                $slice: [
+                                    `$${as}.docs`,
+                                    limitJoin
+                                ]
+                            }
+                        }
+                    });
+                }
+            }
+        }
+    }
+    return aggregate;
+};
+
+//# sourceMappingURL=buildJoinAggregation.js.map

package/dist/utilities/buildJoinAggregation.js.map

@@ -0,0 +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  // 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  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      const {\n        limit: limitJoin = 10,\n        sort: sortJoin,\n        where: whereJoin,\n      } = joins?.[join.schemaPath] || {}\n\n      const sort = buildSortParam({\n        config: adapter.payload.config,\n        fields: adapter.payload.collections[slug].config.fields,\n        locale,\n        sort: sortJoin || collectionConfig.defaultSort,\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.schemaPath}` : join.schemaPath}${code}`\n\n          aggregate.push(\n            {\n              $lookup: {\n                as: `${as}.docs`,\n                foreignField: `${join.field.on}${code}`,\n                from: slug,\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.schemaPath}` : join.schemaPath}${localeSuffix}`\n\n        aggregate.push(\n          {\n            $lookup: {\n              as: `${as}.docs`,\n              foreignField: `${join.field.on}${localeSuffix}`,\n              from: slug,\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  return aggregate\n}\n"],"names":["buildSortParam","buildJoinAggregation","adapter","collection","collectionConfig","joins","limit","locale","query","versions","Object","keys","length","joinConfig","payload","collections","config","aggregate","$sort","createdAt","push","$match","$limit","slug","join","joinModel","field","limitJoin","sort","sortJoin","where","whereJoin","schemaPath","fields","defaultSort","timestamps","sortProperty","sortDirection","buildQuery","pipeline","localization","localeCodes","forEach","code","as","$lookup","foreignField","on","from","localField","$addFields","$map","in","input","$gt","$size","$slice","localeSuffix","localized","Number","MAX_VALUE"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"getDBName.d.ts","sourceRoot":"","sources":["../../src/utilities/getDBName.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAE/C,KAAK,IAAI,GAAG;IACV,MAAM,EAAE;QACN,MAAM,CAAC,EAAE,gBAAgB,CAAA;QACzB,QAAQ,CAAC,EAAE,gBAAgB,CAAA;QAC3B,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,IAAI,CAAC,EAAE,MAAM,CAAA;KACd,CAAA;IACD,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,MAAM,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAA;IAC9B,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,SAAS,0DAKnB,IAAI,KAAG,MAiBT,CAAA"}
+{"version":3,"file":"getDBName.d.ts","sourceRoot":"","sources":["../../src/utilities/getDBName.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAE/C,KAAK,IAAI,GAAG;IACV,MAAM,EAAE;QACN,MAAM,CAAC,EAAE,gBAAgB,CAAA;QACzB,QAAQ,CAAC,EAAE,gBAAgB,CAAA;QAC3B,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,IAAI,CAAC,EAAE,MAAM,CAAA;KACd,CAAA;IACD,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,MAAM,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAA;IAC9B,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,SAAS,0DAKnB,IAAI,KAAG,MAmBT,CAAA"}

package/dist/utilities/getDBName.js

@@ -12,7 +12,9 @@
     } else {
         result = name ?? slug;
     }
-    if (versions) result = `_${result}_versions`;
+    if (versions) {
+        result = `_${result}_versions`;
+    }
     return result;
 };
 

package/dist/utilities/getDBName.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/getDBName.ts"],"sourcesContent":["import type { DBIdentifierName } from 'payload'\n\ntype Args = {\n  config: {\n    dbName?: DBIdentifierName\n    enumName?: DBIdentifierName\n    name?: string\n    slug?: string\n  }\n  locales?: boolean\n  target?: 'dbName' | 'enumName'\n  versions?: boolean\n}\n\n/**\n * Used to name database enums and collections\n * Returns the collection or enum name for a given entity\n */\nexport const getDBName = ({\n  config: { name, slug },\n  config,\n  target = 'dbName',\n  versions = false,\n}: Args): string => {\n  let result: string\n  let custom = config[target]\n\n  if (!custom && target === 'enumName') {\n    custom = config['dbName']\n  }\n\n  if (custom) {\n    result = typeof custom === 'function' ? custom({}) : custom\n  } else {\n    result = name ?? slug\n  }\n\n  if (versions) result = `_${result}_versions`\n\n  return result\n}\n"],"names":["getDBName","config","name","slug","target","versions","result","custom"],"rangeMappings":";;;;;;;;;;;;;;;;","mappings":"AAcA;;;CAGC,GACD,OAAO,MAAMA,YAAY,CAAC,EACxBC,QAAQ,EAAEC,IAAI,EAAEC,IAAI,EAAE,EACtBF,MAAM,EACNG,SAAS,QAAQ,EACjBC,WAAW,KAAK,EACX;IACL,IAAIC;IACJ,IAAIC,SAASN,MAAM,CAACG,OAAO;IAE3B,IAAI,CAACG,UAAUH,WAAW,YAAY;QACpCG,SAASN,MAAM,CAAC,SAAS;IAC3B;IAEA,IAAIM,QAAQ;QACVD,SAAS,OAAOC,WAAW,aAAaA,OAAO,CAAC,KAAKA;IACvD,OAAO;QACLD,SAASJ,QAAQC;IACnB;IAEA,IAAIE,UAAUC,SAAS,CAAC,CAAC,EAAEA,OAAO,SAAS,CAAC;IAE5C,OAAOA;AACT,EAAC"}
+{"version":3,"sources":["../../src/utilities/getDBName.ts"],"sourcesContent":["import type { DBIdentifierName } from 'payload'\n\ntype Args = {\n  config: {\n    dbName?: DBIdentifierName\n    enumName?: DBIdentifierName\n    name?: string\n    slug?: string\n  }\n  locales?: boolean\n  target?: 'dbName' | 'enumName'\n  versions?: boolean\n}\n\n/**\n * Used to name database enums and collections\n * Returns the collection or enum name for a given entity\n */\nexport const getDBName = ({\n  config: { name, slug },\n  config,\n  target = 'dbName',\n  versions = false,\n}: Args): string => {\n  let result: string\n  let custom = config[target]\n\n  if (!custom && target === 'enumName') {\n    custom = config['dbName']\n  }\n\n  if (custom) {\n    result = typeof custom === 'function' ? custom({}) : custom\n  } else {\n    result = name ?? slug\n  }\n\n  if (versions) {\n    result = `_${result}_versions`\n  }\n\n  return result\n}\n"],"names":["getDBName","config","name","slug","target","versions","result","custom"],"mappings":"AAcA;;;CAGC,GACD,OAAO,MAAMA,YAAY,CAAC,EACxBC,QAAQ,EAAEC,IAAI,EAAEC,IAAI,EAAE,EACtBF,MAAM,EACNG,SAAS,QAAQ,EACjBC,WAAW,KAAK,EACX;IACL,IAAIC;IACJ,IAAIC,SAASN,MAAM,CAACG,OAAO;IAE3B,IAAI,CAACG,UAAUH,WAAW,YAAY;QACpCG,SAASN,MAAM,CAAC,SAAS;IAC3B;IAEA,IAAIM,QAAQ;QACVD,SAAS,OAAOC,WAAW,aAAaA,OAAO,CAAC,KAAKA;IACvD,OAAO;QACLD,SAASJ,QAAQC;IACnB;IAEA,IAAIE,UAAU;QACZC,SAAS,CAAC,CAAC,EAAEA,OAAO,SAAS,CAAC;IAChC;IAEA,OAAOA;AACT,EAAC"}

package/dist/utilities/handleError.d.ts

@@ -1,3 +1,7 @@
-declare const handleError: (error: any, req: any) => never;
-export default handleError;
+export declare const handleError: ({ collection, error, global, req, }: {
+    collection?: string;
+    error: any;
+    global?: string;
+    req: any;
+}) => never;
 //# sourceMappingURL=handleError.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"handleError.d.ts","sourceRoot":"","sources":["../../src/utilities/handleError.ts"],"names":[],"mappings":"AAGA,QAAA,MAAM,WAAW,iCAiBhB,CAAA;AAED,eAAe,WAAW,CAAA"}
+{"version":3,"file":"handleError.d.ts","sourceRoot":"","sources":["../../src/utilities/handleError.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,WAAW,wCAKrB;IACD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,MAAA;IACL,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,GAAG,MAAA;CACJ,UAqBA,CAAA"}

package/dist/utilities/handleError.js

@@ -1,20 +1,23 @@
 import httpStatus from 'http-status';
 import { APIError, ValidationError } from 'payload';
-const handleError = (error, req)=>{
+export const handleError = ({ collection, error, global, req })=>{
     // Handle uniqueness error from MongoDB
     if (error.code === 11000 && error.keyValue) {
-        throw new ValidationError([
-            {
-                field: Object.keys(error.keyValue)[0],
-                message: req.t('error:valueMustBeUnique')
-            }
-        ], req.t);
+        throw new ValidationError({
+            collection,
+            errors: [
+                {
+                    field: Object.keys(error.keyValue)[0],
+                    message: req.t('error:valueMustBeUnique')
+                }
+            ],
+            global
+        }, req.t);
     } else if (error.code === 11000) {
         throw new APIError(req.t('error:valueMustBeUnique'), httpStatus.BAD_REQUEST);
     } else {
         throw error;
     }
 };
-export default handleError;
 
 //# sourceMappingURL=handleError.js.map

package/dist/utilities/handleError.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/handleError.ts"],"sourcesContent":["import httpStatus from 'http-status'\nimport { APIError, ValidationError } from 'payload'\n\nconst handleError = (error, req) => {\n  // Handle uniqueness error from MongoDB\n  if (error.code === 11000 && error.keyValue) {\n    throw new ValidationError(\n      [\n        {\n          field: Object.keys(error.keyValue)[0],\n          message: req.t('error:valueMustBeUnique'),\n        },\n      ],\n      req.t,\n    )\n  } else if (error.code === 11000) {\n    throw new APIError(req.t('error:valueMustBeUnique'), httpStatus.BAD_REQUEST)\n  } else {\n    throw error\n  }\n}\n\nexport default handleError\n"],"names":["httpStatus","APIError","ValidationError","handleError","error","req","code","keyValue","field","Object","keys","message","t","BAD_REQUEST"],"rangeMappings":";;;;;;;;;;;;;;;;;","mappings":"AAAA,OAAOA,gBAAgB,cAAa;AACpC,SAASC,QAAQ,EAAEC,eAAe,QAAQ,UAAS;AAEnD,MAAMC,cAAc,CAACC,OAAOC;IAC1B,uCAAuC;IACvC,IAAID,MAAME,IAAI,KAAK,SAASF,MAAMG,QAAQ,EAAE;QAC1C,MAAM,IAAIL,gBACR;YACE;gBACEM,OAAOC,OAAOC,IAAI,CAACN,MAAMG,QAAQ,CAAC,CAAC,EAAE;gBACrCI,SAASN,IAAIO,CAAC,CAAC;YACjB;SACD,EACDP,IAAIO,CAAC;IAET,OAAO,IAAIR,MAAME,IAAI,KAAK,OAAO;QAC/B,MAAM,IAAIL,SAASI,IAAIO,CAAC,CAAC,4BAA4BZ,WAAWa,WAAW;IAC7E,OAAO;QACL,MAAMT;IACR;AACF;AAEA,eAAeD,YAAW"}
+{"version":3,"sources":["../../src/utilities/handleError.ts"],"sourcesContent":["import httpStatus from 'http-status'\nimport { APIError, ValidationError } from 'payload'\n\nexport const handleError = ({\n  collection,\n  error,\n  global,\n  req,\n}: {\n  collection?: string\n  error\n  global?: string\n  req\n}) => {\n  // Handle uniqueness error from MongoDB\n  if (error.code === 11000 && error.keyValue) {\n    throw new ValidationError(\n      {\n        collection,\n        errors: [\n          {\n            field: Object.keys(error.keyValue)[0],\n            message: req.t('error:valueMustBeUnique'),\n          },\n        ],\n        global,\n      },\n      req.t,\n    )\n  } else if (error.code === 11000) {\n    throw new APIError(req.t('error:valueMustBeUnique'), httpStatus.BAD_REQUEST)\n  } else {\n    throw error\n  }\n}\n"],"names":["httpStatus","APIError","ValidationError","handleError","collection","error","global","req","code","keyValue","errors","field","Object","keys","message","t","BAD_REQUEST"],"mappings":"AAAA,OAAOA,gBAAgB,cAAa;AACpC,SAASC,QAAQ,EAAEC,eAAe,QAAQ,UAAS;AAEnD,OAAO,MAAMC,cAAc,CAAC,EAC1BC,UAAU,EACVC,KAAK,EACLC,MAAM,EACNC,GAAG,EAMJ;IACC,uCAAuC;IACvC,IAAIF,MAAMG,IAAI,KAAK,SAASH,MAAMI,QAAQ,EAAE;QAC1C,MAAM,IAAIP,gBACR;YACEE;YACAM,QAAQ;gBACN;oBACEC,OAAOC,OAAOC,IAAI,CAACR,MAAMI,QAAQ,CAAC,CAAC,EAAE;oBACrCK,SAASP,IAAIQ,CAAC,CAAC;gBACjB;aACD;YACDT;QACF,GACAC,IAAIQ,CAAC;IAET,OAAO,IAAIV,MAAMG,IAAI,KAAK,OAAO;QAC/B,MAAM,IAAIP,SAASM,IAAIQ,CAAC,CAAC,4BAA4Bf,WAAWgB,WAAW;IAC7E,OAAO;QACL,MAAMX;IACR;AACF,EAAC"}

package/dist/utilities/sanitizeInternalFields.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"sanitizeInternalFields.d.ts","sourceRoot":"","sources":["../../src/utilities/sanitizeInternalFields.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,sBAAsB,mDAAoD,CAAC,KAAG,CAiBvE,CAAA;AAEb,eAAe,sBAAsB,CAAA"}
+{"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

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

package/dist/utilities/sanitizeInternalFields.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/sanitizeInternalFields.ts"],"sourcesContent":["const internalFields = ['__v']\n\nconst 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\nexport default sanitizeInternalFields\n"],"names":["internalFields","sanitizeInternalFields","incomingDoc","Object","entries","reduce","newDoc","key","val","id","indexOf"],"rangeMappings":";;;;;;;;;;;;;;;;;;","mappings":"AAAA,MAAMA,iBAAiB;IAAC;CAAM;AAE9B,MAAMC,yBAAyB,CAAoCC,cACjEC,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;AAEN,eAAeP,uBAAsB"}
+{"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;AAuGD,eAAO,MAAM,uBAAuB,8BAIjC,IAAI,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CA6B/B,CAAA"}

package/dist/utilities/sanitizeRelationshipIDs.js

@@ -0,0 +1,115 @@
+import mongoose from 'mongoose';
+import { APIError, 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) {
+        try {
+            return new mongoose.Types.ObjectId(value);
+        } catch (error) {
+            throw new APIError(`Failed to create ObjectId from value: ${value}. Error: ${error.message}`, 400);
+        }
+    }
+    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 (field.type === 'relationship' || field.type === 'upload') {
+            // handle localized relationships
+            if (config.localization && field.localized) {
+                const locales = config.localization.locales;
+                const fieldRef = ref[field.name];
+                for (const { code } of locales){
+                    if (ref[field.name]?.[code]) {
+                        const value = ref[field.name][code];
+                        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,
+        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 mongoose 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}): mongoose.Types.ObjectId | number | string => {\n  const customIDField = relatedCollection.fields.find(\n    (field) => fieldAffectsData(field) && field.name === 'id',\n  )\n\n  if (!customIDField) {\n    try {\n      return new mongoose.Types.ObjectId(value)\n    } catch (error) {\n      throw new APIError(\n        `Failed to create ObjectId from value: ${value}. Error: ${error.message}`,\n        400,\n      )\n    }\n  }\n\n  return value\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 (field.type === 'relationship' || field.type === 'upload') {\n      // handle localized relationships\n      if (config.localization && field.localized) {\n        const locales = config.localization.locales\n        const fieldRef = ref[field.name]\n        for (const { code } of locales) {\n          if (ref[field.name]?.[code]) {\n            const value = ref[field.name][code]\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, ref: data })\n\n  return data\n}\n"],"names":["mongoose","APIError","traverseFields","fieldAffectsData","isValidRelationObject","value","convertValue","relatedCollection","customIDField","fields","find","field","name","Types","ObjectId","error","message","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"],"mappings":"AAEA,OAAOA,cAAc,WAAU;AAC/B,SAASC,QAAQ,EAAEC,cAAc,QAAQ,UAAS;AAClD,SAASC,gBAAgB,QAAQ,iBAAgB;AAajD,SAASC,sBAAsBC,KAAc;IAC3C,OAAO,OAAOA,UAAU,YAAYA,UAAU,QAAQ,gBAAgBA,SAAS,WAAWA;AAC5F;AAEA,MAAMC,eAAe,CAAC,EACpBC,iBAAiB,EACjBF,KAAK,EAIN;IACC,MAAMG,gBAAgBD,kBAAkBE,MAAM,CAACC,IAAI,CACjD,CAACC,QAAUR,iBAAiBQ,UAAUA,MAAMC,IAAI,KAAK;IAGvD,IAAI,CAACJ,eAAe;QAClB,IAAI;YACF,OAAO,IAAIR,SAASa,KAAK,CAACC,QAAQ,CAACT;QACrC,EAAE,OAAOU,OAAO;YACd,MAAM,IAAId,SACR,CAAC,sCAAsC,EAAEI,MAAM,SAAS,EAAEU,MAAMC,OAAO,CAAC,CAAC,EACzE;QAEJ;IACF;IAEA,OAAOX;AACT;AAEA,MAAMY,uBAAuB,CAAC,EAAEC,MAAM,EAAEP,KAAK,EAAEQ,MAAM,EAAEC,GAAG,EAAEf,KAAK,EAAE;IACjE,IAAIE;IACJ,IAAIc,SAAShB;IAEb,MAAMiB,mBAAmB,OAAOX,MAAMY,UAAU,KAAK;IAErD,IAAI,CAACD,kBAAkB;QACrBf,oBAAoBW,OAAOM,WAAW,EAAEd,KAAK,CAAC,EAAEe,IAAI,EAAE,GAAKA,SAASd,MAAMY,UAAU;IACtF;IAEA,IAAIG,MAAMC,OAAO,CAACtB,QAAQ;QACxBgB,SAAShB,MAAMuB,GAAG,CAAC,CAACC;YAClB,kBAAkB;YAClB,IAAItB,qBAAqBsB,OAAQ,CAAA,OAAOA,QAAQ,YAAY,OAAOA,QAAQ,QAAO,GAAI;gBACpF,OAAOvB,aAAa;oBAClBC;oBACAF,OAAOwB;gBACT;YACF;YAEA,gCAAgC;YAChC,IAAIzB,sBAAsByB,MAAM;gBAC9B,MAAMC,kCAAkCZ,OAAOM,WAAW,EAAEd,KAC1D,CAAC,EAAEe,IAAI,EAAE,GAAKA,SAASI,IAAIN,UAAU;gBAGvC,IAAIO,iCAAiC;oBACnC,OAAO;wBACLP,YAAYM,IAAIN,UAAU;wBAC1BlB,OAAOC,aAAa;4BAClBC,mBAAmBuB;4BACnBzB,OAAOwB,IAAIxB,KAAK;wBAClB;oBACF;gBACF;YACF;YAEA,OAAOwB;QACT;IACF;IAEA,+BAA+B;IAC/B,IAAIzB,sBAAsBC,QAAQ;QAChCE,oBAAoBW,OAAOM,WAAW,EAAEd,KAAK,CAAC,EAAEe,IAAI,EAAE,GAAKA,SAASpB,MAAMkB,UAAU;QAEpF,IAAIhB,mBAAmB;YACrBc,SAAS;gBACPE,YAAYlB,MAAMkB,UAAU;gBAC5BlB,OAAOC,aAAa;oBAAEC;oBAAmBF,OAAOA,MAAMA,KAAK;gBAAC;YAC9D;QACF;IACF;IAEA,iBAAiB;IACjB,IAAIE,qBAAqBF,SAAU,CAAA,OAAOA,UAAU,YAAY,OAAOA,UAAU,QAAO,GAAI;QAC1FgB,SAASf,aAAa;YACpBC;YACAF;QACF;IACF;IACA,IAAIc,QAAQ;QACVC,GAAG,CAACD,OAAO,GAAGE;IAChB,OAAO;QACLD,GAAG,CAACT,MAAMC,IAAI,CAAC,GAAGS;IACpB;AACF;AAEA,OAAO,MAAMU,0BAA0B,CAAC,EACtCb,MAAM,EACNc,IAAI,EACJvB,MAAM,EACD;IACL,MAAMwB,WAAmC,CAAC,EAAEtB,KAAK,EAAES,GAAG,EAAE;QACtD,IAAIT,MAAMuB,IAAI,KAAK,kBAAkBvB,MAAMuB,IAAI,KAAK,UAAU;YAC5D,iCAAiC;YACjC,IAAIhB,OAAOiB,YAAY,IAAIxB,MAAMyB,SAAS,EAAE;gBAC1C,MAAMC,UAAUnB,OAAOiB,YAAY,CAACE,OAAO;gBAC3C,MAAMC,WAAWlB,GAAG,CAACT,MAAMC,IAAI,CAAC;gBAChC,KAAK,MAAM,EAAE2B,IAAI,EAAE,IAAIF,QAAS;oBAC9B,IAAIjB,GAAG,CAACT,MAAMC,IAAI,CAAC,EAAE,CAAC2B,KAAK,EAAE;wBAC3B,MAAMlC,QAAQe,GAAG,CAACT,MAAMC,IAAI,CAAC,CAAC2B,KAAK;wBACnCtB,qBAAqB;4BAAEC;4BAAQP;4BAAOQ,QAAQoB;4BAAMnB,KAAKkB;4BAAUjC;wBAAM;oBAC3E;gBACF;YACF,OAAO;gBACL,qCAAqC;gBACrCY,qBAAqB;oBACnBC;oBACAP;oBACAQ,QAAQqB;oBACRpB;oBACAf,OAAOe,GAAG,CAACT,MAAMC,IAAI,CAAC;gBACxB;YACF;QACF;IACF;IAEAV,eAAe;QAAEuC,UAAUR;QAAUxB;QAAQW,KAAKY;IAAK;IAEvD,OAAOA;AACT,EAAC"}

package/dist/withSession.d.ts

@@ -1,35 +1,11 @@
-/// <reference types="mongoose/types/aggregate.js" />
-/// <reference types="mongoose/types/callback.js" />
-/// <reference types="mongoose/types/collection.js" />
-/// <reference types="mongoose/types/connection.js" />
-/// <reference types="mongoose/types/cursor.js" />
-/// <reference types="mongoose/types/document.js" />
-/// <reference types="mongoose/types/error.js" />
-/// <reference types="mongoose/types/expressions.js" />
-/// <reference types="mongoose/types/helpers.js" />
-/// <reference types="mongoose/types/middlewares.js" />
-/// <reference types="mongoose/types/indexes.js" />
-/// <reference types="mongoose/types/models.js" />
-/// <reference types="mongoose/types/mongooseoptions.js" />
-/// <reference types="mongoose/types/pipelinestage.js" />
-/// <reference types="mongoose/types/populate.js" />
-/// <reference types="mongoose/types/query.js" />
-/// <reference types="mongoose/types/schemaoptions.js" />
-/// <reference types="mongoose/types/schematypes.js" />
-/// <reference types="mongoose/types/session.js" />
-/// <reference types="mongoose/types/types.js" />
-/// <reference types="mongoose/types/utility.js" />
-/// <reference types="mongoose/types/validation.js" />
-/// <reference types="mongoose/types/virtuals.js" />
-/// <reference types="mongoose/types/inferschematype.js" />
-/// <reference types="mongoose-paginate-v2" />
 import type { ClientSession } from 'mongoose';
+import type { PayloadRequest } from 'payload';
 import type { MongooseAdapter } from './index.js';
 /**
  * returns the session belonging to the transaction of the req.session if exists
  * @returns ClientSession
  */
-export declare function withSession(db: MongooseAdapter, transactionID?: number | string): {
+export declare function withSession(db: MongooseAdapter, req: PayloadRequest): Promise<{
     session: ClientSession;
-} | object;
+} | Record<string, never>>;
 //# sourceMappingURL=withSession.d.ts.map

package/dist/withSession.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withSession.d.ts","sourceRoot":"","sources":["../src/withSession.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAE7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAEjD;;;GAGG;AACH,wBAAgB,WAAW,CACzB,EAAE,EAAE,eAAe,EACnB,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,GAC9B;IAAE,OAAO,EAAE,aAAa,CAAA;CAAE,GAAG,MAAM,CAErC"}
+{"version":3,"file":"withSession.d.ts","sourceRoot":"","sources":["../src/withSession.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAEjD;;;GAGG;AACH,wBAAsB,WAAW,CAC/B,EAAE,EAAE,eAAe,EACnB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC;IAAE,OAAO,EAAE,aAAa,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAU7D"}

package/dist/withSession.js

@@ -1,10 +1,16 @@
 /**
  * returns the session belonging to the transaction of the req.session if exists
  * @returns ClientSession
- */ export function withSession(db, transactionID) {
-    return db.sessions[transactionID] ? {
-        session: db.sessions[transactionID]
-    } : {};
+ */ export async function withSession(db, req) {
+    let transactionID = req.transactionID;
+    if (transactionID instanceof Promise) {
+        transactionID = await req.transactionID;
+    }
+    if (req) {
+        return db.sessions[transactionID] ? {
+            session: db.sessions[transactionID]
+        } : {};
+    }
 }
 
 //# sourceMappingURL=withSession.js.map

package/dist/withSession.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/withSession.ts"],"sourcesContent":["import type { ClientSession } from 'mongoose'\n\nimport type { MongooseAdapter } from './index.js'\n\n/**\n * returns the session belonging to the transaction of the req.session if exists\n * @returns ClientSession\n */\nexport function withSession(\n  db: MongooseAdapter,\n  transactionID?: number | string,\n): { session: ClientSession } | object {\n  return db.sessions[transactionID] ? { session: db.sessions[transactionID] } : {}\n}\n"],"names":["withSession","db","transactionID","sessions","session"],"rangeMappings":";;;;;;;","mappings":"AAIA;;;CAGC,GACD,OAAO,SAASA,YACdC,EAAmB,EACnBC,aAA+B;IAE/B,OAAOD,GAAGE,QAAQ,CAACD,cAAc,GAAG;QAAEE,SAASH,GAAGE,QAAQ,CAACD,cAAc;IAAC,IAAI,CAAC;AACjF"}
+{"version":3,"sources":["../src/withSession.ts"],"sourcesContent":["import type { ClientSession } from 'mongoose'\nimport type { PayloadRequest } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\n/**\n * returns the session belonging to the transaction of the req.session if exists\n * @returns ClientSession\n */\nexport async function withSession(\n  db: MongooseAdapter,\n  req: PayloadRequest,\n): Promise<{ session: ClientSession } | Record<string, never>> {\n  let transactionID = req.transactionID\n\n  if (transactionID instanceof Promise) {\n    transactionID = await req.transactionID\n  }\n\n  if (req) {\n    return db.sessions[transactionID] ? { session: db.sessions[transactionID] } : {}\n  }\n}\n"],"names":["withSession","db","req","transactionID","Promise","sessions","session"],"mappings":"AAKA;;;CAGC,GACD,OAAO,eAAeA,YACpBC,EAAmB,EACnBC,GAAmB;IAEnB,IAAIC,gBAAgBD,IAAIC,aAAa;IAErC,IAAIA,yBAAyBC,SAAS;QACpCD,gBAAgB,MAAMD,IAAIC,aAAa;IACzC;IAEA,IAAID,KAAK;QACP,OAAOD,GAAGI,QAAQ,CAACF,cAAc,GAAG;YAAEG,SAASL,GAAGI,QAAQ,CAACF,cAAc;QAAC,IAAI,CAAC;IACjF;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-mongodb",
-  "version": "3.0.0-canary.a78fca3",
+  "version": "3.0.0-canary.ab70b75",
   "description": "The officially supported MongoDB database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -14,8 +14,8 @@
   "exports": {
     ".": {
       "import": "./dist/index.js",
-      "require": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     }
   },
   "main": "./dist/index.js",
@@ -27,27 +27,29 @@
   ],
   "dependencies": {
     "bson-objectid": "2.0.4",
-    "deepmerge": "4.3.1",
     "http-status": "1.6.2",
     "mongoose": "6.12.3",
+    "mongoose-aggregate-paginate-v2": "1.0.6",
     "mongoose-paginate-v2": "1.7.22",
     "prompts": "2.4.2",
     "uuid": "10.0.0"
   },
   "devDependencies": {
-    "@types/mongoose-aggregate-paginate-v2": "1.0.9",
+    "@types/mongoose-aggregate-paginate-v2": "1.0.6",
     "mongodb": "4.17.1",
     "mongodb-memory-server": "^9",
-    "@payloadcms/eslint-config": "1.1.1",
-    "payload": "3.0.0-canary.a78fca3"
+    "@payloadcms/eslint-config": "3.0.0-beta.112",
+    "payload": "3.0.0-canary.ab70b75"
   },
   "peerDependencies": {
-    "payload": "3.0.0-canary.a78fca3"
+    "payload": "3.0.0-canary.ab70b75"
   },
   "scripts": {
     "build": "pnpm build:types && pnpm build:swc",
     "build:swc": "swc ./src -d ./dist --config-file .swcrc-build --strip-leading-paths",
     "build:types": "tsc --emitDeclarationOnly --outDir dist",
-    "clean": "rimraf {dist,*.tsbuildinfo}"
+    "clean": "rimraf {dist,*.tsbuildinfo}",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix"
   }
 }