export type from react-most.ts

Author: jcouyang

lib/__tests__/react-most-test.jsx

@@ -3,7 +3,7 @@ import ReactDOM from 'react-dom';
 import TestUtils from 'react-addons-test-utils';
 import * as most from 'most';
 
-import Most, {connect} from '../react-most';
+import Most, {connect} from '../../dist/react-most';
 import {stateStreamOf, stateHistoryOf,
         intentStreamOf, intentHistoryOf,
         run, dispatch,

lib/react-most.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import PropTypes from 'prop-types';
+import { PropTypes } from 'prop-types';
 import initHistory, { Traveler } from './history';
 import { from, Stream, Subscription } from 'most';
 import { Engine, EngineSubject } from './engine/most';
@@ -10,30 +10,37 @@ const CONTEXT_TYPE = {
   [REACT_MOST_ENGINE]: PropTypes.object
 };
 
-interface Actions<T> {
+export interface Actions<T> {
   [propName: string]: (...v: any[]) => T
 }
 
-interface Plan<I, S> {
-  (intent: EngineSubject<I>, props?: {}): Process<I,S>
+export interface Plan<I, S> {
+  (intent: EngineSubject<I>, props?: {}): Process<I, S>
 }
-interface Update<S> {
+export interface Update<S> {
   (current: S): S
 }
-interface Process<I,S> {
+export interface Process<I, S> {
   actions: Actions<I>,
   updates: Stream<Update<S>>
 }
 
-interface ConnectProps<I> {
+export interface ConnectProps<I> {
   actions: Actions<I>
 }
 const h = React.createElement;
-function connect<I,S>(main: Plan<I,S>, opts = { history: false }) {
+export class Connect<I, S> extends React.PureComponent<ConnectProps<I>, S> {
+  actions: Actions<I>
+  updates: Stream<Update<S>>
+}
+export interface ConnectClass<I, S> {
+  new (props?: ConnectProps<I>, context?: any): Connect<I, S>;
+}
+export function connect<I, S>(main: Plan<I, S>, opts = { history: false }): (WrappedComponent: React.ComponentClass<any>) => ConnectClass<I, S> {
   return function(WrappedComponent: React.ComponentClass<any>) {
     let connectDisplayName = `Connect(${getDisplayName(WrappedComponent)})`;
     if (WrappedComponent.contextTypes === CONTEXT_TYPE) {
-      return class ConnectNode extends React.PureComponent<ConnectProps<I>, any>{
+      return class ConnectNode extends Connect<I, S>{
         actions: Actions<I>
         updates: Stream<Update<S>>
         static contextTypes = CONTEXT_TYPE
@@ -55,7 +62,7 @@ function connect<I,S>(main: Plan<I,S>, opts = { history: false }) {
         }
       }
     } else {
-      return class ConnectLeaf extends React.PureComponent<ConnectProps<I>, S> {
+      return class ConnectLeaf extends Connect<I, S> {
         actions: Actions<I>
         updates: Stream<Update<S>>
         traveler: Traveler<S>
@@ -71,7 +78,7 @@ function connect<I,S>(main: Plan<I,S>, opts = { history: false }) {
           }
 
           let { actions, updates } = main(context[REACT_MOST_ENGINE].engine.intentStream, props)
-          this.updates = props.updates?updates.merge(props.updates) : updates
+          this.updates = props.updates ? updates.merge(props.updates) : updates
           this.actions = Object.assign({}, actions, props.actions);
           let defaultKey = Object.keys(WrappedComponent.defaultProps);
           this.state = Object.assign(

package.json

@@ -18,7 +18,7 @@
   ],
   "scripts": {
     "license": "(cat LICENSE.txt; cat react-most.js) > react-most.licensed.js && mv react-most.licensed.js react-most.js",
-    "build": "babel lib -d ./ --ignore '__tests__' && npm run license",
+    "build": "tsc -p .",
     "prebrowser": "npm run build",
     "browser": "browserify -r react -r most -r most-subject -o dist/vendor.js && browserify -s Most -x react -x most -x most-subject react-most.js  -o dist/react-most.js",
     "test": "jest --coverage",
@@ -35,6 +35,7 @@
     "react": "^15.5.4"
   },
   "devDependencies": {
+    "@types/node": "^7.0.18",
     "@types/react": "^15.0.22",
     "babel": "^6.1.18",
     "babel-cli": "^6.2.0",
@@ -49,7 +50,8 @@
     "react-addons-test-utils": "^15.2.0",
     "react-dom": "^15.5.4",
     "react-most-spec": "^0.2.3",
-    "redux": "^3.0.4"
+    "redux": "^3.0.4",
+    "typescript": "^2.3.2"
   },
   "jest": {
     "moduleFileExtensions": [

tsconfig.json

@@ -4,7 +4,7 @@
   ],
   "compilerOptions": {
     "module": "commonjs",
-    "lib": ["es2015", "dom", "node"],
+    "lib": ["es2015","dom"],
     "target": "es5",
     "outDir": "dist",
     "declarationDir": "types",

yarn.lock

@@ -12,9 +12,13 @@
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/@most/prelude/-/prelude-1.4.1.tgz#b940b5563096f27637401618a5351f42466ea8f3"
 
-"@types/react@^15.0.23":
-  version "15.0.23"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-15.0.23.tgz#f3facbef5290610f54242f00308759d3a3c27346"
+"@types/node@^7.0.18":
+  version "7.0.18"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.18.tgz#cd67f27d3dc0cfb746f0bdd5e086c4c5d55be173"
+
+"@types/react@^15.0.22":
+  version "15.0.24"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-15.0.24.tgz#8a75299dc37906df327c18ca918bf97a55e7123b"
 
 abab@^1.0.3:
   version "1.0.3"
@@ -3026,6 +3030,10 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+typescript@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.3.2.tgz#f0f045e196f69a72f06b25fd3bd39d01c3ce9984"
+
 ua-parser-js@^0.7.9:
   version "0.7.12"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"