@merkur/plugin-error 0.38.0 → 0.39.0

package/lib/index.cjs

@@ -18,20 +18,13 @@ var core = require('@merkur/core');
  *        call stack frames are dropped by the JS engine).
  *        This flag is enabled by default.
  */
-function ExtensibleError(
-  message,
-  dropInternalStackFrames = true,
-) {
+function ExtensibleError(message, dropInternalStackFrames = true) {
   if (!(this instanceof ExtensibleError)) {
     throw new TypeError('Cannot call a class as a function');
   }
   if (this.constructor === ExtensibleError) {
-    throw new TypeError(
-      'The ExtensibleError is an abstract class and ' +
-        'must be extended before it can be instantiated.',
-    );
+    throw new TypeError('The ExtensibleError is an abstract class and ' + 'must be extended before it can be instantiated.');
   }
-
   Error.call(this, message); // super-constructor call;
 
   /**
@@ -83,7 +76,6 @@ function ExtensibleError(
    */
   this._dropInternalStackFrames = dropInternalStackFrames;
 }
-
 ExtensibleError.prototype = Object.create(Error.prototype);
 ExtensibleError.prototype.constructor = ExtensibleError;
 
@@ -100,7 +92,6 @@ Object.defineProperty(ExtensibleError.prototype, 'stack', {
     if (this._stack) {
       return this._stack;
     }
-
     let stack = this._nativeError.stack;
     if (typeof stack !== 'string') {
       return undefined;
@@ -110,7 +101,6 @@ Object.defineProperty(ExtensibleError.prototype, 'stack', {
     // constructors
     if (this._dropInternalStackFrames) {
       let stackLines = stack.split('\n');
-
       let inheritanceDepth = 1;
       let currentPrototype = Object.getPrototypeOf(this);
       while (currentPrototype !== ExtensibleError.prototype) {
@@ -118,75 +108,59 @@ Object.defineProperty(ExtensibleError.prototype, 'stack', {
         inheritanceDepth++;
       }
       stackLines.splice(1, inheritanceDepth);
-
       this._stack = stackLines.join('\n');
     } else {
       this._stack = stack;
     }
-
     return this._stack;
-  },
+  }
 });
 
 class GenericError extends ExtensibleError {
   constructor(message, params) {
     super(message);
-    const { status = 500, ...otherParams } = params;
-
+    const {
+      status = 500,
+      ...otherParams
+    } = params;
     this.name = 'Error';
     this.status = status;
-
     this._params = otherParams;
   }
-
   get params() {
     return this._params;
   }
 }
 
 const DEV = 'development';
-const ENV =
-  typeof process !== 'undefined' && process && process.env
-    ? process.env.NODE_ENV
-    : DEV;
-
+const ENV = typeof process !== 'undefined' && process && process.env ? process.env.NODE_ENV : DEV;
 const ERROR_EVENTS = {
-  ERROR: '@merkur/plugin-error.error',
+  ERROR: '@merkur/plugin-error.error'
 };
-
 function errorPlugin() {
   return {
     async setup(widget) {
-      widget.error = widget.error
-        ? widget.error
-        : {
-            status: null,
-            message: null,
-          };
-
+      widget.error = widget.error ? widget.error : {
+        status: null,
+        message: null
+      };
       return widget;
     },
     async create(widget) {
       if (ENV === DEV) {
         if (!widget.$in.component) {
-          throw new Error(
-            'You must install missing plugin: npm i @merkur/plugin-component',
-          );
+          throw new Error('You must install missing plugin: npm i @merkur/plugin-component');
         }
         if (!widget.$in.eventEmitter) {
-          throw new Error(
-            'You must install missing plugin: npm i @merkur/plugin-event-emitter',
-          );
+          throw new Error('You must install missing plugin: npm i @merkur/plugin-event-emitter');
         }
       }
-
       core.hookMethod(widget, 'info', infoHook);
       core.hookMethod(widget, 'load', loadHook);
       core.hookMethod(widget, 'mount', mountHook);
       core.hookMethod(widget, 'update', updateHook);
-
       return widget;
-    },
+    }
   };
 }
 
@@ -197,32 +171,24 @@ async function loadHook(widget, originalLoad, ...rest) {
   if (widget.error.status) {
     return result;
   }
-
   try {
     result = await originalLoad(...rest);
   } catch (error) {
     error.status = error.status || 500;
-
     setErrorInfo(widget, error);
-    emitError(widget, error);
   }
-
   return result;
 }
-
 async function infoHook(widget, originalInfo, ...rest) {
   const result = await originalInfo(...rest);
-
   return {
     error: widget.error,
-    ...result,
+    ...result
   };
 }
-
 async function mountHook(widget, originalMount, ...rest) {
   return renderContent(widget, originalMount, rest);
 }
-
 async function updateHook(widget, originalUpdate, ...rest) {
   return renderContent(widget, originalUpdate, rest);
 }
@@ -233,19 +199,15 @@ function setErrorInfo(widget, error) {
   widget.error.status = error.status;
   widget.error.message = error.message;
   widget.error.url = error.params && error.params.url;
-
   if (ENV === DEV) {
     widget.error.stack = error.stack;
   }
+  widget.emit(ERROR_EVENTS.ERROR, {
+    error
+  });
 }
-
-function emitError(widget, error) {
-  widget.emit(ERROR_EVENTS.ERROR, { error });
-}
-
 async function renderContent(widget, method, properties) {
   let result = null;
-
   if (widget.error.status) {
     // error was captured in an earlier lifecycle method
     try {
@@ -267,7 +229,6 @@ async function renderContent(widget, method, properties) {
     // save error info
     err.status = err.status || 500;
     setErrorInfo(widget, err);
-    emitError(widget, err);
 
     // try rendering again
     return renderContent(widget, method, properties);

package/lib/index.es9.cjs

@@ -174,7 +174,6 @@ async function loadHook(widget, originalLoad, ...rest) {
   } catch (error) {
     error.status = error.status || 500;
     setErrorInfo(widget, error);
-    emitError(widget, error);
   }
   return result;
 }
@@ -201,8 +200,6 @@ function setErrorInfo(widget, error) {
   if (ENV === DEV) {
     widget.error.stack = error.stack;
   }
-}
-function emitError(widget, error) {
   widget.emit(ERROR_EVENTS.ERROR, {
     error
   });
@@ -230,7 +227,6 @@ async function renderContent(widget, method, properties) {
     // save error info
     err.status = err.status || 500;
     setErrorInfo(widget, err);
-    emitError(widget, err);
 
     // try rendering again
     return renderContent(widget, method, properties);

package/lib/index.es9.mjs

@@ -172,7 +172,6 @@ async function loadHook(widget, originalLoad, ...rest) {
   } catch (error) {
     error.status = error.status || 500;
     setErrorInfo(widget, error);
-    emitError(widget, error);
   }
   return result;
 }
@@ -199,8 +198,6 @@ function setErrorInfo(widget, error) {
   if (ENV === DEV) {
     widget.error.stack = error.stack;
   }
-}
-function emitError(widget, error) {
   widget.emit(ERROR_EVENTS.ERROR, {
     error
   });
@@ -228,7 +225,6 @@ async function renderContent(widget, method, properties) {
     // save error info
     err.status = err.status || 500;
     setErrorInfo(widget, err);
-    emitError(widget, err);
 
     // try rendering again
     return renderContent(widget, method, properties);

package/lib/index.js

@@ -18,20 +18,13 @@ var core = require('@merkur/core');
  *        call stack frames are dropped by the JS engine).
  *        This flag is enabled by default.
  */
-function ExtensibleError(
-  message,
-  dropInternalStackFrames = true,
-) {
+function ExtensibleError(message, dropInternalStackFrames = true) {
   if (!(this instanceof ExtensibleError)) {
     throw new TypeError('Cannot call a class as a function');
   }
   if (this.constructor === ExtensibleError) {
-    throw new TypeError(
-      'The ExtensibleError is an abstract class and ' +
-        'must be extended before it can be instantiated.',
-    );
+    throw new TypeError('The ExtensibleError is an abstract class and ' + 'must be extended before it can be instantiated.');
   }
-
   Error.call(this, message); // super-constructor call;
 
   /**
@@ -83,7 +76,6 @@ function ExtensibleError(
    */
   this._dropInternalStackFrames = dropInternalStackFrames;
 }
-
 ExtensibleError.prototype = Object.create(Error.prototype);
 ExtensibleError.prototype.constructor = ExtensibleError;
 
@@ -100,7 +92,6 @@ Object.defineProperty(ExtensibleError.prototype, 'stack', {
     if (this._stack) {
       return this._stack;
     }
-
     let stack = this._nativeError.stack;
     if (typeof stack !== 'string') {
       return undefined;
@@ -110,7 +101,6 @@ Object.defineProperty(ExtensibleError.prototype, 'stack', {
     // constructors
     if (this._dropInternalStackFrames) {
       let stackLines = stack.split('\n');
-
       let inheritanceDepth = 1;
       let currentPrototype = Object.getPrototypeOf(this);
       while (currentPrototype !== ExtensibleError.prototype) {
@@ -118,75 +108,59 @@ Object.defineProperty(ExtensibleError.prototype, 'stack', {
         inheritanceDepth++;
       }
       stackLines.splice(1, inheritanceDepth);
-
       this._stack = stackLines.join('\n');
     } else {
       this._stack = stack;
     }
-
     return this._stack;
-  },
+  }
 });
 
 class GenericError extends ExtensibleError {
   constructor(message, params) {
     super(message);
-    const { status = 500, ...otherParams } = params;
-
+    const {
+      status = 500,
+      ...otherParams
+    } = params;
     this.name = 'Error';
     this.status = status;
-
     this._params = otherParams;
   }
-
   get params() {
     return this._params;
   }
 }
 
 const DEV = 'development';
-const ENV =
-  typeof process !== 'undefined' && process && process.env
-    ? process.env.NODE_ENV
-    : DEV;
-
+const ENV = typeof process !== 'undefined' && process && process.env ? process.env.NODE_ENV : DEV;
 const ERROR_EVENTS = {
-  ERROR: '@merkur/plugin-error.error',
+  ERROR: '@merkur/plugin-error.error'
 };
-
 function errorPlugin() {
   return {
     async setup(widget) {
-      widget.error = widget.error
-        ? widget.error
-        : {
-            status: null,
-            message: null,
-          };
-
+      widget.error = widget.error ? widget.error : {
+        status: null,
+        message: null
+      };
       return widget;
     },
     async create(widget) {
       if (ENV === DEV) {
         if (!widget.$in.component) {
-          throw new Error(
-            'You must install missing plugin: npm i @merkur/plugin-component',
-          );
+          throw new Error('You must install missing plugin: npm i @merkur/plugin-component');
         }
         if (!widget.$in.eventEmitter) {
-          throw new Error(
-            'You must install missing plugin: npm i @merkur/plugin-event-emitter',
-          );
+          throw new Error('You must install missing plugin: npm i @merkur/plugin-event-emitter');
         }
       }
-
       core.hookMethod(widget, 'info', infoHook);
       core.hookMethod(widget, 'load', loadHook);
       core.hookMethod(widget, 'mount', mountHook);
       core.hookMethod(widget, 'update', updateHook);
-
       return widget;
-    },
+    }
   };
 }
 
@@ -197,32 +171,24 @@ async function loadHook(widget, originalLoad, ...rest) {
   if (widget.error.status) {
     return result;
   }
-
   try {
     result = await originalLoad(...rest);
   } catch (error) {
     error.status = error.status || 500;
-
     setErrorInfo(widget, error);
-    emitError(widget, error);
   }
-
   return result;
 }
-
 async function infoHook(widget, originalInfo, ...rest) {
   const result = await originalInfo(...rest);
-
   return {
     error: widget.error,
-    ...result,
+    ...result
   };
 }
-
 async function mountHook(widget, originalMount, ...rest) {
   return renderContent(widget, originalMount, rest);
 }
-
 async function updateHook(widget, originalUpdate, ...rest) {
   return renderContent(widget, originalUpdate, rest);
 }
@@ -233,19 +199,15 @@ function setErrorInfo(widget, error) {
   widget.error.status = error.status;
   widget.error.message = error.message;
   widget.error.url = error.params && error.params.url;
-
   if (ENV === DEV) {
     widget.error.stack = error.stack;
   }
+  widget.emit(ERROR_EVENTS.ERROR, {
+    error
+  });
 }
-
-function emitError(widget, error) {
-  widget.emit(ERROR_EVENTS.ERROR, { error });
-}
-
 async function renderContent(widget, method, properties) {
   let result = null;
-
   if (widget.error.status) {
     // error was captured in an earlier lifecycle method
     try {
@@ -267,7 +229,6 @@ async function renderContent(widget, method, properties) {
     // save error info
     err.status = err.status || 500;
     setErrorInfo(widget, err);
-    emitError(widget, err);
 
     // try rendering again
     return renderContent(widget, method, properties);

package/lib/index.mjs

@@ -16,20 +16,13 @@ import { hookMethod } from '@merkur/core';
  *        call stack frames are dropped by the JS engine).
  *        This flag is enabled by default.
  */
-function ExtensibleError(
-  message,
-  dropInternalStackFrames = true,
-) {
+function ExtensibleError(message, dropInternalStackFrames = true) {
   if (!(this instanceof ExtensibleError)) {
     throw new TypeError('Cannot call a class as a function');
   }
   if (this.constructor === ExtensibleError) {
-    throw new TypeError(
-      'The ExtensibleError is an abstract class and ' +
-        'must be extended before it can be instantiated.',
-    );
+    throw new TypeError('The ExtensibleError is an abstract class and ' + 'must be extended before it can be instantiated.');
   }
-
   Error.call(this, message); // super-constructor call;
 
   /**
@@ -81,7 +74,6 @@ function ExtensibleError(
    */
   this._dropInternalStackFrames = dropInternalStackFrames;
 }
-
 ExtensibleError.prototype = Object.create(Error.prototype);
 ExtensibleError.prototype.constructor = ExtensibleError;
 
@@ -98,7 +90,6 @@ Object.defineProperty(ExtensibleError.prototype, 'stack', {
     if (this._stack) {
       return this._stack;
     }
-
     let stack = this._nativeError.stack;
     if (typeof stack !== 'string') {
       return undefined;
@@ -108,7 +99,6 @@ Object.defineProperty(ExtensibleError.prototype, 'stack', {
     // constructors
     if (this._dropInternalStackFrames) {
       let stackLines = stack.split('\n');
-
       let inheritanceDepth = 1;
       let currentPrototype = Object.getPrototypeOf(this);
       while (currentPrototype !== ExtensibleError.prototype) {
@@ -116,75 +106,59 @@ Object.defineProperty(ExtensibleError.prototype, 'stack', {
         inheritanceDepth++;
       }
       stackLines.splice(1, inheritanceDepth);
-
       this._stack = stackLines.join('\n');
     } else {
       this._stack = stack;
     }
-
     return this._stack;
-  },
+  }
 });
 
 class GenericError extends ExtensibleError {
   constructor(message, params) {
     super(message);
-    const { status = 500, ...otherParams } = params;
-
+    const {
+      status = 500,
+      ...otherParams
+    } = params;
     this.name = 'Error';
     this.status = status;
-
     this._params = otherParams;
   }
-
   get params() {
     return this._params;
   }
 }
 
 const DEV = 'development';
-const ENV =
-  typeof process !== 'undefined' && process && process.env
-    ? process.env.NODE_ENV
-    : DEV;
-
+const ENV = typeof process !== 'undefined' && process && process.env ? process.env.NODE_ENV : DEV;
 const ERROR_EVENTS = {
-  ERROR: '@merkur/plugin-error.error',
+  ERROR: '@merkur/plugin-error.error'
 };
-
 function errorPlugin() {
   return {
     async setup(widget) {
-      widget.error = widget.error
-        ? widget.error
-        : {
-            status: null,
-            message: null,
-          };
-
+      widget.error = widget.error ? widget.error : {
+        status: null,
+        message: null
+      };
       return widget;
     },
     async create(widget) {
       if (ENV === DEV) {
         if (!widget.$in.component) {
-          throw new Error(
-            'You must install missing plugin: npm i @merkur/plugin-component',
-          );
+          throw new Error('You must install missing plugin: npm i @merkur/plugin-component');
         }
         if (!widget.$in.eventEmitter) {
-          throw new Error(
-            'You must install missing plugin: npm i @merkur/plugin-event-emitter',
-          );
+          throw new Error('You must install missing plugin: npm i @merkur/plugin-event-emitter');
         }
       }
-
       hookMethod(widget, 'info', infoHook);
       hookMethod(widget, 'load', loadHook);
       hookMethod(widget, 'mount', mountHook);
       hookMethod(widget, 'update', updateHook);
-
       return widget;
-    },
+    }
   };
 }
 
@@ -195,32 +169,24 @@ async function loadHook(widget, originalLoad, ...rest) {
   if (widget.error.status) {
     return result;
   }
-
   try {
     result = await originalLoad(...rest);
   } catch (error) {
     error.status = error.status || 500;
-
     setErrorInfo(widget, error);
-    emitError(widget, error);
   }
-
   return result;
 }
-
 async function infoHook(widget, originalInfo, ...rest) {
   const result = await originalInfo(...rest);
-
   return {
     error: widget.error,
-    ...result,
+    ...result
   };
 }
-
 async function mountHook(widget, originalMount, ...rest) {
   return renderContent(widget, originalMount, rest);
 }
-
 async function updateHook(widget, originalUpdate, ...rest) {
   return renderContent(widget, originalUpdate, rest);
 }
@@ -231,19 +197,15 @@ function setErrorInfo(widget, error) {
   widget.error.status = error.status;
   widget.error.message = error.message;
   widget.error.url = error.params && error.params.url;
-
   if (ENV === DEV) {
     widget.error.stack = error.stack;
   }
+  widget.emit(ERROR_EVENTS.ERROR, {
+    error
+  });
 }
-
-function emitError(widget, error) {
-  widget.emit(ERROR_EVENTS.ERROR, { error });
-}
-
 async function renderContent(widget, method, properties) {
   let result = null;
-
   if (widget.error.status) {
     // error was captured in an earlier lifecycle method
     try {
@@ -265,7 +227,6 @@ async function renderContent(widget, method, properties) {
     // save error info
     err.status = err.status || 500;
     setErrorInfo(widget, err);
-    emitError(widget, err);
 
     // try rendering again
     return renderContent(widget, method, properties);

package/lib/index.umd.js

@@ -1 +1 @@
-function r(t){return r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(r){return typeof r}:function(r){return r&&"function"==typeof Symbol&&r.constructor===Symbol&&r!==Symbol.prototype?"symbol":typeof r},r(t)}!function(r,t){if("function"==typeof define&&define.amd)define("@merkur/plugin-error",["exports","@merkur/core"],t);else if("undefined"!=typeof exports)t(exports,require("@merkur/core"));else{var e={exports:{}};t(e.exports,r.Merkur.Core),r.Merkur=r.Merkur||{},r.Merkur.Plugin=r.Merkur.Plugin||{},r.Merkur.Plugin.Error=e.exports}}("undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:this,(function(t,e){Object.defineProperty(t,"__esModule",{value:!0}),t.GenericError=t.ERROR_EVENTS=void 0,t.errorPlugin=function(){return{setup:function(r){return s((function*(){return r.error=r.error?r.error:{status:null,message:null},r}))()},create:function(r){return s((function*(){if(d===v){if(!r.$in.component)throw new Error("You must install missing plugin: npm i @merkur/plugin-component");if(!r.$in.eventEmitter)throw new Error("You must install missing plugin: npm i @merkur/plugin-event-emitter")}return(0,e.hookMethod)(r,"info",E),(0,e.hookMethod)(r,"load",O),(0,e.hookMethod)(r,"mount",P),(0,e.hookMethod)(r,"update",_),r}))()}}},t.renderContent=M,t.setErrorInfo=R;var n=["status"];function o(r){return function(r){if(Array.isArray(r))return i(r)}(r)||function(r){if("undefined"!=typeof Symbol&&null!=r[Symbol.iterator]||null!=r["@@iterator"])return Array.from(r)}(r)||function(r,t){if(r){if("string"==typeof r)return i(r,t);var e={}.toString.call(r).slice(8,-1);return"Object"===e&&r.constructor&&(e=r.constructor.name),"Map"===e||"Set"===e?Array.from(r):"Arguments"===e||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(e)?i(r,t):void 0}}(r)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function i(r,t){(null==t||t>r.length)&&(t=r.length);for(var e=0,n=Array(t);e<t;e++)n[e]=r[e];return n}function u(r,t){var e=Object.keys(r);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(r);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(r,t).enumerable}))),e.push.apply(e,n)}return e}function a(r,t,e){return(t=l(t))in r?Object.defineProperty(r,t,{value:e,enumerable:!0,configurable:!0,writable:!0}):r[t]=e,r}function c(r,t,e,n,o,i,u){try{var a=r[i](u),c=a.value}catch(r){return void e(r)}a.done?t(c):Promise.resolve(c).then(n,o)}function s(r){return function(){var t=this,e=arguments;return new Promise((function(n,o){var i=r.apply(t,e);function u(r){c(i,n,o,u,a,"next",r)}function a(r){c(i,n,o,u,a,"throw",r)}u(void 0)}))}}function f(r,t){for(var e=0;e<t.length;e++){var n=t[e];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(r,l(n.key),n)}}function l(t){var e=function(t,e){if("object"!=r(t)||!t)return t;var n=t[Symbol.toPrimitive];if(void 0!==n){var o=n.call(t,e||"default");if("object"!=r(o))return o;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===e?String:Number)(t)}(t,"string");return"symbol"==r(e)?e:e+""}function p(t,e,n){return e=h(e),function(t,e){if(e&&("object"==r(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(r){if(void 0===r)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return r}(t)}(t,y()?Reflect.construct(e,n||[],h(t).constructor):e.apply(t,n))}function y(){try{var r=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){})))}catch(r){}return(y=function(){return!!r})()}function h(r){return h=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(r){return r.__proto__||Object.getPrototypeOf(r)},h(r)}function b(r,t){return b=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(r,t){return r.__proto__=t,r},b(r,t)}function m(r){var t=!(arguments.length>1&&void 0!==arguments[1])||arguments[1];if(!(this instanceof m))throw new TypeError("Cannot call a class as a function");if(this.constructor===m)throw new TypeError("The ExtensibleError is an abstract class and must be extended before it can be instantiated.");Error.call(this,r),this.name=this.constructor.name,this.message=r,this._nativeError=new Error(r),this._nativeError.name=this.name,this._nativeError.columnNumber&&(this.lineNumber=this._nativeError.lineNumber,this.columnNumber=this._nativeError.columnNumber,this.fileName=this._nativeError.fileName),this._stack=null,this._dropInternalStackFrames=t}m.prototype=Object.create(Error.prototype),m.prototype.constructor=m,Object.defineProperty(m.prototype,"stack",{configurable:!0,enumerable:!1,get:function(){if(this._stack)return this._stack;var r=this._nativeError.stack;if("string"==typeof r){if(this._dropInternalStackFrames){for(var t=r.split("\n"),e=1,n=Object.getPrototypeOf(this);n!==m.prototype;)n=Object.getPrototypeOf(n),e++;t.splice(1,e),this._stack=t.join("\n")}else this._stack=r;return this._stack}}});t.GenericError=function(r){function t(r,e){var o;!function(r,t){if(!(r instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t),o=p(this,t,[r]);var i=e.status,u=void 0===i?500:i,a=function(r,t){if(null==r)return{};var e,n,o=function(r,t){if(null==r)return{};var e={};for(var n in r)if({}.hasOwnProperty.call(r,n)){if(-1!==t.indexOf(n))continue;e[n]=r[n]}return e}(r,t);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(r);for(n=0;n<i.length;n++)e=i[n],-1===t.indexOf(e)&&{}.propertyIsEnumerable.call(r,e)&&(o[e]=r[e])}return o}(e,n);return o.name="Error",o.status=u,o._params=a,o}return function(r,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");r.prototype=Object.create(t&&t.prototype,{constructor:{value:r,writable:!0,configurable:!0}}),Object.defineProperty(r,"prototype",{writable:!1}),t&&b(r,t)}(t,r),e=t,(o=[{key:"params",get:function(){return this._params}}])&&f(e.prototype,o),i&&f(e,i),Object.defineProperty(e,"prototype",{writable:!1}),e;var e,o,i}(m);var v="development",d="undefined"!=typeof process&&process&&process.env?process.env.NODE_ENV:v,g=t.ERROR_EVENTS={ERROR:"@merkur/plugin-error.error"};function O(r,t){return w.apply(this,arguments)}function w(){return w=s((function*(r,t){var e={};if(r.error.status)return e;try{for(var n=arguments.length,o=new Array(n>2?n-2:0),i=2;i<n;i++)o[i-2]=arguments[i];e=yield t.apply(void 0,o)}catch(t){t.status=t.status||500,R(r,t),x(r,t)}return e})),w.apply(this,arguments)}function E(r,t){return j.apply(this,arguments)}function j(){return j=s((function*(r,t){for(var e=arguments.length,n=new Array(e>2?e-2:0),o=2;o<e;o++)n[o-2]=arguments[o];var i=yield t.apply(void 0,n);return function(r){for(var t=1;t<arguments.length;t++){var e=null!=arguments[t]?arguments[t]:{};t%2?u(Object(e),!0).forEach((function(t){a(r,t,e[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(r,Object.getOwnPropertyDescriptors(e)):u(Object(e)).forEach((function(t){Object.defineProperty(r,t,Object.getOwnPropertyDescriptor(e,t))}))}return r}({error:r.error},i)})),j.apply(this,arguments)}function P(r,t){return k.apply(this,arguments)}function k(){return k=s((function*(r,t){for(var e=arguments.length,n=new Array(e>2?e-2:0),o=2;o<e;o++)n[o-2]=arguments[o];return M(r,t,n)})),k.apply(this,arguments)}function _(r,t){return S.apply(this,arguments)}function S(){return S=s((function*(r,t){for(var e=arguments.length,n=new Array(e>2?e-2:0),o=2;o<e;o++)n[o-2]=arguments[o];return M(r,t,n)})),S.apply(this,arguments)}function R(r,t){r.error.status=t.status,r.error.message=t.message,r.error.url=t.params&&t.params.url,d===v&&(r.error.stack=t.stack)}function x(r,t){r.emit(g.ERROR,{error:t})}function M(r,t,e){return N.apply(this,arguments)}function N(){return(N=s((function*(r,t,e){if(r.error.status)try{return yield t.apply(void 0,o(e))}catch(r){return""}try{return yield t.apply(void 0,o(e))}catch(n){return n.status=n.status||500,R(r,n),x(r,n),M(r,t,e)}}))).apply(this,arguments)}}));
+function r(t){return r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(r){return typeof r}:function(r){return r&&"function"==typeof Symbol&&r.constructor===Symbol&&r!==Symbol.prototype?"symbol":typeof r},r(t)}!function(r,t){if("function"==typeof define&&define.amd)define("@merkur/plugin-error",["exports","@merkur/core"],t);else if("undefined"!=typeof exports)t(exports,require("@merkur/core"));else{var e={exports:{}};t(e.exports,r.Merkur.Core),r.Merkur=r.Merkur||{},r.Merkur.Plugin=r.Merkur.Plugin||{},r.Merkur.Plugin.Error=e.exports}}("undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:this,(function(t,e){Object.defineProperty(t,"__esModule",{value:!0}),t.GenericError=t.ERROR_EVENTS=void 0,t.errorPlugin=function(){return{setup:function(r){return s((function*(){return r.error=r.error?r.error:{status:null,message:null},r}))()},create:function(r){return s((function*(){if(d===v){if(!r.$in.component)throw new Error("You must install missing plugin: npm i @merkur/plugin-component");if(!r.$in.eventEmitter)throw new Error("You must install missing plugin: npm i @merkur/plugin-event-emitter")}return(0,e.hookMethod)(r,"info",E),(0,e.hookMethod)(r,"load",O),(0,e.hookMethod)(r,"mount",P),(0,e.hookMethod)(r,"update",_),r}))()}}},t.renderContent=x,t.setErrorInfo=R;var n=["status"];function o(r){return function(r){if(Array.isArray(r))return i(r)}(r)||function(r){if("undefined"!=typeof Symbol&&null!=r[Symbol.iterator]||null!=r["@@iterator"])return Array.from(r)}(r)||function(r,t){if(r){if("string"==typeof r)return i(r,t);var e={}.toString.call(r).slice(8,-1);return"Object"===e&&r.constructor&&(e=r.constructor.name),"Map"===e||"Set"===e?Array.from(r):"Arguments"===e||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(e)?i(r,t):void 0}}(r)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function i(r,t){(null==t||t>r.length)&&(t=r.length);for(var e=0,n=Array(t);e<t;e++)n[e]=r[e];return n}function u(r,t){var e=Object.keys(r);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(r);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(r,t).enumerable}))),e.push.apply(e,n)}return e}function a(r,t,e){return(t=l(t))in r?Object.defineProperty(r,t,{value:e,enumerable:!0,configurable:!0,writable:!0}):r[t]=e,r}function c(r,t,e,n,o,i,u){try{var a=r[i](u),c=a.value}catch(r){return void e(r)}a.done?t(c):Promise.resolve(c).then(n,o)}function s(r){return function(){var t=this,e=arguments;return new Promise((function(n,o){var i=r.apply(t,e);function u(r){c(i,n,o,u,a,"next",r)}function a(r){c(i,n,o,u,a,"throw",r)}u(void 0)}))}}function f(r,t){for(var e=0;e<t.length;e++){var n=t[e];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(r,l(n.key),n)}}function l(t){var e=function(t,e){if("object"!=r(t)||!t)return t;var n=t[Symbol.toPrimitive];if(void 0!==n){var o=n.call(t,e||"default");if("object"!=r(o))return o;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===e?String:Number)(t)}(t,"string");return"symbol"==r(e)?e:e+""}function p(t,e,n){return e=h(e),function(t,e){if(e&&("object"==r(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(r){if(void 0===r)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return r}(t)}(t,y()?Reflect.construct(e,n||[],h(t).constructor):e.apply(t,n))}function y(){try{var r=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){})))}catch(r){}return(y=function(){return!!r})()}function h(r){return h=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(r){return r.__proto__||Object.getPrototypeOf(r)},h(r)}function b(r,t){return b=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(r,t){return r.__proto__=t,r},b(r,t)}function m(r){var t=!(arguments.length>1&&void 0!==arguments[1])||arguments[1];if(!(this instanceof m))throw new TypeError("Cannot call a class as a function");if(this.constructor===m)throw new TypeError("The ExtensibleError is an abstract class and must be extended before it can be instantiated.");Error.call(this,r),this.name=this.constructor.name,this.message=r,this._nativeError=new Error(r),this._nativeError.name=this.name,this._nativeError.columnNumber&&(this.lineNumber=this._nativeError.lineNumber,this.columnNumber=this._nativeError.columnNumber,this.fileName=this._nativeError.fileName),this._stack=null,this._dropInternalStackFrames=t}m.prototype=Object.create(Error.prototype),m.prototype.constructor=m,Object.defineProperty(m.prototype,"stack",{configurable:!0,enumerable:!1,get:function(){if(this._stack)return this._stack;var r=this._nativeError.stack;if("string"==typeof r){if(this._dropInternalStackFrames){for(var t=r.split("\n"),e=1,n=Object.getPrototypeOf(this);n!==m.prototype;)n=Object.getPrototypeOf(n),e++;t.splice(1,e),this._stack=t.join("\n")}else this._stack=r;return this._stack}}});t.GenericError=function(r){function t(r,e){var o;!function(r,t){if(!(r instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t),o=p(this,t,[r]);var i=e.status,u=void 0===i?500:i,a=function(r,t){if(null==r)return{};var e,n,o=function(r,t){if(null==r)return{};var e={};for(var n in r)if({}.hasOwnProperty.call(r,n)){if(-1!==t.indexOf(n))continue;e[n]=r[n]}return e}(r,t);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(r);for(n=0;n<i.length;n++)e=i[n],-1===t.indexOf(e)&&{}.propertyIsEnumerable.call(r,e)&&(o[e]=r[e])}return o}(e,n);return o.name="Error",o.status=u,o._params=a,o}return function(r,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");r.prototype=Object.create(t&&t.prototype,{constructor:{value:r,writable:!0,configurable:!0}}),Object.defineProperty(r,"prototype",{writable:!1}),t&&b(r,t)}(t,r),e=t,(o=[{key:"params",get:function(){return this._params}}])&&f(e.prototype,o),i&&f(e,i),Object.defineProperty(e,"prototype",{writable:!1}),e;var e,o,i}(m);var v="development",d="undefined"!=typeof process&&process&&process.env?process.env.NODE_ENV:v,g=t.ERROR_EVENTS={ERROR:"@merkur/plugin-error.error"};function O(r,t){return w.apply(this,arguments)}function w(){return w=s((function*(r,t){var e={};if(r.error.status)return e;try{for(var n=arguments.length,o=new Array(n>2?n-2:0),i=2;i<n;i++)o[i-2]=arguments[i];e=yield t.apply(void 0,o)}catch(t){t.status=t.status||500,R(r,t)}return e})),w.apply(this,arguments)}function E(r,t){return j.apply(this,arguments)}function j(){return j=s((function*(r,t){for(var e=arguments.length,n=new Array(e>2?e-2:0),o=2;o<e;o++)n[o-2]=arguments[o];var i=yield t.apply(void 0,n);return function(r){for(var t=1;t<arguments.length;t++){var e=null!=arguments[t]?arguments[t]:{};t%2?u(Object(e),!0).forEach((function(t){a(r,t,e[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(r,Object.getOwnPropertyDescriptors(e)):u(Object(e)).forEach((function(t){Object.defineProperty(r,t,Object.getOwnPropertyDescriptor(e,t))}))}return r}({error:r.error},i)})),j.apply(this,arguments)}function P(r,t){return k.apply(this,arguments)}function k(){return k=s((function*(r,t){for(var e=arguments.length,n=new Array(e>2?e-2:0),o=2;o<e;o++)n[o-2]=arguments[o];return x(r,t,n)})),k.apply(this,arguments)}function _(r,t){return S.apply(this,arguments)}function S(){return S=s((function*(r,t){for(var e=arguments.length,n=new Array(e>2?e-2:0),o=2;o<e;o++)n[o-2]=arguments[o];return x(r,t,n)})),S.apply(this,arguments)}function R(r,t){r.error.status=t.status,r.error.message=t.message,r.error.url=t.params&&t.params.url,d===v&&(r.error.stack=t.stack),r.emit(g.ERROR,{error:t})}function x(r,t,e){return M.apply(this,arguments)}function M(){return(M=s((function*(r,t,e){if(r.error.status)try{return yield t.apply(void 0,o(e))}catch(r){return""}try{return yield t.apply(void 0,o(e))}catch(n){return n.status=n.status||500,R(r,n),x(r,t,e)}}))).apply(this,arguments)}}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkur/plugin-error",
-  "version": "0.38.0",
+  "version": "0.39.0",
   "description": "Merkur plugin for error handling.",
   "main": "lib/index",
   "module": "lib/index",
@@ -27,8 +27,7 @@
     "preversion": "npm test",
     "test": "jest --no-watchman -c ./jest.config.js",
     "test:es:version": "es-check es11 ./lib/index.mjs --module && es-check es9 ./lib/index.es9.mjs --module && es-check es9 ./lib/index.es9.cjs --module",
-    "build": "rollup -c rollup.config.mjs",
-    "prepare": "npm run build"
+    "build": "rollup -c rollup.config.mjs"
   },
   "repository": {
     "type": "git",
@@ -50,12 +49,12 @@
   },
   "homepage": "https://merkur.js.org/",
   "devDependencies": {
-    "@merkur/core": "^0.38.0",
-    "@merkur/plugin-component": "^0.38.0"
+    "@merkur/core": "^0.39.0",
+    "@merkur/plugin-component": "^0.39.0"
   },
   "peerDependencies": {
     "@merkur/core": "*",
     "@merkur/plugin-component": "*"
   },
-  "gitHead": "a6e379c0cb887898e34465dc3db9231feb68e6a5"
+  "gitHead": "8ad2c8b26246850ce6289502a8b05e882f80ce31"
 }

package/server/index.js

@@ -1,21 +1,3 @@
-//**** CALLBACK DEFINITIONS ****//
-
-/**
- * playgroundErrorMiddleware error render function. This is used when rendering playground fails. It's recommended to either mute this for production, or sanitize the output thoroughly.
- *
- * @callback playgroundErrorRenderer
- * @param {string} message
- */
-
-/**
- * Function to render the playground page normally (e.g. a compiled EJS template).
- *
- * @callback playgroundRenderer
- * @param {object} properties
- */
-
-//**** ****//
-
 const DEV = 'development';
 const ENV =
   typeof process !== 'undefined' && process && process.env
@@ -63,54 +45,7 @@ function logErrorMiddleware() {
   };
 }
 
-/**
- * Express middleware that attempts to render a widget that has been returned with a non-OK HTTP status.
- *
- * @param {object} config
- * @param {playgroundRenderer} config.renderPlayground
- * @param {string} config.containerSelector
- * @returns {function}
- */
-// eslint-disable-next-line no-unused-vars
-function playgroundErrorMiddleware({
-  renderPlayground,
-  containerSelector,
-} = {}) {
-  //eslint-disable-next-line no-unused-vars
-  return (error, req, res, next) => {
-    // error handling for playground page
-    let output = '';
-    let errorStatus = error.status || 500;
-
-    const widgetProperties = error?.response?.body;
-
-    if (!widgetProperties) {
-      next(error);
-      return;
-    }
-
-    errorStatus = widgetProperties?.error?.status || 500;
-    const { html } = widgetProperties;
-    if (typeof html === 'undefined') {
-      next(error);
-      return;
-    }
-
-    try {
-      delete widgetProperties.html;
-      widgetProperties.containerSelector = `.${containerSelector}`;
-
-      output = renderPlayground({ widgetProperties, html, containerSelector });
-      res.status(errorStatus).send(output);
-    } catch (e) {
-      console.error(e);
-      next(widgetProperties.error ?? e);
-    }
-  };
-}
-
 module.exports = {
   logErrorMiddleware,
   apiErrorMiddleware,
-  playgroundErrorMiddleware,
 };