@totalsoft/rules-algebra-react 5.0.37 → 5.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,5 @@
1
1
  // Copyright (c) TotalSoft.
2
2
  // This source code is licensed under the MIT license.
3
+
3
4
  export * from './useRules';
4
5
  export * from './useRulesLens';
@@ -1,5 +1,6 @@
1
1
  // Copyright (c) TotalSoft.
2
2
  // This source code is licensed under the MIT license.
3
+
3
4
  import { useState, useCallback, useMemo } from 'react';
4
5
  import { create, detectChanges, ensureArrayUIDsDeep, setInnerProp } from '@totalsoft/change-tracking';
5
6
  import { logTo, applyRule } from '@totalsoft/rules-algebra';
@@ -11,30 +12,27 @@ export function useRules(rules, initialModel, {
11
12
  const [model, setModel] = useState(ensureArrayUIDsDeep(initialModel));
12
13
  const rulesEngine = useMemo(() => {
13
14
  let newRules = rules;
14
-
15
15
  if (isLogEnabled) {
16
16
  newRules = logTo(logger)(newRules);
17
17
  }
18
-
19
18
  return newRules;
20
19
  }, [rules, isLogEnabled, logger, ...deps]); // eslint-disable-line react-hooks/exhaustive-deps
21
20
 
22
- return [model, dirtyInfo, // Update model or property
21
+ return [model, dirtyInfo,
22
+ // Update model or property
23
23
  useCallback((value, propertyPath = undefined) => {
24
24
  const changedModel = propertyPath ? setInnerProp(model, propertyPath, value) : value;
25
-
26
25
  if (changedModel === model) {
27
26
  return model;
28
27
  }
29
-
30
28
  const result = applyRule(rulesEngine, ensureArrayUIDsDeep(changedModel), model);
31
29
  setDirtyInfo(detectChanges(result, model, dirtyInfo));
32
30
  setModel(result);
33
31
  return result;
34
- }, [model, dirtyInfo, rulesEngine]), // Reset
32
+ }, [model, dirtyInfo, rulesEngine]),
33
+ // Reset
35
34
  useCallback((newModel = undefined) => {
36
35
  setDirtyInfo(create());
37
-
38
36
  if (newModel !== undefined) {
39
37
  setModel(ensureArrayUIDsDeep(newModel));
40
38
  }
@@ -1,5 +1,6 @@
1
1
  // Copyright (c) TotalSoft.
2
2
  // This source code is licensed under the MIT license.
3
+
3
4
  import { useStateLens, rmap, over, reuseCache } from '@totalsoft/react-state-lens';
4
5
  import { useMemo, useCallback, useState, useRef } from 'react';
5
6
  import { applyRule, logTo } from '@totalsoft/rules-algebra';
@@ -11,11 +12,9 @@ export function useRulesLens(rules, initialModel, {
11
12
  const [dirtyInfo, setDirtyInfo] = useState(create);
12
13
  const rulesEngine = useMemo(() => {
13
14
  let newRules = rules;
14
-
15
15
  if (isLogEnabled) {
16
16
  newRules = logTo(logger)(newRules);
17
17
  }
18
-
19
18
  return newRules;
20
19
  }, [rules, isLogEnabled, logger, ...deps]); // eslint-disable-line react-hooks/exhaustive-deps
21
20
 
@@ -23,21 +22,19 @@ export function useRulesLens(rules, initialModel, {
23
22
  const prevProxy = useRef(null);
24
23
  const rulesEngineLens = useMemo(() => {
25
24
  var _stateLens;
26
-
27
25
  const proxy = (_stateLens = stateLens, rmap((changedModel, prevModel) => {
28
26
  const result = applyRule(rulesEngine, ensureArrayUIDsDeep(changedModel), prevModel);
29
27
  setDirtyInfo(prevDirtyInfo => detectChanges(result, prevModel, prevDirtyInfo));
30
28
  return result;
31
29
  })(_stateLens));
32
-
33
30
  if (prevProxy.current) {
34
31
  reuseCache(prevProxy.current, proxy);
35
32
  }
36
-
37
33
  prevProxy.current = proxy;
38
34
  return proxy;
39
35
  }, [stateLens, rulesEngine]);
40
- return [rulesEngineLens, dirtyInfo, // Reset
36
+ return [rulesEngineLens, dirtyInfo,
37
+ // Reset
41
38
  useCallback((newModel = undefined) => {
42
39
  setDirtyInfo(create());
43
40
  over(stateLens, prevModel => {
package/esm/index.js CHANGED
@@ -1,4 +1,5 @@
1
1
  // Copyright (c) TotalSoft.
2
2
  // This source code is licensed under the MIT license.
3
+
3
4
  export * from './hooks';
4
5
  export * from "@totalsoft/react-state-lens/lensProxy";
package/hooks/index.js CHANGED
@@ -3,9 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
-
7
6
  var _useRules = require("./useRules");
8
-
9
7
  Object.keys(_useRules).forEach(function (key) {
10
8
  if (key === "default" || key === "__esModule") return;
11
9
  if (key in exports && exports[key] === _useRules[key]) return;
@@ -16,9 +14,7 @@ Object.keys(_useRules).forEach(function (key) {
16
14
  }
17
15
  });
18
16
  });
19
-
20
17
  var _useRulesLens = require("./useRulesLens");
21
-
22
18
  Object.keys(_useRulesLens).forEach(function (key) {
23
19
  if (key === "default" || key === "__esModule") return;
24
20
  if (key in exports && exports[key] === _useRulesLens[key]) return;
package/hooks/useRules.js CHANGED
@@ -1,71 +1,58 @@
1
1
  "use strict";
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
-
5
4
  Object.defineProperty(exports, "__esModule", {
6
5
  value: true
7
6
  });
8
7
  exports.useRules = useRules;
9
-
10
8
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
11
-
12
9
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
13
-
14
10
  var _react = require("react");
15
-
16
11
  var _changeTracking = require("@totalsoft/change-tracking");
17
-
18
12
  var _rulesAlgebra = require("@totalsoft/rules-algebra");
19
-
20
13
  // Copyright (c) TotalSoft.
21
14
  // This source code is licensed under the MIT license.
15
+
22
16
  function useRules(rules, initialModel) {
23
17
  var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
24
- _ref$isLogEnabled = _ref.isLogEnabled,
25
- isLogEnabled = _ref$isLogEnabled === void 0 ? true : _ref$isLogEnabled,
26
- _ref$logger = _ref.logger,
27
- logger = _ref$logger === void 0 ? console : _ref$logger;
28
-
18
+ _ref$isLogEnabled = _ref.isLogEnabled,
19
+ isLogEnabled = _ref$isLogEnabled === void 0 ? true : _ref$isLogEnabled,
20
+ _ref$logger = _ref.logger,
21
+ logger = _ref$logger === void 0 ? console : _ref$logger;
29
22
  var deps = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
30
-
31
23
  var _useState = (0, _react.useState)(_changeTracking.create),
32
- _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
33
- dirtyInfo = _useState2[0],
34
- setDirtyInfo = _useState2[1];
35
-
24
+ _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
25
+ dirtyInfo = _useState2[0],
26
+ setDirtyInfo = _useState2[1];
36
27
  var _useState3 = (0, _react.useState)((0, _changeTracking.ensureArrayUIDsDeep)(initialModel)),
37
- _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
38
- model = _useState4[0],
39
- setModel = _useState4[1];
40
-
28
+ _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
29
+ model = _useState4[0],
30
+ setModel = _useState4[1];
41
31
  var rulesEngine = (0, _react.useMemo)(function () {
42
32
  var newRules = rules;
43
-
44
33
  if (isLogEnabled) {
45
34
  newRules = (0, _rulesAlgebra.logTo)(logger)(newRules);
46
35
  }
47
-
48
36
  return newRules;
49
37
  }, [rules, isLogEnabled, logger].concat((0, _toConsumableArray2["default"])(deps))); // eslint-disable-line react-hooks/exhaustive-deps
50
38
 
51
- return [model, dirtyInfo, // Update model or property
39
+ return [model, dirtyInfo,
40
+ // Update model or property
52
41
  (0, _react.useCallback)(function (value) {
53
42
  var propertyPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
54
43
  var changedModel = propertyPath ? (0, _changeTracking.setInnerProp)(model, propertyPath, value) : value;
55
-
56
44
  if (changedModel === model) {
57
45
  return model;
58
46
  }
59
-
60
47
  var result = (0, _rulesAlgebra.applyRule)(rulesEngine, (0, _changeTracking.ensureArrayUIDsDeep)(changedModel), model);
61
48
  setDirtyInfo((0, _changeTracking.detectChanges)(result, model, dirtyInfo));
62
49
  setModel(result);
63
50
  return result;
64
- }, [model, dirtyInfo, rulesEngine]), // Reset
51
+ }, [model, dirtyInfo, rulesEngine]),
52
+ // Reset
65
53
  (0, _react.useCallback)(function () {
66
54
  var newModel = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
67
55
  setDirtyInfo((0, _changeTracking.create)());
68
-
69
56
  if (newModel !== undefined) {
70
57
  setModel((0, _changeTracking.ensureArrayUIDsDeep)(newModel));
71
58
  }
@@ -1,47 +1,35 @@
1
1
  "use strict";
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
-
5
4
  Object.defineProperty(exports, "__esModule", {
6
5
  value: true
7
6
  });
8
7
  exports.useRulesLens = useRulesLens;
9
-
10
8
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
11
-
12
9
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
13
-
14
10
  var _reactStateLens = require("@totalsoft/react-state-lens");
15
-
16
11
  var _react = require("react");
17
-
18
12
  var _rulesAlgebra = require("@totalsoft/rules-algebra");
19
-
20
13
  var _changeTracking = require("@totalsoft/change-tracking");
21
-
22
14
  // Copyright (c) TotalSoft.
23
15
  // This source code is licensed under the MIT license.
16
+
24
17
  function useRulesLens(rules, initialModel) {
25
18
  var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
26
- _ref$isLogEnabled = _ref.isLogEnabled,
27
- isLogEnabled = _ref$isLogEnabled === void 0 ? true : _ref$isLogEnabled,
28
- _ref$logger = _ref.logger,
29
- logger = _ref$logger === void 0 ? console : _ref$logger;
30
-
19
+ _ref$isLogEnabled = _ref.isLogEnabled,
20
+ isLogEnabled = _ref$isLogEnabled === void 0 ? true : _ref$isLogEnabled,
21
+ _ref$logger = _ref.logger,
22
+ logger = _ref$logger === void 0 ? console : _ref$logger;
31
23
  var deps = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
32
-
33
24
  var _useState = (0, _react.useState)(_changeTracking.create),
34
- _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
35
- dirtyInfo = _useState2[0],
36
- setDirtyInfo = _useState2[1];
37
-
25
+ _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
26
+ dirtyInfo = _useState2[0],
27
+ setDirtyInfo = _useState2[1];
38
28
  var rulesEngine = (0, _react.useMemo)(function () {
39
29
  var newRules = rules;
40
-
41
30
  if (isLogEnabled) {
42
31
  newRules = (0, _rulesAlgebra.logTo)(logger)(newRules);
43
32
  }
44
-
45
33
  return newRules;
46
34
  }, [rules, isLogEnabled, logger].concat((0, _toConsumableArray2["default"])(deps))); // eslint-disable-line react-hooks/exhaustive-deps
47
35
 
@@ -51,7 +39,6 @@ function useRulesLens(rules, initialModel) {
51
39
  var prevProxy = (0, _react.useRef)(null);
52
40
  var rulesEngineLens = (0, _react.useMemo)(function () {
53
41
  var _stateLens;
54
-
55
42
  var proxy = (_stateLens = stateLens, (0, _reactStateLens.rmap)(function (changedModel, prevModel) {
56
43
  var result = (0, _rulesAlgebra.applyRule)(rulesEngine, (0, _changeTracking.ensureArrayUIDsDeep)(changedModel), prevModel);
57
44
  setDirtyInfo(function (prevDirtyInfo) {
@@ -59,15 +46,14 @@ function useRulesLens(rules, initialModel) {
59
46
  });
60
47
  return result;
61
48
  })(_stateLens));
62
-
63
49
  if (prevProxy.current) {
64
50
  (0, _reactStateLens.reuseCache)(prevProxy.current, proxy);
65
51
  }
66
-
67
52
  prevProxy.current = proxy;
68
53
  return proxy;
69
54
  }, [stateLens, rulesEngine]);
70
- return [rulesEngineLens, dirtyInfo, // Reset
55
+ return [rulesEngineLens, dirtyInfo,
56
+ // Reset
71
57
  (0, _react.useCallback)(function () {
72
58
  var newModel = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
73
59
  setDirtyInfo((0, _changeTracking.create)());
package/index.js CHANGED
@@ -3,9 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
-
7
6
  var _hooks = require("./hooks");
8
-
9
7
  Object.keys(_hooks).forEach(function (key) {
10
8
  if (key === "default" || key === "__esModule") return;
11
9
  if (key in exports && exports[key] === _hooks[key]) return;
@@ -16,9 +14,7 @@ Object.keys(_hooks).forEach(function (key) {
16
14
  }
17
15
  });
18
16
  });
19
-
20
17
  var _lensProxy = require("@totalsoft/react-state-lens/lensProxy");
21
-
22
18
  Object.keys(_lensProxy).forEach(function (key) {
23
19
  if (key === "default" || key === "__esModule") return;
24
20
  if (key in exports && exports[key] === _lensProxy[key]) return;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@totalsoft/rules-algebra-react",
3
- "version": "5.0.37",
3
+ "version": "5.1.0",
4
4
  "description": "React extensions for the \"rules-algebra\" business rules api",
5
5
  "main": "./index.js",
6
6
  "author": "TotalSoft",
@@ -15,13 +15,13 @@
15
15
  "access": "public"
16
16
  },
17
17
  "dependencies": {
18
- "@totalsoft/change-tracking-react": "^5.0.37",
18
+ "@totalsoft/change-tracking-react": "^5.1.0",
19
19
  "@totalsoft/rules-algebra": "^5.0.37"
20
20
  },
21
21
  "peerDependencies": {
22
22
  "react": ">= 16.9.0"
23
23
  },
24
- "gitHead": "e0544eb4652e46c697e1b262ebbce4296b2f5971",
24
+ "gitHead": "80c069cd00d68ded0ebff32d3d19acc97c533a33",
25
25
  "private": false,
26
26
  "module": "./esm/index.js",
27
27
  "typings": "./index.d.ts"