Additional fixes for Redux

import/Fable.Import.Test.fsproj

@@ -58,6 +58,11 @@
     <Compile Include="express/Fable.Import.Express.fs" />
     <Compile Include="react/Fable.Import.React.fs" />
     <Compile Include="react/Fable.Helpers.React.fs" />
+    <Compile Include="redux/Fable.Import.Redux.fs" />
+    <Compile Include="react-redux/Fable.Import.ReactRedux.fs" />
+    <Compile Include="react-router/Fable.Import.HistoryModule.fs" />
+    <Compile Include="react-router/Fable.Import.ReactRouter.fs" />
+    <Compile Include="react-router-redux/Fable.Import.ReactRouterRedux.fs" />
     <Compile Include="vscode/Fable.Import.VSCode.fs" />
     <Compile Include="electron/Fable.Import.Electron.fs" />
     <Compile Include="d3/Fable.Import.D3.fs" />

import/electron/Fable.Import.Electron.fs

@@ -28,8 +28,10 @@ module Electron =
             member __.once(``event``: string, listener: Function): NodeJS.EventEmitter = failwith "JS only"
             member __.removeListener(``event``: string, listener: Function): NodeJS.EventEmitter = failwith "JS only"
             member __.removeAllListeners(?``event``: string): NodeJS.EventEmitter = failwith "JS only"
-            member __.setMaxListeners(n: float): unit = failwith "JS only"
+            member __.setMaxListeners(n: int): unit = failwith "JS only"
+            member __.getMaxListeners(): int = failwith "JS only"
             member __.listeners(``event``: string): ResizeArray<Function> = failwith "JS only"
+            member __.listenerCount(``type``: string): int = failwith "JS only"
             member __.emit(``event``: string, [<ParamArray>] args: obj[]): bool = failwith "JS only"
 
     and Event =

import/react-redux/Fable.Import.ReactRedux.fs

@@ -3,10 +3,13 @@ open System
 open System.Text.RegularExpressions
 open Fable.Core
 open Fable.Import.JS
+open Fable.Import.React
+open Fable.Import.Redux
 
+// Type definitions for react-redux v. 4.4.0, generated from Typescript
 module ReactRedux =
-    type [<Import("ElementClass","react-redux")>] ElementClass() =
-        interface Component<obj, obj>
+    type [<Import("ElementClass","react-redux")>] ElementClass<'P, 'S when 'P :> Property<'P>>(?props: 'P, ?context: obj) =
+        inherit Component<'P, 'S>(?props = props, ?context = context)
 
 
     and ClassDecorator =
@@ -19,20 +22,20 @@ module ReactRedux =
         [<Emit("$0($1...)")>] abstract Invoke: dispatch: Dispatch * ?ownProps: obj -> obj
 
     and MapDispatchToPropsObject =
-        [<Emit("$0[$1]{{=$2}}")>] abstract Item: name: string -> ActionCreator with get, set
+        [<Emit("$0[$1]{{=$2}}")>] abstract Item: name: string -> ActionCreator with get
 
     and MergeProps =
         [<Emit("$0($1...)")>] abstract Invoke: stateProps: obj * dispatchProps: obj * ownProps: obj -> obj
 
     and Options =
-        abstract ``pure``: bool with get, set
+        abstract ``pure``: bool with get
 
-    and Property =
-        abstract store: Store option with get, set
-        abstract children: Function option with get, set
+    and Property<'P when 'P :> Property<'P>> =
+        abstract store: Store option with get
+        abstract children: React.ReactElement<'P> option with get
 
-    and [<Import("Provider","react-redux")>] Provider() =
-        interface Component<Property, obj>
+    and [<Import("Provider","react-redux")>] Provider<'StateType, 'PropType when 'PropType :> Property<'PropType>>(?props: Property<'PropType>, ?context: obj) =
+        inherit Component<Property<'PropType>, 'StateType>(?props = props, ?context = context)
 
 
     type [<Import("*","react-redux")>] Globals =

import/react-redux/README.md

@@ -1,6 +1,11 @@
 # fable-import-react-redux
 
-Fable bindings for the Redux React bindings
+Fable bindings for the Redux React bindings (react-redux) version 4.4.0.
+These were generated from the Typescript file but modified to remove setters.
+In addition, ElementClass needs to inherit from Component rather than 
+trying to implement it as an interface.
+
+Typescript source file is [here](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/0b96933934c2e37a749aad8e38e23214e21e7dab/react-redux/react-redux.d.ts).
 
 ## Installation
 

import/react-redux/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fable-import-react-redux",
   "version": "0.0.1",
-  "description": "Fable bindings for Redux bindings for React",
+  "description": "Fable bindings for Redux bindings for React (react-redux) version 4.4.0",
   "repository": {
       "type": "git",
       "url": "https://github.com/fsprojects/Fable/import/react-redux"   

import/react-router-redux/Fable.Import.ReactRouterRedux.fs

@@ -3,7 +3,10 @@ open System
 open System.Text.RegularExpressions
 open Fable.Core
 open Fable.Import.JS
+module H = Fable.Import.HistoryModule
+module R = Fable.Import.Redux
 
+// Type definitions for react-router-redux v4.0.0, generated from Typescript
 module ReactRouterRedux =
     type LocationDescriptor =
         U2<H.Location, H.Path>
@@ -27,11 +30,11 @@ module ReactRouterRedux =
         obj
 
     and RouteActions =
-        abstract push: PushAction with get, set
-        abstract replace: ReplaceAction with get, set
-        abstract go: GoAction with get, set
-        abstract goForward: GoForwardAction with get, set
-        abstract goBack: GoBackAction with get, set
+        abstract push: PushAction with get
+        abstract replace: ReplaceAction with get
+        abstract go: GoAction with get
+        abstract goForward: GoForwardAction with get
+        abstract goBack: GoBackAction with get
 
     and ReactRouterReduxHistory =
         inherit H.History
@@ -42,8 +45,8 @@ module ReactRouterRedux =
         [<Emit("$0($1...)")>] abstract Invoke: state: obj -> obj
 
     and SyncHistoryWithStoreOptions =
-        abstract selectLocationState: DefaultSelectLocationState option with get, set
-        abstract adjustUrlOnReplay: bool option with get, set
+        abstract selectLocationState: DefaultSelectLocationState option with get
+        abstract adjustUrlOnReplay: bool option with get
 
     type [<Import("*","ReactRouterRedux")>] Globals =
         static member CALL_HISTORY_METHOD with get(): string = failwith "JS only" and set(v: string): unit = failwith "JS only"
@@ -54,7 +57,7 @@ module ReactRouterRedux =
         static member goBack with get(): GoForwardAction = failwith "JS only" and set(v: GoForwardAction): unit = failwith "JS only"
         static member goForward with get(): GoBackAction = failwith "JS only" and set(v: GoBackAction): unit = failwith "JS only"
         static member routerActions with get(): RouteActions = failwith "JS only" and set(v: RouteActions): unit = failwith "JS only"
-        static member routerReducer(?state: obj, ?options: obj): R.Reducer = failwith "JS only"
+        static member routerReducer(?state: obj, ?options: obj): R.Reducer<'T,'U> = failwith "JS only"
         static member syncHistoryWithStore(history: H.History, store: R.Store, ?options: SyncHistoryWithStoreOptions): ReactRouterReduxHistory = failwith "JS only"
         static member routerMiddleware(history: H.History): R.Middleware = failwith "JS only"
 

import/react-router-redux/README.md

@@ -1,6 +1,10 @@
 # fable-import-react-router-redux
 
-Fable bindings for the Redux React Router (react-router-redux) bindings.
+Fable bindings for the Redux React Router (react-router-redux) bindings, v4.0.0.
+These were generated from Typescript, with some modifications: namely, all 
+setters were removed, and type parameters were provided when `Reducer` is used.
+
+Typescript source file is [here](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/56295f5058cac7ae458540423c50ac2dcf9fc711/react-router-redux/react-router-redux.d.ts).
 
 ## Installation
 

import/react-router-redux/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fable-import-react-router-redux",
   "version": "0.0.1",
-  "description": "Fable bindings for Redux bindings for React Router",
+  "description": "Fable bindings for Redux bindings for React Router (react-router-redux) v4.0.0",
   "repository": {
       "type": "git",
       "url": "https://github.com/fsprojects/Fable/import/react-router-redux"   

import/react-router/Fable.Import.HistoryModule.fs

@@ -0,0 +1,168 @@
+namespace Fable.Import
+open System
+open System.Text.RegularExpressions
+open Fable.Core
+open Fable.Import.JS
+open Fable.Import.Browser
+
+// Type definitions for history v2.0.0; generated from Typescript with some modifications including some module names.
+module HistoryModule =
+    type Action =
+        string
+
+    and BeforeUnloadHook =
+        Func<U2<string, bool>>
+
+    and CreateHistory<'T> =
+        Func<HistoryOptions, 'T>
+
+    and CreateHistoryEnhancer<'T, 'E> =
+        Func<CreateHistory<'T>, CreateHistory<'E>>
+
+    and History =
+        abstract listenBefore: hook: TransitionHook -> Func<unit>
+        abstract listen: listener: LocationListener -> Func<unit>
+        abstract transitionTo: location: Location -> unit
+        abstract push: path: LocationDescriptor -> unit
+        abstract replace: path: LocationDescriptor -> unit
+        abstract go: n: float -> unit
+        abstract goBack: unit -> unit
+        abstract goForward: unit -> unit
+        abstract createKey: unit -> LocationKey
+        abstract createPath: path: LocationDescriptor -> Path
+        abstract createHref: path: LocationDescriptor -> Href
+        abstract createLocation: ?path: LocationDescriptor * ?action: Action * ?key: LocationKey -> Location
+        abstract createLocation: ?path: Path * ?state: LocationState * ?action: Action * ?key: LocationKey -> Location
+        abstract pushState: state: LocationState * path: Path -> unit
+        abstract replaceState: state: LocationState * path: Path -> unit
+        abstract setState: state: LocationState -> unit
+        abstract registerTransitionHook: hook: TransitionHook -> unit
+        abstract unregisterTransitionHook: hook: TransitionHook -> unit
+
+    and HistoryOptions =
+        obj
+
+    and Href =
+        string
+
+    and Location =
+        obj
+
+    and LocationDescriptorObject =
+        obj
+
+    and LocationDescriptor =
+        U2<LocationDescriptorObject, Path>
+
+    and LocationKey =
+        string
+
+    and LocationListener =
+        Func<Location, unit>
+
+    and LocationState =
+        obj
+
+    and Path =
+        string
+
+    and Pathname =
+        string
+
+    and Query =
+        obj
+
+    and QueryString =
+        string
+
+    and Search =
+        string
+
+    and TransitionHook =
+        Func<Location, Func<obj, unit>, obj>
+
+    and Hash =
+        string
+
+    and HistoryBeforeUnload =
+        abstract listenBeforeUnload: hook: BeforeUnloadHook -> Func<unit>
+
+    and HistoryQueries =
+        abstract pushState: state: LocationState * pathname: U2<Pathname, Path> * ?query: Query -> unit
+        abstract replaceState: state: LocationState * pathname: U2<Pathname, Path> * ?query: Query -> unit
+        abstract createPath: path: Path * ?query: Query -> Path
+        abstract createHref: path: Path * ?query: Query -> Href
+
+    and Module =
+        abstract createHistory: CreateHistory<History> with get
+        abstract createHashHistory: CreateHistory<History> with get
+        abstract createMemoryHistory: CreateHistory<History> with get
+        abstract actions: obj with get
+        abstract createLocation: ?path: Path * ?state: LocationState * ?action: Action * ?key: LocationKey -> Location
+        abstract useBasename: createHistory: CreateHistory<'T> -> CreateHistory<'T>
+        abstract useBeforeUnload: createHistory: CreateHistory<'T> -> CreateHistory<obj>
+        abstract useQueries: createHistory: CreateHistory<'T> -> CreateHistory<obj>
+
+
+
+module CreateBrowserHistory =
+    type [<Import("*","history/lib/createBrowserHistory")>] Globals =
+        static member createBrowserHistory(?options: HistoryModule.HistoryOptions): HistoryModule.History = failwith "JS only"
+
+
+
+module CreateHashHistory =
+    type [<Import("*","history/lib/createHashHistory")>] Globals =
+        static member createHashHistory(?options: HistoryModule.HistoryOptions): HistoryModule.History = failwith "JS only"
+
+
+
+module CreateMemoryHistory =
+    type [<Import("*","history/lib/createMemoryHistory")>] Globals =
+        static member createMemoryHistory(?options: HistoryModule.HistoryOptions): HistoryModule.History = failwith "JS only"
+
+
+
+module CreateLocation =
+    type [<Import("*","history/lib/createLocation")>] Globals =
+        static member createLocation(?path: HistoryModule.Path, ?state: HistoryModule.LocationState, ?action: HistoryModule.Action, ?key: HistoryModule.LocationKey): HistoryModule.Location = failwith "JS only"
+
+
+
+module UseBasename =
+    type [<Import("*","history/lib/useBasename")>] Globals =
+        static member useBasename(createHistory: HistoryModule.CreateHistory<'T>): HistoryModule.CreateHistory<'T> = failwith "JS only"
+
+
+
+module UseBeforeUnload =
+    type [<Import("*","history/lib/useBeforeUnload")>] Globals =
+        static member useBeforeUnload(createHistory: HistoryModule.CreateHistory<'T>): HistoryModule.CreateHistory<obj> = failwith "JS only"
+
+
+
+module UseQueries =
+    type [<Import("*","history/lib/useQueries")>] Globals =
+        static member useQueries(createHistory: HistoryModule.CreateHistory<'T>): HistoryModule.CreateHistory<obj> = failwith "JS only"
+
+
+
+module HistoryActions =
+    type [<Import("*","history/lib/actions")>] Globals =
+        static member PUSH with get(): string = failwith "JS only" and set(v: string): unit = failwith "JS only"
+        static member REPLACE with get(): string = failwith "JS only" and set(v: string): unit = failwith "JS only"
+        static member POP with get(): string = failwith "JS only" and set(v: string): unit = failwith "JS only"
+
+
+
+module HistoryDOMUtils =
+    type [<Import("*","history/lib/DOMUtils")>] Globals =
+        static member addEventListener(node: EventTarget, ``event``: string, listener: EventListenerOrEventListenerObject): unit = failwith "JS only"
+        static member removeEventListener(node: EventTarget, ``event``: string, listener: EventListenerOrEventListenerObject): unit = failwith "JS only"
+        static member getHashPath(): string = failwith "JS only"
+        static member replaceHashPath(path: string): unit = failwith "JS only"
+        static member getWindowPath(): string = failwith "JS only"
+        static member go(n: float): unit = failwith "JS only"
+        static member getUserConfirmation(message: string, callback: Func<bool, unit>): unit = failwith "JS only"
+        static member supportsHistory(): bool = failwith "JS only"
+        static member supportsGoWithoutReloadUsingHash(): bool = failwith "JS only"