goblin-laboratory 2.2.1 → 2.2.2

package/widgets/widget/utils/connect.js

@@ -1,47 +1,47 @@
-//T:2019-02-27
-
-import {connect} from 'react-redux';
-import Shredder from 'xcraft-core-shredder';
-import shallowEqualShredder from './shallowEqualShredder';
-import wrapMapStateToProps from './wrapMapStateToProps';
-
-function withShredder(mapStateToProps) {
-  mapStateToProps = wrapMapStateToProps(mapStateToProps);
-
-  const mapStateToPropsWithOwnProps = (state, ownProps) => {
-    const s = new Shredder({
-      backend: state.backend,
-      widgets: state.widgets,
-      network: state.network,
-    });
-    return mapStateToProps(s, ownProps);
-  };
-
-  const mapStateToPropsWithoutOwnProps = (state) => {
-    return mapStateToPropsWithOwnProps(state);
-  };
-
-  return mapStateToProps.length > 1
-    ? mapStateToPropsWithOwnProps
-    : mapStateToPropsWithoutOwnProps;
-}
-
-export default function (
-  mapStateToProps,
-  mapDispatchToProps,
-  mergeProps,
-  options
-) {
-  return connect(
-    withShredder(mapStateToProps),
-    mapDispatchToProps,
-    mergeProps,
-    {
-      pure: true,
-      areOwnPropsEqual: shallowEqualShredder,
-      areStatePropsEqual: shallowEqualShredder,
-      areMergedPropsEqual: shallowEqualShredder,
-      ...options,
-    }
-  );
-}
+//T:2019-02-27
+
+import {connect} from 'react-redux';
+import Shredder from 'xcraft-core-shredder';
+import shallowEqualShredder from './shallowEqualShredder';
+import wrapMapStateToProps from './wrapMapStateToProps';
+
+function withShredder(mapStateToProps) {
+  mapStateToProps = wrapMapStateToProps(mapStateToProps);
+
+  const mapStateToPropsWithOwnProps = (state, ownProps) => {
+    const s = new Shredder({
+      backend: state.backend,
+      widgets: state.widgets,
+      network: state.network,
+    });
+    return mapStateToProps(s, ownProps);
+  };
+
+  const mapStateToPropsWithoutOwnProps = (state) => {
+    return mapStateToPropsWithOwnProps(state);
+  };
+
+  return mapStateToProps.length > 1
+    ? mapStateToPropsWithOwnProps
+    : mapStateToPropsWithoutOwnProps;
+}
+
+export default function (
+  mapStateToProps,
+  mapDispatchToProps,
+  mergeProps,
+  options
+) {
+  return connect(
+    withShredder(mapStateToProps),
+    mapDispatchToProps,
+    mergeProps,
+    {
+      pure: true,
+      areOwnPropsEqual: shallowEqualShredder,
+      areStatePropsEqual: shallowEqualShredder,
+      areMergedPropsEqual: shallowEqualShredder,
+      ...options,
+    }
+  );
+}

package/widgets/widget/utils/connectBackend.js

@@ -1,48 +1,48 @@
-//T:2019-02-27
-
-import React from 'react';
-import connect from './connect';
-import wrapMapStateToProps from './wrapMapStateToProps';
-
-function withBackendPath(mapStateToProps) {
-  mapStateToProps = wrapMapStateToProps(mapStateToProps);
-  return (state, ownProps) => {
-    if (!ownProps.id) {
-      throw new Error(
-        'Cannot connect backend state without an id. You must add a prop "id" to the connected component'
-      );
-    }
-    const backendState = state.get(`backend.${ownProps.id}`);
-    if (!backendState) {
-      return {
-        _loading: true,
-      };
-    }
-    return mapStateToProps(backendState, ownProps);
-  };
-}
-
-export default function (
-  mapStateToProps,
-  mapDispatchToProps,
-  mergeProps,
-  options
-) {
-  return (Comp) =>
-    connect(
-      withBackendPath(mapStateToProps),
-      mapDispatchToProps,
-      mergeProps,
-      options
-    )((props) => {
-      if (props._loading) {
-        if (Comp.LoadingComponent) {
-          return <Comp.LoadingComponent />;
-        } else {
-          return null;
-        }
-      } else {
-        return <Comp {...props} />;
-      }
-    });
-}
+//T:2019-02-27
+
+import React from 'react';
+import connect from './connect';
+import wrapMapStateToProps from './wrapMapStateToProps';
+
+function withBackendPath(mapStateToProps) {
+  mapStateToProps = wrapMapStateToProps(mapStateToProps);
+  return (state, ownProps) => {
+    if (!ownProps.id) {
+      throw new Error(
+        'Cannot connect backend state without an id. You must add a prop "id" to the connected component'
+      );
+    }
+    const backendState = state.get(`backend.${ownProps.id}`);
+    if (!backendState) {
+      return {
+        _loading: true,
+      };
+    }
+    return mapStateToProps(backendState, ownProps);
+  };
+}
+
+export default function (
+  mapStateToProps,
+  mapDispatchToProps,
+  mergeProps,
+  options
+) {
+  return (Comp) =>
+    connect(
+      withBackendPath(mapStateToProps),
+      mapDispatchToProps,
+      mergeProps,
+      options
+    )((props) => {
+      if (props._loading) {
+        if (Comp.LoadingComponent) {
+          return <Comp.LoadingComponent />;
+        } else {
+          return null;
+        }
+      } else {
+        return <Comp {...props} />;
+      }
+    });
+}

package/widgets/widget/utils/connectWidget.js

@@ -1,31 +1,31 @@
-//T:2019-02-27
-
-import connect from './connect';
-import wrapMapStateToProps from './wrapMapStateToProps';
-
-function withWidgetPath(mapStateToProps) {
-  mapStateToProps = wrapMapStateToProps(mapStateToProps);
-  return (state, ownProps) => {
-    const widgetId = ownProps.widgetId || ownProps.id;
-    if (!widgetId) {
-      throw new Error(
-        'Cannot connect widget state without an id. You must add a prop "widgetId" or "id" to the connected component'
-      );
-    }
-    return mapStateToProps(state.get(`widgets.${widgetId}`), ownProps);
-  };
-}
-
-export default function (
-  mapStateToProps,
-  mapDispatchToProps,
-  mergeProps,
-  options
-) {
-  return connect(
-    withWidgetPath(mapStateToProps),
-    mapDispatchToProps,
-    mergeProps,
-    options
-  );
-}
+//T:2019-02-27
+
+import connect from './connect';
+import wrapMapStateToProps from './wrapMapStateToProps';
+
+function withWidgetPath(mapStateToProps) {
+  mapStateToProps = wrapMapStateToProps(mapStateToProps);
+  return (state, ownProps) => {
+    const widgetId = ownProps.widgetId || ownProps.id;
+    if (!widgetId) {
+      throw new Error(
+        'Cannot connect widget state without an id. You must add a prop "widgetId" or "id" to the connected component'
+      );
+    }
+    return mapStateToProps(state.get(`widgets.${widgetId}`), ownProps);
+  };
+}
+
+export default function (
+  mapStateToProps,
+  mapDispatchToProps,
+  mergeProps,
+  options
+) {
+  return connect(
+    withWidgetPath(mapStateToProps),
+    mapDispatchToProps,
+    mergeProps,
+    options
+  );
+}

package/widgets/widget/utils/manifest.txt

@@ -1,134 +1,134 @@
-------------------------------------------
-backend.toto@1
-------------------------------------------
-id: toto@1
-collection: [tata@0,tat@1,tata@2]
-layout: 'modeX'
-------------------------------------------
-
-------------------------------------------
-widgets.toto@1
-------------------------------------------
-id: toto@1
-extend: tata@0,
-selecteds: {tata@0: true,tat@1:false,tata@2:false}
-------------------------------------------
-
-------------------------------------------
-widgets.tata@0
-------------------------------------------
-id: tata@0
-extend: true,
-selected: true
-------------------------------------------
-
-
-
-
-
-
-class App
-
-    render () {
-        <Toto id={toto@1} />
-    }
-
-
-
-widget.js
-export default ConnectBackend ((toto, ownProps) => return {
-    collection: toto.get('collection')
-})(Toto);
-class Toto extend Widget
-
-
-    static LoadingComponent (props) {
-       return <j'attend la collection>
-    }
-
-   render () {
-      this.props.collection.map (id => <Tata id={id} parent={props.id}/>)
-   }
-}
-
-
-const TataWithBackend =  ConnectBackend ((tata) => {
-    return {
-        info: tata.get('info')
-    }
-})(Tata)
-
-
-export default ConnectParentWidget ((toto,ownProps) => return {
-    extend: toto.extend === ownProps.id
-    selected: toto.get ('selecteds.$(ownProps.id)')
-})(TataWithBackend)
-
-
-
-
-
-
-
-const getParentWidget = (state, props) =>
-  state.get ('widgets.${props.parendId}')
-
-
-const selected = (state, props) =>
-  state.get ('selected')
-
-const withSelectedInParent = createSelector(
-  [ getParentInBackend, selected ],
-  (parent,selected) => {
-    return parent
-  }
-)
-
-
-w
-state = {
-    widgets: {
-        parent : state.get ('widgets.${ownProps.parendId}')
-    }
-}
-
-Connect ((state,ownProps) => {
-    return  {
-        state.widgets.parent.
-        state.backend.
-
-
-Connect ((state,props) => {
-    return  {
-
-
-        extend: state.get ('widgets.${props.parendId}.extend') === ownProps.id,
-        extend: getParentWidget(state, props,'extend') === ownProps.id,
-        extend: getParentWidget(state, props, 'path') === ownProps.id,
-        extend: state.widgets.parent.get('extend') === ownProps.id
-        selected state.get ('widgets.${ownProps.parentId}).get ('selecteds.$(ownProps.id)'),
-        selected:  withSelectedInParent(state,props)
-        mode: state.get ('backend.${ownProps.parentId}.layout),
-        mode: getParentBackend(state,props,'layout')
-        xxx: getBackend(state,props,'layout')
-        yyy:getWidget (state,props,'xxxx)
-    }
-
-    return {
-        extend: withWidget(state,ownProps,'extend')  === ownProps.id
-    }
-}
-
-const withBackend = expr => (state,ownProps) => withBackend (ownProps)(expr)
-
-
-
-( Connect (withBackend((x) => x.extend === ownProps.id, 'extent').withWidget(...).withBackend()) ) 
-
-
-class Tata
-  
-  render () {
-
-      this.props.info, this.props.extended
-  }
+------------------------------------------
+backend.toto@1
+------------------------------------------
+id: toto@1
+collection: [tata@0,tat@1,tata@2]
+layout: 'modeX'
+------------------------------------------
+
+------------------------------------------
+widgets.toto@1
+------------------------------------------
+id: toto@1
+extend: tata@0,
+selecteds: {tata@0: true,tat@1:false,tata@2:false}
+------------------------------------------
+
+------------------------------------------
+widgets.tata@0
+------------------------------------------
+id: tata@0
+extend: true,
+selected: true
+------------------------------------------
+
+
+
+
+
+
+class App
+
+    render () {
+        <Toto id={toto@1} />
+    }
+
+
+
+widget.js
+export default ConnectBackend ((toto, ownProps) => return {
+    collection: toto.get('collection')
+})(Toto);
+class Toto extend Widget
+
+
+    static LoadingComponent (props) {
+       return <j'attend la collection>
+    }
+
+   render () {
+      this.props.collection.map (id => <Tata id={id} parent={props.id}/>)
+   }
+}
+
+
+const TataWithBackend =  ConnectBackend ((tata) => {
+    return {
+        info: tata.get('info')
+    }
+})(Tata)
+
+
+export default ConnectParentWidget ((toto,ownProps) => return {
+    extend: toto.extend === ownProps.id
+    selected: toto.get ('selecteds.$(ownProps.id)')
+})(TataWithBackend)
+
+
+
+
+
+
+
+const getParentWidget = (state, props) =>
+  state.get ('widgets.${props.parendId}')
+
+
+const selected = (state, props) =>
+  state.get ('selected')
+
+const withSelectedInParent = createSelector(
+  [ getParentInBackend, selected ],
+  (parent,selected) => {
+    return parent
+  }
+)
+
+
+w
+state = {
+    widgets: {
+        parent : state.get ('widgets.${ownProps.parendId}')
+    }
+}
+
+Connect ((state,ownProps) => {
+    return  {
+        state.widgets.parent.
+        state.backend.
+
+
+Connect ((state,props) => {
+    return  {
+
+
+        extend: state.get ('widgets.${props.parendId}.extend') === ownProps.id,
+        extend: getParentWidget(state, props,'extend') === ownProps.id,
+        extend: getParentWidget(state, props, 'path') === ownProps.id,
+        extend: state.widgets.parent.get('extend') === ownProps.id
+        selected state.get ('widgets.${ownProps.parentId}).get ('selecteds.$(ownProps.id)'),
+        selected:  withSelectedInParent(state,props)
+        mode: state.get ('backend.${ownProps.parentId}.layout),
+        mode: getParentBackend(state,props,'layout')
+        xxx: getBackend(state,props,'layout')
+        yyy:getWidget (state,props,'xxxx)
+    }
+
+    return {
+        extend: withWidget(state,ownProps,'extend')  === ownProps.id
+    }
+}
+
+const withBackend = expr => (state,ownProps) => withBackend (ownProps)(expr)
+
+
+
+( Connect (withBackend((x) => x.extend === ownProps.id, 'extent').withWidget(...).withBackend()) ) 
+
+
+class Tata
+  
+  render () {
+
+      this.props.info, this.props.extended
+  }

package/widgets/widget/utils/shallowEqualShredder.js

@@ -1,36 +1,36 @@
-// See 'react-redux/src/utils/shallowEqual.js'
-
-const hasOwn = Object.prototype.hasOwnProperty;
-
-function is(x, y) {
-  if (x && typeof x.equals === 'function') {
-    return x.equals(y);
-  }
-  return Object.is(x, y);
-}
-
-export default function shallowEqualShredder(objA, objB) {
-  if (is(objA, objB)) return true;
-
-  if (
-    typeof objA !== 'object' ||
-    objA === null ||
-    typeof objB !== 'object' ||
-    objB === null
-  ) {
-    return false;
-  }
-
-  const keysA = Object.keys(objA);
-  const keysB = Object.keys(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]])) {
-      return false;
-    }
-  }
-
-  return true;
-}
+// See 'react-redux/src/utils/shallowEqual.js'
+
+const hasOwn = Object.prototype.hasOwnProperty;
+
+function is(x, y) {
+  if (x && typeof x.equals === 'function') {
+    return x.equals(y);
+  }
+  return Object.is(x, y);
+}
+
+export default function shallowEqualShredder(objA, objB) {
+  if (is(objA, objB)) return true;
+
+  if (
+    typeof objA !== 'object' ||
+    objA === null ||
+    typeof objB !== 'object' ||
+    objB === null
+  ) {
+    return false;
+  }
+
+  const keysA = Object.keys(objA);
+  const keysB = Object.keys(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]])) {
+      return false;
+    }
+  }
+
+  return true;
+}

package/widgets/widget/utils/widgets-actions.js

@@ -1,21 +1,21 @@
-//T:2019-02-27
-
-export function collect() {
-  return (dispatch, getState) => {
-    const state = getState();
-    const backendState = state.backend;
-    const ids = state.widgets
-      .keySeq()
-      .filter((id) => {
-        if (typeof id === 'string') {
-          id = id.split('$')[0];
-        }
-        return id && !backendState.has(id);
-      })
-      .valueSeq()
-      .toArray();
-    if (ids.length > 0) {
-      return dispatch({type: 'WIDGETS_COLLECT', ids});
-    }
-  };
-}
+//T:2019-02-27
+
+export function collect() {
+  return (dispatch, getState) => {
+    const state = getState();
+    const backendState = state.backend;
+    const ids = state.widgets
+      .keySeq()
+      .filter((id) => {
+        if (typeof id === 'string') {
+          id = id.split('$')[0];
+        }
+        return id && !backendState.has(id);
+      })
+      .valueSeq()
+      .toArray();
+    if (ids.length > 0) {
+      return dispatch({type: 'WIDGETS_COLLECT', ids});
+    }
+  };
+}