amphora 8.2.2 → 8.4.0

package/lib/render.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var uriRoutes, renderers,
+var uriRoutes, renderers, errorHandler,
   db = require('./services/db'),
   log = require('./services/logger').setup({
     file: __filename,
@@ -264,6 +264,16 @@ function logTime(hrStart, uri) {
   };
 }
 
+/**
+ * Passes page error handling back to the site.
+ *
+* @param {Function} handler - (error, response, next) => {}
+*/
+function registerErrorHandler(handler) {
+  errorHandler = handler;
+}
+
+
 /**
  * Run composer by translating url to a "page" by base64ing it.  Errors are handled by Express.
  *
@@ -280,13 +290,17 @@ function renderExpressRoute(req, res, next) {
 
   return module.exports.renderUri(pageReference, req, res, hrStart)
     .catch((error) => {
-      if (error.name === 'NotFoundError') {
-        log('info', `could not find resource ${req.uri}`, {
-          message: error.message
-        });
-        next();
+      if (errorHandler) {
+        errorHandler(error, res, next);
       } else {
-        next(error);
+        if (error.name === 'NotFoundError') {
+          log('info', `could not find resource ${req.uri}`, {
+            message: error.message
+          });
+          next();
+        } else {
+          next(error);
+        }
       }
     });
 }
@@ -373,6 +387,7 @@ module.exports.findRenderer = findRenderer;
 // Setup
 module.exports.renderers = {}; // Overriden when a user registers a render object
 module.exports.registerRenderers = registerRenderers;
+module.exports.registerErrorHandler = registerErrorHandler;
 
 // For Testing
 module.exports.resetUriRouteHandlers = resetUriRouteHandlers;

package/lib/services/layouts.js

@@ -6,8 +6,9 @@ const _ = require('lodash'),
   uid = require('../uid'),
   files = require('../files'),
   models = require('./models'),
+  components = require('./components'),
   meta = require('./metadata'),
-  { getLayoutName, replaceVersion } = require('clayutils'),
+  { getLayoutName, replaceVersion, isComponent } = require('clayutils'),
   bus = require('./bus');
 
 /**
@@ -39,9 +40,13 @@ function get(uri, locals) {
  * @returns {Promise}
  */
 function put(uri, data, locals) {
-  var model = files.getLayoutModules(getLayoutName(uri)),
-    callHooks = _.get(locals, 'hooks') !== 'false',
-    result;
+  // layout-level components are published the same as page-level components
+  if (isComponent(uri)) return components.cmptPut(uri, data, locals);
+
+  // else try to apply a layout model to the layout instance
+  const model = files.getLayoutModules(getLayoutName(uri)),
+    callHooks = _.get(locals, 'hooks') !== 'false';
+  let result;
 
   if (model && _.isFunction(model.save) && callHooks) {
     result = models.put(model, uri, data, locals);

package/lib/setup.js

@@ -35,6 +35,7 @@ module.exports = function (options = {}) {
       providers = [],
       sessionStore,
       renderers,
+      errorHandler,
       plugins = [],
       bootstrap = true,
       storage = false,
@@ -58,6 +59,10 @@ module.exports = function (options = {}) {
     render.registerRenderers(renderers);
   }
 
+  if (errorHandler) {
+    render.registerErrorHandler(errorHandler);
+  }
+
   // Make sure the storage module is run, then bootstrap
   // all the default data and finally return the router
   return storage.setup()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amphora",
-  "version": "8.2.2",
+  "version": "8.4.0",
   "description": "An API mixin for Express that saves, publishes and composes data with the key-value store of your choice.",
   "main": "index.js",
   "scripts": {