new file mode 100644

@@ -0,0 +1,2 @@

+module.exports = require('./dist/provider-api');

+

deleted file mode 100644

@@ -1,4 +0,0 @@

-console.log('woo');

-module.exports = require('./dist/route-provider');

-

-console.log('blarge', module.exports);

@@ -196,6 +196,7 @@ function makeRoute(path, action, extraParams) {

 function normalizeWildcards(path) {

   let curIdx = 0;

+  //todo curIdx doesn't increment

   return path.map(el => {

     if (isWildcard(el)) {

       return `:wildcard${curIdx}`;

@@ -295,62 +296,77 @@ function createActionDispatcher(routesConfig, window) {

     return match ? constructAction(match) : null;

   }

-  const actionDispatcher = {

-    currentLocation: null,

-    store: null,

+  let actionListeners = [];

+  let currentPath = null;

-    activateDispatcher(store) {

-      window.addEventListener("urlchanged", this);

-      this.store = store;

-    },

+  function ifPathChanged(newPath, cb) {

+    if (currentPath !== newPath) {

+      currentPath = newPath;

+      cb();

+    }

+  }

-    pathForAction,

+  const actionDispatcher = {

+    pathForAction,

-    handleEvent(ev) {

-      if (!this.store) {

-        throw new Error(

-          "You must call activateDispatcher with redux store as argument"

-        );

+    //hook for everything to get action on route change

+    addActionListener(cb) {

+      actionListeners.push(cb);

+      return () => {

+        const index = R.findIndex(x => x === cb, actionListeners);

+        actionListeners = R.remove(index, 1, actionListeners);

       }

+    },

+    //needed for window event listener

+    handleEvent(ev) {

       const location = ev.detail;

       this.receiveLocation(location);

     },

-    onLocationChanged(newLoc, cb) {

-      if (this.currentLocation !== newLoc) {

-        this.currentLocation = newLoc;

-        cb();

-      }

-    },

-

     receiveLocation(location) {

-      this.onLocationChanged(location.pathname, () => {

+      ifPathChanged(location.pathname, () => {

         const action = actionForLocation(location);

         if (action) {

-          this.store.dispatch(action);

+          actionListeners.forEach(cb => cb(action));

         }

       });

     },

+    // necessary for new APIs that aren't redux-focused - need to propagate

+    navigateToRoute(route, params) {

+      const action = {type: route, ...params};

+      const newPath = matchesAction(action, compiledActionMatchers)

+        ? pathForAction(action)

+        : null;

+

+      if (newPath) {

+        ifPathChanged(newPath, () => {

+          window.history.pushState({}, "", newPath);

+          actionListeners.forEach(cb => cb(action));

+        });

+      }

+    },

+    // can this be simplified to get rid of fundamental action model?

     receiveAction(action) {

-      const path = pathForAction(action);

+      const newPath = matchesAction(action, compiledActionMatchers)

+                    ? pathForAction(action)

+                    : null;

-      if (path) {

-        this.onLocationChanged(path, () => {

-          window.history.pushState({}, "", path);

+      if (newPath) {

+        ifPathChanged(newPath, () => {

+          window.history.pushState({}, "", newPath);

         });

       }

     },

-    handlesAction(action) {

-      return matchesAction(action, compiledActionMatchers);

-    }

   };

+  window.addEventListener("urlchanged", actionDispatcher);

+

   return actionDispatcher;

 }

@@ -1,6 +1,6 @@

 import * as R from "ramda";

-export function wrapEvent(target, name, obj) {

+function wrapEvent(target, name, obj) {

   target.addEventListener(name, obj);

 }

@@ -1,14 +1,16 @@

 import addMissingHistoryEvents from "./history-events";

 import addChangeUrlEvent from "./change-url-event";

-import installRouter from "./action-router";

+import installBrowserRouter from "./redux-api";

 import Fragment from "./fragment";

 import ActionLink from "./action-link";

+import {createActionDispatcher} from "./action-router";

 addMissingHistoryEvents(window, window.history);

 addChangeUrlEvent(window);

-const installBrowserRouter = function(routesConfig) {

-  return installRouter(routesConfig, window);

+export {

+  installBrowserRouter,

+  Fragment,

+  ActionLink,

+  createActionDispatcher

 };

-

-export { installBrowserRouter, Fragment, ActionLink};

new file mode 100644

@@ -0,0 +1,61 @@

+import * as R from 'ramda';

+import React, {useReducer, useMemo, useEffect} from 'react';

+

+const RouteContext = React.createContext(null);

+const ActionDispatcherContext = React.createContext(null);

+

+function RouteProvider({children, actionDispatcher, _window}) {

+

+  const [route, updateRoute] = useReducer((state, action) =>

+      R.omit(['type'], R.assoc('routeName', action.type, action))

+    , {});

+

+  useEffect(() => {

+    return actionDispatcher.addActionListener(action => updateRoute(action));

+  });

+

+  useEffect(() => {

+    actionDispatcher.receiveLocation(_window.location);

+  });

+

+  return (<ActionDispatcherContext.Provider value={actionDispatcher}>

+    <RouteContext.Provider value={route}>

+      {children}

+    </RouteContext.Provider>

+  </ActionDispatcherContext.Provider>);

+}

+

+RouteProvider.defaultProps = {

+  _window: window ? window : null

+};

+

+function withRoute(Component) {

+  return function ({children, ...restProps}) {

+    return (<RouteContext.Consumer>

+        {route =>

+          <Component {...{...restProps, route}}>{children}</Component>

+        }

+      </RouteContext.Consumer>

+    )

+  }

+}

+

+function RouteLink({route, params, children, ...props}) {

+  const action = {

+    type: route, ...params

+  };

+  return <ActionDispatcherContext.Consumer>{

+    dispatcher => {

+      const url = dispatcher.pathForAction(action);

+      return <a

+        onClick={(ev) => {

+          ev.preventDefault();

+          dispatcher.navigateToRoute(route, params);

+        }}

+        href={url} {...props}>{children}</a>

+    }

+  }

+  </ActionDispatcherContext.Consumer>;

+}

+

+export {RouteProvider, withRoute, RouteLink};

@@ -2,9 +2,8 @@ import {createActionDispatcher} from "./action-router";

 function buildMiddleware(actionDispatcher) {

   return store => next => action => {

-    if (actionDispatcher.handlesAction(action)) {

-      actionDispatcher.receiveAction(action, store);

-    }

+    actionDispatcher.receiveAction(action, store);

+

     return next(action);

   };

 }

@@ -16,7 +15,7 @@ function enhanceStoreCreator(actionDispatcher) {

     return (reducer, finalInitialState, enhancer) => {

       const theStore = nextStoreCreator(reducer, finalInitialState, enhancer);

-      actionDispatcher.activateDispatcher(theStore);

+      actionDispatcher.addActionListener((action) => theStore.dispatch(action));

       theStore.dispatch = middleware(theStore)(

         theStore.dispatch.bind(theStore)

@@ -26,8 +25,9 @@ function enhanceStoreCreator(actionDispatcher) {

   };

 }

-export default function installBrowserRouter(routesConfig, window) {

-  const actionDispatcher = createActionDispatcher(routesConfig, window);

+

+export default function installBrowserRouter(routesConfig, _window = window) {

+  const actionDispatcher = createActionDispatcher(routesConfig, _window);

   const middleware = x => {

     //eslint-disable-next-line no-console

@@ -44,7 +44,7 @@ export default function installBrowserRouter(routesConfig, window) {

     enhancer: enhanceStoreCreator(actionDispatcher),

     init: actionDispatcher.receiveLocation.bind(

       actionDispatcher,

-      window.location

+      _window.location

     ),

     _actionDispatcher: actionDispatcher

   };

deleted file mode 100644

@@ -1,62 +0,0 @@

-import React, {useReducer, useMemo, useEffect} from 'react';

-import {createActionDispatcher} from "./action-router";

-

-export function createRouteProvider(routesConfig, _window = window) {

-

-  const RoutingContext = React.createContext(null);

-  const actionDispatcher = createActionDispatcher(routesConfig, _window)

-

-

-  function RouteProvider({children}) {

-

-    const [route, updateRoute] = useReducer((state, action) => action, {});

-    const store = useMemo(() => {

-      return {dispatch: (action) => {

-          updateRoute(action);

-        }}

-    }, [updateRoute]);

-

-    useEffect(() => {

-      actionDispatcher.activateDispatcher(store);

-    }, [store]);

-

-    useEffect(() => {

-      actionDispatcher.receiveLocation(_window.location);

-    });

-

-    return <RoutingContext.Provider value={route}>

-      {children}

-    </RoutingContext.Provider>

-

-  }

-

-  function withRoute(Component) {

-    return function ({children, ...restProps}) {

-      return (<RoutingContext.Consumer>

-          {route =>

-            <Component {...{...restProps, route}}>{children}</Component>

-          }

-        </RoutingContext.Consumer>

-      )

-    }

-  }

-

-  function routeToUrl(routeName, params) {

-     return actionDispatcher.pathForAction({

-       type: routeName, ...params

-     })

-  }

-

-  function RouteLink({route, params, children, ...props}) {

-    const url = routeToUrl(route, params);

-

-    return <a href={url} {...props}>{children}</a>;

-  }

-

-  const init = actionDispatcher.receiveLocation.bind(

-    actionDispatcher,

-    _window.location

-  );

-

-  return {RouteProvider, withRoute, routeToUrl, RouteLink};

-}

similarity index 100%

rename from src/tests/route-provider.test.js

rename to src/tests/provider-api.test.js