@payloadcms/db-mongodb 3.49.0-canary.3 → 3.49.0-canary.5

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

@@ -1 +1 @@
-{"version":3,"file":"handleError.d.ts","sourceRoot":"","sources":["../../src/utilities/handleError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAI7C,eAAO,MAAM,WAAW,wCAKrB;IACD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,OAAO,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;CAC9B,UA8BA,CAAA"}
+{"version":3,"file":"handleError.d.ts","sourceRoot":"","sources":["../../src/utilities/handleError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAa7C,eAAO,MAAM,WAAW,wCAKrB;IACD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,OAAO,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;CAC9B,UAgCA,CAAA"}

package/dist/utilities/handleError.js

@@ -1,16 +1,31 @@
 import { ValidationError } from 'payload';
+function extractFieldFromMessage(message) {
+    // eslint-disable-next-line regexp/no-super-linear-backtracking
+    const match = message.match(/index:\s*(.*?)_/);
+    if (match && match[1]) {
+        return match[1] // e.g., returns "email" from "index: email_1"
+        ;
+    }
+    return null;
+}
 export const handleError = ({ collection, error, global, req })=>{
     if (!error || typeof error !== 'object') {
         throw error;
     }
     // Handle uniqueness error from MongoDB
-    if ('code' in error && error.code === 11000 && 'keyValue' in error && error.keyValue && typeof error.keyValue === 'object') {
+    if ('code' in error && error.code === 11000) {
+        let path = null;
+        if ('keyValue' in error && error.keyValue && typeof error.keyValue === 'object') {
+            path = Object.keys(error.keyValue)[0] ?? '';
+        } else if ('message' in error && typeof error.message === 'string') {
+            path = extractFieldFromMessage(error.message);
+        }
         throw new ValidationError({
             collection,
             errors: [
                 {
                     message: req?.t ? req.t('error:valueMustBeUnique') : 'Value must be unique',
-                    path: Object.keys(error.keyValue)[0] ?? ''
+                    path: path ?? ''
                 }
             ],
             global

package/dist/utilities/handleError.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/handleError.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\n\nimport { ValidationError } from 'payload'\n\nexport const handleError = ({\n  collection,\n  error,\n  global,\n  req,\n}: {\n  collection?: string\n  error: unknown\n  global?: string\n  req?: Partial<PayloadRequest>\n}) => {\n  if (!error || typeof error !== 'object') {\n    throw error\n  }\n\n  // Handle uniqueness error from MongoDB\n  if (\n    'code' in error &&\n    error.code === 11000 &&\n    'keyValue' in error &&\n    error.keyValue &&\n    typeof error.keyValue === 'object'\n  ) {\n    throw new ValidationError(\n      {\n        collection,\n        errors: [\n          {\n            message: req?.t ? req.t('error:valueMustBeUnique') : 'Value must be unique',\n            path: Object.keys(error.keyValue)[0] ?? '',\n          },\n        ],\n        global,\n      },\n      req?.t,\n    )\n  }\n\n  // eslint-disable-next-line @typescript-eslint/only-throw-error\n  throw error\n}\n"],"names":["ValidationError","handleError","collection","error","global","req","code","keyValue","errors","message","t","path","Object","keys"],"mappings":"AAEA,SAASA,eAAe,QAAQ,UAAS;AAEzC,OAAO,MAAMC,cAAc,CAAC,EAC1BC,UAAU,EACVC,KAAK,EACLC,MAAM,EACNC,GAAG,EAMJ;IACC,IAAI,CAACF,SAAS,OAAOA,UAAU,UAAU;QACvC,MAAMA;IACR;IAEA,uCAAuC;IACvC,IACE,UAAUA,SACVA,MAAMG,IAAI,KAAK,SACf,cAAcH,SACdA,MAAMI,QAAQ,IACd,OAAOJ,MAAMI,QAAQ,KAAK,UAC1B;QACA,MAAM,IAAIP,gBACR;YACEE;YACAM,QAAQ;gBACN;oBACEC,SAASJ,KAAKK,IAAIL,IAAIK,CAAC,CAAC,6BAA6B;oBACrDC,MAAMC,OAAOC,IAAI,CAACV,MAAMI,QAAQ,CAAC,CAAC,EAAE,IAAI;gBAC1C;aACD;YACDH;QACF,GACAC,KAAKK;IAET;IAEA,+DAA+D;IAC/D,MAAMP;AACR,EAAC"}
+{"version":3,"sources":["../../src/utilities/handleError.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\n\nimport { ValidationError } from 'payload'\n\nfunction extractFieldFromMessage(message: string) {\n  // eslint-disable-next-line regexp/no-super-linear-backtracking\n  const match = message.match(/index:\\s*(.*?)_/)\n  if (match && match[1]) {\n    return match[1] // e.g., returns \"email\" from \"index: email_1\"\n  }\n  return null\n}\n\nexport const handleError = ({\n  collection,\n  error,\n  global,\n  req,\n}: {\n  collection?: string\n  error: unknown\n  global?: string\n  req?: Partial<PayloadRequest>\n}) => {\n  if (!error || typeof error !== 'object') {\n    throw error\n  }\n\n  // Handle uniqueness error from MongoDB\n  if ('code' in error && error.code === 11000) {\n    let path: null | string = null\n\n    if ('keyValue' in error && error.keyValue && typeof error.keyValue === 'object') {\n      path = Object.keys(error.keyValue)[0] ?? ''\n    } else if ('message' in error && typeof error.message === 'string') {\n      path = extractFieldFromMessage(error.message)\n    }\n\n    throw new ValidationError(\n      {\n        collection,\n        errors: [\n          {\n            message: req?.t ? req.t('error:valueMustBeUnique') : 'Value must be unique',\n            path: path ?? '',\n          },\n        ],\n        global,\n      },\n      req?.t,\n    )\n  }\n\n  // eslint-disable-next-line @typescript-eslint/only-throw-error\n  throw error\n}\n"],"names":["ValidationError","extractFieldFromMessage","message","match","handleError","collection","error","global","req","code","path","keyValue","Object","keys","errors","t"],"mappings":"AAEA,SAASA,eAAe,QAAQ,UAAS;AAEzC,SAASC,wBAAwBC,OAAe;IAC9C,+DAA+D;IAC/D,MAAMC,QAAQD,QAAQC,KAAK,CAAC;IAC5B,IAAIA,SAASA,KAAK,CAAC,EAAE,EAAE;QACrB,OAAOA,KAAK,CAAC,EAAE,CAAC,8CAA8C;;IAChE;IACA,OAAO;AACT;AAEA,OAAO,MAAMC,cAAc,CAAC,EAC1BC,UAAU,EACVC,KAAK,EACLC,MAAM,EACNC,GAAG,EAMJ;IACC,IAAI,CAACF,SAAS,OAAOA,UAAU,UAAU;QACvC,MAAMA;IACR;IAEA,uCAAuC;IACvC,IAAI,UAAUA,SAASA,MAAMG,IAAI,KAAK,OAAO;QAC3C,IAAIC,OAAsB;QAE1B,IAAI,cAAcJ,SAASA,MAAMK,QAAQ,IAAI,OAAOL,MAAMK,QAAQ,KAAK,UAAU;YAC/ED,OAAOE,OAAOC,IAAI,CAACP,MAAMK,QAAQ,CAAC,CAAC,EAAE,IAAI;QAC3C,OAAO,IAAI,aAAaL,SAAS,OAAOA,MAAMJ,OAAO,KAAK,UAAU;YAClEQ,OAAOT,wBAAwBK,MAAMJ,OAAO;QAC9C;QAEA,MAAM,IAAIF,gBACR;YACEK;YACAS,QAAQ;gBACN;oBACEZ,SAASM,KAAKO,IAAIP,IAAIO,CAAC,CAAC,6BAA6B;oBACrDL,MAAMA,QAAQ;gBAChB;aACD;YACDH;QACF,GACAC,KAAKO;IAET;IAEA,+DAA+D;IAC/D,MAAMT;AACR,EAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-mongodb",
-  "version": "3.49.0-canary.3",
+  "version": "3.49.0-canary.5",
   "description": "The officially supported MongoDB database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -50,10 +50,10 @@
     "mongodb": "6.16.0",
     "mongodb-memory-server": "10.1.4",
     "@payloadcms/eslint-config": "3.28.0",
-    "payload": "3.49.0-canary.3"
+    "payload": "3.49.0-canary.5"
   },
   "peerDependencies": {
-    "payload": "3.49.0-canary.3"
+    "payload": "3.49.0-canary.5"
   },
   "scripts": {
     "build": "pnpm build:types && pnpm build:swc",