@civet/events 0.1.6 → 0.1.9

package/lib/ConfigProvider.js

@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _react = _interopRequireDefault(require("react"));
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
+var _react = _interopRequireDefault(require("react"));
+
 var _context = require("./context");
 
 var _EventReceiver = require("./EventReceiver");

package/lib/EventHandler.js

@@ -1,51 +1,51 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.composeHandlers = exports["default"] = void 0;
 
-var _react = _interopRequireWildcard(require("react"));
-
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _core = require("@civet/core");
 
 var _fastDeepEqual = _interopRequireDefault(require("fast-deep-equal"));
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _react = _interopRequireWildcard(require("react"));
+
 var _context = require("./context");
 
 var _EventReceiver = require("./EventReceiver");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(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); } }
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
-function _createSuper(Derived) { return function () { var Super = _getPrototypeOf(Derived), result; if (_isNativeReflectConstruct()) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+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 } }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+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); }; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-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 } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+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 _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || 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); }
 
 var EventHandler = /*#__PURE__*/function (_Component) {
   _inherits(EventHandler, _Component);
@@ -105,18 +105,27 @@ var EventHandler = /*#__PURE__*/function (_Component) {
       var _this$props3 = this.props,
           eventReceiver = _this$props3.eventReceiver,
           resource = _this$props3.resource,
-          onEvent = _this$props3.onEvent;
+          onEvent = _this$props3.onEvent,
+          onNotify = _this$props3.onNotify;
       if (eventReceiver == null || data == null || (data.length || 0) === 0) return;
+      var unhandledEvents;
 
       if (typeof onEvent === 'function') {
-        var allEventsHandled = data.reduce(function (othersHandled, event) {
-          return onEvent(event) && othersHandled;
-        }, true);
-        if (allEventsHandled) return;
+        unhandledEvents = data.filter(function (event) {
+          return !onEvent(event);
+        });
+      } else {
+        unhandledEvents = data;
       }
 
-      if (resource == null || typeof resource.notify !== 'function') return;
-      resource.notify();
+      if (unhandledEvents.length === 0 || resource == null || typeof resource.notify !== 'function') {
+        return;
+      }
+
+      var promise = resource.notify();
+      if (typeof onNotify === 'function') promise.then(function (result) {
+        return onNotify(result, unhandledEvents);
+      });
     }
   }, {
     key: "render",
@@ -133,6 +142,7 @@ EventHandler.propTypes = {
   resource: _propTypes["default"].object,
   options: _propTypes["default"].object,
   onEvent: _propTypes["default"].func,
+  onNotify: _propTypes["default"].func,
   children: _propTypes["default"].node
 };
 

package/lib/context.js

@@ -9,11 +9,11 @@ exports.useConfigContext = exports.ConfigContext = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var ConfigContext = _react["default"].createContext({});
+var ConfigContext = /*#__PURE__*/_react["default"].createContext({});
 
 exports.ConfigContext = ConfigContext;
 ConfigContext.displayName = 'Events.ConfigContext';

package/lib/index.js

@@ -17,16 +17,16 @@ Object.defineProperty(exports, "ConfigProvider", {
     return _ConfigProvider["default"];
   }
 });
-Object.defineProperty(exports, "EventHandler", {
+Object.defineProperty(exports, "composeHandlers", {
   enumerable: true,
   get: function get() {
-    return _EventHandler["default"];
+    return _EventHandler.composeHandlers;
   }
 });
-Object.defineProperty(exports, "composeHandlers", {
+Object.defineProperty(exports, "EventHandler", {
   enumerable: true,
   get: function get() {
-    return _EventHandler.composeHandlers;
+    return _EventHandler["default"];
   }
 });
 Object.defineProperty(exports, "EventReceiver", {
@@ -35,16 +35,16 @@ Object.defineProperty(exports, "EventReceiver", {
     return _EventReceiver["default"];
   }
 });
-Object.defineProperty(exports, "isEventReceiver", {
+Object.defineProperty(exports, "eventReceiverPropType", {
   enumerable: true,
   get: function get() {
-    return _EventReceiver.isEventReceiver;
+    return _EventReceiver.eventReceiverPropType;
   }
 });
-Object.defineProperty(exports, "eventReceiverPropType", {
+Object.defineProperty(exports, "isEventReceiver", {
   enumerable: true,
   get: function get() {
-    return _EventReceiver.eventReceiverPropType;
+    return _EventReceiver.isEventReceiver;
   }
 });
 exports.ConfigConsumer = void 0;
@@ -57,9 +57,9 @@ var _EventHandler = _interopRequireWildcard(require("./EventHandler"));
 
 var _EventReceiver = _interopRequireWildcard(require("./EventReceiver"));
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@civet/events",
-  "version": "0.1.6",
+  "version": "0.1.9",
   "description": "Civet",
   "main": "./lib/index.js",
   "scripts": {
@@ -34,35 +34,36 @@
   },
   "homepage": "https://civet.js.org/",
   "devDependencies": {
-    "@babel/cli": "7.8.4",
-    "@babel/core": "7.9.0",
-    "@babel/plugin-proposal-class-properties": "7.8.3",
-    "@babel/preset-env": "7.9.0",
-    "@babel/preset-react": "7.9.4",
-    "@civet/core": "0.2.0",
-    "babel-eslint": "10.1.0",
-    "cross-env": "7.0.2",
-    "cross-var": "1.1.0",
-    "eslint": "6.8.0",
-    "eslint-config-airbnb": "18.1.0",
-    "eslint-config-airbnb-base": "14.1.0",
-    "eslint-config-prettier": "6.10.1",
-    "eslint-plugin-import": "2.20.2",
-    "eslint-plugin-jsx-a11y": "6.2.3",
-    "eslint-plugin-prettier": "3.1.2",
-    "eslint-plugin-react": "7.19.0",
-    "prettier": "2.0.2",
+    "@babel/cli": "^7.14.8",
+    "@babel/core": "^7.15.0",
+    "@babel/plugin-proposal-class-properties": "^7.14.5",
+    "@babel/preset-env": "^7.15.0",
+    "@babel/preset-react": "^7.14.5",
+    "@civet/core": "^0.6.8",
+    "babel-eslint": "^10.1.0",
+    "cross-env": "^7.0.3",
+    "cross-var": "^1.1.0",
+    "eslint": "7.2",
+    "eslint-config-airbnb": "^18.2.1",
+    "eslint-config-airbnb-base": "^14.2.1",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-jsx-a11y": "^6.4.1",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-react": "^7.21.5",
+    "eslint-plugin-react-hooks": "^4.2.0",
+    "prettier": "^2.3.2",
     "react": "*",
     "react-dom": "*",
-    "rimraf": "3.0.2"
+    "rimraf": "^3.0.2"
   },
   "peerDependencies": {
-    "@civet/core": ">= 0.1.1",
+    "@civet/core": ">= 0.6.8",
     "react": ">= 16.8",
     "react-dom": ">= 16.8"
   },
   "dependencies": {
-    "fast-deep-equal": "3.1.3",
-    "prop-types": "15.7.2"
+    "fast-deep-equal": "^3.1.3",
+    "prop-types": "^15.7.2"
   }
 }

package/src/ConfigProvider.js

@@ -1,5 +1,5 @@
-import React from 'react';
 import PropTypes from 'prop-types';
+import React from 'react';
 
 import { ConfigContext } from './context';
 import { eventReceiverPropType } from './EventReceiver';

package/src/EventHandler.js

@@ -1,7 +1,7 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
 import { ResourceConsumer } from '@civet/core';
 import deepEquals from 'fast-deep-equal';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
 
 import { ConfigContext } from './context';
 import { eventReceiverPropType } from './EventReceiver';
@@ -42,17 +42,19 @@ class EventHandler extends Component {
   }
 
   handleNotify(data) {
-    const { eventReceiver, resource, onEvent } = this.props;
+    const { eventReceiver, resource, onEvent, onNotify } = this.props;
     if (eventReceiver == null || data == null || (data.length || 0) === 0) return;
+    let unhandledEvents;
     if (typeof onEvent === 'function') {
-      const allEventsHandled = data.reduce(
-        (othersHandled, event) => onEvent(event) && othersHandled,
-        true,
-      );
-      if (allEventsHandled) return;
+      unhandledEvents = data.filter((event) => !onEvent(event));
+    } else {
+      unhandledEvents = data;
+    }
+    if (unhandledEvents.length === 0 || resource == null || typeof resource.notify !== 'function') {
+      return;
     }
-    if (resource == null || typeof resource.notify !== 'function') return;
-    resource.notify();
+    const promise = resource.notify();
+    if (typeof onNotify === 'function') promise.then((result) => onNotify(result, unhandledEvents));
   }
 
   render() {
@@ -65,14 +67,17 @@ EventHandler.propTypes = {
   resource: PropTypes.object,
   options: PropTypes.object,
   onEvent: PropTypes.func,
+  onNotify: PropTypes.func,
   children: PropTypes.node,
 };
 
-const composeHandlers = (...handlers) => (...args) =>
-  handlers.reduce(
-    (sum, handler) => sum || (typeof handler === 'function' ? handler(...args) : false),
-    false,
-  );
+const composeHandlers =
+  (...handlers) =>
+  (...args) =>
+    handlers.reduce(
+      (sum, handler) => sum || (typeof handler === 'function' ? handler(...args) : false),
+      false,
+    );
 
 /* eslint-disable react/jsx-props-no-spreading */
 const withResource = (ChildComponent) => {

package/src/index.js

@@ -1,8 +1,7 @@
 import { ConfigContext, useConfigContext } from './context';
 
 export const { Consumer: ConfigConsumer } = ConfigContext;
-export { useConfigContext };
-
 export { default as ConfigProvider } from './ConfigProvider';
-export { default as EventHandler, composeHandlers } from './EventHandler';
-export { default as EventReceiver, isEventReceiver, eventReceiverPropType } from './EventReceiver';
+export { composeHandlers, default as EventHandler } from './EventHandler';
+export { default as EventReceiver, eventReceiverPropType, isEventReceiver } from './EventReceiver';
+export { useConfigContext };