@webkrafters/react-observable-context 4.1.0-rc.0 → 4.1.0-rc.2

package/README.md

@@ -92,6 +92,8 @@ A special property path [@@STATE](#fullstate-selectorkey) may be used to access
 ## Provider
 The Provider component is a property of the `React-Observable-Context` context object. As a `React.context` based provider, it accepts the customary `children` and `value` props. It also accepts **2** optional props: <a href="#prehooks"><code>prehooks</code></a> and <a href="#storage"><code>storage</code></a>.
 
+External direct access to the context store may be obtained via the `ref` attribute. Please see a [Provider Usage](#provider-usage) sample below. 
+
 Routinely, the `value` prop is initialized with the full initial state. It may only be updated with parts of the state which are changing. Please see a [Provider Usage](#provider-usage) sample below. 
 
 <h2 id="selector-map">Selector Map</h2>
@@ -541,6 +543,8 @@ const storageStub = {
 };
 
 const Provider = ({ c = DEFAULT_C }) => {
+
+  const storeRef = useRef();
 	
   const [ state, setState ] = useState(() => ({
     a: { b: { c, x: { y: { z: [ 2022 ] } } } }
@@ -557,6 +561,7 @@ const Provider = ({ c = DEFAULT_C }) => {
   return (
     <ObservableContext.Provider
       prehooks={ updateHooks }
+	  ref={ storeRef }
       storage={ storageStub }
       value={ state }
     >
@@ -580,16 +585,15 @@ ReactDOM.render( <Provider />, document.getElementById( 'root' ) );
 ```
 
 <h1 id="changes">What's Changed?</h1>
-<b>v4.1.0</b>
+
 <table>
+	<thead><tr><th>v4.1.0</th></tr></thead>
 	<tbody>
 		<tr><td><b>1.</b></td><td>Added new setState <a href="#setstate-tags">tags</a> to facilitate state update operations.</td></tr>
+		<tr><td><b>2.</b></td><td>Exposing the store via its Context Provider `ref` attribute.</td></tr>
+		<tr><td><b>3.</b></td><td>Exporting crucial constants such as @@STATE and setState <a href="#setstate-tags">tags</a> such as @@CLEAR, @@MOVE etc.</td></tr>
 	</tbody>
-</table>
-<hr />
-
-<b>v4.0.0</b>
-<table>
+	<thead><tr><th>v4.0.0</th></tr></thead>
 	<tbody>
 		<tr><td><b>1.</b></td><td>Added the <a href="#connect"><code>connect</code></a> function to facilitate the encapsulated context-usage method.</td></tr>
 		<tr><td><b>2.</b></td><td>Added stronger support for deeply nested state structure. See <a href="#store-setstate"><code>store.setState</code></a></td></tr>

package/dist/main/hooks/use-store/index.d.ts

@@ -17,6 +17,7 @@ declare function useStore<T extends import("../../../types").State>(prehooks: Pr
     };
     resetState: (propertyPaths?: string[]) => void;
     setState: (changes: import("../../../types").UpdatePayload<import("../../../types").PartialState<T>>) => void;
+    state: T;
     subscribe: (listener: import("../../../types").Listener<T>) => VoidFunction;
     unlinkCache: (clientId: string) => void;
 };

package/dist/main/hooks/use-store/index.js

@@ -122,6 +122,7 @@ var useStore = function useStore(prehooks, value, storage) {
       getState: select,
       resetState: resetState,
       setState: setState,
+      state: state,
       subscribe: subscribe,
       unlinkCache: unlink
     };

package/dist/main/index.d.ts

@@ -1,25 +1,9 @@
-/**
- * @param {ObservableContext<T>} context Refers to the PublicObservableContext<T> type of the ObservableContext<T>
- * @param {SelectorMap<T>} [selectorMap] Key:value pairs where `key` => arbitrary key given to a Store.data property holding a state slice and `value` => property path to a state slice used by this component: see examples below. May add a mapping for a certain arbitrary key='state' and value='@@STATE' to indicate a desire to obtain the entire state object and assign to a `state` property of Store.data. A change in any of the referenced properties results in this component render. When using '@@STATE', note that any change within the state object will result in this component render.
- * @returns {(WrappedComponent: C) => MemoExoticComponent<P>}
- * @template {State} T
- * @template {PartialStore<T> & {[x:string]:*}} [P=PartialStore<T>]
- * @template {ComponentType<P>|ExoticComponent<P>} C
- * @see {ObservableContext<T>}
- * @see {useContext} for selectorMap sample
- */
-export function connect<T extends import("../types").State, P extends PartialStore<T> & {
-    [x: string]: any;
-} = PartialStore<T>, C extends ComponentType<P> | import("react").ExoticComponent<ComponentType<P>>>(context: ObservableContext<T>, selectorMap?: SelectorMap<T>): (WrappedComponent: C) => MemoExoticComponent<P>;
-
 /**
  * @returns {ObservableContext<T>} Refers to the IObservableContext<T> type of the ObservableContext<T>
  * @template {State} T
  * @see {ObservableContext<T>}
  */
 export function createContext<T extends import("../types").State>(): ObservableContext<T>;
-export class UsageError extends Error {
-}
 
 /**
  * Actively monitors the store and triggers component re-render if any of the watched keys in the state objects changes
@@ -47,18 +31,101 @@ export class UsageError extends Error {
  * {myData: '@@STATE'} => {myData: state}
  */
 export function useContext<T extends import("../types").State>(context: ObservableContext<T>, selectorMap?: SelectorMap<T>): Store<T>;
+
+/**
+ * @param {ObservableContext<T>} context Refers to the PublicObservableContext<T> type of the ObservableContext<T>
+ * @param {SelectorMap<T>} [selectorMap] Key:value pairs where `key` => arbitrary key given to a Store.data property holding a state slice and `value` => property path to a state slice used by this component: see examples below. May add a mapping for a certain arbitrary key='state' and value='@@STATE' to indicate a desire to obtain the entire state object and assign to a `state` property of Store.data. A change in any of the referenced properties results in this component render. When using '@@STATE', note that any change within the state object will result in this component render.
+ * @returns {(WrappedComponent: C) => MemoExoticComponent<P>}
+ * @template {State} T
+ * @template {PartialStore<T> & {[x:string]:*}} [P=PartialStore<T>]
+ * @template {ComponentType<P>|ExoticComponent<P>} C
+ * @see {ObservableContext<T>}
+ * @see {useContext} for selectorMap sample
+ */
+export function connect<T extends import("../types").State, P extends PartialStore<T> & {
+    [x: string]: any;
+} = PartialStore<T>, C extends ComponentType<P> | import("react").ExoticComponent<ComponentType<P>>>(context: ObservableContext<T>, selectorMap?: SelectorMap<T>): (WrappedComponent: C) => MemoExoticComponent<P>;
+export type CLEAR_TAG = typeof CLEAR_TAG;
+
+/** @example changes = { property: CLEAR_TAG } */
+export const CLEAR_TAG: "@@CLEAR";
+export type DELETE_TAG = typeof DELETE_TAG;
+
+/**
+ * @example
+ * changes = {
+ * 	property: {
+ * 		[DELETE_TAG]: [keys/indexes to remove from property]
+ * 	}
+ * }
+ */
+export const DELETE_TAG: "@@DELETE";
+export type FULL_STATE_SELECTOR = import("../types").FULL_STATE_SELECTOR;
+export const FULL_STATE_SELECTOR: "@@STATE";
+export type MOVE_TAG = typeof MOVE_TAG;
+
+/**
+ * @example
+ * changes = {
+ * 	arrayProperty: {
+ * 		[MOVE_TAG]: [-/+fromIndex, -/+toIndex, +numItems?] // numItems = 1 by default
+ * 	}
+ * }
+ */
+export const MOVE_TAG: "@@MOVE";
+export type PUSH_TAG = typeof PUSH_TAG;
+
+/** @example changes = { arrayProperty: { [PUSH_TAG]: [new items to append to array] } } */
+export const PUSH_TAG: "@@PUSH";
+export type REPLACE_TAG = typeof REPLACE_TAG;
+
+/** @example changes = { property: { [REPLACE_TAG]: replacement } } */
+export const REPLACE_TAG: "@@REPLACE";
+export type SET_TAG = typeof SET_TAG;
+
+/**
+ * @example
+ * changes = {
+ * 	property: {
+ * 		[SET_TAG]: replacement // or a compute replacement function (i.e. currentProperty => replacement)
+ * 	}
+ * }
+ */
+export const SET_TAG: "@@SET";
+export type SPLICE_TAG = typeof SPLICE_TAG;
+
+/**
+ * @example
+ * changes = {
+ *   arrayProperty: {
+ *     [SPLICE_TAG]: [-/+fromIndex, +deleteCount, ...newItems?] // newItems = ...[] by default
+ *   }
+ * }
+ */
+export const SPLICE_TAG: "@@SPLICE";
+export class UsageError extends Error {
+}
 export type ObservableContext<T extends import("../types").State> = IObservableContext<T> | PublicObservableContext<T>;
 export type PublicObservableContext<T extends import("../types").State> = WithObservableProvider<Context<Store<T>>, T>;
 export type IObservableContext<T extends import("../types").State> = WithObservableProvider<Context<IStore>, T>;
 export type WithObservableProvider<T, S extends import("../types").State> = T & {
     Provider: ObservableProvider<S>;
 };
-export type ObservableProvider<T extends import("../types").State> = FC<{
+export type ObservableProvider<T extends import("../types").State> = ForwardRefExoticComponent<ProviderProps<T>, StoreRef<T>>;
+export type ProviderProps<T extends import("../types").State> = {
     children?: ReactNode;
     prehooks?: Prehooks<T>;
     storage?: IStorage<T>;
     value: PartialState<T>;
-}>;
+};
+export type StoreRef<T extends import("../types").State> = {
+    [x: string]: any;
+    getState: () => T;
+} & {
+    resetState: (propertyPaths?: string[]) => void;
+    setState: (changes: import("../types").UpdatePayload<import("../types").PartialState<T>>) => void;
+    subscribe: (listener: import("../types").Listener<T>) => VoidFunction;
+};
 export type State = import("../types").State;
 export type PartialState<T extends import("../types").State> = import("../types").PartialState<T>;
 export type Prehooks<T extends import("../types").State> = import("../types").Prehooks<T>;
@@ -79,6 +146,7 @@ export type IStorage<T extends import("../types").State> = import("../types").IS
 export type NonReactUsageReport = import("../types").NonReactUsageReport;
 export type Data = import("../types").Data;
 export type ReactNode = import("react").ReactNode;
+export type ForwardRefExoticComponent<P, T> = import('react').ForwardRefExoticComponent<import('react').PropsWithRef<P> & import('react').RefAttributes<T>>;
 export type MemoExoticComponent<P extends {
     [x: string]: any;
 } = {}> = import('react').MemoExoticComponent<ComponentType<P>>;

package/dist/main/index.js

@@ -2,37 +2,26 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useContext = exports.createContext = exports.connect = exports.UsageError = void 0;
+exports.useContext = exports.createContext = exports.connect = exports.UsageError = exports.SPLICE_TAG = exports.SET_TAG = exports.REPLACE_TAG = exports.PUSH_TAG = exports.MOVE_TAG = exports.FULL_STATE_SELECTOR = exports.DELETE_TAG = exports.CLEAR_TAG = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _lodash = _interopRequireDefault(require("lodash.isempty"));
 var _lodash2 = _interopRequireDefault(require("lodash.isequal"));
 var _lodash3 = _interopRequireDefault(require("lodash.isplainobject"));
 var _lodash4 = _interopRequireDefault(require("lodash.omit"));
 var _uuid = require("uuid");
+var constants = _interopRequireWildcard(require("../constants"));
+var _utils = require("../utils");
 var _useRenderKeyProvider = _interopRequireDefault(require("./hooks/use-render-key-provider"));
 var _useStore = _interopRequireDefault(require("./hooks/use-store"));
+var _excluded = ["state"];
 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 _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 _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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-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(_e2) { throw _e2; }, 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(_e3) { didErr = true; err = _e3; }, 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 _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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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 _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 _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0) { ; } } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+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; }
 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, _toPropertyKey(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 _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a 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 _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); }; }
@@ -45,20 +34,22 @@ function _isNativeFunction(fn) { return Function.toString.call(fn).indexOf("[nat
 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.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : 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); }
-var connect = function connect(context, selectorMap) {
-  return function (WrappedComponent) {
-    if (!((0, _lodash3["default"])(WrappedComponent) && 'compare' in WrappedComponent)) {
-      WrappedComponent = (0, _react.memo)(WrappedComponent);
-    }
-    var ConnectedComponent = (0, _react.memo)(function (ownProps) {
-      var store = useContext(context, selectorMap);
-      return _react["default"].createElement(WrappedComponent, _extends({}, store, ownProps));
-    });
-    ConnectedComponent.displayName = 'ObservableContext.Connected';
-    return ConnectedComponent;
-  };
-};
-exports.connect = connect;
+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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+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(_e2) { throw _e2; }, 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(_e3) { didErr = true; err = _e3; }, 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 _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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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 _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 _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0) { ; } } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var createContext = function createContext() {
   var Context = (0, _react.createContext)({
     getState: reportNonReactUsage,
@@ -71,20 +62,10 @@ var createContext = function createContext() {
   return Context;
 };
 exports.createContext = createContext;
-var UsageError = function (_Error) {
-  _inherits(UsageError, _Error);
-  var _super = _createSuper(UsageError);
-  function UsageError() {
-    _classCallCheck(this, UsageError);
-    return _super.apply(this, arguments);
-  }
-  return _createClass(UsageError);
-}( _wrapNativeSuper(Error));
-exports.UsageError = UsageError;
 var useContext = function useContext(context) {
   var selectorMap = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var _React$useContext = _react["default"].useContext(context),
-    _getState = _React$useContext.getState,
+    getState = _React$useContext.getState,
     _resetState = _React$useContext.resetState,
     subscribe = _React$useContext.subscribe,
     unlinkCache = _React$useContext.unlinkCache,
@@ -109,7 +90,7 @@ var useContext = function useContext(context) {
       if ((0, _lodash["default"])(_renderKeys)) {
         return data;
       }
-      var state = _getState.apply(void 0, [clientId].concat(_toConsumableArray(_renderKeys)));
+      var state = getState.apply(void 0, [clientId].concat(_toConsumableArray(_renderKeys)));
       var _iterator = _createForOfIteratorHelper(_renderKeys),
         _step;
       try {
@@ -129,7 +110,7 @@ var useContext = function useContext(context) {
     setData = _React$useState4[1];
   var updateData = function updateData() {
     var hasChanges = false;
-    var state = _getState.apply(void 0, [clientId].concat(_toConsumableArray(_renderKeys)));
+    var state = getState.apply(void 0, [clientId].concat(_toConsumableArray(_renderKeys)));
     var _iterator2 = _createForOfIteratorHelper(_renderKeys),
       _step2;
     try {
@@ -177,6 +158,46 @@ var useContext = function useContext(context) {
   }, [data]);
 };
 exports.useContext = useContext;
+var connect = function connect(context, selectorMap) {
+  return function (WrappedComponent) {
+    if (!((0, _lodash3["default"])(WrappedComponent) && 'compare' in WrappedComponent)) {
+      WrappedComponent = (0, _react.memo)(WrappedComponent);
+    }
+    var ConnectedComponent = (0, _react.memo)(function (ownProps) {
+      var store = useContext(context, selectorMap);
+      return _react["default"].createElement(WrappedComponent, _extends({}, store, ownProps));
+    });
+    ConnectedComponent.displayName = 'ObservableContext.Connected';
+    return ConnectedComponent;
+  };
+};
+exports.connect = connect;
+var CLEAR_TAG = constants.CLEAR_TAG;
+exports.CLEAR_TAG = CLEAR_TAG;
+var DELETE_TAG = constants.DELETE_TAG;
+exports.DELETE_TAG = DELETE_TAG;
+var FULL_STATE_SELECTOR = constants.FULL_STATE_SELECTOR;
+exports.FULL_STATE_SELECTOR = FULL_STATE_SELECTOR;
+var MOVE_TAG = constants.MOVE_TAG;
+exports.MOVE_TAG = MOVE_TAG;
+var PUSH_TAG = constants.PUSH_TAG;
+exports.PUSH_TAG = PUSH_TAG;
+var REPLACE_TAG = constants.REPLACE_TAG;
+exports.REPLACE_TAG = REPLACE_TAG;
+var SET_TAG = constants.SET_TAG;
+exports.SET_TAG = SET_TAG;
+var SPLICE_TAG = constants.SPLICE_TAG;
+exports.SPLICE_TAG = SPLICE_TAG;
+var UsageError = function (_Error) {
+  _inherits(UsageError, _Error);
+  var _super = _createSuper(UsageError);
+  function UsageError() {
+    _classCallCheck(this, UsageError);
+    return _super.apply(this, arguments);
+  }
+  return _createClass(UsageError);
+}( _wrapNativeSuper(Error));
+exports.UsageError = UsageError;
 var ChildMemo = function () {
   var useNodeMemo = function useNodeMemo(node) {
     var nodeRef = (0, _react.useRef)(node);
@@ -201,7 +222,7 @@ var ChildMemo = function () {
 }();
 var defaultPrehooks = Object.freeze({});
 function makeObservable(Provider) {
-  var Observable = function Observable(_ref3) {
+  var Observable = (0, _react.forwardRef)(function (_ref3, storeRef) {
     var _ref3$children = _ref3.children,
       children = _ref3$children === void 0 ? null : _ref3$children,
       _ref3$prehooks = _ref3.prehooks,
@@ -209,10 +230,32 @@ function makeObservable(Provider) {
       _ref3$storage = _ref3.storage,
       storage = _ref3$storage === void 0 ? null : _ref3$storage,
       value = _ref3.value;
+    var _store = (0, _useStore["default"])(prehooks, value, storage);
+    var _useMemo = (0, _react.useMemo)(function () {
+        var state = _store.state,
+          store = _objectWithoutProperties(_store, _excluded);
+        return {
+          state: state,
+          store: store
+        };
+      }, [_store]),
+      state = _useMemo.state,
+      store = _useMemo.store;
+    (0, _react.useImperativeHandle)(storeRef, function () {
+      var _storeRef$current;
+      return _objectSpread(_objectSpread({}, (_storeRef$current = storeRef === null || storeRef === void 0 ? void 0 : storeRef.current) !== null && _storeRef$current !== void 0 ? _storeRef$current : {}), {}, {
+        getState: function getState() {
+          return (0, _utils.clonedeep)(state);
+        },
+        resetState: store.resetState,
+        setState: store.setState,
+        subscribe: store.subscribe
+      });
+    }, [storeRef === null || storeRef === void 0 ? void 0 : storeRef.current, state]);
     return _react["default"].createElement(Provider, {
-      value: (0, _useStore["default"])(prehooks, value, storage)
+      value: store
     }, memoizeImmediateChildTree(children));
-  };
+  });
   Observable.displayName = 'ObservableContext.Provider';
   return Observable;
 }

package/dist/model/accessor-cache/index.js

@@ -103,11 +103,10 @@ var AccessorCache = function () {
       var atoms = _classPrivateFieldGet(this, _atoms);
       var updatedPaths = [];
       for (var path in atoms) {
-        if (path !== _constants.FULL_STATE_SELECTOR && !(0, _utils.getProperty)(originChanges, path).exists) {
-          continue;
-        }
-        var newAtomVal = _classPrivateMethodGet(this, _getOriginAt, _getOriginAt2).call(this, path);
-        if ((0, _lodash2["default"])(newAtomVal, atoms[path].value)) {
+        var _classPrivateMethodGe = _classPrivateMethodGet(this, _getOriginAt, _getOriginAt2).call(this, path),
+          exists = _classPrivateMethodGe.exists,
+          newAtomVal = _classPrivateMethodGe.value;
+        if (path !== _constants.FULL_STATE_SELECTOR && exists && typeof newAtomVal === 'undefined' && !(0, _utils.getProperty)(originChanges, path).exists || (0, _lodash2["default"])(newAtomVal, atoms[path].value)) {
           continue;
         }
         atoms[path].setValue(newAtomVal);
@@ -134,7 +133,7 @@ function _createAccessor2(cacheKey, propertyPaths) {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var path = _step2.value;
       if (!(path in atoms)) {
-        atoms[path] = new _atom["default"](_classPrivateMethodGet(this, _getOriginAt, _getOriginAt2).call(this, path));
+        atoms[path] = new _atom["default"](_classPrivateMethodGet(this, _getOriginAt, _getOriginAt2).call(this, path).value);
       }
     }
   } catch (err) {
@@ -145,7 +144,10 @@ function _createAccessor2(cacheKey, propertyPaths) {
   return _classPrivateFieldGet(this, _accessors)[cacheKey];
 }
 function _getOriginAt2(propertyPath) {
-  return propertyPath !== _constants.FULL_STATE_SELECTOR ? (0, _utils.getProperty)(_classPrivateFieldGet(this, _origin), propertyPath).value : _classPrivateFieldGet(this, _origin);
+  return propertyPath === _constants.FULL_STATE_SELECTOR ? {
+    exists: true,
+    value: _classPrivateFieldGet(this, _origin)
+  } : (0, _utils.getProperty)(_classPrivateFieldGet(this, _origin), propertyPath);
 }
 var _default = AccessorCache;
 exports["default"] = _default;

package/package.json

@@ -133,5 +133,5 @@
     "test:watch": "eslint --fix && jest --updateSnapshot --watchAll"
   },
   "types": "dist/main/index.d.ts",
-  "version": "4.1.0-rc.0"
+  "version": "4.1.0-rc.2"
 }