expose Xstream and FantasyX

Author: jcouyang

Makefile

@@ -1,4 +1,4 @@
-docs = ./docs/**/*
+docsdir = ./docs/**/*
 browserify = ./node_modules/.bin/browserify
 watchify = ./node_modules/.bin/watchify
 uglify = ./node_modules/.bin/uglifyjs
@@ -14,12 +14,12 @@ lib/%.js: src/%.ts
 
 all: test browser
 
-.PHONY: test build unit integrate browser
+.PHONY: test build unit integrate browser docs docs/publish
 
 unit: build
 	yarn test
 
-integrate: test/*.js docs/src/main/tut/examples/example.js
+integrate: build test/*.js docs/src/main/tut/examples/example.js
 	mocha test/test.js
 
 docs/src/main/tut/examples/example.js: docs/src/main/tut/examples/example.tsx
@@ -39,10 +39,10 @@ dist/xreact-%.js:  lib/xs/%.js
 dist/%.min.js: dist/%.js
 	env NODE_ENV=production $(uglify) -c dead_code $(basename $(basename $@)).js -o $@
 
-docs: $(docs)
-	sbt makeMicrosite
+docs: $(docsdir)
+	sbt "project docs" makeMicrosite
 
-docs/publish: $(docs)
+docs/publish: $(docsdir)
 	sbt "project docs" publishMicrosite
 
 clean:

docs/src/main/tut/Get-Started.md

@@ -20,7 +20,8 @@ position: 1
 Sorry we don't have a **book** to document how to use xreact, and I don't really need to,
 there's only 3 things you should notice when using xreact, I'll explain by a simple counter app.
 
-<iframe src="https://www.webpackbin.com/bins/-KsSVkmGpVrLlwylSrkE" frameborder="0" width="100%" height="500"></iframe>
+<p data-height="265" data-theme-id="0" data-slug-hash="gGqvBW" data-default-tab="js,result" data-user="jcouyang" data-embed-version="2" data-pen-title="XREACT" class="codepen">See the Pen <a href="https://codepen.io/jcouyang/pen/gGqvBW/">XREACT</a> by Jichao Ouyang (<a href="https://codepen.io/jcouyang">@jcouyang</a>) on <a href="https://codepen.io">CodePen</a>.</p>
+<script async src="https://production-assets.codepen.io/assets/embed/ei.js"></script>
 
 ### 1. Define a simple stateless View component
 
@@ -101,4 +102,6 @@ render(
 
 If you are TypeScript user and want to enjoy a type safe counter app, it's simple to do so since xReact is written 100% in TypeScript.
 
-<iframe src="https://www.webpackbin.com/bins/-KsSYQVTkFjd_MQon3b9" frameborder="0" width="100%" height="500"></iframe>
+<p data-height="265" data-theme-id="0" data-slug-hash="jGdzYR" data-default-tab="js,result" data-user="jcouyang" data-embed-version="2" data-pen-title="XREACT Counter in TypeScript" class="codepen">See the Pen <a href="https://codepen.io/jcouyang/pen/jGdzYR/">XREACT Counter in TypeScript</a> by Jichao Ouyang (<a href="https://codepen.io/jcouyang">@jcouyang</a>) on <a href="https://codepen.io">CodePen</a>.</p>
+<script async src="https://production-assets.codepen.io/assets/embed/ei.js"></script>
+

src/fantasy/index.ts

@@ -1,5 +1,5 @@
-import './xstream'
-import './fantasyx'
+export { Xstream } from './xstream'
+export { FantasyX } from './fantasyx'
 export * from './typeclasses/applicative'
 export * from './typeclasses/functor'
 export * from './typeclasses/apply'

src/xclass.ts

@@ -61,19 +61,10 @@ export function genXComponentClass<E extends Stream, I, S>(WrappedComponent: Rea
               console.log('UPDATE:', action)
             this.setState((prevState, props) => {
               let newState: S = action.call(this, prevState, props);
-              let newStateWithoutPromise = <S>{}
-              for (let i in newState) {
-                let val = newState[i]
-                if (isPromise(val)) {
-                  val.then((v: S) => this.setState(v))
-                } else {
-                  newStateWithoutPromise[i] = newState[i]
-                }
-              }
-              this.context[XREACT_ENGINE].history$.next(newStateWithoutPromise)
+              this.context[XREACT_ENGINE].history$.next(newState)
               if (process.env.NODE_ENV == 'debug')
-                console.log('STATE:', newStateWithoutPromise)
-              return newStateWithoutPromise;
+                console.log('STATE:', newState)
+              return newState;
             });
           } else {
             /* istanbul ignore next */