integration works

.eslintrc

@@ -426,20 +426,7 @@
     "react/react-in-jsx-scope": "error",
     "react/require-extension": 0,
     "react/self-closing-comp": "error",
-    "react/sort-comp": [
-      "error",
-      {
-        "order": [
-          "static-methods",
-          "lifecycle",
-          "/^on.+$/",
-          "/^(get|set)(?!(InitialState$|DefaultProps$|ChildContext$)).+$/",
-          "everything-else",
-          "/^render.+$/",
-          "render"
-        ]
-      }
-    ],
+    "react/sort-comp": 0,
     "react/sort-prop-types": 0,
     "react/jsx-wrap-multilines": "error",
     "react/jsx-boolean-value": [

.gitignore

@@ -1,3 +1,4 @@
+dist
 
 ############
 # Node

.npmignore

@@ -1,5 +1,5 @@
 playground
-
+integration
 
 
 

integration/remx-support-component.js

@@ -0,0 +1,36 @@
+import {Text} from 'react-native';
+import React, {Component} from 'react';
+
+import {connect} from 'remx/react-native';
+
+import {selectors} from './remx-support-store';
+
+class MyContainer extends Component {
+  constructor(props) {
+    super(props);
+    this.renders = 0;
+  }
+
+  render() {
+    this.renders++;
+    if (this.props.printAge) {
+      return this.renderAge();
+    } else {
+      return this.renderName();
+    }
+  }
+
+  renderName() {
+    return (
+      <Text>{selectors.getName()}</Text>
+    );
+  }
+
+  renderAge() {
+    return (
+      <Text>{selectors.getAge()}</Text>
+    );
+  }
+}
+
+export default connect(MyContainer);

src/integration/remx-support-store.js → integration/remx-support-store.js

@@ -2,17 +2,27 @@ import _ from 'lodash';
 import * as remx from 'remx';
 
 export const state = remx.state({
-  person: {}
+  person: {
+    name: 'no name'
+  }
 });
 
 export const mutators = remx.setters({
   setName(newName) {
     state.person.name = newName;
+  },
+
+  setAge(age) {
+    state.merge({person: {age}});
   }
 });
 
 export const selectors = remx.getters({
   getName() {
-    return _(state).get('person.name', 'no name');
+    return _.get(state, ['person', 'name']);
+  },
+
+  getAge() {
+    return _(state).get('person.age');
   }
 });

integration/remx-support.test.js

@@ -0,0 +1,46 @@
+require('react-native');
+import React from 'react';
+import renderer from 'react-test-renderer';
+
+describe('remx support', () => {
+  let MyConnectedContainer;
+  let store;
+
+  beforeEach(() => {
+    MyConnectedContainer = require('./remx-support-component').default;
+    store = require('./remx-support-store');
+  });
+
+  it('renders normally', () => {
+    const tree = renderer.create(<MyConnectedContainer/>);
+    expect(tree.toJSON().children).toEqual(['no name']);
+  });
+
+  it('rerenders as a result of an underlying state change (by selector)', () => {
+    const tree = renderer.create(<MyConnectedContainer/>);
+    const instance = tree.getInstance();
+
+    expect(tree.toJSON().children).toEqual(['no name']);
+    expect(instance.renders).toEqual(1);
+
+    store.mutators.setName('Bob');
+    expect(store.selectors.getName()).toEqual('Bob');
+    expect(tree.toJSON().children).toEqual(['Bob']);
+
+    expect(instance.renders).toEqual(2);
+  });
+
+  it('rerenders as a result of an underlying state change with a new key using merge', () => {
+    const tree = renderer.create(<MyConnectedContainer printAge={true}/>);
+    const instance = tree.getInstance();
+
+    expect(tree.toJSON().children).toEqual(null);
+    expect(instance.renders).toEqual(1);
+
+    store.mutators.setAge(30);
+    expect(store.selectors.getAge()).toEqual(30);
+    expect(tree.toJSON().children).toEqual([30]);
+
+    expect(instance.renders).toEqual(2);
+  });
+});

package.json

@@ -30,7 +30,7 @@
     "test-js": "BABEL_ENV=test jest --coverage",
     "test-android": "cd android && ./gradlew clean testDebugUnitTest",
     "test-ios": ":",
-    "test": "npm run lint && npm run test:js && npm run test:android && npm run test:ios",
+    "test": "npm run lint && npm run test-js && npm run test-android && npm run test-ios",
     "test-watch": "BABEL_ENV=test jest --coverage --watch",
     "release": ":"
   },
@@ -57,6 +57,7 @@
     "jest": "18.x.x",
     "jest-cli": "18.x.x",
     "react-test-renderer": "15.4.1",
+    "remx": "0.1.x",
     "semver": "5.x.x"
   },
   "babel": {
@@ -73,7 +74,8 @@
     "preset": "react-native",
     "testPathDirs": [
       "node_modules",
-      "src"
+      "src",
+      "integration"
     ],
     "resetMocks": true,
     "resetModules": true

src/integration/env.test.js

@@ -1,13 +0,0 @@
-describe('test environment', () => {
-  it('handles object spread', () => {
-    const {x, y, ...z} = {x: 1, y: 2, a: 3, b: 4};
-    expect(x).toEqual(1);
-    expect(y).toEqual(2);
-    expect(z).toEqual({a: 3, b: 4});
-  });
-
-  it('handles async await', async() => {
-    const result = await new Promise((r) => r('hello'));
-    expect(result).toEqual('hello');
-  });
-});

src/integration/remx-support-component.js

@@ -1,22 +0,0 @@
-import {Text} from 'react-native';
-import React, {Component} from 'react';
-
-import {connect} from 'remx/react-native';
-
-import * as store from './remx-support-store';
-
-class MyContainer extends Component {
-  constructor(props) {
-    super(props);
-    this.renders = 0;
-  }
-  render() {
-    this.renders++;
-    const txt = store.selectors.getName();
-    return (
-      <Text>{txt}</Text>
-    );
-  }
-}
-
-export default MyContainer;

src/integration/remx-support.test.js

@@ -1,29 +0,0 @@
-xdescribe('remx support', () => {
-  let React;
-  let renderer;
-  let MyConnectedContainer;
-  let store;
-
-  beforeEach(() => {
-    require('react-native');
-    React = require('react');
-    renderer = require('react-test-renderer');
-    MyConnectedContainer = require('./remx-support-component').default;
-    store = require('./remx-support-store');
-  });
-
-  it('renders normally', () => {
-    const tree = renderer.create(<MyConnectedContainer/>);
-    expect(tree.toJSON().children).toEqual(['no name']);
-  });
-
-  it('rerenders as a result of an underlying state change (by selector)', () => {
-    const tree = renderer.create(<MyConnectedContainer/>);
-    const instance = tree.getInstance();
-    expect(tree.toJSON().children).toEqual(['no name']);
-    expect(instance.renders).toEqual(1);
-    store.mutators.setName('Bob');
-    expect(tree.toJSON().children).toEqual(['no name']);
-    expect(instance.renders).toEqual(2);
-  });
-});

wallaby.js

@@ -14,11 +14,14 @@ module.exports = function(wallaby) {
     files: [
       'package.json',
       'src/**/*.js',
-      '!src/**/*.test.js'
+      '!src/**/*.test.js',
+      'integration/**/*.js',
+      '!integration/**/*.test.js'
     ],
 
     tests: [
-      'src/**/*.test.js'
+      'src/**/*.test.js',
+      'integration/**/*.test.js'
     ],
 
     compilers: {

yarn.lock

@@ -1662,7 +1662,11 @@ dom-walk@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"
 
-domelementtype@1, domelementtype@~1.1.1:
+domelementtype@1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
+
+domelementtype@~1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
 
@@ -2623,6 +2627,10 @@ hoek@2.x.x:
   version "2.16.3"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
 
+hoist-non-react-statics@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
+
 home-or-tmp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
@@ -3781,6 +3789,16 @@ minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
   dependencies:
     minimist "0.0.8"
 
+mobx-react@3.x.x:
+  version "3.5.9"
+  resolved "https://registry.yarnpkg.com/mobx-react/-/mobx-react-3.5.9.tgz#b710299539d58d7af1189b5e86bc0be4198a43c1"
+  dependencies:
+    hoist-non-react-statics "^1.2.0"
+
+mobx@2.x.x:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/mobx/-/mobx-2.7.0.tgz#cf3d82d18c0ca7f458d8f2a240817b3dc7e54a01"
+
 module-deps@^3.9.1:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-3.9.1.tgz#ea75caf9199090d25b0d5512b5acacb96e7f87f3"
@@ -4559,6 +4577,14 @@ regjsparser@^0.1.4:
   dependencies:
     jsesc "~0.5.0"
 
+remx@0.1.x:
+  version "0.1.35"
+  resolved "https://registry.yarnpkg.com/remx/-/remx-0.1.35.tgz#dc8e8fa2c9b28805213dad85f647f64f4a78adf5"
+  dependencies:
+    lodash "4.x.x"
+    mobx "2.x.x"
+    mobx-react "3.x.x"
+
 repeat-element@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"