Fix mixin init order. Close #329.

docs/mixins.md

@@ -113,14 +113,3 @@ app({
   ])]
 })
 ```
-
-## Presets
-
-Group mixins under the same category to create a preset. Then use it like any other mixin.
-
-```jsx
-const DevTools = () => ({
-  mixins: [Logger, Debugger, Replayer]
-})
-```
-

src/app.js

@@ -2,26 +2,24 @@ var globalInvokeLaterStack = []
 
 export function app(props) {
   var appState
+  var appView = props.view
   var appActions = {}
   var appEvents = {}
-  var appMixins = []
-  var appView = props.view
+  var appMixins = props.mixins || []
   var appRoot = props.root || document.body
   var element = appRoot.children[0]
   var oldNode
   var willRender
 
-  for (var i = -1; i < appMixins.length; i++) {
-    props = appMixins[i] ? appMixins[i](emit) : props
+  for (var i = 0; i <= appMixins.length; i++) {
+    var mixin = appMixins[i] ? appMixins[i](emit) : props
 
-    Object.keys(props.events || []).map(function(key) {
-      appEvents[key] = (appEvents[key] || []).concat(props.events[key])
+    Object.keys(mixin.events || []).map(function(key) {
+      appEvents[key] = (appEvents[key] || []).concat(mixin.events[key])
     })
 
-    initialize(appActions, props.actions)
-
-    appMixins = appMixins.concat(props.mixins || [])
-    appState = merge(appState, props.state)
+    initialize(appActions, mixin.actions)
+    appState = merge(appState, mixin.state)
   }
 
   requestRender(

test/mixins.test.js

@@ -43,25 +43,25 @@ test("extend events", done => {
       }
     },
     events: {
-      load(state, actions) {
-        expect(state.value).toBe(0)
-        actions.up()
+      load(state) {
+        expect(state.value).toBe(2)
+        done()
       }
     },
     mixins: [
       () => ({
         events: {
           load(state, actions) {
-            expect(state.value).toBe(1)
+            expect(state.value).toBe(0)
             actions.up()
           }
         }
       }),
       () => ({
         events: {
-          load(state) {
-            expect(state.value).toBe(2)
-            done()
+          load(state, actions) {
+            expect(state.value).toBe(1)
+            actions.up()
           }
         }
       })
@@ -140,33 +140,6 @@ test("extend namespace", done => {
   })
 })
 
-test("presets", () => {
-  const foobar = () => ({
-    mixins: [
-      () => ({
-        state: {
-          foo: 1
-        }
-      }),
-      () => ({
-        state: {
-          bar: 2
-        }
-      })
-    ]
-  })
-
-  app({
-    events: {
-      load(state) {
-        expect(state.foo).toBe(1)
-        expect(state.bar).toBe(2)
-      }
-    },
-    mixins: [foobar]
-  })
-})
-
 test("receive emit function", done => {
   app({
     events: {