nitro-web 0.2.4 → 0.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitro-web",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "repository": "github:boycce/nitro-web",
   "homepage": "https://boycce.github.io/nitro-web/",
   "description": "Nitro is a battle-tested, modular base project to turbocharge your projects, styled using Tailwind 🚀",
@@ -64,7 +64,7 @@
   },
   "peerDependencies": {
     "@stripe/stripe-js": "^1.34.0",
-    "monastery": "^4.0.1",
+    "monastery": "^4.0.6",
     "stripe": "^9.16.0"
   },
   "_peers-are-packages-that-will-be-used-in-the-host-repo-too": "",

package/server/router.js

@@ -9,7 +9,7 @@ import expressFileUpload from 'express-fileupload'
 import express from 'express'
 import bodyParser from 'body-parser'
 import sortRouteAddressesNodeps from 'sort-route-addresses-nodeps'
-
+import { formatDuplicateKeyError } from 'monastery'
 import { sendEmail } from 'nitro-web/server'
 import * as util from 'nitro-web/util'
 
@@ -177,17 +177,6 @@ function setupErrorResponses (expressApp) {
     serverError: function(a, b) { error.call(this, a, b, 500) },
   })
 
-  function duplicateKeyIndexAndValue(error) {
-    // https://github.com/Automattic/mongoose/issues/2129#issuecomment-280507821
-    // E.g. E11000 duplicate key error collection: anamata-production.person index:
-    //   email_1 dup key: { email: "person1@gmail.com" }
-    let regex = /index: (?:.*\.)?\$?(?:([_a-z0-9]*)(?:_\d*)|([_a-z0-9]*))\s*dup key/i
-    let match = error.message.match(regex)
-    let index = match[1] || match[2]
-    let value = (error.message.match(/.*{.*?: (.*) }/i)[1]||'').replace(/"/g, '')
-    return [index, value]
-  }
-
   function error(error, detail, status) {
     /**
      * Returns a formatted error
@@ -218,11 +207,15 @@ function setupErrorResponses (expressApp) {
       else errors = [{ detail: error || _detail }]
 
     // Mongo error
-    } else if (util.isObject(error) && (error.name||'').match(/Mongo|BulkWriteError/)) {
-      if (error.code == 11000) {
-        let [name] = duplicateKeyIndexAndValue(error)
-        if (name == 'email') errors = [{ title: 'email', detail: 'That email is already linked to an account.' }]
-        else errors = [{ title: name, detail: `Cannot insert duplicate values for "${name}".` }]
+    } else if (util.isObject(error) && (error.name || '').match(/Mongo|BulkWriteError/)) {
+      // Below is thrown by Monastery if a custom message is not used, e.g. `{ ..., messages : { email: { unique: '...' } } }`
+      const formattedDuplicateKeyError = formatDuplicateKeyError(undefined, error)
+      if (formattedDuplicateKeyError) {
+        errors = formattedDuplicateKeyError
+        const hasRawMessage = errors[0].detail.includes('E11000 duplicate key')
+        // Add default messages if no custom message is used from definition.messages
+        if (hasRawMessage && errors[0].title == 'email') errors[0].detail = 'That email is already linked to an account.'
+        else if (hasRawMessage) errors[0].detail = `Cannot insert duplicate values for "${errors[0].title}".`
       } else {
         errors = [{ title: 'mongo', detail: error.message }]
       }

package/types/server/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../server/router.js"],"names":[],"mappings":"AAoCA,uGAAuG;AACvG,0CADc,OAAO,CAAC;IAAE,MAAM,EAAE,OAAO,MAAM,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,OAAO,SAAS,EAAE,WAAW,CAAA;CAAE,CAAC,CA+HlG;AAyPD,+CAEC;AAED,kEAYC;AAzGD,+BAA+B;AAC/B,yBADW,gBAAgB,CAuF1B;sBA1YY,OAAO,CAAC,OAAO,GAAG;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,GAAoB,CAAC;CAC7B;uBACS,OAAO,CAAC,QAAQ,GAAG;IAC3B,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACjE,YAAY,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC;IACvD,SAAS,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC;IACpD,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC;IACnD,WAAW,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC;CACvD;+BACS;IACR,KAAK,EAAE,MAAM,EAAE,CAAC;IACpB,CAAK,GAAG,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,UAAU,KAAK,IAAI,CAAC,GAAG,MAAM,EAAE,CAAC;CACnF;oBAtBgB,SAAS"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../server/router.js"],"names":[],"mappings":"AAoCA,uGAAuG;AACvG,0CADc,OAAO,CAAC;IAAE,MAAM,EAAE,OAAO,MAAM,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,OAAO,SAAS,EAAE,WAAW,CAAA;CAAE,CAAC,CA+HlG;AAkPD,+CAEC;AAED,kEAYC;AAzGD,+BAA+B;AAC/B,yBADW,gBAAgB,CAuF1B;sBAnYY,OAAO,CAAC,OAAO,GAAG;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,GAAoB,CAAC;CAC7B;uBACS,OAAO,CAAC,QAAQ,GAAG;IAC3B,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACjE,YAAY,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC;IACvD,SAAS,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC;IACpD,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC;IACnD,WAAW,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC;CACvD;+BACS;IACR,KAAK,EAAE,MAAM,EAAE,CAAC;IACpB,CAAK,GAAG,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,UAAU,KAAK,IAAI,CAAC,GAAG,MAAM,EAAE,CAAC;CACnF;oBAtBgB,SAAS"}