inertia-sails 0.1.7 → 0.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inertia-sails",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "The Sails adapter for Inertia.",
   "main": "index.js",
   "sails": {
@@ -13,10 +13,12 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/sailscastshq/inertia-sails.git"
+    "url": "git+https://github.com/sailscastshq/boring-stack.git",
+    "directory": "packages/inertia-sails"
   },
   "peerDependencies": {
-    "sails": ">=1"
+    "sails": ">=1",
+    "sails-flash": ">=0.0.1"
   },
   "keywords": [
     "Inertia",

package/private/inertia-middleware.js

@@ -11,7 +11,27 @@ const getPartialData = require('./get-partial-data')
 const resolveValidationErrors = require('./resolve-validation-errors')
 function inertia(sails, { hook, sharedProps, sharedViewData, rootView }) {
   return function inertiaMiddleware(req, res, next) {
-    hook.share('errors', resolveValidationErrors(req))
+    /**
+     * Flash messages stored in the session.
+     * @typedef {Object} FlashMessages
+     * @property {Array} message - Flash message(s).
+     * @property {Array} error - Error message(s).
+     * @property {Array} success - Success message(s).
+     */
+    const flash = {
+      message: req.flash('message'),
+      error: req.flash('error'),
+      success: req.flash('success')
+    }
+    hook.share('flash', flash) // Share the flash object as props
+    /**
+     * Validation errors stored in the session, resolved and formatted for Inertia.js.
+     * @type {Object}
+     */
+    const validationErrors = resolveValidationErrors(req)
+    req.flash('errors', validationErrors) // Flash the validation error so we can share it later
+
+    hook.share('errors', req.flash('errors')[0] || {}) // Share validation errors as props
 
     hook.render = function (component, props = {}, viewData = {}) {
       const allProps = {
@@ -49,14 +69,16 @@ function inertia(sails, { hook, sharedProps, sharedViewData, rootView }) {
       }
 
       if (isInertiaRequest(req)) {
+        res.set(INERTIA, true)
+        res.set('Vary', 'Accept')
         return res.json(page)
+      } else {
+        // Implements full page reload
+        return sails.hooks.views.render(rootView, {
+          page,
+          viewData: allViewData
+        })
       }
-
-      // Implements full page reload
-      return sails.hooks.views.render(rootView, {
-        page,
-        viewData: allViewData
-      })
     }
     /**
      * Handle 303 and external redirects
@@ -73,11 +95,6 @@ function inertia(sails, { hook, sharedProps, sharedViewData, rootView }) {
       )
     }
 
-    if (isInertiaRequest(req)) {
-      res.set(INERTIA, true)
-      res.set('Vary', 'Accept')
-    }
-
     return next()
   }
 }

package/private/resolve-validation-errors.js

@@ -35,6 +35,6 @@ module.exports = function resolveValidationErrors(req) {
     const defaultErrors = { default: collectedErrors.default }
     return defaultErrors
   }
-
+  delete req.session.errors
   return collectedErrors
 }