@civet/core 1.0.0-rc2 → 1.0.0-rc3

package/lib/Resource.js

@@ -15,10 +15,12 @@ var _DataProvider = require("./DataProvider");
 
 var _useResource = _interopRequireDefault(require("./useResource"));
 
-var _excluded = ["children"];
+var _excluded = ["dataProvider", "name", "query", "empty", "options", "persistent", "children"];
 
 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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -29,16 +31,46 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
  * The provided DataProvider must not be replaced.
  */
 function Resource(_ref) {
-  var children = _ref.children,
-      props = _objectWithoutProperties(_ref, _excluded);
-
-  var context = (0, _useResource["default"])(props);
-  return /*#__PURE__*/_react["default"].createElement(_context.ResourceContext.Provider, {
-    value: context
-  }, children);
+  var dataProvider = _ref.dataProvider,
+      name = _ref.name,
+      query = _ref.query,
+      empty = _ref.empty,
+      options = _ref.options,
+      persistent = _ref.persistent,
+      children = _ref.children,
+      rest = _objectWithoutProperties(_ref, _excluded);
+
+  var context = (0, _useResource["default"])({
+    dataProvider: dataProvider,
+    name: name,
+    query: query,
+    empty: empty,
+    options: options,
+    persistent: persistent
+  });
+  return context.dataProvider.uiPlugins.reduceRight(function (next, Plugin) {
+    return function (result) {
+      return (
+        /*#__PURE__*/
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        _react["default"].createElement(Plugin, _extends({}, rest, {
+          context: result
+        }), next)
+      );
+    };
+  }, function (result) {
+    return /*#__PURE__*/_react["default"].createElement(_context.ResourceContext.Provider, {
+      value: result
+    }, children);
+  })(context);
 }
 
 Resource.propTypes = {
+  /**
+   * DataProvider to be used for requests
+   */
+  dataProvider: _DataProvider.dataProviderPropType.isRequired,
+
   /**
    * Resource name
    */
@@ -59,11 +91,6 @@ Resource.propTypes = {
    */
   options: _propTypes["default"].object,
 
-  /**
-   * DataProvider to be used for requests
-   */
-  dataProvider: _DataProvider.dataProviderPropType.isRequired,
-
   /**
    * Whether stale data should be retained during the next request - this only applies if neither dataProvider nor name have changed, unless set to "very"
    */

package/lib/useResource.js

@@ -15,7 +15,7 @@ var _Meta = _interopRequireDefault(require("./Meta"));
 
 var _uniqueIdentifier = _interopRequireDefault(require("./uniqueIdentifier"));
 
-var _excluded = ["name", "query", "empty", "options", "dataProvider", "persistent"],
+var _excluded = ["dataProvider", "name", "query", "empty", "options", "persistent"],
     _excluded2 = ["data"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -51,14 +51,14 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
  * If not explicitly specified, necessary configuration is taken from the nearest <ConfigProvider>.
  * The provided DataProvider must not be replaced.
  */
-function useResource(props) {
-  var name = props.name,
-      query = props.query,
-      empty = props.empty,
-      options = props.options,
-      dataProviderProp = props.dataProvider,
-      persistent = props.persistent,
-      rest = _objectWithoutProperties(props, _excluded);
+function useResource(_ref) {
+  var dataProviderProp = _ref.dataProvider,
+      name = _ref.name,
+      query = _ref.query,
+      empty = _ref.empty,
+      options = _ref.options,
+      persistent = _ref.persistent,
+      rest = _objectWithoutProperties(_ref, _excluded);
 
   var configContext = (0, _context2.useConfigContext)();
   var currentDataProvider = dataProviderProp || configContext.dataProvider;
@@ -255,8 +255,7 @@ function useResource(props) {
     });
   }, [value, dataProvider, isLoading, isStale, notify]);
 
-  var contextPlugins = Array.isArray(dataProvider.contextPlugins) ? dataProvider.contextPlugins : [];
-  return contextPlugins.reduce(function (result, fn) {
+  return dataProvider.contextPlugins.reduce(function (result, fn) {
     return fn(result, rest);
   }, context);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@civet/core",
-  "version": "1.0.0-rc2",
+  "version": "1.0.0-rc3",
   "description": "Civet",
   "main": "./lib/index.js",
   "scripts": {
@@ -51,7 +51,7 @@
     "eslint-plugin-prettier": "^3.4.1",
     "eslint-plugin-react": "^7.21.5",
     "eslint-plugin-react-hooks": "^4.2.0",
-    "prettier": "^2.3.2",
+    "prettier": "^2.6.2",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "rimraf": "^3.0.2"

package/src/Resource.js

@@ -10,13 +10,26 @@ import useResource from './useResource';
  * If not explicitly specified, necessary configuration is taken from the nearest <ConfigProvider>.
  * The provided DataProvider must not be replaced.
  */
-function Resource({ children, ...props }) {
-  const context = useResource(props);
+function Resource({ dataProvider, name, query, empty, options, persistent, children, ...rest }) {
+  const context = useResource({ dataProvider, name, query, empty, options, persistent });
 
-  return <ResourceContext.Provider value={context}>{children}</ResourceContext.Provider>;
+  return context.dataProvider.uiPlugins.reduceRight(
+    (next, Plugin) => (result) =>
+      (
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        <Plugin {...rest} context={result}>
+          {next}
+        </Plugin>
+      ),
+    (result) => <ResourceContext.Provider value={result}>{children}</ResourceContext.Provider>,
+  )(context);
 }
 
 Resource.propTypes = {
+  /**
+   * DataProvider to be used for requests
+   */
+  dataProvider: dataProviderPropType.isRequired,
   /**
    * Resource name
    */
@@ -33,10 +46,6 @@ Resource.propTypes = {
    * DataProvider options for requests
    */
   options: PropTypes.object,
-  /**
-   * DataProvider to be used for requests
-   */
-  dataProvider: dataProviderPropType.isRequired,
   /**
    * Whether stale data should be retained during the next request - this only applies if neither dataProvider nor name have changed, unless set to "very"
    */

package/src/useResource.js

@@ -10,17 +10,15 @@ import uniqueIdentifier from './uniqueIdentifier';
  * If not explicitly specified, necessary configuration is taken from the nearest <ConfigProvider>.
  * The provided DataProvider must not be replaced.
  */
-function useResource(props) {
-  const {
-    name,
-    query,
-    empty,
-    options,
-    dataProvider: dataProviderProp,
-    persistent,
-    ...rest
-  } = props;
-
+function useResource({
+  dataProvider: dataProviderProp,
+  name,
+  query,
+  empty,
+  options,
+  persistent,
+  ...rest
+}) {
   const configContext = useConfigContext();
   const currentDataProvider = dataProviderProp || configContext.dataProvider;
   const dataProvider = React.useMemo(() => currentDataProvider, []);
@@ -199,10 +197,7 @@ function useResource(props) {
     [value, dataProvider, isLoading, isStale, notify],
   );
 
-  const contextPlugins = Array.isArray(dataProvider.contextPlugins)
-    ? dataProvider.contextPlugins
-    : [];
-  return contextPlugins.reduce((result, fn) => fn(result, rest), context);
+  return dataProvider.contextPlugins.reduce((result, fn) => fn(result, rest), context);
 }
 
 export default useResource;