react-ui-basics 0.0.211 → 0.0.213

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-ui-basics",
-  "version": "0.0.211",
+  "version": "0.0.213",
   "description": "",
   "module": "index.js",
   "_main": "index.cjs.js",
@@ -57,6 +57,7 @@
     "@babel/plugin-transform-runtime": "7.22.15",
     "@babel/preset-env": "7.22.20",
     "@babel/preset-react": "7.22.15",
+    "@babel/preset-typescript": "^7.23.3",
     "@rollup/plugin-typescript": "^9.0.1",
     "@storybook/addon-actions": "6.4.19",
     "@storybook/addon-controls": "6.4.19",
@@ -65,6 +66,7 @@
     "@storybook/addons": "6.4.19",
     "@storybook/react": "6.4.19",
     "@storybook/source-loader": "6.4.19",
+    "@types/jest": "^29.5.11",
     "@types/react": "^17.0.50",
     "@types/react-dom": "^17.0.17",
     "babel-loader": "^8.2.5",

package/router/Link.js

@@ -1,6 +1,6 @@
 import ReactConstants from "./../ReactConstants"; import {clientHeight as __clientHeight, clientWidth as __clientWidth, createAccessor as __createAccessor, data as __data, height as __height, left as __left, length as __length, pageX as __pageX, pageY as __pageY, props as __props, scrollLeft as __scrollLeft, scrollTop as __scrollTop, state as __state, style as __style, target as __target, top as __top, value as __value, width as __width} from "./../CommonFields"; import {toConsumableArray as __toConsumableArray} from "./../_virtual/_rollupPluginBabelHelpers"; import {extends as __extends} from "./../_virtual/_rollupPluginBabelHelpers"; import {inherits as __inherits} from "./../_virtual/_rollupPluginBabelHelpers"; import 'react';
 import ReactCreateElement from '../ReactCreateElement.js';
-import PropTypes from 'prop-types';
+import 'prop-types';
 import { pushLocation } from './HistoryTools.js';
 import { preventDefault } from '../Tools.js';
 
@@ -19,11 +19,6 @@ var Link = function Link(_ref) {
     }
   }, children);
 };
-if (process.env.NODE_ENV !== 'production') {
-  Link.propTypes = {
-    href: PropTypes.string.isRequired
-  };
-}
 var Link$1 = Link;
 
 export { Link$1 as default };

package/router/Link.js.map

@@ -1 +1 @@
-{"version":3,"file":"Link.js","sources":["../src/router/Link.js"],"sourcesContent":["import React from 'react';\nimport ReactCreateElement from '../ReactCreateElement';\nimport PropTypes from 'prop-types';\nimport './HistoryTools'\nimport {pushLocation} from \"./HistoryTools\";\nimport {preventDefault} from \"../Tools\";\n\nconst Link = ({children, href, className}) =>\n    <a href={href} className={className} onClick={(e) => {\n        if (!e.ctrlKey) {\n            preventDefault(e);\n            pushLocation(href);\n        }\n    }}>{children}</a>;\n\nif (window.isNotProductionEnvironment) {\n    Link.propTypes = {\n        href: PropTypes.string.isRequired,\n    };\n}\n\nexport default Link;"],"names":["Link","_ref","children","href","className","ReactCreateElement","onClick","e","ctrlKey","preventDefault","pushLocation","window","isNotProductionEnvironment","propTypes","PropTypes","string","isRequired"],"mappings":";;;;;;AAOA,IAAMA,IAAI,GAAG,SAAPA,IAAIA,CAAAC,IAAA,EAAA;AAAA,EAAA,IAAKC,QAAQ,GAAAD,IAAA,CAARC,QAAQ;IAAEC,IAAI,GAAAF,IAAA,CAAJE,IAAI;IAAEC,SAAS,GAAAH,IAAA,CAATG,SAAS,CAAA;AAAA,EAAA,OACpCC,kBAAA,CAAA,GAAA,EAAA;AAAGF,IAAAA,IAAI,EAAEA,IAAK;AAACC,IAAAA,SAAS,EAAEA,SAAU;AAACE,IAAAA,OAAO,EAAE,SAAAA,OAACC,CAAAA,CAAC,EAAK;AACjD,MAAA,IAAI,CAACA,CAAC,CAACC,OAAO,EAAE;QACZC,cAAc,CAACF,CAAC,CAAC,CAAA;QACjBG,YAAY,CAACP,IAAI,CAAC,CAAA;AACtB,OAAA;AACJ,KAAA;AAAE,GAAA,EAAED,QAAY,CAAC,CAAA;AAAA,CAAA,CAAA;AAErB,IAAIS,MAAM,CAACC,0BAA0B,EAAE;EACnCZ,IAAI,CAACa,SAAS,GAAG;AACbV,IAAAA,IAAI,EAAEW,SAAS,CAACC,MAAM,CAACC,UAAAA;GAC1B,CAAA;AACL,CAAA;AAEA,aAAehB,IAAI;;;;"}
+{"version":3,"file":"Link.js","sources":["../src/router/Link.js"],"sourcesContent":["import React from 'react';\nimport ReactCreateElement from '../ReactCreateElement';\nimport PropTypes from 'prop-types';\nimport './HistoryTools'\nimport {pushLocation} from \"./HistoryTools\";\nimport {preventDefault} from \"../Tools\";\n\nconst Link = ({children, href, className}) =>\n    <a href={href} className={className} onClick={(e) => {\n        if (!e.ctrlKey) {\n            preventDefault(e);\n            pushLocation(href);\n        }\n    }}>{children}</a>;\n\nif (window.isNotProductionEnvironment) {\n    Link.propTypes = {\n        href: PropTypes.string.isRequired,\n    };\n}\n\nexport default Link;"],"names":["Link","_ref","children","href","className","ReactCreateElement","onClick","e","ctrlKey","preventDefault","pushLocation"],"mappings":";;;;;;AAOA,IAAMA,IAAI,GAAG,SAAPA,IAAIA,CAAAC,IAAA,EAAA;AAAA,EAAA,IAAKC,QAAQ,GAAAD,IAAA,CAARC,QAAQ;IAAEC,IAAI,GAAAF,IAAA,CAAJE,IAAI;IAAEC,SAAS,GAAAH,IAAA,CAATG,SAAS,CAAA;AAAA,EAAA,OACpCC,kBAAA,CAAA,GAAA,EAAA;AAAGF,IAAAA,IAAI,EAAEA,IAAK;AAACC,IAAAA,SAAS,EAAEA,SAAU;AAACE,IAAAA,OAAO,EAAE,SAAAA,OAACC,CAAAA,CAAC,EAAK;AACjD,MAAA,IAAI,CAACA,CAAC,CAACC,OAAO,EAAE;QACZC,cAAc,CAACF,CAAC,CAAC,CAAA;QACjBG,YAAY,CAACP,IAAI,CAAC,CAAA;AACtB,OAAA;AACJ,KAAA;AAAE,GAAA,EAAED,QAAY,CAAC,CAAA;AAAA,CAAA,CAAA;AAQrB,aAAeF,IAAI;;;;"}

package/router/NavLink.js

@@ -21,9 +21,6 @@ var NavLink = function NavLink(_ref) {
     }
   });
 };
-if (process.env.NODE_ENV !== 'production') {
-  NavLink.propTypes = Link.propTypes;
-}
 var NavLink$1 = NavLink;
 
 export { NavLink$1 as default };

package/router/NavLink.js.map

@@ -1 +1 @@
-{"version":3,"file":"NavLink.js","sources":["../src/router/NavLink.js"],"sourcesContent":["import React from 'react';\nimport ReactCreateElement from '../ReactCreateElement';\nimport PropTypes from 'prop-types';\nimport './HistoryTools'\nimport Route from \"./Route\";\nimport Link from \"./Link\";\nimport {classNames} from \"../Tools\";\n\nconst NavLink = ({children, href, highlightPath, className, activeClassName}) =>\n    <Route path={highlightPath || href}\n           controller={matches => <Link href={href} className={classNames(className, matches && activeClassName)}>\n               {children}\n           </Link>}\n    />;\n\nif(window.isNotProductionEnvironment) {\n    NavLink.propTypes = Link.propTypes;\n}\n\nexport default NavLink;"],"names":["NavLink","_ref","children","href","highlightPath","className","activeClassName","ReactCreateElement","Route","path","controller","matches","Link","classNames","window","isNotProductionEnvironment","propTypes"],"mappings":";;;;;;;AAQA,IAAMA,OAAO,GAAG,SAAVA,OAAOA,CAAAC,IAAA,EAAA;AAAA,EAAA,IAAKC,QAAQ,GAAAD,IAAA,CAARC,QAAQ;IAAEC,IAAI,GAAAF,IAAA,CAAJE,IAAI;IAAEC,aAAa,GAAAH,IAAA,CAAbG,aAAa;IAAEC,SAAS,GAAAJ,IAAA,CAATI,SAAS;IAAEC,eAAe,GAAAL,IAAA,CAAfK,eAAe,CAAA;EAAA,OACvEC,kBAAA,CAACC,KAAK,EAAA;IAACC,IAAI,EAAEL,aAAa,IAAID,IAAK;IAC5BO,UAAU,EAAE,SAAAA,UAAAA,CAAAC,OAAO,EAAA;MAAA,OAAIJ,kBAAA,CAACK,IAAI,EAAA;AAACT,QAAAA,IAAI,EAAEA,IAAK;AAACE,QAAAA,SAAS,EAAEQ,UAAU,CAACR,SAAS,EAAEM,OAAO,IAAIL,eAAe,CAAA;AAAE,OAAA,EACjGJ,QACC,CAAC,CAAA;AAAA,KAAA;AAAC,GACd,CAAC,CAAA;AAAA,CAAA,CAAA;AAEN,IAAGY,MAAM,CAACC,0BAA0B,EAAE;AAClCf,EAAAA,OAAO,CAACgB,SAAS,GAAGJ,IAAI,CAACI,SAAS,CAAA;AACtC,CAAA;AAEA,gBAAehB,OAAO;;;;"}
+{"version":3,"file":"NavLink.js","sources":["../src/router/NavLink.js"],"sourcesContent":["import React from 'react';\nimport ReactCreateElement from '../ReactCreateElement';\nimport PropTypes from 'prop-types';\nimport './HistoryTools'\nimport Route from \"./Route\";\nimport Link from \"./Link\";\nimport {classNames} from \"../Tools\";\n\nconst NavLink = ({children, href, highlightPath, className, activeClassName}) =>\n    <Route path={highlightPath || href}\n           controller={matches => <Link href={href} className={classNames(className, matches && activeClassName)}>\n               {children}\n           </Link>}\n    />;\n\nif(window.isNotProductionEnvironment) {\n    NavLink.propTypes = Link.propTypes;\n}\n\nexport default NavLink;"],"names":["NavLink","_ref","children","href","highlightPath","className","activeClassName","ReactCreateElement","Route","path","controller","matches","Link","classNames"],"mappings":";;;;;;;AAQA,IAAMA,OAAO,GAAG,SAAVA,OAAOA,CAAAC,IAAA,EAAA;AAAA,EAAA,IAAKC,QAAQ,GAAAD,IAAA,CAARC,QAAQ;IAAEC,IAAI,GAAAF,IAAA,CAAJE,IAAI;IAAEC,aAAa,GAAAH,IAAA,CAAbG,aAAa;IAAEC,SAAS,GAAAJ,IAAA,CAATI,SAAS;IAAEC,eAAe,GAAAL,IAAA,CAAfK,eAAe,CAAA;EAAA,OACvEC,kBAAA,CAACC,KAAK,EAAA;IAACC,IAAI,EAAEL,aAAa,IAAID,IAAK;IAC5BO,UAAU,EAAE,SAAAA,UAAAA,CAAAC,OAAO,EAAA;MAAA,OAAIJ,kBAAA,CAACK,IAAI,EAAA;AAACT,QAAAA,IAAI,EAAEA,IAAK;AAACE,QAAAA,SAAS,EAAEQ,UAAU,CAACR,SAAS,EAAEM,OAAO,IAAIL,eAAe,CAAA;AAAE,OAAA,EACjGJ,QACC,CAAC,CAAA;AAAA,KAAA;AAAC,GACd,CAAC,CAAA;AAAA,CAAA,CAAA;AAMN,gBAAeF,OAAO;;;;"}

package/router/Route.js

@@ -1,6 +1,6 @@
 import ReactConstants from "./../ReactConstants"; import {clientHeight as __clientHeight, clientWidth as __clientWidth, createAccessor as __createAccessor, data as __data, height as __height, left as __left, length as __length, pageX as __pageX, pageY as __pageY, props as __props, scrollLeft as __scrollLeft, scrollTop as __scrollTop, state as __state, style as __style, target as __target, top as __top, value as __value, width as __width} from "./../CommonFields"; import {toConsumableArray as __toConsumableArray} from "./../_virtual/_rollupPluginBabelHelpers"; import {extends as __extends} from "./../_virtual/_rollupPluginBabelHelpers"; import {inherits as __inherits} from "./../_virtual/_rollupPluginBabelHelpers"; import { inherits as _inherits, createSuper as _createSuper, createClass as _createClass, classCallCheck as _classCallCheck, assertThisInitialized as _assertThisInitialized, slicedToArray as _slicedToArray } from '../_virtual/_rollupPluginBabelHelpers.js';
 import React from 'react';
-import PropTypes from 'prop-types';
+import 'prop-types';
 import { setOf, allPropsExcept, isDifferent, addEventListener, WINDOW, removeEventListener, orNoop } from '../Tools.js';
 import { stateGSs, componentDidUpdate, render, componentDidMount, componentWillUnmount, PureComponent, propsGetter, setState } from '../ReactConstants.js';
 
@@ -151,13 +151,6 @@ var Route = function (_PureComponent) {
   }
   return _createClass(Route);
 }(PureComponent);
-if (process.env.NODE_ENV !== 'production') {
-  Route.propTypes = {
-    path: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string)]).isRequired,
-    controller: PropTypes.func,
-    onToggle: PropTypes.func
-  };
-}
 var DefaultController = function DefaultController(matches, children, props) {
   if (!matches || !children) return null;
   if (Object.keys(props).length > 0) {

package/router/Route.js.map

@@ -1 +1 @@
-{"version":3,"file":"Route.js","sources":["../src/router/Route.js"],"sourcesContent":["import React from 'react';\nimport ReactCreateElement from '../ReactCreateElement';\nimport PropTypes from 'prop-types';\nimport './HistoryTools'\nimport {allPropsExcept, isDifferent, orNoop, setOf, WINDOW, addEventListener, removeEventListener} from \"../Tools\";\nimport {componentDidUpdate, render, PureComponent, componentDidMount, componentWillUnmount, propsGetter, stateGSs, setState} from \"../ReactConstants\";\n\nconst historyEvents = ['popstate', 'pushState', 'replaceState'];\n\nconst cleanPath = (path) => {\n    if (path.length > 1 && path.lastIndexOf('/') === path.length - 1)\n        return path.substring(0, path.length - 1);\n\n    return path;\n};\n\nconst createUrlMatcher = path => {\n    let matcher;\n    const segments = path.split('/');\n    const optionals = segments.map(it => it === '*' || it.indexOf('?') === it.length - 1);\n    const containsVariables = path.indexOf(':') !== -1;\n    const containsAnySegment = path.indexOf('*') !== -1;\n    const containsNot = path.indexOf('!') !== -1;\n\n    if (!containsAnySegment && !containsVariables && !containsNot) {\n        matcher = (p) => p === path\n    } else {\n        const endsWithAny = path.lastIndexOf('*') === path.length - 1;\n        const matchers = segments.map((segment, i) => {\n            let matcher;\n            const variableNameIndex = segment.indexOf(':');\n            if (segment === '*')\n                matcher = () => true;\n            else if (variableNameIndex !== -1) {\n                let variable = segment.substring(variableNameIndex + 1);\n                let regex = null\n                if (variable.indexOf('?') !== -1)\n                    variable = variable.substring(0, variable.indexOf('?'));\n                if (variable.indexOf('(') !== -1) {\n                    let regexStart = variable.indexOf('(');\n                    regex = new RegExp(variable.substring(regexStart))\n                    variable = variable.substring(0, regexStart);\n                }\n\n                const prefix = variableNameIndex && segment.substring(0, variableNameIndex);\n                matcher = (p, params) => {\n                    if (regex && !!p && !p.match(regex))\n                        return false\n\n                    if (!p && !optionals[i])\n                        return false;\n                    if (prefix) {\n                        if (p.indexOf(prefix) === 0)\n                            p = p.substring(variableNameIndex);\n                        else\n                            return false;\n                    }\n\n                    params[variable] = p;\n                    return true;\n                }\n            } else if (segment.indexOf('!') === 0) {\n                const not = segment.substring(1);\n                matcher = (p) => p !== not;\n            } else\n                matcher = (p) => p === segment;\n            return matcher;\n        });\n\n        matcher = (path, params) => {\n            const segments = path.split('/');\n            const length = Math.min(matchers.length, segments.length);\n\n            // only exact match if mapping not ends with *\n            if (!endsWithAny && matchers.length < segments.length)\n                return false;\n\n            // check that each segment matches\n            for (let i = 0; i < length; i++) {\n                if (!matchers[i](segments[i], params))\n                    return false;\n            }\n\n            // check that all other segments are optional\n            for (let i = length; i < optionals.length; i++) {\n                if (!optionals[i])\n                    return false;\n            }\n\n            return true;\n        };\n    }\n    return matcher\n};\n\nconst createUrlMatchers = path => {\n    if (Array.isArray(path)) {\n        const matchers = path.map(it => createUrlMatcher(it));\n        return (path, params) => {\n            for (let i = 0; i < matchers.length; i++) {\n                let props = {};\n                if (matchers[i](path, props)) {\n                    Object.assign(params, props);\n                    return true;\n                }\n            }\n            return false;\n        }\n    } else {\n        return createUrlMatcher(path);\n    }\n};\n\nconst selfProps = setOf([\n    'children',\n    'path',\n    'controller',\n    'onToggle',\n]);\n\nclass Route extends PureComponent {\n\n    constructor(properties) {\n        super(properties);\n        const that = this;\n        that.state = {};\n        let matcher;\n\n        const props = propsGetter(that);\n        const [\n            isRendering,\n            paramsState,\n            mergedPropsState,\n        ] = stateGSs(that, 3);\n\n        const process = () => {\n            let params = {};\n            let nextState = {};\n            let isMatching = matcher(cleanPath(WINDOW.location.pathname), params);\n\n            const toggle = isMatching !== isRendering();\n            toggle && (nextState[isRendering] = isMatching);\n\n            if (isDifferent(paramsState(), params)) {\n                nextState[mergedPropsState] = Object.assign(allPropsExcept(props(), selfProps), params);\n                nextState[paramsState] = params;\n            }\n\n            //set new state just once to avoid several renders\n            setState(that, nextState, () => {\n                toggle && orNoop(props().onToggle)(isMatching);\n            })\n        };\n\n        that[componentDidUpdate] = (prevProps, prevState) => {\n            if (props() !== prevProps) {\n                let mergedProps = Object.assign(allPropsExcept(props(), selfProps), paramsState());\n                if (isDifferent(mergedProps, mergedPropsState()))\n                    mergedPropsState(mergedProps);\n            }\n        };\n\n        that[render] = () => {\n            const {children, controller} = props();\n            return (controller || DefaultController)(isRendering(), children, mergedPropsState());\n        };\n\n        that[componentDidMount] = () => {\n            matcher = createUrlMatchers(props().path);\n\n            historyEvents.forEach(it => {\n                addEventListener(WINDOW, it, process);\n            });\n            process();\n        };\n\n        that[componentWillUnmount] = () => {\n            historyEvents.forEach(it => {\n                removeEventListener(WINDOW, it, process);\n            });\n        };\n    }\n}\n\nif (window.isNotProductionEnvironment) {\n    Route.propTypes = {\n        path: PropTypes.oneOfType([\n            PropTypes.string,\n            PropTypes.arrayOf(PropTypes.string)\n        ]).isRequired,\n        controller: PropTypes.func,\n        onToggle: PropTypes.func,\n    };\n}\n\nconst DefaultController = (matches, children, props) => {\n    if (!matches || !children) return null;\n    if (Object.keys(props).length > 0) {\n        return React.Children.map(children, child => React.cloneElement(child, props));\n    }\n    return children;\n};\n\nexport default Route;"],"names":["historyEvents","cleanPath","path","length","lastIndexOf","substring","createUrlMatcher","matcher","segments","split","optionals","map","it","indexOf","containsVariables","containsAnySegment","containsNot","p","endsWithAny","matchers","segment","i","variableNameIndex","variable","regex","regexStart","RegExp","prefix","params","match","not","Math","min","createUrlMatchers","Array","isArray","props","Object","assign","selfProps","setOf","Route","_PureComponent","_inherits","_super","_createSuper","properties","_this","_classCallCheck","call","that","_assertThisInitialized","state","propsGetter","_stateGSs","stateGSs","_stateGSs2","_slicedToArray","isRendering","paramsState","mergedPropsState","process","nextState","isMatching","WINDOW","location","pathname","toggle","isDifferent","allPropsExcept","setState","orNoop","onToggle","componentDidUpdate","prevProps","prevState","mergedProps","render","_props","children","controller","DefaultController","componentDidMount","forEach","addEventListener","componentWillUnmount","removeEventListener","_createClass","PureComponent","window","isNotProductionEnvironment","propTypes","PropTypes","oneOfType","string","arrayOf","isRequired","func","matches","keys","React","Children","child","cloneElement"],"mappings":"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"}
+{"version":3,"file":"Route.js","sources":["../src/router/Route.js"],"sourcesContent":["import React from 'react';\nimport ReactCreateElement from '../ReactCreateElement';\nimport PropTypes from 'prop-types';\nimport './HistoryTools'\nimport {allPropsExcept, isDifferent, orNoop, setOf, WINDOW, addEventListener, removeEventListener} from \"../Tools\";\nimport {componentDidUpdate, render, PureComponent, componentDidMount, componentWillUnmount, propsGetter, stateGSs, setState} from \"../ReactConstants\";\n\nconst historyEvents = ['popstate', 'pushState', 'replaceState'];\n\nconst cleanPath = (path) => {\n    if (path.length > 1 && path.lastIndexOf('/') === path.length - 1)\n        return path.substring(0, path.length - 1);\n\n    return path;\n};\n\nconst createUrlMatcher = path => {\n    let matcher;\n    const segments = path.split('/');\n    const optionals = segments.map(it => it === '*' || it.indexOf('?') === it.length - 1);\n    const containsVariables = path.indexOf(':') !== -1;\n    const containsAnySegment = path.indexOf('*') !== -1;\n    const containsNot = path.indexOf('!') !== -1;\n\n    if (!containsAnySegment && !containsVariables && !containsNot) {\n        matcher = (p) => p === path\n    } else {\n        const endsWithAny = path.lastIndexOf('*') === path.length - 1;\n        const matchers = segments.map((segment, i) => {\n            let matcher;\n            const variableNameIndex = segment.indexOf(':');\n            if (segment === '*')\n                matcher = () => true;\n            else if (variableNameIndex !== -1) {\n                let variable = segment.substring(variableNameIndex + 1);\n                let regex = null\n                if (variable.indexOf('?') !== -1)\n                    variable = variable.substring(0, variable.indexOf('?'));\n                if (variable.indexOf('(') !== -1) {\n                    let regexStart = variable.indexOf('(');\n                    regex = new RegExp(variable.substring(regexStart))\n                    variable = variable.substring(0, regexStart);\n                }\n\n                const prefix = variableNameIndex && segment.substring(0, variableNameIndex);\n                matcher = (p, params) => {\n                    if (regex && !!p && !p.match(regex))\n                        return false\n\n                    if (!p && !optionals[i])\n                        return false;\n                    if (prefix) {\n                        if (p.indexOf(prefix) === 0)\n                            p = p.substring(variableNameIndex);\n                        else\n                            return false;\n                    }\n\n                    params[variable] = p;\n                    return true;\n                }\n            } else if (segment.indexOf('!') === 0) {\n                const not = segment.substring(1);\n                matcher = (p) => p !== not;\n            } else\n                matcher = (p) => p === segment;\n            return matcher;\n        });\n\n        matcher = (path, params) => {\n            const segments = path.split('/');\n            const length = Math.min(matchers.length, segments.length);\n\n            // only exact match if mapping not ends with *\n            if (!endsWithAny && matchers.length < segments.length)\n                return false;\n\n            // check that each segment matches\n            for (let i = 0; i < length; i++) {\n                if (!matchers[i](segments[i], params))\n                    return false;\n            }\n\n            // check that all other segments are optional\n            for (let i = length; i < optionals.length; i++) {\n                if (!optionals[i])\n                    return false;\n            }\n\n            return true;\n        };\n    }\n    return matcher\n};\n\nconst createUrlMatchers = path => {\n    if (Array.isArray(path)) {\n        const matchers = path.map(it => createUrlMatcher(it));\n        return (path, params) => {\n            for (let i = 0; i < matchers.length; i++) {\n                let props = {};\n                if (matchers[i](path, props)) {\n                    Object.assign(params, props);\n                    return true;\n                }\n            }\n            return false;\n        }\n    } else {\n        return createUrlMatcher(path);\n    }\n};\n\nconst selfProps = setOf([\n    'children',\n    'path',\n    'controller',\n    'onToggle',\n]);\n\nclass Route extends PureComponent {\n\n    constructor(properties) {\n        super(properties);\n        const that = this;\n        that.state = {};\n        let matcher;\n\n        const props = propsGetter(that);\n        const [\n            isRendering,\n            paramsState,\n            mergedPropsState,\n        ] = stateGSs(that, 3);\n\n        const process = () => {\n            let params = {};\n            let nextState = {};\n            let isMatching = matcher(cleanPath(WINDOW.location.pathname), params);\n\n            const toggle = isMatching !== isRendering();\n            toggle && (nextState[isRendering] = isMatching);\n\n            if (isDifferent(paramsState(), params)) {\n                nextState[mergedPropsState] = Object.assign(allPropsExcept(props(), selfProps), params);\n                nextState[paramsState] = params;\n            }\n\n            //set new state just once to avoid several renders\n            setState(that, nextState, () => {\n                toggle && orNoop(props().onToggle)(isMatching);\n            })\n        };\n\n        that[componentDidUpdate] = (prevProps, prevState) => {\n            if (props() !== prevProps) {\n                let mergedProps = Object.assign(allPropsExcept(props(), selfProps), paramsState());\n                if (isDifferent(mergedProps, mergedPropsState()))\n                    mergedPropsState(mergedProps);\n            }\n        };\n\n        that[render] = () => {\n            const {children, controller} = props();\n            return (controller || DefaultController)(isRendering(), children, mergedPropsState());\n        };\n\n        that[componentDidMount] = () => {\n            matcher = createUrlMatchers(props().path);\n\n            historyEvents.forEach(it => {\n                addEventListener(WINDOW, it, process);\n            });\n            process();\n        };\n\n        that[componentWillUnmount] = () => {\n            historyEvents.forEach(it => {\n                removeEventListener(WINDOW, it, process);\n            });\n        };\n    }\n}\n\nif (window.isNotProductionEnvironment) {\n    Route.propTypes = {\n        path: PropTypes.oneOfType([\n            PropTypes.string,\n            PropTypes.arrayOf(PropTypes.string)\n        ]).isRequired,\n        controller: PropTypes.func,\n        onToggle: PropTypes.func,\n    };\n}\n\nconst DefaultController = (matches, children, props) => {\n    if (!matches || !children) return null;\n    if (Object.keys(props).length > 0) {\n        return React.Children.map(children, child => React.cloneElement(child, props));\n    }\n    return children;\n};\n\nexport default Route;"],"names":["historyEvents","cleanPath","path","length","lastIndexOf","substring","createUrlMatcher","matcher","segments","split","optionals","map","it","indexOf","containsVariables","containsAnySegment","containsNot","p","endsWithAny","matchers","segment","i","variableNameIndex","variable","regex","regexStart","RegExp","prefix","params","match","not","Math","min","createUrlMatchers","Array","isArray","props","Object","assign","selfProps","setOf","Route","_PureComponent","_inherits","_super","_createSuper","properties","_this","_classCallCheck","call","that","_assertThisInitialized","state","propsGetter","_stateGSs","stateGSs","_stateGSs2","_slicedToArray","isRendering","paramsState","mergedPropsState","process","nextState","isMatching","WINDOW","location","pathname","toggle","isDifferent","allPropsExcept","setState","orNoop","onToggle","componentDidUpdate","prevProps","prevState","mergedProps","render","_props","children","controller","DefaultController","componentDidMount","forEach","addEventListener","componentWillUnmount","removeEventListener","_createClass","PureComponent","matches","keys","React","Children","child","cloneElement"],"mappings":"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"}

package/src/Tools.ts

@@ -105,6 +105,8 @@ export const isFunction = (v) => typeOf(v) === 'function';
 export const isString = (v) => typeOf(v) === 'string';
 export const isObject = (v) => typeOf(v) === 'object';
 
+export const deleteKey = (obj: object, key: string | symbol) => delete obj[key];
+
 const FALSE = false;
 const TRUE = true;
 

package/src/store/{ProxyTools.test.js → ProxyTools.test.ts}

@@ -1,4 +1,9 @@
-import ReactConstants from "./ReactConstants"; import {clientHeight as __clientHeight, clientWidth as __clientWidth, createAccessor as __createAccessor, data as __data, height as __height, left as __left, length as __length, pageX as __pageX, pageY as __pageY, props as __props, scrollLeft as __scrollLeft, scrollTop as __scrollTop, state as __state, style as __style, target as __target, top as __top, value as __value, width as __width} from "./CommonFields"; import {toConsumableArray as __toConsumableArray} from "./_virtual/_rollupPluginBabelHelpers"; import {extends as __extends} from "./_virtual/_rollupPluginBabelHelpers"; import {inherits as __inherits} from "./_virtual/_rollupPluginBabelHelpers"; import {createProxy} from "./ProxyTools";
+import {createProxy} from "./ProxyTools";
+
+it('test proxy null', () => {
+    const p = createProxy(null);
+    expect(p).toBe(null);
+});
 
 it('test proxy noop', () => {
     const user = {name: 'Bob'};
@@ -19,7 +24,10 @@ it('test proxy add property', () => {
     const user = {name: 'Bob'};
     const p = createProxy(user);
     p.age = 16
+    expect(p.age).toEqual(16);
+
     p.age = 32
+    expect(p.age).toEqual(32);
 
     expect(user).toEqual({name: 'Bob'});
     expect(p.bake()).toEqual({name: 'Bob', age: 32});
@@ -29,6 +37,7 @@ it('test proxy delete property', () => {
     const user = {name: 'Bob'};
     const p = createProxy(user);
     delete p.name;
+    expect(p.name).toBe(undefined);
 
     expect(user).toEqual({name: 'Bob'});
     expect(p.bake()).toEqual({});
@@ -59,6 +68,7 @@ it('test proxy change inner properties', () => {
     const p = createProxy(user);
 
     p.hobbies.push('poker');
+    expect(p.hobbies).toEqual(['chess', 'poker']);
 
     expect(user).toEqual({name: 'Bob', hobbies: ['chess']});
     expect(p.bake()).toEqual({name: 'Bob', hobbies: ['chess', 'poker']});

package/src/store/ProxyTools.ts

@@ -0,0 +1,85 @@
+import {UNDEFINED, isObject, deleteKey} from "../Tools";
+
+const FIELD_CHANGED = '__changed';
+const FIELD_BAKE = 'bake';
+
+export const createProxy = <T extends object>(target: T) => {
+    if (!target)
+        return target
+
+    let changedValue = UNDEFINED;
+    let deletedKeys = UNDEFINED;
+    let innerProxies = UNDEFINED
+    const isChanged = () => changedValue || (innerProxies && Object.values(innerProxies).some(it => it[FIELD_CHANGED]));
+    const initChangedValue = (target) => {
+        !changedValue && (changedValue = Array.isArray(target) ? [...target] : {...target})
+    };
+    return new Proxy<T>(target, {
+        get: (target: T, prop: string | symbol) => {
+            if (prop === FIELD_CHANGED)
+                return isChanged();
+            if (prop === FIELD_BAKE) {
+                return () => {
+                    // console.log('bake', changedValue, innerProxies)
+                    if (!isChanged())
+                        return target
+
+                    if (changedValue && !innerProxies)
+                        return changedValue
+
+                    let result = changedValue || (Array.isArray(target) ? [...target] : {...target});
+                    for (let key in innerProxies) {
+                        result[key] = innerProxies[key][FIELD_BAKE]()
+                    }
+                    return result
+                }
+            }
+
+            // console.log('get', {target, prop})
+            const innerProxy = innerProxies && innerProxies[prop];
+            if (innerProxy)
+                return innerProxy
+
+            const changed = changedValue && changedValue[prop]
+            if (changed !== UNDEFINED)
+                return changed
+
+            if (deletedKeys && deletedKeys[prop])
+                return UNDEFINED
+
+            const value = target[prop];
+            if (value && isObject(value)) {
+                !innerProxies && (innerProxies = {})
+                return innerProxies[prop] = createProxy(value)
+            }
+
+            return value;
+        },
+        set: (target: T, prop, newval) => {
+            // console.log('set', {target, prop, newval})
+            initChangedValue(target);
+
+            if (newval && isObject(newval)) {
+                !innerProxies && (innerProxies = {})
+                innerProxies[prop] = newval = createProxy(newval)
+            } else {
+                innerProxies && deleteKey(innerProxies, prop)
+            }
+            changedValue[prop] = newval
+            // console.log('changedValue', changedValue)
+            return true;
+        },
+        deleteProperty: (target: T, prop) => {
+            // console.log('delete', {target, prop})
+            initChangedValue(target);
+
+            if (prop in changedValue) {
+                deleteKey(changedValue, prop)
+                innerProxies && deleteKey(innerProxies, prop)
+                !deletedKeys && (deletedKeys = {})
+                deletedKeys[prop] = true;
+            }
+            return true;
+        }
+    })
+}

package/src/store/Store.test.js

@@ -0,0 +1,86 @@
+import ReactConstants from "./ReactConstants"; import {clientHeight as __clientHeight, clientWidth as __clientWidth, createAccessor as __createAccessor, data as __data, height as __height, left as __left, length as __length, pageX as __pageX, pageY as __pageY, props as __props, scrollLeft as __scrollLeft, scrollTop as __scrollTop, state as __state, style as __style, target as __target, top as __top, value as __value, width as __width} from "./CommonFields"; import {toConsumableArray as __toConsumableArray} from "./_virtual/_rollupPluginBabelHelpers"; import {extends as __extends} from "./_virtual/_rollupPluginBabelHelpers"; import {inherits as __inherits} from "./_virtual/_rollupPluginBabelHelpers"; import React from 'react';
+import {mount} from 'enzyme';
+import Store, {useStore} from "./Store";
+import {act} from 'react-dom/test-utils';
+
+it('test 1', () => {
+    const store = new Store({
+        count: 0,
+        value: ''
+    });
+    let renderCount = 0
+    const MyComponent = () => {
+        let s = useStore(store);
+        renderCount++
+        return <div>{s.count}</div>;
+    };
+    const wrapper = mount(<MyComponent/>);
+    expect(wrapper).toHaveHTML('<div>0</div>');
+    expect(renderCount).toBe(1);
+
+    act(() => {
+        store.set(it => {
+            it.count++
+        })
+    });
+    expect(wrapper).toHaveHTML('<div>1</div>');
+    expect(renderCount).toBe(2);
+
+    act(() => {
+        store.set(it => {
+            it.value = 'foo'
+        })
+    });
+    expect(wrapper).toHaveHTML('<div>1</div>');
+    expect(renderCount).toBe(3);
+
+    act(() => {
+        store.set(it => {
+            it.value = 'bar'
+        })
+    });
+    expect(wrapper).toHaveHTML('<div>1</div>');
+    expect(renderCount).toBe(4);
+});
+
+
+it('test 2', () => {
+    const store = new Store({
+        count: 0,
+        value: ''
+    });
+    let renderCount = 0
+    const MyComponent = () => {
+        let count = useStore(store, it=> it.count);
+        renderCount++
+        return <div>{count}</div>;
+    };
+    const wrapper = mount(<MyComponent/>);
+    expect(wrapper).toHaveHTML('<div>0</div>');
+    expect(renderCount).toBe(1);
+
+    act(() => {
+        store.set(it => {
+            it.count++
+        })
+    });
+    expect(wrapper).toHaveHTML('<div>1</div>');
+    expect(renderCount).toBe(2);
+
+    act(() => {
+        store.set({
+            value: 'foo'
+        })
+    });
+    expect(wrapper).toHaveHTML('<div>1</div>');
+    // react executes functional-component after first setState with the same value
+    expect(renderCount).toBe(3);
+
+    act(() => {
+        store.set({
+            value: 'bar'
+        })
+    });
+    expect(wrapper).toHaveHTML('<div>1</div>');
+    expect(renderCount).toBe(3);
+});

package/src/store/Store.ts

@@ -1,5 +1,6 @@
 import {useEffect, useState} from "react";
 import {createProxy} from "./ProxyTools";
+import {isFunction, isObject} from "../Tools";
 
 interface Stores {
     [index: number]: any
@@ -8,46 +9,67 @@ interface Stores {
 let STORES: Stores = {}
 let COUNTER = 0
 
-export class Store<T> {
-    private name: string
-    private listeners: Array<() => void> = []
-    private initialState: T
-    private index: number
+type Setter<T> = (oldState: T) => T | void;
+
+abstract class AbstractStore<T> {
+    get: () => T;
+    set: (setter: T | Partial<T> | (Setter<T>)) => void;
+    reset: () => void;
+    subscribe: (fn: () => void) => void;
+    unsubscribe: (fn: () => void) => void;
+    toString: () => string;
+}
+
+export class Store<T> extends AbstractStore<T> {
 
     constructor(initialState: T, name?: string) {
+        super()
         let that = this;
-        that.name = name;
-        that.initialState = initialState;
-        const index = COUNTER++;
-        that.index = index;
-        STORES[index] = initialState
-    }
+        let listeners: Array<() => void> = []
+        let index = '' + COUNTER++;
+        let runListeners = () => {
+            listeners.forEach(fn => fn())
+        };
 
-    get = (): T => STORES[this.index]
-    set = (mutator: (oldState: T) => T | void) => {
-        const proxy = createProxy(STORES[this.index]);
-        const result = mutator(proxy);
-        if (!result || result === proxy)
-            STORES[this.index] = proxy.bake()
-        else
-            STORES[this.index] = result
+        STORES[index] = initialState
 
-        this.listeners.forEach(fn => fn())
-    }
+        that.unsubscribe = (fn: () => void) => {
+            let i = listeners.indexOf(fn)
+            let length = listeners.length;
+            if (i > -1) {
+                listeners[i] = listeners[length - 1]
+                listeners.splice(length - 1, 1)
+            }
+        }
+        that.get = (): T => STORES[index]
+        that.set = (setter) => {
+            let result;
+            if (isFunction(setter)) {
+                const proxy = createProxy(STORES[index]);
+                result = (setter as Setter<T>)(proxy);
+                if (!result || result === proxy)
+                    result = proxy.bake()
+            } else if (isObject(setter)) {
+                result = {...STORES[index], ...setter}
+            } else {
+                result = setter
+            }
+
+            STORES[index] = result
+            runListeners();
+        }
 
-    reset = () => {
-        STORES[this.index] = this.initialState
-    }
+        that.reset = () => {
+            STORES[index] = initialState
+            runListeners();
+        }
 
-    subscribe = (fn: () => void) => {
-        this.listeners.push(fn)
-    }
+        that.subscribe = (fn: () => void) => {
+            listeners.push(fn)
+        }
 
-    unsubscribe = (fn: () => void) => {
-        this.listeners = this.listeners.filter(f => f !== fn)
+        that.toString = (): string => name;
     }
-
-    toString = (): string => this.name;
 }
 
 export default Store;
@@ -75,7 +97,7 @@ export function useStore<T, R>(store: Store<T>, selector?: Selector<T, R>): R {
     if (!selector)
         selector = (defaultSelector as Selector<T, R>)
 
-    const [state, setState] = useState(selector(store.get()))
+    const [state, setState] = useState(() => selector(store.get()))
 
     useEffect(() => {
         const updateState = () => {
@@ -86,7 +108,7 @@ export function useStore<T, R>(store: Store<T>, selector?: Selector<T, R>): R {
         return () => {
             store.unsubscribe(updateState);
         }
-    }, [selector])
+    }, [])
 
     return state
 }

package/store/ProxyTools.d.ts

@@ -0,0 +1 @@
+export declare const createProxy: <T extends object>(target: T) => any;