studiokit-scaffolding-js 7.0.14-alpha.1 → 7.1.1

package/lib/components/HOC/AsyncComponent.js

@@ -1,133 +1,57 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+exports.default = asyncComponent;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _react = require("react");
+var _ErrorBoundary = require("../ErrorBoundary");
+var _Loading = require("../Loading");
+var _jsxRuntime = require("react/jsx-runtime");
+function asyncComponent(importComponent) {
+  let showLoader = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+  return class AsyncComponent extends _react.Component {
+    constructor(props) {
+      super(props);
+      // tslint:disable-next-line: variable-name
+      (0, _defineProperty2.default)(this, "_isMounted", false);
+      this.state = {
+        component: undefined
+      };
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    async componentDidMount() {
+      this._isMounted = true;
+      const {
+        default: component
+      } = await importComponent();
+      // component may have unmounted while awaiting importComponent()
+      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+      if (this._isMounted) {
+        this.setState({
+          component
+        });
+      }
+    }
+    componentWillUnmount() {
+      this._isMounted = false;
     }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var react_1 = __importStar(require("react"));
-var ErrorBoundary_1 = require("../ErrorBoundary");
-var Loading_1 = require("../Loading");
-function asyncComponent(importComponent, showLoader) {
-    if (showLoader === void 0) { showLoader = true; }
-    return /** @class */ (function (_super) {
-        __extends(AsyncComponent, _super);
-        function AsyncComponent(props) {
-            var _this = _super.call(this, props) || this;
-            // tslint:disable-next-line: variable-name
-            _this._isMounted = false;
-            _this.state = {
-                component: undefined
-            };
-            return _this;
-        }
-        AsyncComponent.prototype.componentDidMount = function () {
-            return __awaiter(this, void 0, void 0, function () {
-                var component;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            this._isMounted = true;
-                            return [4 /*yield*/, importComponent()
-                                // component may have unmounted while awaiting importComponent()
-                            ];
-                        case 1:
-                            component = (_a.sent()).default;
-                            // component may have unmounted while awaiting importComponent()
-                            if (this._isMounted) {
-                                this.setState({ component: component });
-                            }
-                            return [2 /*return*/];
-                    }
-                });
-            });
-        };
-        AsyncComponent.prototype.componentWillUnmount = function () {
-            this._isMounted = false;
-        };
-        AsyncComponent.prototype.render = function () {
-            var ImportedComponent = this.state.component;
-            if (!ImportedComponent) {
-                return showLoader ? react_1.default.createElement(Loading_1.Loading, null) : null;
-            }
-            return (react_1.default.createElement(ErrorBoundary_1.ErrorBoundary, null,
-                react_1.default.createElement(ImportedComponent, __assign({}, this.props))));
-        };
-        return AsyncComponent;
-    }(react_1.Component));
+    render() {
+      const {
+        component: ImportedComponent
+      } = this.state;
+      if (!ImportedComponent) {
+        return showLoader ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Loading.Loading, {}) : null;
+      }
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ErrorBoundary.ErrorBoundary, {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(ImportedComponent, {
+          ...this.props
+        })
+      });
+    }
+  };
 }
-exports.default = asyncComponent;
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJfcmVhY3QiLCJyZXF1aXJlIiwiX0Vycm9yQm91bmRhcnkiLCJfTG9hZGluZyIsIl9qc3hSdW50aW1lIiwiYXN5bmNDb21wb25lbnQiLCJpbXBvcnRDb21wb25lbnQiLCJzaG93TG9hZGVyIiwiYXJndW1lbnRzIiwibGVuZ3RoIiwidW5kZWZpbmVkIiwiQXN5bmNDb21wb25lbnQiLCJDb21wb25lbnQiLCJjb25zdHJ1Y3RvciIsInByb3BzIiwiX2RlZmluZVByb3BlcnR5MiIsImRlZmF1bHQiLCJzdGF0ZSIsImNvbXBvbmVudCIsImNvbXBvbmVudERpZE1vdW50IiwiX2lzTW91bnRlZCIsInNldFN0YXRlIiwiY29tcG9uZW50V2lsbFVubW91bnQiLCJyZW5kZXIiLCJJbXBvcnRlZENvbXBvbmVudCIsImpzeCIsIkxvYWRpbmciLCJFcnJvckJvdW5kYXJ5IiwiY2hpbGRyZW4iXSwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29tcG9uZW50cy9IT0MvQXN5bmNDb21wb25lbnQudHN4Il0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENvbXBvbmVudCwgQ29tcG9uZW50VHlwZSB9IGZyb20gJ3JlYWN0J1xuaW1wb3J0IHsgRXJyb3JCb3VuZGFyeSB9IGZyb20gJy4uL0Vycm9yQm91bmRhcnknXG5pbXBvcnQgeyBMb2FkaW5nIH0gZnJvbSAnLi4vTG9hZGluZydcblxuaW50ZXJmYWNlIEFzeW5jQ29tcG9uZW50U3RhdGU8VE93blByb3BzIGV4dGVuZHMgb2JqZWN0PiB7XG5cdGNvbXBvbmVudDogQ29tcG9uZW50VHlwZTxUT3duUHJvcHM+IHwgdW5kZWZpbmVkXG59XG5cbmV4cG9ydCB0eXBlIEFzeW5jV3JhcHBlZENvbXBvbmVudDxUT3duUHJvcHMgZXh0ZW5kcyBvYmplY3Q+ID0gKCkgPT4gUHJvbWlzZTx7XG5cdGRlZmF1bHQ6IENvbXBvbmVudFR5cGU8VE93blByb3BzPlxufT5cblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gYXN5bmNDb21wb25lbnQ8VE93blByb3BzIGV4dGVuZHMgb2JqZWN0Pihcblx0aW1wb3J0Q29tcG9uZW50OiBBc3luY1dyYXBwZWRDb21wb25lbnQ8VE93blByb3BzPixcblx0c2hvd0xvYWRlciA9IHRydWVcbikge1xuXHRyZXR1cm4gY2xhc3MgQXN5bmNDb21wb25lbnQgZXh0ZW5kcyBDb21wb25lbnQ8VE93blByb3BzLCBBc3luY0NvbXBvbmVudFN0YXRlPFRPd25Qcm9wcz4+IHtcblx0XHQvLyB0c2xpbnQ6ZGlzYWJsZS1uZXh0LWxpbmU6IHZhcmlhYmxlLW5hbWVcblx0XHRfaXNNb3VudGVkID0gZmFsc2Vcblx0XHRjb25zdHJ1Y3Rvcihwcm9wczogVE93blByb3BzKSB7XG5cdFx0XHRzdXBlcihwcm9wcylcblx0XHRcdHRoaXMuc3RhdGUgPSB7XG5cdFx0XHRcdGNvbXBvbmVudDogdW5kZWZpbmVkXG5cdFx0XHR9XG5cdFx0fVxuXG5cdFx0Ly8gZXNsaW50LWRpc2FibGUtbmV4dC1saW5lIEB0eXBlc2NyaXB0LWVzbGludC9uby1taXN1c2VkLXByb21pc2VzXG5cdFx0YXN5bmMgY29tcG9uZW50RGlkTW91bnQoKSB7XG5cdFx0XHR0aGlzLl9pc01vdW50ZWQgPSB0cnVlXG5cdFx0XHRjb25zdCB7IGRlZmF1bHQ6IGNvbXBvbmVudCB9ID0gYXdhaXQgaW1wb3J0Q29tcG9uZW50KClcblx0XHRcdC8vIGNvbXBvbmVudCBtYXkgaGF2ZSB1bm1vdW50ZWQgd2hpbGUgYXdhaXRpbmcgaW1wb3J0Q29tcG9uZW50KClcblx0XHRcdC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBAdHlwZXNjcmlwdC1lc2xpbnQvbm8tdW5uZWNlc3NhcnktY29uZGl0aW9uXG5cdFx0XHRpZiAodGhpcy5faXNNb3VudGVkKSB7XG5cdFx0XHRcdHRoaXMuc2V0U3RhdGUoeyBjb21wb25lbnQgfSlcblx0XHRcdH1cblx0XHR9XG5cblx0XHRjb21wb25lbnRXaWxsVW5tb3VudCgpIHtcblx0XHRcdHRoaXMuX2lzTW91bnRlZCA9IGZhbHNlXG5cdFx0fVxuXG5cdFx0cmVuZGVyKCkge1xuXHRcdFx0Y29uc3QgeyBjb21wb25lbnQ6IEltcG9ydGVkQ29tcG9uZW50IH0gPSB0aGlzLnN0YXRlXG5cblx0XHRcdGlmICghSW1wb3J0ZWRDb21wb25lbnQpIHtcblx0XHRcdFx0cmV0dXJuIHNob3dMb2FkZXIgPyA8TG9hZGluZyAvPiA6IG51bGxcblx0XHRcdH1cblx0XHRcdHJldHVybiAoXG5cdFx0XHRcdDxFcnJvckJvdW5kYXJ5PlxuXHRcdFx0XHRcdDxJbXBvcnRlZENvbXBvbmVudCB7Li4udGhpcy5wcm9wc30gLz5cblx0XHRcdFx0PC9FcnJvckJvdW5kYXJ5PlxuXHRcdFx0KVxuXHRcdH1cblx0fVxufVxuIl0sIm1hcHBpbmdzIjoiOzs7Ozs7OztBQUFBLElBQUFBLE1BQUEsR0FBQUMsT0FBQTtBQUNBLElBQUFDLGNBQUEsR0FBQUQsT0FBQTtBQUNBLElBQUFFLFFBQUEsR0FBQUYsT0FBQTtBQUFvQyxJQUFBRyxXQUFBLEdBQUFILE9BQUE7QUFVckIsU0FBU0ksY0FBY0EsQ0FDckNDLGVBQWlELEVBRWhEO0VBQUEsSUFEREMsVUFBVSxHQUFBQyxTQUFBLENBQUFDLE1BQUEsUUFBQUQsU0FBQSxRQUFBRSxTQUFBLEdBQUFGLFNBQUEsTUFBRyxJQUFJO0VBRWpCLE9BQU8sTUFBTUcsY0FBYyxTQUFTQyxnQkFBUyxDQUE0QztJQUd4RkMsV0FBV0EsQ0FBQ0MsS0FBZ0IsRUFBRTtNQUM3QixLQUFLLENBQUNBLEtBQUssQ0FBQztNQUhiO01BQUEsSUFBQUMsZ0JBQUEsQ0FBQUMsT0FBQSxzQkFDYSxLQUFLO01BR2pCLElBQUksQ0FBQ0MsS0FBSyxHQUFHO1FBQ1pDLFNBQVMsRUFBRVI7TUFDWixDQUFDO0lBQ0Y7O0lBRUE7SUFDQSxNQUFNUyxpQkFBaUJBLENBQUEsRUFBRztNQUN6QixJQUFJLENBQUNDLFVBQVUsR0FBRyxJQUFJO01BQ3RCLE1BQU07UUFBRUosT0FBTyxFQUFFRTtNQUFVLENBQUMsR0FBRyxNQUFNWixlQUFlLENBQUMsQ0FBQztNQUN0RDtNQUNBO01BQ0EsSUFBSSxJQUFJLENBQUNjLFVBQVUsRUFBRTtRQUNwQixJQUFJLENBQUNDLFFBQVEsQ0FBQztVQUFFSDtRQUFVLENBQUMsQ0FBQztNQUM3QjtJQUNEO0lBRUFJLG9CQUFvQkEsQ0FBQSxFQUFHO01BQ3RCLElBQUksQ0FBQ0YsVUFBVSxHQUFHLEtBQUs7SUFDeEI7SUFFQUcsTUFBTUEsQ0FBQSxFQUFHO01BQ1IsTUFBTTtRQUFFTCxTQUFTLEVBQUVNO01BQWtCLENBQUMsR0FBRyxJQUFJLENBQUNQLEtBQUs7TUFFbkQsSUFBSSxDQUFDTyxpQkFBaUIsRUFBRTtRQUN2QixPQUFPakIsVUFBVSxnQkFBRyxJQUFBSCxXQUFBLENBQUFxQixHQUFBLEVBQUN0QixRQUFBLENBQUF1QixPQUFPLElBQUUsQ0FBQyxHQUFHLElBQUk7TUFDdkM7TUFDQSxvQkFDQyxJQUFBdEIsV0FBQSxDQUFBcUIsR0FBQSxFQUFDdkIsY0FBQSxDQUFBeUIsYUFBYTtRQUFBQyxRQUFBLGVBQ2IsSUFBQXhCLFdBQUEsQ0FBQXFCLEdBQUEsRUFBQ0QsaUJBQWlCO1VBQUEsR0FBSyxJQUFJLENBQUNWO1FBQUssQ0FBRztNQUFDLENBQ3ZCLENBQUM7SUFFbEI7RUFDRCxDQUFDO0FBQ0YiLCJpZ25vcmVMaXN0IjpbXX0=

package/lib/components/HOC/AuthenticatedComponent.d.ts

@@ -1,9 +1,9 @@
-import React, { ComponentClass, ComponentType } from 'react';
+import { ComponentClass, ComponentType } from 'react';
 import { RouteComponentProps } from 'react-router-dom';
 import { AuthState, BaseReduxState } from '../../types';
-export declare type AuthenticatedComponentStateProps = Pick<AuthState, 'isAuthenticating' | 'isAuthenticated'>;
+export type AuthenticatedComponentStateProps = Pick<AuthState, 'isAuthenticating' | 'isAuthenticated'>;
 export interface AuthenticatedComponentProps extends AuthenticatedComponentStateProps, RouteComponentProps {
 }
-export declare const configureAuthenticatedComponent: <TOwnProps extends {}>(WrappedComponent: React.ComponentType<TOwnProps>) => React.ComponentType<TOwnProps & AuthenticatedComponentProps>;
+export declare const configureAuthenticatedComponent: <TOwnProps extends object>(WrappedComponent: ComponentType<TOwnProps>) => ComponentType<TOwnProps & AuthenticatedComponentProps>;
 export declare const configureMapStateToProps: () => (state: BaseReduxState) => AuthenticatedComponentStateProps;
-export default function authenticatedComponent<TOwnProps extends {}>(WrappedComponent: ComponentType<TOwnProps>): ComponentClass<TOwnProps>;
+export default function authenticatedComponent<TOwnProps extends object>(WrappedComponent: ComponentType<TOwnProps>): ComponentClass<TOwnProps>;

package/lib/components/HOC/AuthenticatedComponent.js

@@ -1,104 +1,67 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.configureMapStateToProps = exports.configureAuthenticatedComponent = void 0;
-var react_1 = __importStar(require("react"));
-var react_redux_1 = require("react-redux");
-var react_router_dom_1 = require("react-router-dom");
-var persistenceService_1 = require("../../services/persistenceService");
-var configureAuthenticatedComponent = function (WrappedComponent) {
-    return /** @class */ (function (_super) {
-        __extends(AuthenticatedComponent, _super);
-        function AuthenticatedComponent() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        AuthenticatedComponent.prototype.isNotAuthenticated = function () {
-            var _a = this.props, isAuthenticating = _a.isAuthenticating, isAuthenticated = _a.isAuthenticated;
-            return !isAuthenticating && !isAuthenticated;
-        };
-        AuthenticatedComponent.prototype.persistReturnUrlIfNeeded = function () {
-            var pathname = this.props.location.pathname;
-            var returnUrl = persistenceService_1.persistenceService.getItem(persistenceService_1.returnUrlKey);
-            if (!returnUrl) {
-                void persistenceService_1.persistenceService.setItem(persistenceService_1.returnUrlKey, pathname);
-            }
-        };
-        AuthenticatedComponent.prototype.render = function () {
-            var _a = this.props, isAuthenticating = _a.isAuthenticating, isAuthenticated = _a.isAuthenticated, history = _a.history, location = _a.location, match = _a.match, staticContext = _a.staticContext, rest = __rest(_a, ["isAuthenticating", "isAuthenticated", "history", "location", "match", "staticContext"]);
-            if (this.isNotAuthenticated()) {
-                this.persistReturnUrlIfNeeded();
-                return react_1.default.createElement(react_router_dom_1.Redirect, { to: "/login" });
-            }
-            return react_1.default.createElement(WrappedComponent, __assign({}, rest));
-        };
-        return AuthenticatedComponent;
-    }(react_1.Component));
+exports.default = authenticatedComponent;
+var _react = require("react");
+var _reactRedux = require("react-redux");
+var _reactRouterDom = require("react-router-dom");
+var _persistenceService = require("../../services/persistenceService");
+var _jsxRuntime = require("react/jsx-runtime");
+const configureAuthenticatedComponent = WrappedComponent => {
+  return class AuthenticatedComponent extends _react.Component {
+    isNotAuthenticated() {
+      const {
+        isAuthenticating,
+        isAuthenticated
+      } = this.props;
+      return !isAuthenticating && !isAuthenticated;
+    }
+    persistReturnUrlIfNeeded() {
+      const {
+        pathname
+      } = this.props.location;
+      const returnUrl = _persistenceService.persistenceService.getItem(_persistenceService.returnUrlKey);
+      if (!returnUrl) {
+        _persistenceService.persistenceService.setItem(_persistenceService.returnUrlKey, pathname);
+      }
+    }
+    render() {
+      const {
+        isAuthenticating,
+        isAuthenticated,
+        history,
+        location,
+        match,
+        staticContext,
+        ...rest
+      } = this.props;
+      if (this.isNotAuthenticated()) {
+        this.persistReturnUrlIfNeeded();
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.Redirect, {
+          to: "/login"
+        });
+      }
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(WrappedComponent, {
+        ...rest
+      });
+    }
+  };
 };
 exports.configureAuthenticatedComponent = configureAuthenticatedComponent;
-var configureMapStateToProps = function () { return function (state) {
-    return {
-        isAuthenticating: !state.auth.isAuthenticated && state.auth.isAuthenticating,
-        isAuthenticated: state.auth.isAuthenticated
-    };
-}; };
+const configureMapStateToProps = () => state => {
+  return {
+    isAuthenticating: !state.auth.isAuthenticated && state.auth.isAuthenticating,
+    isAuthenticated: state.auth.isAuthenticated
+  };
+};
 exports.configureMapStateToProps = configureMapStateToProps;
 function authenticatedComponent(WrappedComponent) {
-    var AuthenticatedComponent = exports.configureAuthenticatedComponent(WrappedComponent);
-    var mapStateToProps = exports.configureMapStateToProps();
-    // @ts-ignore: could not match inferred type from the `connect` HOC
-    return react_router_dom_1.withRouter(react_redux_1.connect(mapStateToProps)(AuthenticatedComponent));
+  const AuthenticatedComponent = configureAuthenticatedComponent(WrappedComponent);
+  const mapStateToProps = configureMapStateToProps();
+  // @ts-ignore: could not match inferred type from the `connect` HOC
+  return (0, _reactRouterDom.withRouter)((0, _reactRedux.connect)(mapStateToProps)(AuthenticatedComponent));
 }
-exports.default = authenticatedComponent;
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJfcmVhY3QiLCJyZXF1aXJlIiwiX3JlYWN0UmVkdXgiLCJfcmVhY3RSb3V0ZXJEb20iLCJfcGVyc2lzdGVuY2VTZXJ2aWNlIiwiX2pzeFJ1bnRpbWUiLCJjb25maWd1cmVBdXRoZW50aWNhdGVkQ29tcG9uZW50IiwiV3JhcHBlZENvbXBvbmVudCIsIkF1dGhlbnRpY2F0ZWRDb21wb25lbnQiLCJDb21wb25lbnQiLCJpc05vdEF1dGhlbnRpY2F0ZWQiLCJpc0F1dGhlbnRpY2F0aW5nIiwiaXNBdXRoZW50aWNhdGVkIiwicHJvcHMiLCJwZXJzaXN0UmV0dXJuVXJsSWZOZWVkZWQiLCJwYXRobmFtZSIsImxvY2F0aW9uIiwicmV0dXJuVXJsIiwicGVyc2lzdGVuY2VTZXJ2aWNlIiwiZ2V0SXRlbSIsInJldHVyblVybEtleSIsInNldEl0ZW0iLCJyZW5kZXIiLCJoaXN0b3J5IiwibWF0Y2giLCJzdGF0aWNDb250ZXh0IiwicmVzdCIsImpzeCIsIlJlZGlyZWN0IiwidG8iLCJleHBvcnRzIiwiY29uZmlndXJlTWFwU3RhdGVUb1Byb3BzIiwic3RhdGUiLCJhdXRoIiwiYXV0aGVudGljYXRlZENvbXBvbmVudCIsIm1hcFN0YXRlVG9Qcm9wcyIsIndpdGhSb3V0ZXIiLCJjb25uZWN0Il0sInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbXBvbmVudHMvSE9DL0F1dGhlbnRpY2F0ZWRDb21wb25lbnQudHN4Il0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENvbXBvbmVudCwgQ29tcG9uZW50Q2xhc3MsIENvbXBvbmVudFR5cGUgfSBmcm9tICdyZWFjdCdcbmltcG9ydCB7IGNvbm5lY3QgfSBmcm9tICdyZWFjdC1yZWR1eCdcbmltcG9ydCB7IFJlZGlyZWN0LCBSb3V0ZUNvbXBvbmVudFByb3BzLCB3aXRoUm91dGVyIH0gZnJvbSAncmVhY3Qtcm91dGVyLWRvbSdcbmltcG9ydCB7IHBlcnNpc3RlbmNlU2VydmljZSwgcmV0dXJuVXJsS2V5IH0gZnJvbSAnLi4vLi4vc2VydmljZXMvcGVyc2lzdGVuY2VTZXJ2aWNlJ1xuaW1wb3J0IHsgQXV0aFN0YXRlLCBCYXNlUmVkdXhTdGF0ZSB9IGZyb20gJy4uLy4uL3R5cGVzJ1xuXG5leHBvcnQgdHlwZSBBdXRoZW50aWNhdGVkQ29tcG9uZW50U3RhdGVQcm9wcyA9IFBpY2s8QXV0aFN0YXRlLCAnaXNBdXRoZW50aWNhdGluZycgfCAnaXNBdXRoZW50aWNhdGVkJz5cblxuZXhwb3J0IGludGVyZmFjZSBBdXRoZW50aWNhdGVkQ29tcG9uZW50UHJvcHMgZXh0ZW5kcyBBdXRoZW50aWNhdGVkQ29tcG9uZW50U3RhdGVQcm9wcywgUm91dGVDb21wb25lbnRQcm9wcyB7fVxuXG5leHBvcnQgY29uc3QgY29uZmlndXJlQXV0aGVudGljYXRlZENvbXBvbmVudCA9IDxUT3duUHJvcHMgZXh0ZW5kcyBvYmplY3Q+KFxuXHRXcmFwcGVkQ29tcG9uZW50OiBDb21wb25lbnRUeXBlPFRPd25Qcm9wcz5cbik6IENvbXBvbmVudFR5cGU8VE93blByb3BzICYgQXV0aGVudGljYXRlZENvbXBvbmVudFByb3BzPiA9PiB7XG5cdHJldHVybiBjbGFzcyBBdXRoZW50aWNhdGVkQ29tcG9uZW50IGV4dGVuZHMgQ29tcG9uZW50PFxuXHRcdFRPd25Qcm9wcyAmIEF1dGhlbnRpY2F0ZWRDb21wb25lbnRTdGF0ZVByb3BzICYgUm91dGVDb21wb25lbnRQcm9wc1xuXHQ+IHtcblx0XHRpc05vdEF1dGhlbnRpY2F0ZWQoKSB7XG5cdFx0XHRjb25zdCB7IGlzQXV0aGVudGljYXRpbmcsIGlzQXV0aGVudGljYXRlZCB9ID0gdGhpcy5wcm9wc1xuXHRcdFx0cmV0dXJuICFpc0F1dGhlbnRpY2F0aW5nICYmICFpc0F1dGhlbnRpY2F0ZWRcblx0XHR9XG5cblx0XHRwZXJzaXN0UmV0dXJuVXJsSWZOZWVkZWQoKSB7XG5cdFx0XHRjb25zdCB7IHBhdGhuYW1lIH0gPSB0aGlzLnByb3BzLmxvY2F0aW9uXG5cdFx0XHRjb25zdCByZXR1cm5VcmwgPSBwZXJzaXN0ZW5jZVNlcnZpY2UuZ2V0SXRlbShyZXR1cm5VcmxLZXkpXG5cdFx0XHRpZiAoIXJldHVyblVybCkge1xuXHRcdFx0XHRwZXJzaXN0ZW5jZVNlcnZpY2Uuc2V0SXRlbShyZXR1cm5VcmxLZXksIHBhdGhuYW1lKVxuXHRcdFx0fVxuXHRcdH1cblxuXHRcdHJlbmRlcigpIHtcblx0XHRcdGNvbnN0IHsgaXNBdXRoZW50aWNhdGluZywgaXNBdXRoZW50aWNhdGVkLCBoaXN0b3J5LCBsb2NhdGlvbiwgbWF0Y2gsIHN0YXRpY0NvbnRleHQsIC4uLnJlc3QgfSA9IHRoaXMucHJvcHNcblx0XHRcdGlmICh0aGlzLmlzTm90QXV0aGVudGljYXRlZCgpKSB7XG5cdFx0XHRcdHRoaXMucGVyc2lzdFJldHVyblVybElmTmVlZGVkKClcblx0XHRcdFx0cmV0dXJuIDxSZWRpcmVjdCB0bz1cIi9sb2dpblwiIC8+XG5cdFx0XHR9XG5cdFx0XHRyZXR1cm4gPFdyYXBwZWRDb21wb25lbnQgey4uLihyZXN0IGFzIFRPd25Qcm9wcyl9IC8+XG5cdFx0fVxuXHR9XG59XG5cbmV4cG9ydCBjb25zdCBjb25maWd1cmVNYXBTdGF0ZVRvUHJvcHMgPVxuXHQoKSA9PlxuXHQoc3RhdGU6IEJhc2VSZWR1eFN0YXRlKTogQXV0aGVudGljYXRlZENvbXBvbmVudFN0YXRlUHJvcHMgPT4ge1xuXHRcdHJldHVybiB7XG5cdFx0XHRpc0F1dGhlbnRpY2F0aW5nOiAhc3RhdGUuYXV0aC5pc0F1dGhlbnRpY2F0ZWQgJiYgc3RhdGUuYXV0aC5pc0F1dGhlbnRpY2F0aW5nLFxuXHRcdFx0aXNBdXRoZW50aWNhdGVkOiBzdGF0ZS5hdXRoLmlzQXV0aGVudGljYXRlZFxuXHRcdH1cblx0fVxuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBhdXRoZW50aWNhdGVkQ29tcG9uZW50PFRPd25Qcm9wcyBleHRlbmRzIG9iamVjdD4oXG5cdFdyYXBwZWRDb21wb25lbnQ6IENvbXBvbmVudFR5cGU8VE93blByb3BzPlxuKTogQ29tcG9uZW50Q2xhc3M8VE93blByb3BzPiB7XG5cdGNvbnN0IEF1dGhlbnRpY2F0ZWRDb21wb25lbnQgPSBjb25maWd1cmVBdXRoZW50aWNhdGVkQ29tcG9uZW50KFdyYXBwZWRDb21wb25lbnQpXG5cdGNvbnN0IG1hcFN0YXRlVG9Qcm9wcyA9IGNvbmZpZ3VyZU1hcFN0YXRlVG9Qcm9wcygpXG5cdC8vIEB0cy1pZ25vcmU6IGNvdWxkIG5vdCBtYXRjaCBpbmZlcnJlZCB0eXBlIGZyb20gdGhlIGBjb25uZWN0YCBIT0Ncblx0cmV0dXJuIHdpdGhSb3V0ZXIoY29ubmVjdChtYXBTdGF0ZVRvUHJvcHMpKEF1dGhlbnRpY2F0ZWRDb21wb25lbnQpKVxufVxuIl0sIm1hcHBpbmdzIjoiOzs7Ozs7O0FBQUEsSUFBQUEsTUFBQSxHQUFBQyxPQUFBO0FBQ0EsSUFBQUMsV0FBQSxHQUFBRCxPQUFBO0FBQ0EsSUFBQUUsZUFBQSxHQUFBRixPQUFBO0FBQ0EsSUFBQUcsbUJBQUEsR0FBQUgsT0FBQTtBQUFvRixJQUFBSSxXQUFBLEdBQUFKLE9BQUE7QUFPN0UsTUFBTUssK0JBQStCLEdBQzNDQyxnQkFBMEMsSUFDa0I7RUFDNUQsT0FBTyxNQUFNQyxzQkFBc0IsU0FBU0MsZ0JBQVMsQ0FFbkQ7SUFDREMsa0JBQWtCQSxDQUFBLEVBQUc7TUFDcEIsTUFBTTtRQUFFQyxnQkFBZ0I7UUFBRUM7TUFBZ0IsQ0FBQyxHQUFHLElBQUksQ0FBQ0MsS0FBSztNQUN4RCxPQUFPLENBQUNGLGdCQUFnQixJQUFJLENBQUNDLGVBQWU7SUFDN0M7SUFFQUUsd0JBQXdCQSxDQUFBLEVBQUc7TUFDMUIsTUFBTTtRQUFFQztNQUFTLENBQUMsR0FBRyxJQUFJLENBQUNGLEtBQUssQ0FBQ0csUUFBUTtNQUN4QyxNQUFNQyxTQUFTLEdBQUdDLHNDQUFrQixDQUFDQyxPQUFPLENBQUNDLGdDQUFZLENBQUM7TUFDMUQsSUFBSSxDQUFDSCxTQUFTLEVBQUU7UUFDZkMsc0NBQWtCLENBQUNHLE9BQU8sQ0FBQ0QsZ0NBQVksRUFBRUwsUUFBUSxDQUFDO01BQ25EO0lBQ0Q7SUFFQU8sTUFBTUEsQ0FBQSxFQUFHO01BQ1IsTUFBTTtRQUFFWCxnQkFBZ0I7UUFBRUMsZUFBZTtRQUFFVyxPQUFPO1FBQUVQLFFBQVE7UUFBRVEsS0FBSztRQUFFQyxhQUFhO1FBQUUsR0FBR0M7TUFBSyxDQUFDLEdBQUcsSUFBSSxDQUFDYixLQUFLO01BQzFHLElBQUksSUFBSSxDQUFDSCxrQkFBa0IsQ0FBQyxDQUFDLEVBQUU7UUFDOUIsSUFBSSxDQUFDSSx3QkFBd0IsQ0FBQyxDQUFDO1FBQy9CLG9CQUFPLElBQUFULFdBQUEsQ0FBQXNCLEdBQUEsRUFBQ3hCLGVBQUEsQ0FBQXlCLFFBQVE7VUFBQ0MsRUFBRSxFQUFDO1FBQVEsQ0FBRSxDQUFDO01BQ2hDO01BQ0Esb0JBQU8sSUFBQXhCLFdBQUEsQ0FBQXNCLEdBQUEsRUFBQ3BCLGdCQUFnQjtRQUFBLEdBQU1tQjtNQUFJLENBQWlCLENBQUM7SUFDckQ7RUFDRCxDQUFDO0FBQ0YsQ0FBQztBQUFBSSxPQUFBLENBQUF4QiwrQkFBQSxHQUFBQSwrQkFBQTtBQUVNLE1BQU15Qix3QkFBd0IsR0FDcENBLENBQUEsS0FDQ0MsS0FBcUIsSUFBdUM7RUFDNUQsT0FBTztJQUNOckIsZ0JBQWdCLEVBQUUsQ0FBQ3FCLEtBQUssQ0FBQ0MsSUFBSSxDQUFDckIsZUFBZSxJQUFJb0IsS0FBSyxDQUFDQyxJQUFJLENBQUN0QixnQkFBZ0I7SUFDNUVDLGVBQWUsRUFBRW9CLEtBQUssQ0FBQ0MsSUFBSSxDQUFDckI7RUFDN0IsQ0FBQztBQUNGLENBQUM7QUFBQWtCLE9BQUEsQ0FBQUMsd0JBQUEsR0FBQUEsd0JBQUE7QUFFYSxTQUFTRyxzQkFBc0JBLENBQzdDM0IsZ0JBQTBDLEVBQ2Q7RUFDNUIsTUFBTUMsc0JBQXNCLEdBQUdGLCtCQUErQixDQUFDQyxnQkFBZ0IsQ0FBQztFQUNoRixNQUFNNEIsZUFBZSxHQUFHSix3QkFBd0IsQ0FBQyxDQUFDO0VBQ2xEO0VBQ0EsT0FBTyxJQUFBSywwQkFBVSxFQUFDLElBQUFDLG1CQUFPLEVBQUNGLGVBQWUsQ0FBQyxDQUFDM0Isc0JBQXNCLENBQUMsQ0FBQztBQUNwRSIsImlnbm9yZUxpc3QiOltdfQ==

package/lib/components/HOC/CollectionComponent.d.ts

@@ -1,7 +1,7 @@
-import React, { ComponentClass, ComponentType } from 'react';
+import { ComponentClass, ComponentType } from 'react';
 import { RouteComponentProps } from 'react-router';
 import { MODEL_STATUS } from '../../constants/modelStatus';
-import { BaseReduxState, Model, ModelCollection } from '../../types';
+import { BaseReduxState, CollectionSelectorMethodResponse, Model, ModelCollection } from '../../types';
 import { CollectionCommonProps, CollectionCommonState, CollectionCreateParams, CollectionDeleteParams, CollectionDerivedProps, CollectionLoadParams, CollectionMethodConfiguration, CollectionMethods, CollectionReduxResponse, CollectionUpdateParams } from '../../types/Collection';
 import { GuidComponentWrappedProps } from './GuidComponent';
 /** The props passed into `CollectionComponent` from the user and other HOCs. */
@@ -10,32 +10,32 @@ export interface CollectionComponentProps<TModel extends Model> extends Collecti
 /** The props passed down to the `WrappedComponent`. */
 export interface CollectionComponentWrappedProps<TModel extends Model> extends Omit<CollectionComponentProps<TModel>, keyof RouteComponentProps>, CollectionDerivedProps<TModel>, CollectionMethods, CollectionCommonState {
 }
-export declare function configureCollectionComponent<TModel extends Model, TOwnProps extends {}>(WrappedComponent: ComponentType<TOwnProps & CollectionComponentWrappedProps<TModel>>, LoaderComponent?: ComponentType): {
+export declare function configureCollectionComponent<TModel extends Model, TOwnProps extends object>(WrappedComponent: ComponentType<TOwnProps & CollectionComponentWrappedProps<TModel>>, LoaderComponent?: ComponentType): {
     new (props: TOwnProps & CollectionComponentProps<TModel>): {
         componentDidMount(): void;
         componentDidUpdate(prevProps: TOwnProps & CollectionComponentProps<TModel>): void;
         componentWillUnmount(): void;
-        changeModelStatus: (newModelStatus: MODEL_STATUS, fetchingId?: string | number | undefined) => void;
+        changeModelStatus: (newModelStatus: MODEL_STATUS, fetchingId?: string | number) => void;
         getCollectionMethodConfig: () => CollectionMethodConfiguration;
         load: (params?: CollectionLoadParams) => void;
         stopPeriodicLoad: (taskId: string) => void;
         create: (params: CollectionCreateParams) => void;
         update: (params: CollectionUpdateParams) => void;
         delete: (params: CollectionDeleteParams) => void;
-        getModelArray: import("memoize-one").MemoizedFn<(model: ModelCollection<TModel>, guid?: string | undefined) => TModel[]>;
-        render(): React.JSX.Element;
+        getModelArray: import("memoize-one").MemoizedFn<(model: ModelCollection<TModel>, guid?: string) => TModel[]>;
+        render(): import("react/jsx-runtime").JSX.Element;
         context: any;
-        setState<K extends "modelStatus" | "previousModelStatus" | "fetchingId">(state: CollectionCommonState | ((prevState: Readonly<CollectionCommonState>, props: Readonly<TOwnProps & CollectionComponentProps<TModel>>) => CollectionCommonState | Pick<CollectionCommonState, K> | null) | Pick<CollectionCommonState, K> | null, callback?: (() => void) | undefined): void;
+        setState<K extends keyof CollectionCommonState>(state: CollectionCommonState | ((prevState: Readonly<CollectionCommonState>, props: Readonly<TOwnProps & CollectionComponentProps<TModel>>) => CollectionCommonState | Pick<CollectionCommonState, K> | null) | Pick<CollectionCommonState, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<TOwnProps & CollectionComponentProps<TModel>> & Readonly<{
-            children?: React.ReactNode;
+            children?: import("react").ReactNode | undefined;
         }>;
         state: Readonly<CollectionCommonState>;
         refs: {
-            [key: string]: React.ReactInstance;
+            [key: string]: import("react").ReactInstance;
         };
         shouldComponentUpdate?(nextProps: Readonly<TOwnProps & CollectionComponentProps<TModel>>, nextState: Readonly<CollectionCommonState>, nextContext: any): boolean;
-        componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
+        componentDidCatch?(error: Error, errorInfo: import("react").ErrorInfo): void;
         getSnapshotBeforeUpdate?(prevProps: Readonly<TOwnProps & CollectionComponentProps<TModel>>, prevState: Readonly<CollectionCommonState>): any;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
@@ -44,9 +44,9 @@ export declare function configureCollectionComponent<TModel extends Model, TOwnP
         componentWillUpdate?(nextProps: Readonly<TOwnProps & CollectionComponentProps<TModel>>, nextState: Readonly<CollectionCommonState>, nextContext: any): void;
         UNSAFE_componentWillUpdate?(nextProps: Readonly<TOwnProps & CollectionComponentProps<TModel>>, nextState: Readonly<CollectionCommonState>, nextContext: any): void;
     };
-    contextType?: React.Context<any> | undefined;
+    contextType?: import("react").Context<any> | undefined;
 };
-export declare const configureMapStateToProps: <TModel extends Model, TOwnProps extends Pick<CollectionComponentProps<TModel>, "guid" | "match" | "modelName" | "pathParams" | "queryParams" | "location" | "history" | "staticContext" | "disableAutoLoad" | "disableAutoLoadOnParamsChange">>(modelName: string) => (state: BaseReduxState, ownProps: TOwnProps & Partial<CollectionComponentProps<TModel>>) => import("../../types").CollectionSelectorMethodResponse<Model>;
+export declare const configureMapStateToProps: <TModel extends Model>(modelName: string) => (state: BaseReduxState, ownProps: Omit<CollectionComponentProps<TModel>, keyof CollectionSelectorMethodResponse<TModel>> & Partial<CollectionCommonProps>) => CollectionSelectorMethodResponse<Model>;
 /**
  * HOC that provides "collection" related functionality, using redux `connect()`, react-router-dom `withRouter()`, and `GuidComponent`.
  *