first

README.md

@@ -33,7 +33,7 @@ store.setState({counter: 1});
 
 ```
 
-#### `get currentState():T`
+#### `state():T`
 return copy of the current state
 ```javascript
 import {Store} from "appolo-store"
@@ -42,7 +42,7 @@ import {Store} from "appolo-store"
 
     store.setState({counter: 1});
 
-    let state = store.currentState
+    let state = store.state()
 
 
 ```
@@ -78,7 +78,7 @@ store.setState({counter: 1});
 store.setState({counter: 2});
 store.goToState(1);
 
-store.currentState.counter // 1
+store.state().counter // 1
 
 ```
 
@@ -156,7 +156,7 @@ let store = new Store<{ counter: number }>({counter: 0});
 store.setState({counter: 1});
 store.setState({counter: 2});
 
-for (let state of  store.states) {
+for (let state of  store.states()) {
     console.log(state.counter) // 0 ,1 ,2
 }
 
@@ -174,7 +174,7 @@ store.setState({counter: 2});
 
 store.reset()
 
-store.currentState.counter // 0
+store.state().counter // 0
 
 ```
 

lib/action.ts

@@ -26,7 +26,7 @@ export function action(name?: string): (target: any, propertyKey: string, descri
                 result = await result;
             }
 
-            this.fireEvent(name || propertyKey, this.currentState);
+            this.fireEvent(name || propertyKey, this.state());
 
             return result;
         }

lib/store.ts

@@ -32,11 +32,11 @@ export class Store<T extends { [index: string]: any }> extends EventDispatcher {
         return this.initialState as T;
     }
 
-    public get currentState(): T {
+    public  state(): T {
         return this.stateAt(this._stateIndex);
     }
 
-    public get states(): IterableIterator<T> {
+    public states(): IterableIterator<T> {
 
         let $self = this, index = -1;
 
@@ -71,7 +71,7 @@ export class Store<T extends { [index: string]: any }> extends EventDispatcher {
     }
 
     public setState(value: Partial<T> | T, options: { arrayMerge?: "override" | "extend" } = {arrayMerge: "extend"}) {
-        let state = this.currentState;
+        let state = this.state;
 
         let mergeOptions: any = {};
 
@@ -87,13 +87,14 @@ export class Store<T extends { [index: string]: any }> extends EventDispatcher {
 
         this._states.push(newState as T);
 
-        this._stateIndex = this.countIndex;
-
         if (this.count > this.MaxStates) {
             this._states.shift();
         }
 
-        this.fireEvent("stateChanged", this.currentState);
+        this._stateIndex = this.countIndex;
+
+
+        this.fireEvent("stateChanged", this.state());
     }
 
     public get count(): number {
@@ -137,7 +138,7 @@ export class Store<T extends { [index: string]: any }> extends EventDispatcher {
         this._stateIndex = index;
 
         if (oldIndex != this._stateIndex) {
-            this.fireEvent("stateChanged", this.currentState);
+            this.fireEvent("stateChanged", this.state);
         }
     }
 

package.json

@@ -18,7 +18,7 @@
     "test": "mocha test"
   },
   "main": "./index.js",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "license": "MIT",
   "repository": {
     "type": "git",