@feathersjs/client 5.0.0-pre.22 → 5.0.0-pre.23

package/dist/feathers.js

@@ -42,7 +42,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -52,7 +52,7 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 Object.defineProperty(exports, "__esModule", ({
   value: true
@@ -867,15 +867,15 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 
 function _wrapNativeSuper(Class) { var _cache = typeof Map === "function" ? new Map() : undefined; _wrapNativeSuper = function _wrapNativeSuper(Class) { if (Class === null || !_isNativeFunction(Class)) return Class; if (typeof Class !== "function") { throw new TypeError("Super expression must either be null or a function"); } if (typeof _cache !== "undefined") { if (_cache.has(Class)) return _cache.get(Class); _cache.set(Class, Wrapper); } function Wrapper() { return _construct(Class, arguments, _getPrototypeOf(this).constructor); } Wrapper.prototype = Object.create(Class.prototype, { constructor: { value: Wrapper, enumerable: false, writable: true, configurable: true } }); return _setPrototypeOf(Wrapper, Class); }; return _wrapNativeSuper(Class); }
 
-function _construct(Parent, args, Class) { if (_isNativeReflectConstruct()) { _construct = Reflect.construct; } else { _construct = function _construct(Parent, args, Class) { var a = [null]; a.push.apply(a, args); var Constructor = Function.bind.apply(Parent, a); var instance = new Constructor(); if (Class) _setPrototypeOf(instance, Class.prototype); return instance; }; } return _construct.apply(null, arguments); }
+function _construct(Parent, args, Class) { if (_isNativeReflectConstruct()) { _construct = Reflect.construct.bind(); } else { _construct = function _construct(Parent, args, Class) { var a = [null]; a.push.apply(a, args); var Constructor = Function.bind.apply(Parent, a); var instance = new Constructor(); if (Class) _setPrototypeOf(instance, Class.prototype); return instance; }; } return _construct.apply(null, arguments); }
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 function _isNativeFunction(fn) { return Function.toString.call(fn).indexOf("[native code]") !== -1; }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 Object.defineProperty(exports, "__esModule", ({
   value: true
@@ -1283,22 +1283,12 @@ exports.convert = convert;
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -1307,7 +1297,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -1317,7 +1307,7 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 var __importDefault = this && this.__importDefault || function (mod) {
   return mod && mod.__esModule ? mod : {
@@ -1332,20 +1322,24 @@ exports.Feathers = void 0;
 
 var version_1 = __importDefault(__webpack_require__(/*! ./version */ "../feathers/lib/version.js"));
 
-var dependencies_1 = __webpack_require__(/*! ./dependencies */ "../feathers/lib/dependencies.js");
+var events_1 = __webpack_require__(/*! events */ "../../node_modules/events/events.js");
+
+var commons_1 = __webpack_require__(/*! @feathersjs/commons */ "../commons/lib/index.js");
+
+var hooks_1 = __webpack_require__(/*! @feathersjs/hooks */ "../../node_modules/@feathersjs/hooks/script/index.js");
 
-var events_1 = __webpack_require__(/*! ./events */ "../feathers/lib/events.js");
+var events_2 = __webpack_require__(/*! ./events */ "../feathers/lib/events.js");
 
-var index_1 = __webpack_require__(/*! ./hooks/index */ "../feathers/lib/hooks/index.js");
+var hooks_2 = __webpack_require__(/*! ./hooks */ "../feathers/lib/hooks.js");
 
 var service_1 = __webpack_require__(/*! ./service */ "../feathers/lib/service.js");
 
-var regular_1 = __webpack_require__(/*! ./hooks/regular */ "../feathers/lib/hooks/regular.js");
+var hooks_3 = __webpack_require__(/*! ./hooks */ "../feathers/lib/hooks.js");
 
-var debug = (0, dependencies_1.createDebug)('@feathersjs/feathers');
+var debug = (0, commons_1.createDebug)('@feathersjs/feathers');
 
-var Feathers = /*#__PURE__*/function (_dependencies_1$Event) {
-  _inherits(Feathers, _dependencies_1$Event);
+var Feathers = /*#__PURE__*/function (_events_1$EventEmitte) {
+  _inherits(Feathers, _events_1$EventEmitte);
 
   var _super = _createSuper(Feathers);
 
@@ -1357,19 +1351,23 @@ var Feathers = /*#__PURE__*/function (_dependencies_1$Event) {
     _this = _super.call(this);
     _this.services = {};
     _this.settings = {};
-    _this.mixins = [index_1.hookMixin, events_1.eventMixin];
+    _this.mixins = [hooks_2.hookMixin, events_2.eventMixin];
     _this.version = version_1.default;
     _this._isSetup = false;
-    _this.appHooks = _defineProperty({}, dependencies_1.HOOKS, [events_1.eventHook]);
-    _this.regularHooks = (0, regular_1.enableRegularHooks)(_assertThisInitialized(_this));
-    (0, dependencies_1.hooks)(_assertThisInitialized(_this), {
-      setup: (0, dependencies_1.middleware)().params('server').props({
+    (0, hooks_1.hooks)(_assertThisInitialized(_this), {
+      setup: (0, hooks_1.middleware)().params('server').props({
         app: _assertThisInitialized(_this)
       }),
-      teardown: (0, dependencies_1.middleware)().params('server').props({
+      teardown: (0, hooks_1.middleware)().params('server').props({
         app: _assertThisInitialized(_this)
       })
     });
+    _this.registerHooks = (0, hooks_3.enableHooks)(_assertThisInitialized(_this));
+
+    _this.registerHooks({
+      around: [events_2.eventHook]
+    });
+
     return _this;
   }
 
@@ -1398,7 +1396,7 @@ var Feathers = /*#__PURE__*/function (_dependencies_1$Event) {
   }, {
     key: "service",
     value: function service(location) {
-      var path = (0, dependencies_1.stripSlashes)(location) || '/';
+      var path = (0, commons_1.stripSlashes)(location) || '/';
       var current = this.services[path];
 
       if (typeof current === 'undefined') {
@@ -1417,7 +1415,7 @@ var Feathers = /*#__PURE__*/function (_dependencies_1$Event) {
         throw new Error("'".concat(path, "' is not a valid service path."));
       }
 
-      var location = (0, dependencies_1.stripSlashes)(path) || '/';
+      var location = (0, commons_1.stripSlashes)(path) || '/';
       var subApp = service;
       var isSubApp = typeof subApp.service === 'function' && subApp.services;
 
@@ -1465,23 +1463,18 @@ var Feathers = /*#__PURE__*/function (_dependencies_1$Event) {
   }, {
     key: "hooks",
     value: function hooks(hookMap) {
-      var _this3 = this;
-
       var untypedMap = hookMap;
 
-      if (untypedMap.before || untypedMap.after || untypedMap.error) {
-        this.regularHooks(untypedMap);
+      if (untypedMap.before || untypedMap.after || untypedMap.error || untypedMap.around) {
+        // regular hooks for all service methods
+        this.registerHooks(untypedMap);
       } else if (untypedMap.setup || untypedMap.teardown) {
-        (0, dependencies_1.hooks)(this, untypedMap);
-      } else if (Array.isArray(hookMap)) {
-        var _this$appHooks$depend;
-
-        (_this$appHooks$depend = this.appHooks[dependencies_1.HOOKS]).push.apply(_this$appHooks$depend, _toConsumableArray(hookMap));
+        // .setup and .teardown application hooks
+        (0, hooks_1.hooks)(this, untypedMap);
       } else {
-        var methodHookMap = hookMap;
-        Object.keys(methodHookMap).forEach(function (key) {
-          var methodHooks = _this3.appHooks[key] || [];
-          _this3.appHooks[key] = methodHooks.concat(methodHookMap[key]);
+        // Other registration formats are just `around` hooks
+        this.registerHooks({
+          around: untypedMap
         });
       }
 
@@ -1490,45 +1483,45 @@ var Feathers = /*#__PURE__*/function (_dependencies_1$Event) {
   }, {
     key: "setup",
     value: function setup() {
-      var _this4 = this;
+      var _this3 = this;
 
       this._isSetup = true;
       return Object.keys(this.services).reduce(function (current, path) {
         return current.then(function () {
-          var service = _this4.service(path);
+          var service = _this3.service(path);
 
           if (typeof service.setup === 'function') {
             debug("Setting up service for `".concat(path, "`"));
-            return service.setup(_this4, path);
+            return service.setup(_this3, path);
           }
         });
       }, Promise.resolve()).then(function () {
-        return _this4;
+        return _this3;
       });
     }
   }, {
     key: "teardown",
     value: function teardown() {
-      var _this5 = this;
+      var _this4 = this;
 
       this._isSetup = false;
       return Object.keys(this.services).reduce(function (current, path) {
         return current.then(function () {
-          var service = _this5.service(path);
+          var service = _this4.service(path);
 
           if (typeof service.teardown === 'function') {
             debug("Tearing down service for `".concat(path, "`"));
-            return service.teardown(_this5, path);
+            return service.teardown(_this4, path);
           }
         });
       }, Promise.resolve()).then(function () {
-        return _this5;
+        return _this4;
       });
     }
   }]);
 
   return Feathers;
-}(dependencies_1.EventEmitter);
+}(events_1.EventEmitter);
 
 exports.Feathers = Feathers;
 
@@ -1549,60 +1542,6 @@ Object.defineProperty(exports, "__esModule", ({
 
 /***/ }),
 
-/***/ "../feathers/lib/dependencies.js":
-/*!***************************************!*\
-  !*** ../feathers/lib/dependencies.js ***!
-  \***************************************/
-/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  var desc = Object.getOwnPropertyDescriptor(m, k);
-
-  if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-    desc = {
-      enumerable: true,
-      get: function get() {
-        return m[k];
-      }
-    };
-  }
-
-  Object.defineProperty(o, k2, desc);
-} : function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  o[k2] = m[k];
-});
-
-var __exportStar = this && this.__exportStar || function (m, exports) {
-  for (var p in m) {
-    if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-  }
-};
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-exports.EventEmitter = void 0;
-
-var events_1 = __webpack_require__(/*! events */ "../../node_modules/events/events.js");
-
-Object.defineProperty(exports, "EventEmitter", ({
-  enumerable: true,
-  get: function get() {
-    return events_1.EventEmitter;
-  }
-}));
-
-__exportStar(__webpack_require__(/*! @feathersjs/commons */ "../commons/lib/index.js"), exports);
-
-__exportStar(__webpack_require__(/*! @feathersjs/hooks */ "../../node_modules/@feathersjs/hooks/script/index.js"), exports);
-
-/***/ }),
-
 /***/ "../feathers/lib/events.js":
 /*!*********************************!*\
   !*** ../feathers/lib/events.js ***!
@@ -1617,7 +1556,7 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.eventMixin = exports.eventHook = void 0;
 
-var dependencies_1 = __webpack_require__(/*! ./dependencies */ "../feathers/lib/dependencies.js");
+var events_1 = __webpack_require__(/*! events */ "../../node_modules/events/events.js");
 
 var service_1 = __webpack_require__(/*! ./service */ "../feathers/lib/service.js");
 
@@ -1645,7 +1584,7 @@ function eventMixin(service) {
   var isEmitter = typeof service.on === 'function' && typeof service.emit === 'function';
 
   if (!isEmitter) {
-    Object.assign(service, dependencies_1.EventEmitter.prototype);
+    Object.assign(service, events_1.EventEmitter.prototype);
   }
 
   return service;
@@ -1655,42 +1594,28 @@ exports.eventMixin = eventMixin;
 
 /***/ }),
 
-/***/ "../feathers/lib/hooks/index.js":
-/*!**************************************!*\
-  !*** ../feathers/lib/hooks/index.js ***!
-  \**************************************/
+/***/ "../feathers/lib/hooks.js":
+/*!********************************!*\
+  !*** ../feathers/lib/hooks.js ***!
+  \********************************/
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
 
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { 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 _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-function _get() { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(arguments.length < 3 ? target : receiver); } return desc.value; }; } return _get.apply(this, arguments); }
+function _get() { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get.bind(); } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(arguments.length < 3 ? target : receiver); } return desc.value; }; } return _get.apply(this, arguments); }
 
 function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -1700,57 +1625,146 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { 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 _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.hookMixin = exports.FeathersHookManager = exports.createContext = exports.fromErrorHooks = exports.fromErrorHook = exports.fromAfterHooks = exports.fromAfterHook = exports.fromBeforeHooks = exports.fromBeforeHook = void 0;
+exports.hookMixin = exports.FeathersHookManager = exports.createContext = exports.enableHooks = exports.convertHookData = exports.collectHooks = void 0;
 
-var dependencies_1 = __webpack_require__(/*! ../dependencies */ "../feathers/lib/dependencies.js");
+var hooks_1 = __webpack_require__(/*! @feathersjs/hooks */ "../../node_modules/@feathersjs/hooks/script/index.js");
 
-var service_1 = __webpack_require__(/*! ../service */ "../feathers/lib/service.js");
+var service_1 = __webpack_require__(/*! ./service */ "../feathers/lib/service.js");
 
-var regular_1 = __webpack_require__(/*! ./regular */ "../feathers/lib/hooks/regular.js");
+function collectHooks(target, method) {
+  return target.__hooks.hooks[method] || [];
+}
 
-var regular_2 = __webpack_require__(/*! ./regular */ "../feathers/lib/hooks/regular.js");
+exports.collectHooks = collectHooks; // Converts different hook registration formats into the
+// same internal format
 
-Object.defineProperty(exports, "fromBeforeHook", ({
-  enumerable: true,
-  get: function get() {
-    return regular_2.fromBeforeHook;
-  }
-}));
-Object.defineProperty(exports, "fromBeforeHooks", ({
-  enumerable: true,
-  get: function get() {
-    return regular_2.fromBeforeHooks;
-  }
-}));
-Object.defineProperty(exports, "fromAfterHook", ({
-  enumerable: true,
-  get: function get() {
-    return regular_2.fromAfterHook;
-  }
-}));
-Object.defineProperty(exports, "fromAfterHooks", ({
-  enumerable: true,
-  get: function get() {
-    return regular_2.fromAfterHooks;
-  }
-}));
-Object.defineProperty(exports, "fromErrorHook", ({
-  enumerable: true,
-  get: function get() {
-    return regular_2.fromErrorHook;
+function convertHookData(input) {
+  var result = {};
+
+  if (Array.isArray(input)) {
+    result.all = input;
+  } else if (_typeof(input) !== 'object') {
+    result.all = [input];
+  } else {
+    for (var _i = 0, _Object$keys = Object.keys(input); _i < _Object$keys.length; _i++) {
+      var key = _Object$keys[_i];
+      var value = input[key];
+      result[key] = Array.isArray(value) ? value : [value];
+    }
   }
-}));
-Object.defineProperty(exports, "fromErrorHooks", ({
-  enumerable: true,
-  get: function get() {
-    return regular_2.fromErrorHooks;
+
+  return result;
+}
+
+exports.convertHookData = convertHookData;
+var types = ['before', 'after', 'error', 'around'];
+
+var isType = function isType(value) {
+  return types.includes(value);
+};
+
+var createMap = function createMap(input, methods) {
+  var map = {};
+  Object.keys(input).forEach(function (type) {
+    if (!isType(type)) {
+      throw new Error("'".concat(type, "' is not a valid hook type"));
+    }
+
+    var data = convertHookData(input[type]);
+    Object.keys(data).forEach(function (method) {
+      if (method !== 'all' && !methods.includes(method) && !service_1.defaultServiceMethods.includes(method)) {
+        throw new Error("'".concat(method, "' is not a valid hook method"));
+      }
+    });
+    map[type] = data;
+  });
+  return map;
+};
+
+var updateStore = function updateStore(store, map) {
+  return Object.keys(store.hooks).forEach(function (method) {
+    Object.keys(map).forEach(function (key) {
+      var _a;
+
+      var type = key;
+      var allHooks = map[type].all || [];
+      var methodHooks = map[type][method] || [];
+
+      if (allHooks.length || methodHooks.length) {
+        var list = [].concat(_toConsumableArray(allHooks), _toConsumableArray(methodHooks));
+        var hooks = (_a = store[type])[method] || (_a[method] = []);
+        hooks.push.apply(hooks, _toConsumableArray(list));
+      }
+    });
+    var collected = (0, hooks_1.collect)({
+      before: store.before[method] || [],
+      after: store.after[method] || [],
+      error: store.error[method] || []
+    });
+    store.hooks[method] = [].concat(_toConsumableArray(store.around[method] || []), [collected]);
+  });
+}; // Add `.hooks` functionality to an object
+
+
+function enableHooks(object) {
+  var methods = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : service_1.defaultServiceMethods;
+  var store = {
+    around: {},
+    before: {},
+    after: {},
+    error: {},
+    hooks: {}
+  };
+
+  var _iterator = _createForOfIteratorHelper(methods),
+      _step;
+
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var method = _step.value;
+      store.hooks[method] = [];
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
   }
-}));
+
+  Object.defineProperty(object, '__hooks', {
+    configurable: true,
+    value: store,
+    writable: true
+  });
+  return function registerHooks(input) {
+    var store = this.__hooks;
+    var map = createMap(input, methods);
+    updateStore(store, map);
+    return this;
+  };
+}
+
+exports.enableHooks = enableHooks;
 
 function createContext(service, method) {
   var data = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
@@ -1765,8 +1779,8 @@ function createContext(service, method) {
 
 exports.createContext = createContext;
 
-var FeathersHookManager = /*#__PURE__*/function (_dependencies_1$HookM) {
-  _inherits(FeathersHookManager, _dependencies_1$HookM);
+var FeathersHookManager = /*#__PURE__*/function (_hooks_1$HookManager) {
+  _inherits(FeathersHookManager, _hooks_1$HookManager);
 
   var _super = _createSuper(FeathersHookManager);
 
@@ -1785,14 +1799,12 @@ var FeathersHookManager = /*#__PURE__*/function (_dependencies_1$HookM) {
   _createClass(FeathersHookManager, [{
     key: "collectMiddleware",
     value: function collectMiddleware(self, args) {
-      var app = this.app;
-      var appHooks = app.appHooks[dependencies_1.HOOKS].concat(app.appHooks[this.method] || []);
-      var regularAppHooks = (0, regular_1.collectRegularHooks)(this.app, this.method);
+      var appHooks = collectHooks(this.app, this.method);
 
       var middleware = _get(_getPrototypeOf(FeathersHookManager.prototype), "collectMiddleware", this).call(this, self, args);
 
-      var regularHooks = (0, regular_1.collectRegularHooks)(self, this.method);
-      return [].concat(_toConsumableArray(appHooks), _toConsumableArray(regularAppHooks), _toConsumableArray(middleware), _toConsumableArray(regularHooks));
+      var methodHooks = collectHooks(self, this.method);
+      return [].concat(_toConsumableArray(appHooks), _toConsumableArray(middleware), _toConsumableArray(methodHooks));
     }
   }, {
     key: "initializeContext",
@@ -1814,23 +1826,24 @@ var FeathersHookManager = /*#__PURE__*/function (_dependencies_1$HookM) {
   }]);
 
   return FeathersHookManager;
-}(dependencies_1.HookManager);
+}(hooks_1.HookManager);
 
 exports.FeathersHookManager = FeathersHookManager;
 
 function hookMixin(service, path, options) {
+  var _this2 = this;
+
   if (typeof service.hooks === 'function') {
     return service;
   }
 
-  var app = this;
   var hookMethods = (0, service_1.getHookMethods)(service, options);
   var serviceMethodHooks = hookMethods.reduce(function (res, method) {
     var _FeathersHookManager;
 
     var params = service_1.defaultServiceArguments[method] || ['data', 'params'];
-    res[method] = (_FeathersHookManager = new FeathersHookManager(app, method)).params.apply(_FeathersHookManager, _toConsumableArray(params)).props({
-      app: app,
+    res[method] = (_FeathersHookManager = new FeathersHookManager(_this2, method)).params.apply(_FeathersHookManager, _toConsumableArray(params)).props({
+      app: _this2,
       path: path,
       method: method,
       service: service,
@@ -1844,28 +1857,29 @@ function hookMixin(service, path, options) {
       },
 
       set statusCode(value) {
-        (this.http || (this.http = {})).status = value;
+        this.http = this.http || {};
+        this.http.status = value;
       }
 
     });
     return res;
   }, {});
-  var handleRegularHooks = (0, regular_1.enableRegularHooks)(service, hookMethods);
-  (0, dependencies_1.hooks)(service, serviceMethodHooks);
+  var registerHooks = enableHooks(service, hookMethods);
+  (0, hooks_1.hooks)(service, serviceMethodHooks);
 
   service.hooks = function (hookOptions) {
-    var _this2 = this;
+    var _this3 = this;
 
-    if (hookOptions.before || hookOptions.after || hookOptions.error) {
-      return handleRegularHooks.call(this, hookOptions);
+    if (hookOptions.before || hookOptions.after || hookOptions.error || hookOptions.around) {
+      return registerHooks.call(this, hookOptions);
     }
 
     if (Array.isArray(hookOptions)) {
-      return (0, dependencies_1.hooks)(this, hookOptions);
+      return (0, hooks_1.hooks)(this, hookOptions);
     }
 
     Object.keys(hookOptions).forEach(function (method) {
-      var manager = (0, dependencies_1.getManager)(_this2[method]);
+      var manager = (0, hooks_1.getManager)(_this3[method]);
 
       if (!(manager instanceof FeathersHookManager)) {
         throw new Error("Method ".concat(method, " is not a Feathers hooks enabled service method"));
@@ -1883,267 +1897,6 @@ exports.hookMixin = hookMixin;
 
 /***/ }),
 
-/***/ "../feathers/lib/hooks/regular.js":
-/*!****************************************!*\
-  !*** ../feathers/lib/hooks/regular.js ***!
-  \****************************************/
-/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
-
-"use strict";
-
-
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-exports.enableRegularHooks = exports.convertHookData = exports.collectRegularHooks = exports.fromErrorHooks = exports.fromAfterHooks = exports.fromBeforeHooks = exports.fromErrorHook = exports.fromAfterHook = exports.fromBeforeHook = void 0;
-
-var service_1 = __webpack_require__(/*! ../service */ "../feathers/lib/service.js");
-
-var runHook = function runHook(hook, context, type) {
-  if (type) context.type = type;
-  return Promise.resolve(hook.call(context.self, context)).then(function (res) {
-    if (type) context.type = null;
-
-    if (res && res !== context) {
-      Object.assign(context, res);
-    }
-  });
-};
-
-function fromBeforeHook(hook) {
-  return function (context, next) {
-    return runHook(hook, context, 'before').then(next);
-  };
-}
-
-exports.fromBeforeHook = fromBeforeHook;
-
-function fromAfterHook(hook) {
-  return function (context, next) {
-    return next().then(function () {
-      return runHook(hook, context, 'after');
-    });
-  };
-}
-
-exports.fromAfterHook = fromAfterHook;
-
-function fromErrorHook(hook) {
-  return function (context, next) {
-    return next().catch(function (error) {
-      if (context.error !== error || context.result !== undefined) {
-        context.original = _objectSpread({}, context);
-        context.error = error;
-        delete context.result;
-      }
-
-      return runHook(hook, context, 'error').then(function () {
-        if (context.result === undefined && context.error !== undefined) {
-          throw context.error;
-        }
-      });
-    });
-  };
-}
-
-exports.fromErrorHook = fromErrorHook;
-
-var RunHooks = function RunHooks(hooks) {
-  return function (context) {
-    return hooks.reduce(function (promise, hook) {
-      return promise.then(function () {
-        return runHook(hook, context);
-      });
-    }, Promise.resolve(undefined));
-  };
-};
-
-function fromBeforeHooks(hooks) {
-  return fromBeforeHook(RunHooks(hooks));
-}
-
-exports.fromBeforeHooks = fromBeforeHooks;
-
-function fromAfterHooks(hooks) {
-  return fromAfterHook(RunHooks(hooks));
-}
-
-exports.fromAfterHooks = fromAfterHooks;
-
-function fromErrorHooks(hooks) {
-  return fromErrorHook(RunHooks(hooks));
-}
-
-exports.fromErrorHooks = fromErrorHooks;
-
-function collectRegularHooks(target, method) {
-  return target.__hooks.hooks[method] || [];
-}
-
-exports.collectRegularHooks = collectRegularHooks; // Converts different hook registration formats into the
-// same internal format
-
-function convertHookData(input) {
-  var result = {};
-
-  if (Array.isArray(input)) {
-    result.all = input;
-  } else if (_typeof(input) !== 'object') {
-    result.all = [input];
-  } else {
-    for (var _i = 0, _Object$keys = Object.keys(input); _i < _Object$keys.length; _i++) {
-      var key = _Object$keys[_i];
-      var value = input[key];
-      result[key] = Array.isArray(value) ? value : [value];
-    }
-  }
-
-  return result;
-}
-
-exports.convertHookData = convertHookData;
-var types = ['before', 'after', 'error'];
-
-var isType = function isType(value) {
-  return types.includes(value);
-};
-
-var wrappers = {
-  before: fromBeforeHooks,
-  after: fromAfterHooks,
-  error: fromErrorHooks
-};
-
-var createStore = function createStore(methods) {
-  var store = {
-    before: {},
-    after: {},
-    error: {},
-    hooks: {}
-  };
-
-  var _iterator = _createForOfIteratorHelper(methods),
-      _step;
-
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var method = _step.value;
-      store.hooks[method] = [];
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-
-  return store;
-};
-
-var setStore = function setStore(object, store) {
-  Object.defineProperty(object, '__hooks', {
-    configurable: true,
-    value: store,
-    writable: true
-  });
-};
-
-var getStore = function getStore(object) {
-  return object.__hooks;
-};
-
-var createMap = function createMap(input, methods) {
-  var map = {};
-  Object.keys(input).forEach(function (type) {
-    if (!isType(type)) {
-      throw new Error("'".concat(type, "' is not a valid hook type"));
-    }
-
-    var data = convertHookData(input[type]);
-    Object.keys(data).forEach(function (method) {
-      if (method !== 'all' && !methods.includes(method) && !service_1.defaultServiceMethods.includes(method)) {
-        throw new Error("'".concat(method, "' is not a valid hook method"));
-      }
-    });
-    map[type] = data;
-  });
-  return map;
-};
-
-var createAdapter = function createAdapter(type) {
-  var hooks = [];
-  var hook = wrappers[type](hooks);
-  var adapter = Object.assign(hook, {
-    hooks: hooks
-  });
-  return adapter;
-};
-
-var updateStore = function updateStore(store, map) {
-  Object.keys(store.hooks).forEach(function (method) {
-    var adapted = false;
-    Object.keys(map).forEach(function (key) {
-      var _a;
-
-      var type = key;
-      var allHooks = map[type].all || [];
-      var methodHooks = map[type][method] || [];
-
-      if (allHooks.length || methodHooks.length) {
-        var _adapter$hooks;
-
-        var adapter = (_a = store[type])[method] || (_a[method] = (adapted = true, createAdapter(type)));
-
-        (_adapter$hooks = adapter.hooks).push.apply(_adapter$hooks, _toConsumableArray(allHooks).concat(_toConsumableArray(methodHooks)));
-      }
-    });
-
-    if (adapted) {
-      store.hooks[method] = [store.error[method], store.before[method], store.after[method]].filter(function (hook) {
-        return hook;
-      });
-    }
-  });
-}; // Add `.hooks` functionality to an object
-
-
-function enableRegularHooks(object) {
-  var methods = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : service_1.defaultServiceMethods;
-  var store = createStore(methods);
-  setStore(object, store);
-  return function regularHooks(input) {
-    var store = getStore(this);
-    var map = createMap(input, methods);
-    updateStore(store, map);
-    return this;
-  };
-}
-
-exports.enableRegularHooks = enableRegularHooks;
-
-/***/ }),
-
 /***/ "../feathers/lib/index.js":
 /*!********************************!*\
   !*** ../feathers/lib/index.js ***!
@@ -2189,7 +1942,7 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.Feathers = exports.version = exports.feathers = void 0;
 
-var dependencies_1 = __webpack_require__(/*! ./dependencies */ "../feathers/lib/dependencies.js");
+var commons_1 = __webpack_require__(/*! @feathersjs/commons */ "../commons/lib/index.js");
 
 var version_1 = __importDefault(__webpack_require__(/*! ./version */ "../feathers/lib/version.js"));
 
@@ -2209,9 +1962,9 @@ function feathers() {
 }
 
 exports.feathers = feathers;
-feathers.setDebug = dependencies_1.setDebug;
+feathers.setDebug = commons_1.setDebug;
 
-__exportStar(__webpack_require__(/*! ./hooks/index */ "../feathers/lib/hooks/index.js"), exports);
+__exportStar(__webpack_require__(/*! ./hooks */ "../feathers/lib/hooks.js"), exports);
 
 __exportStar(__webpack_require__(/*! ./declarations */ "../feathers/lib/declarations.js"), exports);
 
@@ -2243,9 +1996,11 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.wrapService = exports.getServiceOptions = exports.getHookMethods = exports.protectedMethods = exports.defaultEventMap = exports.defaultServiceMethods = exports.defaultServiceArguments = exports.SERVICE = void 0;
 
-var dependencies_1 = __webpack_require__(/*! ./dependencies */ "../feathers/lib/dependencies.js");
+var events_1 = __webpack_require__(/*! events */ "../../node_modules/events/events.js");
+
+var commons_1 = __webpack_require__(/*! @feathersjs/commons */ "../commons/lib/index.js");
 
-exports.SERVICE = (0, dependencies_1.createSymbol)('@feathersjs/service');
+exports.SERVICE = (0, commons_1.createSymbol)('@feathersjs/service');
 exports.defaultServiceArguments = {
   find: ['params'],
   get: ['id', 'params'],
@@ -2261,7 +2016,7 @@ exports.defaultEventMap = {
   patch: 'patched',
   remove: 'removed'
 };
-exports.protectedMethods = Object.keys(Object.prototype).concat(Object.keys(dependencies_1.EventEmitter.prototype)).concat(['all', 'before', 'after', 'error', 'hooks', 'setup', 'teardown', 'publish']);
+exports.protectedMethods = Object.keys(Object.prototype).concat(Object.keys(events_1.EventEmitter.prototype)).concat(['all', 'around', 'before', 'after', 'error', 'hooks', 'setup', 'teardown', 'publish']);
 
 function getHookMethods(service, options) {
   var methods = options.methods;
@@ -2355,7 +2110,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -2365,7 +2120,7 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 Object.defineProperty(exports, "__esModule", ({
   value: true
@@ -2511,8 +2266,7 @@ var Base = /*#__PURE__*/function () {
     }
   }, {
     key: "find",
-    value: function find() {
-      var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    value: function find(params) {
       return this.request({
         url: this.makeUrl(params.query),
         method: 'GET',
@@ -2521,11 +2275,9 @@ var Base = /*#__PURE__*/function () {
     }
   }, {
     key: "get",
-    value: function get(id) {
-      var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
+    value: function get(id, params) {
       if (typeof id === 'undefined') {
-        return Promise.reject(new Error('id for \'get\' can not be undefined'));
+        return Promise.reject(new Error("id for 'get' can not be undefined"));
       }
 
       return this.request({
@@ -2536,8 +2288,7 @@ var Base = /*#__PURE__*/function () {
     }
   }, {
     key: "create",
-    value: function create(body) {
-      var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    value: function create(body, params) {
       return this.request({
         url: this.makeUrl(params.query),
         body: body,
@@ -2549,11 +2300,9 @@ var Base = /*#__PURE__*/function () {
     }
   }, {
     key: "update",
-    value: function update(id, body) {
-      var params = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-
+    value: function update(id, body, params) {
       if (typeof id === 'undefined') {
-        return Promise.reject(new Error('id for \'update\' can not be undefined, only \'null\' when updating multiple entries'));
+        return Promise.reject(new Error("id for 'update' can not be undefined, only 'null' when updating multiple entries"));
       }
 
       return this.request({
@@ -2567,11 +2316,9 @@ var Base = /*#__PURE__*/function () {
     }
   }, {
     key: "patch",
-    value: function patch(id, body) {
-      var params = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-
+    value: function patch(id, body, params) {
       if (typeof id === 'undefined') {
-        return Promise.reject(new Error('id for \'patch\' can not be undefined, only \'null\' when updating multiple entries'));
+        return Promise.reject(new Error("id for 'patch' can not be undefined, only 'null' when updating multiple entries"));
       }
 
       return this.request({
@@ -2585,11 +2332,9 @@ var Base = /*#__PURE__*/function () {
     }
   }, {
     key: "remove",
-    value: function remove(id) {
-      var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
+    value: function remove(id, params) {
       if (typeof id === 'undefined') {
-        return Promise.reject(new Error('id for \'remove\' can not be undefined, only \'null\' when removing multiple entries'));
+        return Promise.reject(new Error("id for 'remove' can not be undefined, only 'null' when removing multiple entries"));
       }
 
       return this.request({
@@ -2626,7 +2371,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -2636,7 +2381,7 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 Object.defineProperty(exports, "__esModule", ({
   value: true
@@ -2711,11 +2456,25 @@ exports.FetchClient = FetchClient;
 "use strict";
 
 
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { 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 _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
 exports.SuperagentClient = exports.FetchClient = exports.AxiosClient = void 0;
 
+var feathers_1 = __webpack_require__(/*! @feathersjs/feathers */ "../feathers/lib/index.js");
+
 var base_1 = __webpack_require__(/*! ./base */ "../rest-client/lib/base.js");
 
 var axios_1 = __webpack_require__(/*! ./axios */ "../rest-client/lib/axios.js");
@@ -2785,6 +2544,14 @@ function restClient() {
 
         app.rest = connection;
         app.defaultService = defaultService;
+        app.mixins.unshift(function (service, _location, options) {
+          if (options && options.methods && service instanceof base_1.Base) {
+            var customMethods = options.methods.filter(function (name) {
+              return !feathers_1.defaultServiceMethods.includes(name);
+            });
+            service.methods.apply(service, _toConsumableArray(customMethods));
+          }
+        });
       };
 
       initialize.Service = Service;
@@ -2822,7 +2589,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -2832,7 +2599,7 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 Object.defineProperty(exports, "__esModule", ({
   value: true
@@ -2896,6 +2663,18 @@ exports.SuperagentClient = SuperagentClient;
 "use strict";
 
 
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { 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 _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
@@ -2927,6 +2706,14 @@ function socketioClient(connection, options) {
 
     app.io = connection;
     app.defaultService = defaultService;
+    app.mixins.unshift(function (service, _location, options) {
+      if (options && options.methods && service instanceof client_1.Service) {
+        var customMethods = options.methods.filter(function (name) {
+          return !feathers_1.defaultServiceMethods.includes(name);
+        });
+        service.methods.apply(service, _toConsumableArray(customMethods));
+      }
+    });
   };
 
   initialize.Service = client_1.Service;
@@ -2971,6 +2758,7 @@ Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
 exports.Service = void 0;
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 
 var errors_1 = __webpack_require__(/*! @feathersjs/errors */ "../errors/lib/index.js");
 
@@ -4311,8 +4099,9 @@ function addNumericSeparator(num, str) {
     return $replace.call(str, sepRegex, '$&_');
 }
 
-var inspectCustom = (__webpack_require__(/*! ./util.inspect */ "?c95a").custom);
-var inspectSymbol = inspectCustom && isSymbol(inspectCustom) ? inspectCustom : null;
+var utilInspect = __webpack_require__(/*! ./util.inspect */ "?c95a");
+var inspectCustom = utilInspect.custom;
+var inspectSymbol = isSymbol(inspectCustom) ? inspectCustom : null;
 
 module.exports = function inspect_(obj, options, depth, seen) {
     var opts = options || {};
@@ -4402,7 +4191,7 @@ module.exports = function inspect_(obj, options, depth, seen) {
         return inspect_(value, opts, depth + 1, seen);
     }
 
-    if (typeof obj === 'function') {
+    if (typeof obj === 'function' && !isRegExp(obj)) { // in older engines, regexes are callable
         var name = nameOf(obj);
         var keys = arrObjKeys(obj, inspect);
         return '[Function' + (name ? ': ' + name : ' (anonymous)') + ']' + (keys.length > 0 ? ' { ' + $join.call(keys, ', ') + ' }' : '');
@@ -4432,15 +4221,15 @@ module.exports = function inspect_(obj, options, depth, seen) {
     }
     if (isError(obj)) {
         var parts = arrObjKeys(obj, inspect);
-        if ('cause' in obj && !isEnumerable.call(obj, 'cause')) {
+        if (!('cause' in Error.prototype) && 'cause' in obj && !isEnumerable.call(obj, 'cause')) {
             return '{ [' + String(obj) + '] ' + $join.call($concat.call('[cause]: ' + inspect(obj.cause), parts), ', ') + ' }';
         }
         if (parts.length === 0) { return '[' + String(obj) + ']'; }
         return '{ [' + String(obj) + '] ' + $join.call(parts, ', ') + ' }';
     }
     if (typeof obj === 'object' && customInspect) {
-        if (inspectSymbol && typeof obj[inspectSymbol] === 'function') {
-            return obj[inspectSymbol]();
+        if (inspectSymbol && typeof obj[inspectSymbol] === 'function' && utilInspect) {
+            return utilInspect(obj, { depth: maxDepth - depth });
         } else if (customInspect !== 'symbol' && typeof obj.inspect === 'function') {
             return obj.inspect();
         }
@@ -5894,7 +5683,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -5904,7 +5693,7 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
@@ -6560,7 +6349,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.collect = exports.fromErrorHook = exports.fromAfterHook = exports.fromBeforeHook = void 0;
+exports.collect = exports.fromErrorHook = exports.fromAfterHook = exports.fromBeforeHook = exports.runHooks = exports.runHook = void 0;
 
 var compose_js_1 = __webpack_require__(/*! ./compose.js */ "../../node_modules/@feathersjs/hooks/script/compose.js");
 
@@ -6575,9 +6364,23 @@ var runHook = function runHook(hook, context, type) {
   });
 };
 
+exports.runHook = runHook;
+
+var runHooks = function runHooks(hooks) {
+  return function (context) {
+    return hooks.reduce(function (promise, hook) {
+      return promise.then(function () {
+        return (0, exports.runHook)(hook, context);
+      });
+    }, Promise.resolve(context));
+  };
+};
+
+exports.runHooks = runHooks;
+
 function fromBeforeHook(hook) {
   return function (context, next) {
-    return runHook(hook, context, 'before').then(next);
+    return (0, exports.runHook)(hook, context, 'before').then(next);
   };
 }
 
@@ -6586,7 +6389,7 @@ exports.fromBeforeHook = fromBeforeHook;
 function fromAfterHook(hook) {
   return function (context, next) {
     return next().then(function () {
-      return runHook(hook, context, 'after');
+      return (0, exports.runHook)(hook, context, 'after');
     });
   };
 }
@@ -6602,7 +6405,7 @@ function fromErrorHook(hook) {
         delete context.result;
       }
 
-      return runHook(hook, context, 'error').then(function () {
+      return (0, exports.runHook)(hook, context, 'error').then(function () {
         if (context.result === undefined && context.error !== undefined) {
           throw context.error;
         }
@@ -6624,8 +6427,8 @@ function collect(_ref) {
 
   var afterHooks = _toConsumableArray(after).reverse().map(fromAfterHook);
 
-  var errorHooks = error.map(fromErrorHook);
-  return (0, compose_js_1.compose)([].concat(_toConsumableArray(errorHooks), _toConsumableArray(afterHooks), _toConsumableArray(beforeHooks)));
+  var errorHooks = error.length ? [fromErrorHook((0, exports.runHooks)(error))] : [];
+  return (0, compose_js_1.compose)([].concat(errorHooks, _toConsumableArray(beforeHooks), _toConsumableArray(afterHooks)));
 }
 
 exports.collect = collect;