@evlop/commons 1.0.90 → 1.0.94

package/dist/src/data-sources/collection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../../../src/data-sources/collection.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAwC,MAAM,aAAa,CAAC;AAWhF,QAAA,MAAM,oBAAoB,EAAE,WA+B3B,CAAA;AA+BD,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../../../src/data-sources/collection.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAwC,MAAM,aAAa,CAAC;AAWhF,QAAA,MAAM,oBAAoB,EAAE,WA+B3B,CAAA;AAgCD,eAAe,oBAAoB,CAAC"}

package/dist/src/data-sources/collection.js

@@ -72,6 +72,7 @@ collectionDataSource.keyExtractor = (options) => {
     return [
         lodash_1.get(requestOptions, 'key', ''),
         lodash_1.get(options, 'collectionName'),
+        lodash_1.get(requestOptions, 'search'),
         lodash_1.get(requestOptions, 'pageSize'),
         JSON.stringify(lodash_1.get(requestOptions, 'sort')),
         ...lodash_1.map(lodash_1.get(requestOptions, 'filter'), (v, k) => `${k}=${JSON.stringify(v)}`)

package/dist/src/data-sources/collection.js.map

@@ -1 +1 @@
-{"version":3,"file":"collection.js","sourceRoot":"","sources":["../../../src/data-sources/collection.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,mCAAiE;AACjE,wCAAmC;AACnC,0CAAgF;AAEhF,SAAS,SAAS,CAAE,cAAc,EAAE,QAAQ;IACxC,IAAG,CAAC,cAAc;QAAE,OAAO,eAAK,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAG,QAAQ,CAAC,gCAAqB,CAAC,cAAc,CAAC,CAAC,CAAA;IAC7D,IAAG,KAAK;QAAE,OAAO,KAAK,CAAC;IACvB,OAAO,eAAK,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;AACnD,CAAC;AAED,MAAM,QAAQ,GAAG,gBAAO,CAAC,SAAS,CAAC,CAAC;AAEpC,MAAM,oBAAoB,GAAgB,CAAO,OAAO,EAAE,EAAC,QAAQ,EAAC,EAAC,EAAE;IACnE,MAAM,EAAC,GAAG,EAAE,QAAQ,EAAE,cAAc,GAAG,QAAQ,EAAE,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,cAAc,EAAC,GAAG,OAAO,CAAC;IAE7F,IAAI,UAAU,GAAG,EAAE,CAAC;IACpB,IAAG,cAAc,EAAC;QACd,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAC;YACnC,IAAG;gBACC,eAAM,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;aAClD;YAAC,OAAM,CAAC,EAAC;gBACN,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;aAChC;SACJ;aAAM,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAC;YAC1C,eAAM,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;SACtC;KACJ;IAED,MAAM,QAAQ,GAAG,YAAG,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAA;IACpE,MAAM,MAAM,GAAG,YAAG,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAA;IAC5C,MAAM,MAAM,GAAG,YAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IACxC,MAAM,IAAI,GAAG,YAAG,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;IAExC,MAAM,EAAC,QAAQ,EAAC,GAAG,MAAM,QAAQ,CAAC,wBAAa,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;IAChH,MAAM,MAAM,GAAG,QAAQ,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IAElD,OAAO;QACH,KAAK,EAAE,YAAG,CAAC,YAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,IAAI,CAAA,EAAE,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAI,EAAE,YAAG,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC3B,QAAQ,EAAE,YAAG,CAAC,QAAQ,EAAE,UAAU,CAAC;QACnC,YAAY,EAAE,YAAG,CAAC,QAAQ,EAAE,cAAc,CAAC;QAC3C,UAAU,EAAE,YAAG,CAAC,QAAQ,EAAE,YAAY,CAAC;KAC1C,CAAC;AACN,CAAC,CAAA,CAAA;AAGD,oBAAoB,CAAC,WAAW,GAAG,YAAY,CAAC;AAChD,oBAAoB,CAAC,UAAU,GAAG,YAAY,CAAC;AAC/C,oBAAoB,CAAC,IAAI,GAAG,OAAO,CAAC;AACpC,oBAAoB,CAAC,oBAAoB,GAAG;IACxC,EAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,iBAAiB,EAAE,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAE,gBAAgB,EAAC;IACxF,EAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,mBAAmB,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAC;CAC5F,CAAC;AACF,oBAAoB,CAAC,aAAa,GAAG;IACjC,cAAc,EAAE,EAAE;IAClB,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,EAAC,IAAI,EAAE,EAAC,SAAS,EAAE,CAAC,CAAC,EAAC,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAC,EAAE,IAAI,EAAE,CAAC,CAAC;CACnF,CAAC;AACF,oBAAoB,CAAC,YAAY,GAAG,CAAC,OAAO,EAAC,EAAE;IAC3C,MAAM,EAAE,MAAM,EAAE,oBAAoB,EAAC,GAAG,OAAO,CAAC;IAChD,IAAI,cAAc,CAAC;IACnB,IAAG;QACC,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;KACrD;IAAA,OAAM,CAAC,EAAC,GAAE;IAEX,OAAO;QACH,YAAG,CAAC,cAAc,EAAE,KAAK,EAAE,EAAE,CAAC;QAC9B,YAAG,CAAC,OAAO,EAAE,gBAAgB,CAAE;QAC/B,YAAG,CAAC,cAAc,EAAE,UAAU,CAAC;QAC/B,IAAI,CAAC,SAAS,CAAC,YAAG,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QAC3C,GAAG,YAAG,CAAC,YAAG,CAAC,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAC,EAAE,CAAA,GAAG,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;KAC7E,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACf,CAAC,CAAC;AAGF,kBAAe,oBAAoB,CAAC"}
+{"version":3,"file":"collection.js","sourceRoot":"","sources":["../../../src/data-sources/collection.ts"],"names":[],"mappings":"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"}

package/dist/src/data-sources/scopeDataSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scopeDataSource.d.ts","sourceRoot":"","sources":["../../../src/data-sources/scopeDataSource.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,QAAA,MAAM,eAAe,EAAE,WAEtB,CAAC;AAWF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"scopeDataSource.d.ts","sourceRoot":"","sources":["../../../src/data-sources/scopeDataSource.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,QAAA,MAAM,eAAe,EAAE,WAEtB,CAAC;AAcF,eAAe,eAAe,CAAC"}

package/dist/src/data-sources/scopeDataSource.js

@@ -4,7 +4,10 @@ const lodash_1 = require("lodash");
 const scopeDataSource = (options, { scope }) => {
     return lodash_1.get(scope, lodash_1.get(options, 'path'));
 };
-scopeDataSource.keyExtractor = (options) => options.path || options.sourceId;
+scopeDataSource.keyExtractor = (options, { scope }) => {
+    const path = lodash_1.get(options, 'path', '');
+    return [path, JSON.stringify(lodash_1.get(scope, lodash_1.get(options, 'path')))].join(':');
+};
 scopeDataSource.displayName = 'Scope';
 scopeDataSource.identifier = 'scope';
 scopeDataSource.type = 'Object';

package/dist/src/data-sources/scopeDataSource.js.map

@@ -1 +1 @@
-{"version":3,"file":"scopeDataSource.js","sourceRoot":"","sources":["../../../src/data-sources/scopeDataSource.ts"],"names":[],"mappings":";;AAAA,mCAA6B;AAG7B,MAAM,eAAe,GAAgB,CAAC,OAAO,EAAE,EAAC,KAAK,EAAC,EAAC,EAAE;IACjD,OAAO,YAAG,CAAC,KAAK,EAAC,YAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAA;AAC9C,CAAC,CAAC;AAEF,eAAe,CAAC,YAAY,GAAG,CAAC,OAAO,EAAC,EAAE,CAAA,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC;AAC3E,eAAe,CAAC,WAAW,GAAG,OAAO,CAAC;AACtC,eAAe,CAAC,UAAU,GAAG,OAAO,CAAC;AACrC,eAAe,CAAC,IAAI,GAAG,QAAQ,CAAC;AAChC,eAAe,CAAC,oBAAoB,GAAG;IACnC,EAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,YAAY,EAAG,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAC;CAEjG,CAAC;AAEF,kBAAe,eAAe,CAAC"}
+{"version":3,"file":"scopeDataSource.js","sourceRoot":"","sources":["../../../src/data-sources/scopeDataSource.ts"],"names":[],"mappings":";;AAAA,mCAA6B;AAG7B,MAAM,eAAe,GAAgB,CAAC,OAAO,EAAE,EAAC,KAAK,EAAC,EAAC,EAAE;IACjD,OAAO,YAAG,CAAC,KAAK,EAAC,YAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAA;AAC9C,CAAC,CAAC;AAEF,eAAe,CAAC,YAAY,GAAG,CAAC,OAAO,EAAE,EAAC,KAAK,EAAC,EAAC,EAAE;IAC/C,MAAM,IAAI,GAAG,YAAG,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IACtC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,YAAG,CAAC,KAAK,EAAC,YAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC5E,CAAC,CAAC;AACF,eAAe,CAAC,WAAW,GAAG,OAAO,CAAC;AACtC,eAAe,CAAC,UAAU,GAAG,OAAO,CAAC;AACrC,eAAe,CAAC,IAAI,GAAG,QAAQ,CAAC;AAChC,eAAe,CAAC,oBAAoB,GAAG;IACnC,EAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,YAAY,EAAG,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAC;CAEjG,CAAC;AAEF,kBAAe,eAAe,CAAC"}

package/dist/src/hooks/useAction.d.ts

@@ -13,6 +13,6 @@ interface ActionObject {
     callback: Function;
 }
 declare type Action = ActionObject | Function | any;
-export declare const useAction: (action: Action) => any;
+export declare const useAction: (action: Action) => (event: any) => any;
 export default useAction;
 //# sourceMappingURL=useAction.d.ts.map

package/dist/src/hooks/useAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAction.d.ts","sourceRoot":"","sources":["../../../src/hooks/useAction.tsx"],"names":[],"mappings":"AASA;;;;GAIG;AAEF,UAAU,YAAY;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;IACjC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;IAC7B,QAAQ,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC5B,QAAQ,EAAE,QAAQ,CAAC;CACtB;AAED,aAAK,MAAM,GAAG,YAAY,GAAG,QAAQ,GAAG,GAAG,CAAA;AAE5C,eAAO,MAAM,SAAS,WAAY,MAAM,QAgCvC,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"useAction.d.ts","sourceRoot":"","sources":["../../../src/hooks/useAction.tsx"],"names":[],"mappings":"AASA;;;;GAIG;AAEF,UAAU,YAAY;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;IACjC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;IAC7B,QAAQ,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC5B,QAAQ,EAAE,QAAQ,CAAC;CACtB;AAED,aAAK,MAAM,GAAG,YAAY,GAAG,QAAQ,GAAG,GAAG,CAAA;AAE5C,eAAO,MAAM,SAAS,WAAY,MAAM,wBAgCvC,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/dist/src/hooks/useAction.js

@@ -16,7 +16,7 @@ const useAction = (action) => {
     const dispatch = react_redux_1.useDispatch();
     const scope = useScope_1.useScope();
     const template = useTemplate_1.default();
-    return react_1.useMemo(() => {
+    return react_1.useCallback((event) => {
         let actionToUse = action;
         while (actionToUse && actionToUse.bindKey) {
             actionToUse = lodash_1.get(scope, actionToUse.bindKey);
@@ -26,25 +26,25 @@ const useAction = (action) => {
         if (actionToUse) {
             const { link, navigate, push, page, params, dispatch: dispatchAction, route, callback } = actionToUse;
             if (link)
-                return () => navigator.openURL(template(link));
+                return navigator.openURL(template(link));
             if (navigate)
-                return () => navigator.navigate(...lodash_1.castArray(JSON.parse(template(JSON.stringify(navigate)))));
+                return navigator.navigate(...lodash_1.castArray(JSON.parse(template(JSON.stringify(navigate)))));
             if (push)
-                return () => navigator.push(...lodash_1.castArray(JSON.parse(template(JSON.stringify(navigate)))));
-            if (page)
-                return () => {
-                    console.log(page, params);
-                    const routeParams = lodash_2.mapValues(params, (paramValue) => template(paramValue.toString()));
-                    navigator.openPage(page, routeParams);
-                };
+                return navigator.push(...lodash_1.castArray(JSON.parse(template(JSON.stringify(navigate)))));
+            if (page) {
+                console.log(page, params);
+                const routeParams = lodash_2.mapValues(params, (paramValue) => template(paramValue.toString()));
+                return navigator.openPage(page, routeParams);
+            }
+            ;
             if (route)
-                return () => navigator.openRoute(template(route));
+                return navigator.openRoute(template(route));
             if (dispatchAction)
-                return () => dispatch(dispatchAction);
+                return dispatch(dispatchAction);
             if (callback)
-                return (event) => callback({ event, navigator, dispatch });
+                return callback({ event, navigator, dispatch });
         }
-    }, [action, navigator, dispatch]);
+    }, [action, navigator, dispatch, template, scope]);
 };
 exports.useAction = useAction;
 exports.default = exports.useAction;

package/dist/src/hooks/useAction.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAction.js","sourceRoot":"","sources":["../../../src/hooks/useAction.tsx"],"names":[],"mappings":";;;;;;AAAA,iCAAgC;AAChC,6CAA0C;AAC1C,mCAAwC;AACxC,iDAA4C;AAC5C,yCAAoC;AACpC,gEAAwC;AACxC,mCAAiC;AAqB1B,MAAM,SAAS,GAAG,CAAC,MAAc,EAAC,EAAE;IAEvC,MAAM,SAAS,GAAG,2BAAY,EAAE,CAAC;IACjC,MAAM,QAAQ,GAAG,yBAAW,EAAE,CAAC;IAC/B,MAAM,KAAK,GAAG,mBAAQ,EAAE,CAAC;IACzB,MAAM,QAAQ,GAAG,qBAAW,EAAE,CAAC;IAE/B,OAAO,eAAO,CAAC,GAAE,EAAE;QACf,IAAI,WAAW,GAAG,MAAM,CAAC;QAEzB,OAAO,WAAW,IAAI,WAAW,CAAC,OAAO,EAAC;YACtC,WAAW,GAAG,YAAG,CAAC,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;SACjD;QAED,IAAG,OAAO,WAAW,KAAK,UAAU;YAAE,OAAO,WAAW,CAAC;QAEzD,IAAG,WAAW,EAAE;YACZ,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,QAAQ,EAAC,GAAG,WAAW,CAAC;YAErG,IAAI,IAAI;gBAAE,OAAO,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;YACzD,IAAI,QAAQ;gBAAE,OAAO,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,kBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5G,IAAI,IAAI;gBAAE,OAAO,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,kBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACpG,IAAI,IAAI;gBAAE,OAAO,GAAG,EAAE;oBAClB,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;oBAC1B,MAAM,WAAW,GAAG,kBAAS,CAAC,MAAM,EAAE,CAAC,UAAiB,EAAC,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;oBAC5F,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;gBACzC,CAAC,CAAC;YACF,IAAI,KAAK;gBAAE,OAAO,GAAG,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;YAC7D,IAAI,cAAc;gBAAE,OAAO,GAAG,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;YAC1D,IAAI,QAAQ;gBAAE,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAC,CAAC,CAAC;SAC1E;IACL,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;AACtC,CAAC,CAAC;AAhCW,QAAA,SAAS,aAgCpB;AAEF,kBAAe,iBAAS,CAAC"}
+{"version":3,"file":"useAction.js","sourceRoot":"","sources":["../../../src/hooks/useAction.tsx"],"names":[],"mappings":";;;;;;AAAA,iCAA6C;AAC7C,6CAA0C;AAC1C,mCAAwC;AACxC,iDAA4C;AAC5C,yCAAoC;AACpC,gEAAwC;AACxC,mCAAiC;AAqB1B,MAAM,SAAS,GAAG,CAAC,MAAc,EAAC,EAAE;IAEvC,MAAM,SAAS,GAAG,2BAAY,EAAE,CAAC;IACjC,MAAM,QAAQ,GAAG,yBAAW,EAAE,CAAC;IAC/B,MAAM,KAAK,GAAG,mBAAQ,EAAE,CAAC;IACzB,MAAM,QAAQ,GAAG,qBAAW,EAAE,CAAC;IAE/B,OAAO,mBAAW,CAAC,CAAC,KAAK,EAAC,EAAE;QACxB,IAAI,WAAW,GAAG,MAAM,CAAC;QAEzB,OAAO,WAAW,IAAI,WAAW,CAAC,OAAO,EAAC;YACtC,WAAW,GAAG,YAAG,CAAC,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;SACjD;QAED,IAAG,OAAO,WAAW,KAAK,UAAU;YAAE,OAAO,WAAW,CAAC;QAEzD,IAAG,WAAW,EAAE;YACZ,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,QAAQ,EAAC,GAAG,WAAW,CAAC;YAErG,IAAI,IAAI;gBAAE,OAAO,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;YACnD,IAAI,QAAQ;gBAAE,OAAO,SAAS,CAAC,QAAQ,CAAC,GAAG,kBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACtG,IAAI,IAAI;gBAAE,OAAO,SAAS,CAAC,IAAI,CAAC,GAAG,kBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9F,IAAI,IAAI,EAAC;gBACL,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBAC1B,MAAM,WAAW,GAAG,kBAAS,CAAC,MAAM,EAAE,CAAC,UAAiB,EAAC,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;gBAC5F,OAAO,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;aAC/C;YAAA,CAAC;YACF,IAAI,KAAK;gBAAE,OAAO,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;YACvD,IAAI,cAAc;gBAAE,OAAO,QAAQ,CAAC,cAAc,CAAC,CAAC;YACpD,IAAI,QAAQ;gBAAE,OAAO,QAAQ,CAAC,EAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAC,CAAC,CAAC;SAC/D;IACL,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;AACvD,CAAC,CAAC;AAhCW,QAAA,SAAS,aAgCpB;AAEF,kBAAe,iBAAS,CAAC"}

package/dist/src/hooks/useDataSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDataSource.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDataSource.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAIxC,UAAU,iBAAiB;IACvB,IAAI,EAAE,QAAQ,GAAG,YAAY,GAAG,KAAK,GAAG,OAAO,GAAG,GAAG,CAAC;IACtD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAE;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,aAAK,IAAI,GAAG,UAAU,GAAG,MAAM,CAAC;AAIhC,eAAO,MAAM,aAAa,WAAa,MAAM,GAAG,iBAAiB,YAAa,iBAAiB,KAAI,IAsGlG,CAAC"}
+{"version":3,"file":"useDataSource.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDataSource.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAIxC,UAAU,iBAAiB;IACvB,IAAI,EAAE,QAAQ,GAAG,YAAY,GAAG,KAAK,GAAG,OAAO,GAAG,GAAG,CAAC;IACtD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAE;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,aAAK,IAAI,GAAG,UAAU,GAAG,MAAM,CAAC;AAEhC,eAAO,MAAM,aAAa,WAAa,MAAM,GAAG,iBAAiB,YAAa,iBAAiB,KAAI,IAwGlG,CAAC"}

package/dist/src/hooks/useDataSource.js

@@ -11,7 +11,6 @@ const classes_1 = require("../classes");
 const reducers_1 = require("../reducers");
 const useScope_1 = require("./useScope");
 const useTemplate_1 = __importDefault(require("./useTemplate"));
-const initialValue = null;
 const useDataSource = (source, options) => {
     const dispatch = react_redux_1.useDispatch();
     const template = useTemplate_1.default();
@@ -36,8 +35,8 @@ const useDataSource = (source, options) => {
         }
         return { dependencies, dataSourceOptions: lodash_1.defaults(templatedValues, _dataSourceOptions) };
     }, [scope, template, dataSourceName, dataSource, _dataSourceOptions]);
-    const key = dataSource && dataSource.keyExtractor(dataSourceOptions);
-    const currentValue = react_redux_1.useSelector(state => state.dataSource.data[key]) || initialValue;
+    const key = dataSource && dataSource.keyExtractor(dataSourceOptions, { scope, dispatch });
+    const currentValue = react_redux_1.useSelector(state => state.dataSource.data[key]);
     const loadData = react_1.useCallback((params) => {
         return dispatch({
             type: reducers_1.DATA_SOURCE_LOAD_DATA,
@@ -78,8 +77,10 @@ const useDataSource = (source, options) => {
         });
     }, [loadData, dataSourceOptions, scope, key]);
     react_1.useEffect(() => {
-        loadData();
-    }, [key, ...dependencies]);
+        if (!currentValue) {
+            loadData();
+        }
+    }, [key]);
     return react_1.useMemo(() => {
         if (lodash_1.get(dataSource, 'type') === 'Array') {
             let items = lodash_1.get(currentValue, 'items');

package/dist/src/hooks/useDataSource.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDataSource.js","sourceRoot":"","sources":["../../../src/hooks/useDataSource.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"useDataSource.js","sourceRoot":"","sources":["../../../src/hooks/useDataSource.tsx"],"names":[],"mappings":"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"}

package/dist/src/reducers/dataSource.d.ts

@@ -17,7 +17,10 @@ export interface _DataSource extends Function {
         scope: any;
         dispatch: any;
     }) => Promise<any>;
-    keyExtractor: (options: any) => string;
+    keyExtractor: (options: any, { scope: Object, dispatch: Function }: {
+        scope: any;
+        dispatch: any;
+    }) => string;
 }
 export declare function registerDataSource(dataSource: _DataSource): {
     type: string;

package/dist/src/reducers/dataSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataSource.d.ts","sourceRoot":"","sources":["../../../src/reducers/dataSource.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAC3D,eAAO,MAAM,uBAAuB,4BAA4B,CAAC;AACjE,eAAO,MAAM,qBAAqB,0BAA0B,CAAC;AAC7D,eAAO,MAAM,0BAA0B,+BAA+B,CAAC;AACvE,eAAO,MAAM,+BAA+B,oCAAoC,CAAC;AACjF,eAAO,MAAM,mCAAmC,wCAAwC,CAAC;AACzF,eAAO,MAAM,6BAA6B,kCAAkC,CAAC;AAC7E,eAAO,MAAM,6BAA6B,kCAAkC,CAAC;AAC7E,eAAO,MAAM,4BAA4B,iCAAiC,CAAC;AAE3E,MAAM,WAAW,WAAY,SAAQ,QAAQ;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,QAAQ,GAAC,OAAO,CAAC;IACvB,oBAAoB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAC;;;KAAA,KAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1E,YAAY,EAAE,CAAC,OAAO,EAAE,GAAG,KAAG,MAAM,CAAC;CACxC;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,WAAW;;;EAKzD;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;;;;EAMhD;;AAQD,wBAyBC"}
+{"version":3,"file":"dataSource.d.ts","sourceRoot":"","sources":["../../../src/reducers/dataSource.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAC3D,eAAO,MAAM,uBAAuB,4BAA4B,CAAC;AACjE,eAAO,MAAM,qBAAqB,0BAA0B,CAAC;AAC7D,eAAO,MAAM,0BAA0B,+BAA+B,CAAC;AACvE,eAAO,MAAM,+BAA+B,oCAAoC,CAAC;AACjF,eAAO,MAAM,mCAAmC,wCAAwC,CAAC;AACzF,eAAO,MAAM,6BAA6B,kCAAkC,CAAC;AAC7E,eAAO,MAAM,6BAA6B,kCAAkC,CAAC;AAC7E,eAAO,MAAM,4BAA4B,iCAAiC,CAAC;AAE3E,MAAM,WAAW,WAAY,SAAQ,QAAQ;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,QAAQ,GAAC,OAAO,CAAC;IACvB,oBAAoB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAC;;;KAAA,KAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1E,YAAY,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE;;;KAAA,KAAG,MAAM,CAAC;CAC/E;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,WAAW;;;EAKzD;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;;;;EAMhD;;AAQD,wBAyBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evlop/commons",
-  "version": "1.0.90",
+  "version": "1.0.94",
   "description": "",
   "main": "dist/main.js",
   "peerDependencies": {