upgrade packages and fix type errors

jcouyang · jcouyang · commit 163c6c5606ff · 2018-02-01T21:26:17.000+11:00
diff --git a/Makefile b/Makefile
@@ -2,16 +2,13 @@ docsdir = ./docs/**/*
 browserify = ./node_modules/.bin/browserify
 watchify = ./node_modules/.bin/watchify
 uglify = ./node_modules/.bin/uglifyjs
+mocha = ./node_modules/.bin/mocha
+tsc = ./node_modules/.bin/tsc
 
 test: unit integrate
 
-build: lib/**/*.js
-
-lib/**/*.js: src/**/*.ts
-	tsc
-
-lib/%.js: src/%.ts
-	tsc
+build:
+	${tsc}
 
 all: test dist
 
@@ -21,7 +18,7 @@ unit: build
 	yarn test
 
 integrate: build test/*.js docs/src/main/tut/examples/example.js
-	mocha test/test.js
+	${mocha} test/test.js
 
 docs/src/main/tut/examples/example.js: docs/src/main/tut/examples/example.tsx
 	$(browserify) -p [tsify -p tsconfig.examples.json] docs/src/main/tut/examples/example.tsx -o docs/src/main/tut/examples/example.js
diff --git a/package.json b/package.json
@@ -25,8 +25,8 @@
     "most": "global:most"
   },
   "dependencies": {
-    "prop-types": "^15.5.8",
-    "reflect-metadata": "^0.1.10"
+    "prop-types": "^15.6.0",
+    "reflect-metadata": "^0.1.12"
   },
   "peerDependencies": {
     "@reactivex/rxjs": "^5.4.0",
@@ -35,31 +35,32 @@
     "react": "^15.5.4"
   },
   "devDependencies": {
-    "@reactivex/rxjs": "^5.4.3",
-    "@types/jest": "^21.1.0",
-    "@types/node": "^8.0.0",
+    "@reactivex/rxjs": "^5.5.6",
+    "@types/jest": "^22.1.0",
+    "@types/node": "^9.3.0",
     "@types/prop-types": "^15.5.2",
-    "@types/react": "^16.0.13",
-    "browserify": "^14.4.0",
+    "@types/react": "^16.0.34",
+    "browserify": "^15.2.0",
     "browserify-shim": "^3.8.14",
     "chai": "^4.1.2",
-    "create-react-class": "^15.6.0",
+    "create-react-class": "^15.6.2",
     "envify": "^4.1.0",
-    "enzyme": "^2.8.2",
-    "jest": "^21.0.0",
+    "enzyme": "^3.3.0",
+    "enzyme-adapter-react-16": "^1.1.1",
+    "jest": "^22.1.4",
     "lodash": "^4.0.0",
-    "mocha": "^4.0.0",
-    "most": "^1.2.2",
+    "mocha": "^5.0.0",
+    "most": "^1.7.2",
     "most-subject": "^5.3.0",
     "nightmare": "^2.10.0",
-    "react": "^15.6.1",
-    "react-dom": "^15.5.4",
-    "react-test-renderer": "^15.5.4",
+    "react": "^16.2.0",
+    "react-dom": "^16.2.0",
+    "react-test-renderer": "^16.2.0",
     "redux": "^3.0.4",
-    "ts-jest": "^20.0.2",
-    "tsify": "^3.0.3",
-    "typescript": "^2.5.2",
-    "uglify-js": "^3.1.1",
+    "ts-jest": "^22.0.1",
+    "tsify": "^3.0.4",
+    "typescript": "^2.7.1",
+    "uglify-js": "^3.3.8",
     "watchify": "^3.9.0"
   },
   "jest": {
diff --git a/src/__tests__/xtest.tsx b/src/__tests__/xtest.tsx
@@ -1,11 +1,14 @@
 import * as React from 'react';
-import { mount } from 'enzyme';
+import { mount, configure } from 'enzyme';
 import '@reactivex/rxjs'
 import { X, x } from '../index';
 import * as createClass from 'create-react-class'
 import * as rx from '../xs/rx'
 const compose = (f, g) => x => f(g(x));
-import {Stream} from '../xs'
+import { Stream } from '../xs'
+import * as Adapter from 'enzyme-adapter-react-16';
+
+configure({ adapter: new Adapter() });
 
 const CounterView: React.SFC<any> = props => (
   <div className="counter-view">
@@ -61,19 +64,19 @@ for (let name of Xs) {
     let engine, Xtest, mountx
     beforeEach(() => {
       engine = require(`../xs/${name}`)
-      Xtest = require(`../xtests/${name}`).default
+      Xtest = require(`../xtests/`)[name]
       mountx = compose(mount, y => React.createFactory(X)({}, y))
     })
     describe('actions', () => {
       let counterWrapper, counter, t, counterView, actions
       beforeEach(() => {
         counterWrapper = mountx(<Counter />)
-        counter = counterWrapper.find(Counter).getNode()
+        counter = counterWrapper.find(Counter).instance()
         counterView = counterWrapper.find(CounterView)
         actions = counterView.prop('actions')
         t = new Xtest(counterView.props());
       })
-      it('add intent to intent$ and go through sink$', () => {
+      it.only('add intent to intent$ and go through sink$', () => {
         return t
           .do([
             actions.inc,
diff --git a/src/fantasy/fantasyx.ts b/src/fantasy/fantasyx.ts
@@ -237,7 +237,7 @@ export class FantasyXCartesian implements Cartesian<"FantasyX"> {
     return new FantasyX(
       FlatMap.State.flatMap(s1$ => (
         Functor.State.map(s2$ => (
-          streamOps.combine((a, b) => Cartesian.State.product(a, b), s1$, s2$)
+          streamOps.combine((a: any, b: any) => Cartesian.State.product(a, b), s1$, s2$)
         ), fb.plan)
       ), fa.plan))
   }
@@ -259,7 +259,7 @@ export class FantasyXApply implements Apply<"FantasyX"> {
     return new FantasyX(
       FlatMap.State.flatMap(s1$ => (
         Functor.State.map(s2$ => (
-          streamOps.combine((s1, s2) => Apply.State.ap(s1, s2), s1$, s2$)
+          streamOps.combine((s1: any, s2: any) => Apply.State.ap(s1, s2), s1$, s2$)
         ), fa.plan)
       ), fab.plan))
   }
diff --git a/src/fantasy/state.ts b/src/fantasy/state.ts
@@ -19,8 +19,6 @@ declare module './typeclasses' {
 
 @datatype(kind)
 export class State<S, A> {
-  _S: S
-  _A: A
   runState: (s: S) => pair<S, A>
   constructor(runState: (s: S) => pair<S, A>) {
     this.runState = runState
@@ -50,7 +48,7 @@ export class State<S, A> {
     return new State((s: S) => ({ a: undefined, s: Object.assign({}, s, f(s)) }))
   }
 
-  patch(f: (a: A, s?: S) => Partial<S>): State<S, Partial<S>> {
+  patch(f: (a: A, s: S) => Partial<S>): State<S, Partial<S>> {
     return new State((state: S) => {
       let { a, s } = this.runState(state)
       let p = f(a, s)
diff --git a/src/fantasy/streamT.ts b/src/fantasy/streamT.ts
@@ -4,8 +4,6 @@ import { FunctorInstances, map } from './typeclasses/functor'
 
 
 class StreamT<F extends FunctorInstances, A> {
-  _F: F
-  _A: A
   value: $<F, $<Stream, A>>
   constructor(v: $<F, $<Stream, A>>) {
     this.value = v
diff --git a/src/fantasy/xstream.ts b/src/fantasy/xstream.ts
@@ -13,9 +13,6 @@ import { datatype, $, HKT } from './typeclasses'
 
 @datatype('Xstream')
 export class Xstream<S extends Stream, I, A> {
-  _S: S
-  _V: A
-  _I: I
   streamS: State<$<S, I>, $<S, A>>
   constructor(streamS: State<$<S, I>, $<S, A>>) {
     this.streamS = streamS
@@ -26,14 +23,14 @@ export class Xstream<S extends Stream, I, A> {
   }
 
   static fromIntent<F extends Stream, I>() {
-    return new Xstream<F, I, I>(new State((intent$: Subject<F, I>) => ({
+    return new Xstream<F, I, I>(new State((intent$: $<F, I>) => ({
       s: intent$,
       a: intent$
     })))
   }
 
   static fromEvent<F extends Stream>(type: string, name: string, defaultValue?: string) {
-    return new Xstream<F, Event, string>(new State((intent$: Subject<F, Event>) => ({
+    return new Xstream<F, Event, string>(new State((intent$: $<F, Event>) => ({
       s: intent$,
       a: streamOps.merge(
         typeof defaultValue != 'undefined' ? streamOps.just(defaultValue) : streamOps.empty()
@@ -49,14 +46,14 @@ export class Xstream<S extends Stream, I, A> {
   }
 
   static fromPromise<F extends Stream, I, A>(p: Promise<A>) {
-    return new Xstream<F, I, A>(new State((intent$: Subject<F, I>) => ({
+    return new Xstream<F, I, A>(new State((intent$: $<F, I>) => ({
       s: intent$,
       a: streamOps.fromPromise(p)
     })))
   }
 
   static from<F extends Stream, I, A, G extends FunctorInstances>(p: $<G, A>) {
-    return new Xstream<F, I, A>(new State((intent$: Subject<F, I>) => ({
+    return new Xstream<F, I, A>(new State((intent$: $<F, I>) => ({
       s: intent$,
       a: streamOps.from(p) as $<F, A>
     })))
@@ -97,11 +94,11 @@ export class XstreamFunctor implements Functor<"Xstream">{
 Functor.Xstream = new XstreamFunctor
 
 export class XstreamCartesian implements Cartesian<"Xstream">{
-  product<A, B>(fa: Xstream<any, any, A>, fb: Xstream<any, any, B>): Xstream<any, typeof fa._I, [A, B]> {
+  product<A, B, C extends Stream, D>(fa: Xstream<C, D, A>, fb: Xstream<C, D, B>): Xstream<C, D, [A, B]> {
     return new Xstream(
       FlatMap.State.flatMap(s1 => (
         Functor.State.map(s2 => (
-          streamOps.combine((a, b) => [a, b], s1, s2)
+          streamOps.combine<A, B, [A, B]>((a, b) => [a, b], s1, s2)
         ), fb.streamS)
       ), fa.streamS))
   }
diff --git a/src/interfaces.ts b/src/interfaces.ts
@@ -10,7 +10,7 @@ export interface Actions<T> {
 }
 
 export interface Plan<E extends Stream, I, S> {
-  (intent: Subject<E, I>, props?: {}): Machine<E, I, S>
+  (intent: Subject<E, I>, props?: Xprops<I>): Machine<E, I, S>
 }
 
 export interface Update<S> {
@@ -43,7 +43,7 @@ export interface XcomponentClass<E extends Stream, I, S> {
   displayName: string
   contextTypes?: ContextType<E, I, S>
   defaultProps?: any
-  new(props?: Xprops<I>, context?: ContextEngine<E, I, S>): Xcomponent<E, I, S>;
+  new(props: Xprops<I>, context: ContextEngine<E, I, S>): Xcomponent<E, I, S>;
 }
 
 export interface History<E extends Stream, S> {
diff --git a/src/x.ts b/src/x.ts
@@ -6,17 +6,18 @@ import { streamOps, Stream, Subject } from './xs'
 import { Plan, Xcomponent, XcomponentClass, Engine, ContextEngine, XREACT_ENGINE } from './interfaces'
 export { XREACT_ENGINE }
 
-export function isXcomponentClass<E extends Stream, I, S>(ComponentClass: XcomponentClass<E, I, S> | React.ComponentClass<any> | React.SFC<any>): ComponentClass is XcomponentClass<E, I, S> {
-  return (<XcomponentClass<E, I, S>>ComponentClass).contextTypes == CONTEXT_TYPE;
+export function isXcomponentClass<E extends Stream, I, S>(
+  ComponentClass: any): ComponentClass is XcomponentClass<E, I, S> {
+  return (ComponentClass).contextTypes == CONTEXT_TYPE;
 }
 export type XOrReactComponent<E extends Stream, I, S> = XcomponentClass<E, I, S> | React.ComponentClass<S> | React.SFC<S>
 
-export function x<E extends Stream, I, S>(main: Plan<E, I, S>, opts = {}): (WrappedComponent: XOrReactComponent<E, I, S>) => XcomponentClass<E, I, S> {
-  return function(WrappedComponent: XOrReactComponent<E, I, S>) {
-    if (isXcomponentClass(WrappedComponent)) {
-      return extendXComponentClass(WrappedComponent, main)
+export function x<E extends Stream, I, S>(main: Plan<E, I, S>, opts = {}): (WrappedComponent: React.ComponentType<S> | XcomponentClass<E, I, S>) => XcomponentClass<E, I, S> {
+  return function(WrappedComponent: React.ComponentType<S> | XcomponentClass<E, I, S>) {
+    if (isXcomponentClass<E, I, S>(WrappedComponent)) {
+      return extendXComponentClass<E, I, S>(WrappedComponent, main)
     } else {
-      return genXComponentClass(WrappedComponent, main, opts)
+      return genXComponentClass<E, I, S>(WrappedComponent, main, opts)
     }
   };
 }
diff --git a/src/xclass.ts b/src/xclass.ts
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { createElement as h } from 'react'
 import * as PropTypes from 'prop-types';
-import { Plan, Xcomponent, XcomponentClass, ContextEngine, XREACT_ENGINE, Update, Actions } from './interfaces'
+import { Plan, Xcomponent, XcomponentClass, ContextEngine, XREACT_ENGINE, Update, Actions, Xprops } from './interfaces'
 import { streamOps, Stream, Subject } from './xs'
 
 export const CONTEXT_TYPE = {
@@ -18,7 +18,7 @@ export function extendXComponentClass<E extends Stream, I, S>(WrappedComponent:
   return class XNode extends WrappedComponent {
     static contextTypes = CONTEXT_TYPE
     static displayName = `X(${getDisplayName(WrappedComponent)})`
-    constructor(props: S, context: ContextEngine<E, I, S>) {
+    constructor(props: Xprops<I>, context: ContextEngine<E, I, S>) {
       super(props, context);
       let engine = context[XREACT_ENGINE]
       let { actions, update$ } = main(engine.intent$, props)
@@ -28,12 +28,12 @@ export function extendXComponentClass<E extends Stream, I, S>(WrappedComponent:
     }
   }
 }
-export function genXComponentClass<E extends Stream, I, S>(WrappedComponent: React.SFC<S> | React.ComponentClass<S>, main: Plan<E, I, S>, opts?: any): XcomponentClass<E, I, S> {
+export function genXComponentClass<E extends Stream, I, S>(WrappedComponent: React.ComponentType<S>, main: Plan<E, I, S>, opts?: any): XcomponentClass<E, I, S> {
   return class XLeaf extends Xcomponent<E, I, S> {
     static contextTypes = CONTEXT_TYPE
     static displayName = `X(${getDisplayName(WrappedComponent)})`
     defaultKeys: (keyof S)[]
-    constructor(props: any, context: ContextEngine<E, I, S>) {
+    constructor(props: Xprops<I>, context: ContextEngine<E, I, S>) {
       super(props, context);
       let engine = context[XREACT_ENGINE]
       let { actions, update$ } = main(engine.intent$, props)
@@ -43,14 +43,14 @@ export function genXComponentClass<E extends Stream, I, S>(WrappedComponent: Rea
       this.machine.actions = bindActions(actions || {}, engine.intent$, this)
 
       this.defaultKeys = WrappedComponent.defaultProps ? (<(keyof S)[]>Object.keys(WrappedComponent.defaultProps)) : [];
-      this.state = Object.assign(
+      this.setState(Object.assign(
         {},
         WrappedComponent.defaultProps,
-        pick(this.defaultKeys, props)
-      );
+        <Pick<S, keyof S>>pick(this.defaultKeys, props)
+      ));
     }
     componentWillReceiveProps(nextProps: I) {
-      this.setState(state => Object.assign({}, nextProps, pick(this.defaultKeys, state)));
+      this.setState((state, props) => Object.assign({}, nextProps, pick(this.defaultKeys, state)));
     }
     componentDidMount() {
       this.subscription = streamOps.subscribe(
@@ -109,7 +109,7 @@ export function genXComponentClass<E extends Stream, I, S>(WrappedComponent: Rea
   }
 }
 
-function getDisplayName<E extends Stream, I, S>(WrappedComponent: XcomponentClass<E, I, S> | React.SFC<S> | React.ComponentClass<S>) {
+function getDisplayName<E extends Stream, I, S>(WrappedComponent: React.ComponentType<S>) {
   return WrappedComponent.displayName || WrappedComponent.name || 'X';
 }
 
@@ -137,7 +137,7 @@ function bindActions<E extends Stream, I, S>(actions: Actions<void>, intent$: Su
   return _actions;
 }
 function pick<A>(names: Array<keyof A>, obj: A) {
-  let result = <Partial<A>>{};
+  let result = <Pick<A, keyof A>>{};
   for (let name of names) {
     if (obj[name]) result[name] = obj[name];
   }
diff --git a/src/xs/rx.ts b/src/xs/rx.ts
@@ -1,17 +1,17 @@
-import { Observable as RxStream } from '@reactivex/rxjs/dist/cjs/Observable'
-import { Subject } from '@reactivex/rxjs/dist/cjs/Subject'
+import { Observable as RxStream } from '@reactivex/rxjs/dist/package/Observable'
+import { Subject } from '@reactivex/rxjs/dist/package/Subject'
 import { Subscription, StreamOps } from './index'
-import '@reactivex/rxjs/dist/cjs/add/operator/map'
-import '@reactivex/rxjs/dist/cjs/add/operator/merge'
-import '@reactivex/rxjs/dist/cjs/add/operator/mergeMap'
-import '@reactivex/rxjs/dist/cjs/add/operator/scan'
-import '@reactivex/rxjs/dist/cjs/add/operator/catch'
-import '@reactivex/rxjs/dist/cjs/add/operator/filter'
-import '@reactivex/rxjs/dist/cjs/add/observable/empty'
-import '@reactivex/rxjs/dist/cjs/add/observable/from'
-import '@reactivex/rxjs/dist/cjs/add/observable/of'
-import '@reactivex/rxjs/dist/cjs/add/observable/fromPromise'
-import '@reactivex/rxjs/dist/cjs/add/observable/combineLatest'
+import '@reactivex/rxjs/dist/package/add/operator/map'
+import '@reactivex/rxjs/dist/package/add/operator/merge'
+import '@reactivex/rxjs/dist/package/add/operator/mergeMap'
+import '@reactivex/rxjs/dist/package/add/operator/scan'
+import '@reactivex/rxjs/dist/package/add/operator/catch'
+import '@reactivex/rxjs/dist/package/add/operator/filter'
+import '@reactivex/rxjs/dist/package/add/observable/empty'
+import '@reactivex/rxjs/dist/package/add/observable/from'
+import '@reactivex/rxjs/dist/package/add/observable/of'
+import '@reactivex/rxjs/dist/package/add/observable/fromPromise'
+import '@reactivex/rxjs/dist/package/add/observable/combineLatest'
 
 declare module '.' {
   interface S_<A> {
diff --git a/tsconfig.common.json b/tsconfig.common.json
@@ -17,7 +17,8 @@
     // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
     // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
 
-    /* Strict Type-Checking Options */
+   /* Strict Type-Checking Options */
+   "strictPropertyInitialization": false,
     "strict": true,                            /* Enable all strict type-checking options. */
     "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
     // "strictNullChecks": true,              /* Enable strict null checks. */
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ export interface Actions<T> {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`export interface Plan<E extends Stream, I, S> {`
`13`		`- (intent: Subject<E, I>, props?: {}): Machine<E, I, S>`
	`13`	`+ (intent: Subject<E, I>, props?: Xprops<I>): Machine<E, I, S>`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`export interface Update<S> {`
`@@ -43,7 +43,7 @@ export interface XcomponentClass<E extends Stream, I, S> {`
`43`	`43`	`displayName: string`
`44`	`44`	`contextTypes?: ContextType<E, I, S>`
`45`	`45`	`defaultProps?: any`
`46`		`- new(props?: Xprops<I>, context?: ContextEngine<E, I, S>): Xcomponent<E, I, S>;`
	`46`	`+ new(props: Xprops<I>, context: ContextEngine<E, I, S>): Xcomponent<E, I, S>;`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`export interface History<E extends Stream, S> {`