goblin-laboratory 4.3.0 → 4.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goblin-laboratory",
-  "version": "4.3.0",
+  "version": "4.5.2",
   "description": "Laboratory",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -23,7 +23,6 @@
     "aphrodite": "^2.2.2",
     "connected-react-router": "^6.3.2",
     "css-key": "^1.0.0",
-    "faster-stable-stringify": "^1.0.0",
     "@fortawesome/react-fontawesome": "^0.1.9",
     "history": "^4.6.1",
     "immutable": "4.0.0-rc.14",
@@ -36,6 +35,7 @@
     "react-redux": "^7.1.0",
     "react-router": "^5.0.0",
     "redux-thunk": "^2.3.0",
+    "safe-stable-stringify": "^2.5.0",
     "xcraft-core-shredder": "^5.3.0",
     "xcraft-dev-prettier": "^2.0.0",
     "xcraft-dev-rules": "^4.4.2",

package/widgets/store/widgets-reducer.js

@@ -57,9 +57,7 @@ function getReducerForAction(action) {
   }
 
   throw new Error(
-    `No reducer named "${reducerName}" found. Action:\n${JSON.stringify(
-      action
-    )}`
+    `No reducer named "${reducerName}" found. Action:\n${action.type}`
   );
 }
 

package/widgets/widget/index.js

@@ -28,10 +28,6 @@ const throttle250 = _.throttle((fct) => fct(), 250);
 //   );
 // }
 
-function getWidgetName(constructorName) {
-  return constructorName.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
-}
-
 class Widget extends React.Component {
   constructor() {
     super(...arguments);
@@ -47,6 +43,10 @@ class Widget extends React.Component {
     }
   }
 
+  static getWidgetName(constructorName) {
+    return constructorName.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
+  }
+
   _getInheritedNames() {
     let p = this;
     const names = new Set();
@@ -55,7 +55,7 @@ class Widget extends React.Component {
       if (constructorName === 'Widget') {
         break;
       }
-      const widgetName = getWidgetName(constructorName);
+      const widgetName = Widget.getWidgetName(constructorName);
       names.add(widgetName);
     }
     return [...names];

package/widgets/widget/style/build-style.js

@@ -17,10 +17,10 @@ const {StyleSheet, css} = Aphrodite.extend([
       const nestedTags = [];
       const selectors = selector.split(',');
       _.each(selectors, (subselector, key) => {
-        if (selector[0] === '&') {
-          const tag = key === 0 ? subselector.slice(1) : subselector;
+        if (subselector.includes('&')) {
+          const tag = subselector.replace(/&/g, baseSelector);
           const nestedTag = generateSubtreeStyles(
-            `${baseSelector}${tag}`.replace(/ +(?= )/g, '')
+            `${tag}`.replace(/ +(?= )/g, '')
           );
           nestedTags.push(nestedTag);
         }

package/widgets/widget/style/compute-style-hash.js

@@ -1,9 +1,9 @@
-import fasterStringify from 'faster-stable-stringify';
+import safeStringify from 'safe-stable-stringify';
 
 export default function computeStyleHash(myStyle, theme, styleProps) {
   let hashProps = '';
   if (myStyle.hasPropsParam) {
-    hashProps = fasterStringify(styleProps);
+    hashProps = safeStringify(styleProps);
   }
 
   let hashTheme = '';

package/widgets/widget/utils/shallowEqualShredder.js

@@ -2,7 +2,7 @@
 
 const hasOwn = Object.prototype.hasOwnProperty;
 
-function is(x, y) {
+export function isEqual(x, y) {
   if (x && typeof x.equals === 'function') {
     return x.equals(y);
   }
@@ -10,7 +10,7 @@ function is(x, y) {
 }
 
 export default function shallowEqualShredder(objA, objB) {
-  if (is(objA, objB)) return true;
+  if (isEqual(objA, objB)) return true;
 
   if (
     typeof objA !== 'object' ||
@@ -27,7 +27,10 @@ export default function shallowEqualShredder(objA, objB) {
   if (keysA.length !== keysB.length) return false;
 
   for (let i = 0; i < keysA.length; i++) {
-    if (!hasOwn.call(objB, keysA[i]) || !is(objA[keysA[i]], objB[keysA[i]])) {
+    if (
+      !hasOwn.call(objB, keysA[i]) ||
+      !isEqual(objA[keysA[i]], objB[keysA[i]])
+    ) {
       return false;
     }
   }

package/widgets/with-model/widget.js

@@ -3,8 +3,9 @@ import PropTypes from 'prop-types';
 import Widget from 'goblin-laboratory/widgets/widget';
 import joinModels from '../connect-helpers/join-models';
 import ModelContext from './context';
+import withC from '../connect-helpers/with-c.js';
 
-export default class WithModel extends Widget {
+class WithModelNC extends Widget {
   constructor() {
     super(...arguments);
   }
@@ -40,3 +41,7 @@ export default class WithModel extends Widget {
     );
   }
 }
+
+const WithModel = withC(WithModelNC);
+
+export default WithModel;