Converts react-tree-walker to be promised based.

Author: ctrlplusb

.eslintrc

@@ -2,9 +2,6 @@
   "root": true,
   "parser": "babel-eslint",
   "extends": "airbnb",
-  "plugins": [
-    "flowtype"
-  ],
   "env": {
     "browser": true,
     "es6": true,

.flowconfig

@@ -26,11 +26,7 @@
   "scripts": {
     "build": "babel-node ./tools/scripts/build.js",
     "check": "yarn run lint && yarn run test",
-    "clean": "rimraf ./commonjs && rimraf ./umd && rimraf ./coverage && rimraf ./flow-coverage && rimraf ./umd",
-    "example:web": "echo 'Make sure to `cd example/web && yarn install`' && cd example/web && yarn run start",
-    "flow": "babel-node ./tools/scripts/flow",
-    "flow:coverage": "flow-coverage-report -i 'src/**/*.js' -t html -t json -t text",
-    "flow:defs": "flow-typed install --overwrite",
+    "clean": "rimraf ./commonjs && rimraf ./umd && rimraf ./coverage && rimraf ./umd",
     "lint": "eslint src",
     "prepublish": "yarn run build",
     "test": "jest",
@@ -42,45 +38,41 @@
   },
   "devDependencies": {
     "app-root-dir": "1.0.2",
-    "babel-cli": "6.22.2",
-    "babel-core": "6.22.1",
+    "babel-cli": "6.23.0",
+    "babel-core": "6.23.1",
     "babel-eslint": "7.1.1",
-    "babel-jest": "18.0.0",
-    "babel-loader": "6.2.10",
-    "babel-polyfill": "6.22.0",
-    "babel-preset-env": "1.1.8",
+    "babel-jest": "19.0.0",
+    "babel-loader": "6.4.0",
+    "babel-polyfill": "6.23.0",
+    "babel-preset-env": "1.2.1",
     "babel-preset-latest": "6.22.0",
-    "babel-preset-react": "6.22.0",
+    "babel-preset-react": "6.23.0",
     "babel-preset-stage-3": "6.22.0",
-    "babel-register": "6.22.0",
+    "babel-register": "6.23.0",
     "codecov": "1.0.1",
-    "cross-env": "3.1.4",
+    "cross-env": "3.2.3",
     "enzyme": "2.7.1",
-    "enzyme-to-json": "1.4.5",
-    "eslint": "3.14.0",
-    "eslint-config-airbnb": "14.0.0",
-    "eslint-plugin-flowtype": "2.30.0",
+    "enzyme-to-json": "1.5.0",
+    "eslint": "3.17.1",
+    "eslint-config-airbnb": "14.1.0",
     "eslint-plugin-import": "2.2.0",
-    "eslint-plugin-jsx-a11y": "3.0.2",
-    "eslint-plugin-react": "6.9.0",
-    "flow-bin": "0.38.0",
-    "flow-coverage-report": "0.2.0",
-    "flow-typed": "2.0.0",
+    "eslint-plugin-jsx-a11y": "4.0.0",
+    "eslint-plugin-react": "6.10.0",
     "ghooks": "2.0.0",
     "gzip-size": "3.0.0",
     "in-publish": "2.0.0",
-    "jest": "18.1.0",
+    "jest": "19.0.2",
     "pretty-bytes": "4.0.2",
     "ramda": "0.23.0",
     "react": "15.4.2",
     "react-addons-test-utils": "15.4.2",
     "react-dom": "15.4.2",
-    "readline-sync": "1.4.5",
-    "rimraf": "2.5.4",
+    "readline-sync": "1.4.6",
+    "rimraf": "2.6.1",
     "sinon": "1.17.7",
-    "webpack": "2.2.0-rc.3",
-    "webpack-dev-middleware": "1.9.0",
-    "webpack-hot-middleware": "2.15.0"
+    "webpack": "2.2.1",
+    "webpack-dev-middleware": "1.10.1",
+    "webpack-hot-middleware": "2.17.1"
   },
   "config": {
     "ghooks": {
@@ -97,5 +89,8 @@
     "testPathIgnorePatterns": [
       "<rootDir>/(commonjs|coverage|flow-typed|node_modules|tools|umd)/"
     ]
+  },
+  "dependencies": {
+    "p-map-series": "^1.0.0"
   }
 }

package.json

@@ -1,4 +1,3 @@
-/* @flow */
 /* eslint-disable react/sort-comp */
 /* eslint-disable react/no-multi-comp */
 /* eslint-disable react/prop-types */
@@ -12,8 +11,6 @@ const Bob = ({ children }) => <div>{children}</div>;
 
 describe('reactTreeWalker', () => {
   class Foo extends Component {
-    props: { children?: any, something: any }
-
     constructor(props) {
       super(props);
       // $FlowIgnore
@@ -53,56 +50,36 @@ describe('reactTreeWalker', () => {
     </div>
   );
 
-  it('simple sync', () => {
+  it('simple sync visitor', () => {
     const tree = createTree(false);
     const actual = [];
     // eslint-disable-next-line no-unused-vars
     const visitor = (element, instance, context) => {
-      if (instance && typeof instance.getSomething) {
+      if (instance && typeof instance.getSomething === 'function') {
         const something = instance.getSomething();
         actual.push(something);
       }
     };
-    reactTreeWalker(tree, visitor);
-    const expected = [1, 2, 4, 5, 3];
-    expect(actual).toEqual(expected);
+    return reactTreeWalker(tree, visitor).then(() => {
+      const expected = [1, 2, 4, 5, 3];
+      expect(actual).toEqual(expected);
+    });
   });
 
-  it('complex async', () => {
-    const treeRoot = createTree(true);
+  it('promise based visitor', () => {
+    const tree = createTree(true);
     const actual = [];
-
-    const doWalk = (el, ctx = {}, fetchRoot = false) => {
-      const somethings = [];
-
-      // eslint-disable-next-line no-unused-vars
-      const visitor = (element, instance, context) => {
-        const skipRoot = !fetchRoot && (element === el);
-        if (instance && typeof instance.getSomething === 'function' && !skipRoot) {
-          const something = instance.getSomething();
-          somethings.push({ something, element, context });
-          return false;
-        }
-        return undefined;
-      };
-
-      reactTreeWalker(el, visitor, ctx);
-
-      // eslint-disable-next-line arrow-body-style
-      const promises = somethings.map(({ something, element, context }) => {
-        return something.then((result) => {
-          actual.push(result);
-          return doWalk(element, context);
+    // eslint-disable-next-line no-unused-vars
+    const visitor = (element, instance, context) => {
+      if (instance && typeof instance.getSomething === 'function') {
+        return instance.getSomething().then((something) => {
+          actual.push(something);
         });
-      });
-
-      return promises.length > 0
-        ? Promise.all(promises)
-        : Promise.resolve([]);
+      }
+      return true;
     };
-
-    return doWalk(treeRoot, {}, true).then(() => {
-      const expected = [1, 2, 3, 4, 5];
+    return reactTreeWalker(tree, visitor).then(() => {
+      const expected = [1, 2, 4, 5, 3];
       expect(actual).toEqual(expected);
     });
   });
@@ -137,9 +114,10 @@ describe('reactTreeWalker', () => {
         actual = instance.getState();
       }
     };
-    reactTreeWalker(tree, visitor);
-    const expected = { foo: 'bar' };
-    expect(actual).toMatchObject(expected);
+    return reactTreeWalker(tree, visitor).then(() => {
+      const expected = { foo: 'bar' };
+      expect(actual).toMatchObject(expected);
+    });
   });
 
   it('getChildContext', () => {
@@ -163,9 +141,9 @@ describe('reactTreeWalker', () => {
     const tree = <Baz><Qux /></Baz>;
     // eslint-disable-next-line no-unused-vars
     const visitor = (element, instance, context) => undefined;
-    reactTreeWalker(tree, visitor);
-
-    const expected = { foo: 'bar' };
-    expect(actual).toMatchObject(expected);
+    return reactTreeWalker(tree, visitor).then(() => {
+      const expected = { foo: 'bar' };
+      expect(actual).toMatchObject(expected);
+    });
   });
 });