refactor(xod-project): rename normalizePinLabels to normalizeEmptyPin…

…Labels
xodio · Jul 13, 2018 · a630e79 · a630e79
1 parent f807e3b
commit a630e79
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 57 deletions.
diff --git a/packages/xod-arduino/src/transpiler.js b/packages/xod-arduino/src/transpiler.js
@@ -121,7 +121,7 @@ const convertPatchToTPatch = def(
           ),
         })
       ),
-      XP.normalizePinLabels,
+      XP.normalizeEmptyPinLabels,
       XP.listOutputPins
     )(patch);
 
@@ -133,7 +133,7 @@ const convertPatchToTPatch = def(
           isDirtyable,
         })
       ),
-      XP.normalizePinLabels,
+      XP.normalizeEmptyPinLabels,
       XP.listInputPins
     )(patch);
 
@@ -266,7 +266,7 @@ const getNodePinsUnsafe = def(
 
 const getNodePinLabels = def(
   'getNodePinLabels :: Node -> Project -> Map PinKey PinLabel',
-  R.compose(getPinLabelsMap, XP.normalizePinLabels, getNodePinsUnsafe)
+  R.compose(getPinLabelsMap, XP.normalizeEmptyPinLabels, getNodePinsUnsafe)
 );
 
 // TODO: Remove it when `Project.getBoundValue` will return default values

diff --git a/packages/xod-client/src/editor/components/PatchDocs.jsx b/packages/xod-client/src/editor/components/PatchDocs.jsx
@@ -124,7 +124,7 @@ const PatchDocs = ({ patch, minimal }) => {
 
   const [inputPins, outputPins] = R.compose(
     R.partition(XP.isInputPin),
-    XP.normalizePinLabels,
+    XP.normalizeEmptyPinLabels,
     R.map(pin =>
       R.assoc('isVariadic', R.contains(XP.getPinKey(pin), variadicPinKeys), pin)
     ),

diff --git a/packages/xod-client/src/project/utils.js b/packages/xod-client/src/project/utils.js
@@ -82,49 +82,51 @@ export const getInitialPatchOffset = R.compose(
 );
 
 // extract information from Patch that is required to render it with Node component
-export const patchToNodeProps = R.curry((shouldNormalizePinLabels, patch) => {
-  const pins = XP.listPins(patch);
-  const size = calcutaleNodeSizeFromPins(pins);
-  const type = XP.getPatchPath(patch);
-  const isVariadic = XP.isVariadicPatch(patch);
-  const arityStep = foldMaybe(0, R.identity, XP.getArityStepFromPatch(patch));
-
-  return {
-    id: type,
-    type,
-    label: '',
-    position: { x: 0, y: 0 },
-    size,
-    isVariadic,
-    pins: R.compose(
-      R.when(
-        () => isVariadic,
-        renderablePins =>
-          R.compose(
-            R.merge(renderablePins),
-            R.indexBy(R.prop('keyName')),
-            R.map(R.assoc('isLastVariadicGroup', true)),
-            R.takeLast(arityStep),
-            R.sortBy(XP.getPinOrder),
-            R.filter(XP.isInputPin),
-            R.values
-          )(renderablePins)
-      ),
-      R.indexBy(R.prop('keyName')),
-      R.map(
-        R.applySpec({
-          key: XP.getPinKey,
-          keyName: XP.getPinKey,
-          type: XP.getPinType,
-          direction: XP.getPinDirection,
-          label: XP.getPinLabel,
-          position: calculatePinPosition(size),
-        })
-      ),
-      shouldNormalizePinLabels ? XP.normalizePinLabels : R.identity
-    )(pins),
-  };
-});
+export const patchToNodeProps = R.curry(
+  (shouldnormalizeEmptyPinLabels, patch) => {
+    const pins = XP.listPins(patch);
+    const size = calcutaleNodeSizeFromPins(pins);
+    const type = XP.getPatchPath(patch);
+    const isVariadic = XP.isVariadicPatch(patch);
+    const arityStep = foldMaybe(0, R.identity, XP.getArityStepFromPatch(patch));
+
+    return {
+      id: type,
+      type,
+      label: '',
+      position: { x: 0, y: 0 },
+      size,
+      isVariadic,
+      pins: R.compose(
+        R.when(
+          () => isVariadic,
+          renderablePins =>
+            R.compose(
+              R.merge(renderablePins),
+              R.indexBy(R.prop('keyName')),
+              R.map(R.assoc('isLastVariadicGroup', true)),
+              R.takeLast(arityStep),
+              R.sortBy(XP.getPinOrder),
+              R.filter(XP.isInputPin),
+              R.values
+            )(renderablePins)
+        ),
+        R.indexBy(R.prop('keyName')),
+        R.map(
+          R.applySpec({
+            key: XP.getPinKey,
+            keyName: XP.getPinKey,
+            type: XP.getPinType,
+            direction: XP.getPinDirection,
+            label: XP.getPinLabel,
+            position: calculatePinPosition(size),
+          })
+        ),
+        shouldnormalizeEmptyPinLabels ? XP.normalizeEmptyPinLabels : R.identity
+      )(pins),
+    };
+  }
+);
 
 export const isPatchDeadTerminal = R.compose(
   R.ifElse(

diff --git a/packages/xod-project/src/index.js b/packages/xod-project/src/index.js
@@ -93,7 +93,7 @@ export {
   isInputPin,
   isOutputPin,
   isTerminalPin,
-  normalizePinLabels,
+  normalizeEmptyPinLabels,
   isPinBindable,
   isPulsePin,
 } from './pin';

diff --git a/packages/xod-project/src/patch.js b/packages/xod-project/src/patch.js
@@ -502,7 +502,7 @@ export const validatePinLabels = def(
       ),
       R.filter(groupedPins => groupedPins.length > 1),
       R.groupBy(Pin.getPinLabel),
-      Pin.normalizePinLabels,
+      Pin.normalizeEmptyPinLabels,
       listPins
     )(patch)
 );
@@ -974,7 +974,7 @@ export const getNondeadNodePins = def(
           R.mergeWith(R.merge, R.__, patchPins),
           R.map(R.compose(R.objOf('normalizedLabel'), Pin.getPinLabel)),
           R.indexBy(Pin.getPinKey),
-          Pin.normalizePinLabels,
+          Pin.normalizeEmptyPinLabels,
           R.values
         )(patchPins),
       R.indexBy(Pin.getPinKey),

diff --git a/packages/xod-project/src/pin.js b/packages/xod-project/src/pin.js
@@ -247,8 +247,8 @@ const getPinLabelByDirection = def(
  * - "" (input) -> "IN2"
  * - "" (output) -> "OUT"
  */
-export const normalizePinLabels = def(
-  'normalizePinLabels :: [Pin] -> [Pin]',
+export const normalizeEmptyPinLabels = def(
+  'normalizeEmptyPinLabels :: [Pin] -> [Pin]',
   R.compose(
     R.unnest,
     R.over(

diff --git a/packages/xod-project/test/pin.spec.js b/packages/xod-project/test/pin.spec.js
@@ -90,7 +90,7 @@ describe('Pin', () => {
       assert.isTrue(Pin.isPulsePin(pin));
     });
   });
-  describe('normalizePinLabels', () => {
+  describe('normalizeEmptyPinLabels', () => {
     const { INPUT, OUTPUT } = CONST.PIN_DIRECTION;
 
     it('should leave pins with labels untouched', () => {
@@ -100,7 +100,7 @@ describe('Pin', () => {
         { label: 'A', direction: OUTPUT },
       ].map(Helper.defaultizePin);
 
-      assert.deepEqual(Pin.normalizePinLabels(pins), pins);
+      assert.deepEqual(Pin.normalizeEmptyPinLabels(pins), pins);
     });
 
     it('should generate unique labels for pins with empty labels', () => {
@@ -115,7 +115,7 @@ describe('Pin', () => {
         { label: 'OUT', direction: OUTPUT },
       ].map(Helper.defaultizePin);
 
-      assert.deepEqual(Pin.normalizePinLabels(pins), pinsExpected);
+      assert.deepEqual(Pin.normalizeEmptyPinLabels(pins), pinsExpected);
     });
 
     it('should allow clashes of generated labels with existing labels', () => {
@@ -132,7 +132,7 @@ describe('Pin', () => {
         { label: 'IN', direction: OUTPUT },
       ].map(Helper.defaultizePin);
 
-      assert.deepEqual(Pin.normalizePinLabels(pins), pinsExpected);
+      assert.deepEqual(Pin.normalizeEmptyPinLabels(pins), pinsExpected);
     });
   });
 

diff --git a/packages/xod-tabtest/src/XodProject/Pin.re b/packages/xod-tabtest/src/XodProject/Pin.re
@@ -38,7 +38,7 @@ let getDirection = (pin: t) : direction => {
 };
 
 [@bs.module "xod-project"]
-external _normalizeLabels : array(t) => array(t) = "normalizePinLabels";
+external _normalizeLabels : array(t) => array(t) = "normalizeEmptyPinLabels";
 
 let normalizeLabels = pins =>
   pins |. List.toArray |. _normalizeLabels |. List.fromArray;