@legalplace/wizardx-core 2.7.0 → 2.7.1

package/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.7.1](https://git.legalplace.eu/legalplace/monorepo/compare/@legalplace/wizardx-core@2.7.0...@legalplace/wizardx-core@2.7.1) (2022-01-18)
+
+
+### Bug Fixes
+
+* fix cacheKey for memoized states api[#4719](https://git.legalplace.eu/legalplace/monorepo/issues/4719) ([b76f9a0](https://git.legalplace.eu/legalplace/monorepo/commits/b76f9a0cbee082ff607da40682a40253c9991eec))
+* fix input type number and enabling bundle analyzer with variable only api[#4719](https://git.legalplace.eu/legalplace/monorepo/issues/4719) ([3948d0b](https://git.legalplace.eu/legalplace/monorepo/commits/3948d0b520ebc2aac5f1ad735d0beb12814486f2))
+* fix issue with props equalityCheck on state memoization api[#4719](https://git.legalplace.eu/legalplace/monorepo/issues/4719) ([e059091](https://git.legalplace.eu/legalplace/monorepo/commits/e059091be42aa358598f4bc2173fd940c7da968f))
+* fix moment import api[#4719](https://git.legalplace.eu/legalplace/monorepo/issues/4719) ([bb4fd18](https://git.legalplace.eu/legalplace/monorepo/commits/bb4fd188666fb412e8c96cd22bc7149c5566aa55))
+
+
+
+
+
 # [2.7.0](https://git.legalplace.eu/legalplace/monorepo/compare/@legalplace/wizardx-core@2.6.4...@legalplace/wizardx-core@2.7.0) (2022-01-06)
 
 

package/dist/components/SmartScript.d.ts

@@ -1,5 +1,5 @@
 import { Action } from "redux";
-import type { Moment } from "moment-business-days";
+import moment from "moment-business-days";
 import { SmartScriptStore } from "../libs/SmartScriptStore";
 import { StateType } from "../types/State.type";
 export declare type TInitTriggersCallback = (triggers: StateType.SmartScript["triggers"], actions: Action[]) => void;
@@ -21,7 +21,7 @@ declare global {
         displayOption: typeof SmartScriptStore.displayOption;
         hideVariable: typeof SmartScriptStore.hideVariable;
         displayVariable: typeof SmartScriptStore.displayVariable;
-        moment: Moment;
+        moment: typeof moment;
         triggerListeners: (type: "option" | "variable", id: number, inputs: StateType.Inputs) => Action[];
         initTriggers: (callback: TInitTriggersCallback, inputs: StateType.Inputs, newInstance: boolean) => void;
     }

package/dist/components/SmartScript.js

@@ -2,6 +2,7 @@ import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 import { useEffect, useState } from "react";
 import { useParams } from "react-router-dom";
 import queryString from "query-string";
+import moment from "moment-business-days";
 import { getConfig } from "../config";
 import { SmartScriptStore } from "../libs/SmartScriptStore";
 const SmartScriptComponent = () => {
@@ -24,6 +25,7 @@ const SmartScriptComponent = () => {
     window.displayVariable = SmartScriptStore.displayVariable;
     window.hideOption = SmartScriptStore.hideOption;
     window.displayOption = SmartScriptStore.displayOption;
+    window.moment = moment;
     const apiEndpoint = getConfig().apiEndpoint + (/\/$/.test(getConfig().apiEndpoint) ? "" : "/");
     const { permalink, uniqid } = useParams();
     const modelVersion = queryString.parse(window.location.search).version;

package/dist/componentsConnectors/connector/componentConnector.js

@@ -40,25 +40,24 @@ const ConnectorHooc = (Component, componentName, additionnalHooks) => {
     ConnectedComponent.displayName = `connectedComponent(${componentName})`;
     return ConnectedComponent;
 };
-const generateCacheKey = (object) => sha1(Object.keys(object)
-    .map((prop) => {
-    if (typeof object[prop] === "function")
-        return `${prop}.function`;
-    if (typeof object[prop] === "undefined")
-        return `${prop}.undefined`;
-    if (object[prop] === null)
-        return `${prop}.null`;
-    if (object[prop] && typeof object[prop] === "object")
-        return `${prop}.${generateCacheKey(object[prop])}`;
-    return `${prop}.${object[prop].toString()}`;
-})
-    .join("."), "hex");
-function MemoizeStateToProps(stateToProps) {
+const generateCacheKey = (object, hashKey = true) => {
+    const key = Object.entries(object).reduce((p, [prop, value]) => {
+        if (["function", "undefined"].includes(typeof value))
+            return `${p}.${prop}.${typeof value}`;
+        if (value === null)
+            return `${p}.${prop}.null`;
+        if (value && typeof value === "object")
+            return `${prop}.${generateCacheKey(value, false)}`;
+        return `${p}.${prop}.${value.toString()}`;
+    }, "");
+    return hashKey && key.length > 40 ? sha1(key, "hex") : key;
+};
+function MemoizeStateToProps(componentName, stateToProps) {
     if (!stateToProps)
         return undefined;
     const cache = {};
     return (selectors) => (state, ownProps) => {
-        const nextProps = stateToProps(selectorsLibrary)(state, ownProps);
+        const nextProps = stateToProps(selectors)(state, ownProps);
         const cacheKey = generateCacheKey(ownProps);
         const prevProps = cache[cacheKey];
         const equalityCheck = prevProps && propsEqualityCheck(cache[cacheKey], nextProps);
@@ -91,7 +90,7 @@ export function componentConnector(options) {
         const hooc = ConnectorHooc(Component, componentName, additionnalHooks);
         return (connectStore ? ConnectorConnectWithStore : ConnectorConnect)({
             stateToProps: memoizeStateToProps
-                ? MemoizeStateToProps(stateToProps)
+                ? MemoizeStateToProps(componentName, stateToProps)
                 : stateToProps,
             dispatchToProps,
         })(hooc);

package/dist/helpers/propsEqualityCheck.js

@@ -1,9 +1,10 @@
-export const propsEqualityCheck = (prevProps, nextProps) => Object.entries(nextProps).reduce((ps, [k, v]) => {
-    if (prevProps[k] !== v) {
-        if (typeof prevProps[k] === "object" && typeof v === "object") {
-            return ps && propsEqualityCheck(prevProps[k], v);
+export const propsEqualityCheck = (prevProps, nextProps) => Object.entries(nextProps).length === Object.entries(prevProps).length &&
+    Object.entries(nextProps).reduce((ps, [k, v]) => {
+        if (prevProps[k] !== v) {
+            if (typeof prevProps[k] === "object" && typeof v === "object") {
+                return ps && propsEqualityCheck(prevProps[k], v);
+            }
+            return false;
         }
-        return false;
-    }
-    return ps;
-}, true);
+        return ps;
+    }, true);

package/dist/redux/selectors/app.js

@@ -9,7 +9,7 @@ export const selectIsLastWizardPage = createSelector((state) => state.app.pagina
     state.app.wizard.availableSections.length, (state) => state.app.pagination.currentPage.toString());
 export const selectGreatestPage = createSelector((state) => state.app.pagination.greatestPage, (state) => state.app.pagination.greatestPage.toString());
 export const selectCurrentSectionId = createSelector((state) => state.app.wizard.currentSectionId, (state) => state.app.wizard.currentSectionId.toString());
-export const selectAvailableSections = createSelector((state) => [...state.app.wizard.availableSections], (state) => state.app.wizard.availableSections.reduce((p, c) => p + c, "0"));
+export const selectAvailableSections = createSelector((state) => [...state.app.wizard.availableSections], (state) => state.app.wizard.availableSections.reduce((p, c) => `${p}.${c}`, "0"));
 export const selectAvailableOptions = createSelector((state, document = "main") => {
     let availableOptions = [];
     const { availableSections } = state.app.wizard;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/wizardx-core",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "author": "Moncef Hammou (moncef@legalplace.fr)",
   "license": "MIT",
   "files": [
@@ -24,7 +24,7 @@
     "@legalplace/lplogic": "^2.1.6",
     "@legalplace/model-healthcheck": "^1.1.5",
     "@legalplace/referencesparser": "^1.7.0",
-    "@legalplace/storybook": "2.8.0-2604-0.3",
+    "@legalplace/storybook": "2.10.4",
     "@loadable/component": "^5.15.0",
     "@redux-saga/core": "^1.1.3",
     "connected-react-router": "^6.8.0",
@@ -35,9 +35,9 @@
     "mousetrap": "^1.6.5",
     "prop-types": "^15.7.2",
     "query-string": "^7.0.1",
-    "react": "^17.0.1",
+    "react": "^17.0.2",
     "react-app-polyfill": "^2.0.0",
-    "react-dom": "^17.0.1",
+    "react-dom": "^17.0.2",
     "react-redux": "^7.2.5",
     "react-router": "5.2.1",
     "react-router-dom": "^5.2.0",
@@ -91,5 +91,5 @@
     "*.test.ts",
     "*.test.tsx"
   ],
-  "gitHead": "bf413725716b7aafa4e9e001ac9e69a4065258d1"
+  "gitHead": "47024b8ba1d94f8c646b5f8f15950c6804f32159"
 }