Move private functions out of the class

Author: jseminck

lib/util/Components.js

@@ -10,6 +10,34 @@ const doctrine = require('doctrine');
 const variableUtil = require('./variable');
 const pragmaUtil = require('./pragma');
 
+function getId(node) {
+  return node && node.range.join(':');
+}
+
+
+function usedPropTypesAreEquivalent(propA, propB) {
+  if (propA.name === propB.name) {
+    if (!propA.allNames && !propB.allNames) {
+      return true;
+    } else if (Array.isArray(propA.allNames) && Array.isArray(propB.allNames) && propA.allNames.join('') === propB.allNames.join('')) {
+      return true;
+    }
+    return false;
+  }
+  return false;
+}
+
+function mergeUsedPropTypes(propsList, newPropsList) {
+  const propsToAdd = [];
+  newPropsList.forEach(newProp => {
+    const newPropisAlreadyInTheList = propsList.some(prop => usedPropTypesAreEquivalent(prop, newProp));
+    if (!newPropisAlreadyInTheList) {
+      propsToAdd.push(newProp);
+    }
+  });
+  return propsList.concat(propsToAdd);
+}
+
 /**
  * Components
  */
@@ -18,10 +46,6 @@ class Components {
     this._list = {};
   }
 
-  _getId(node) {
-    return node && node.range.join(':');
-  }
-
   /**
    * Add a node to the components list, or update it if it's already in the list
    *
@@ -30,7 +54,7 @@ class Components {
    * @returns {Object} Added component object
    */
   add(node, confidence) {
-    const id = this._getId(node);
+    const id = getId(node);
     if (this._list[id]) {
       if (confidence === 0 || this._list[id].confidence === 0) {
         this._list[id].confidence = 0;
@@ -53,7 +77,7 @@ class Components {
    * @returns {Object} Component object, undefined if the component is not found
    */
   get(node) {
-    const id = this._getId(node);
+    const id = getId(node);
     return this._list[id];
   }
 
@@ -64,13 +88,13 @@ class Components {
    * @param {Object} props Additional properties to add to the component.
    */
   set(node, props) {
-    while (node && !this._list[this._getId(node)]) {
+    while (node && !this._list[getId(node)]) {
       node = node.parent;
     }
     if (!node) {
       return;
     }
-    const id = this._getId(node);
+    const id = getId(node);
     let copyUsedPropTypes;
     if (this._list[id]) {
       // usedPropTypes is an array. _extend replaces existing array with a new one which caused issue #1309.
@@ -79,7 +103,7 @@ class Components {
     }
     this._list[id] = util._extend(this._list[id], props);
     if (this._list[id] && props.usedPropTypes) {
-      this._list[id].usedPropTypes = this._mergeUsedPropTypes(copyUsedPropTypes || [], props.usedPropTypes);
+      this._list[id].usedPropTypes = mergeUsedPropTypes(copyUsedPropTypes || [], props.usedPropTypes);
     }
   }
 
@@ -112,7 +136,7 @@ class Components {
       if (component) {
         const newUsedProps = (this._list[i].usedPropTypes || []).filter(propType => !propType.node || propType.node.kind !== 'init');
 
-        const componentId = this._getId(component.node);
+        const componentId = getId(component.node);
         usedPropTypes[componentId] = (usedPropTypes[componentId] || []).concat(newUsedProps);
       }
     }
@@ -122,7 +146,7 @@ class Components {
       if (!has(this._list, j) || this._list[j].confidence < 2) {
         continue;
       }
-      const id = this._getId(this._list[j].node);
+      const id = getId(this._list[j].node);
       list[j] = this._list[j];
       if (usedPropTypes[id]) {
         list[j].usedPropTypes = (list[j].usedPropTypes || []).concat(usedPropTypes[id]);
@@ -147,29 +171,6 @@ class Components {
     }
     return length;
   }
-
-  _mergeUsedPropTypes(propsList, newPropsList) {
-    const propsToAdd = [];
-    newPropsList.forEach(newProp => {
-      const newPropisAlreadyInTheList = propsList.some(prop => this._usedPropTypesAreEquivalent(prop, newProp));
-      if (!newPropisAlreadyInTheList) {
-        propsToAdd.push(newProp);
-      }
-    });
-    return propsList.concat(propsToAdd);
-  }
-
-  _usedPropTypesAreEquivalent(propA, propB) {
-    if (propA.name === propB.name) {
-      if (!propA.allNames && !propB.allNames) {
-        return true;
-      } else if (Array.isArray(propA.allNames) && Array.isArray(propB.allNames) && propA.allNames.join('') === propB.allNames.join('')) {
-        return true;
-      }
-      return false;
-    }
-    return false;
-  }
 }
 
 function componentRule(rule, context) {