@payloadcms/db-mongodb 3.0.0-canary.0017c67 → 3.0.0-canary.0cf6f1e

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"],"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/withSession.d.ts

@@ -1,10 +1,11 @@
 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;
+} | object>;
 //# 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,CAQ9C"}

package/dist/withSession.js

@@ -1,8 +1,12 @@
 /**
  * returns the session belonging to the transaction of the req.session if exists
  * @returns ClientSession
- */ export function withSession(db, transactionID) {
-    return 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]
     } : {};
 }

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"],"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 } | object> {\n  let transactionID = req.transactionID\n\n  if (transactionID instanceof Promise) {\n    transactionID = await req.transactionID\n  }\n\n  if (req) return db.sessions[transactionID] ? { session: db.sessions[transactionID] } : {}\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,OAAOD,GAAGI,QAAQ,CAACF,cAAc,GAAG;QAAEG,SAASL,GAAGI,QAAQ,CAACF,cAAc;IAAC,IAAI,CAAC;AAC1F"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-mongodb",
-  "version": "3.0.0-canary.0017c67",
+  "version": "3.0.0-canary.0cf6f1e",
   "description": "The officially supported MongoDB database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -27,7 +27,6 @@
   ],
   "dependencies": {
     "bson-objectid": "2.0.4",
-    "deepmerge": "4.3.1",
     "http-status": "1.6.2",
     "mongoose": "6.12.3",
     "mongoose-paginate-v2": "1.7.22",
@@ -38,11 +37,11 @@
     "@types/mongoose-aggregate-paginate-v2": "1.0.9",
     "mongodb": "4.17.1",
     "mongodb-memory-server": "^9",
-    "@payloadcms/eslint-config": "1.1.1",
-    "payload": "3.0.0-canary.0017c67"
+    "@payloadcms/eslint-config": "3.0.0-beta.59",
+    "payload": "3.0.0-canary.0cf6f1e"
   },
   "peerDependencies": {
-    "payload": "3.0.0-canary.0017c67"
+    "payload": "3.0.0-canary.0cf6f1e"
   },
   "scripts": {
     "build": "pnpm build:types && pnpm build:swc",