@anansi/core 0.12.0 → 0.14.1

package/lib/spouts/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/spouts/router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAiB,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEtC,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAI1D,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,WAAW,EAAE,OAAO,EAAE;IACxD,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,cAAc,EAAE,MAAM,WAAW,CAAC;IAClC,YAAY,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;IACxC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,SAAS,KAAK,IAAI,CAAC;CACvE,6CAmBoB,OAAO,MAAM,EAAE,OAAO,CAAC,+BAEhB,OAAO,MAAM,EAAE,OAAO,CAAC;;;;GAgBlD"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/spouts/router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAiB,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEtC,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEzD,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,WAAW,EAAE,OAAO,EAAE;IACxD,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,cAAc,EAAE,MAAM,WAAW,CAAC;IAClC,YAAY,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;IACxC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,SAAS,KAAK,IAAI,CAAC;CACvE,GAAG,WAAW,CACb,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvB;IACE,aAAa,EAAE,KAAK,CAAC,WAAW,EAAE,GAAG,CAAC,EAAE,CAAC;IACzC,MAAM,EAAE,eAAe,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC;CAClD,CACF,CAiCA"}

package/lib/spouts/router.js

@@ -25,19 +25,20 @@ function routerSpout(options) {
     }, void 0, children);
   };
 
-  return function (next) {
-    return async initData => {
-      const history = (0, _history.createBrowserHistory)();
-      const router = options.createRouter(history);
-      const matchedRoutes = router.getMatchedRoutes(history.location.pathname);
-      const nextProps = await next(initData);
-      const Router = createRouteComponent(router);
-      return { ...nextProps,
-        matchedRoutes,
-        router,
-        app: /*#__PURE__*/(0, _jsx2.default)(Router, {}, void 0, nextProps.app)
-      };
+  return next => async props => {
+    const history = (0, _history.createBrowserHistory)();
+    const router = options.createRouter(history);
+    const matchedRoutes = router.getMatchedRoutes(history.location.pathname);
+    const nextProps = await next({ ...props,
+      matchedRoutes,
+      router
+    });
+    const Router = createRouteComponent(router);
+    return { ...nextProps,
+      matchedRoutes,
+      router,
+      app: /*#__PURE__*/(0, _jsx2.default)(Router, {}, void 0, nextProps.app)
     };
   };
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJyb3V0ZXJTcG91dCIsIm9wdGlvbnMiLCJjcmVhdGVSb3V0ZUNvbXBvbmVudCIsInJvdXRlciIsIlJvdXRlciIsImNoaWxkcmVuIiwicmVzb2x2ZVdpdGgiLCJ1c2VSZXNvbHZlV2l0aCIsIm9uQ2hhbmdlIiwibmV4dCIsImluaXREYXRhIiwiaGlzdG9yeSIsImNyZWF0ZUJyb3dzZXJIaXN0b3J5IiwiY3JlYXRlUm91dGVyIiwibWF0Y2hlZFJvdXRlcyIsImdldE1hdGNoZWRSb3V0ZXMiLCJsb2NhdGlvbiIsInBhdGhuYW1lIiwibmV4dFByb3BzIiwiYXBwIl0sInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Nwb3V0cy9yb3V0ZXIudHN4Il0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFJvdXRlLCBSb3V0ZVByb3ZpZGVyLCBSb3V0ZUNvbnRyb2xsZXIgfSBmcm9tICdAYW5hbnNpL3JvdXRlcic7XG5pbXBvcnQgUmVhY3QgZnJvbSAncmVhY3QnO1xuaW1wb3J0IHsgY3JlYXRlQnJvd3Nlckhpc3RvcnkgfSBmcm9tICdoaXN0b3J5JztcbmltcG9ydCB0eXBlIHsgVXBkYXRlIH0gZnJvbSAnaGlzdG9yeSc7XG5cbmltcG9ydCB0eXBlIHsgUmVzb2x2ZVByb3BzLCBDcmVhdGVSb3V0ZXIgfSBmcm9tICcuL3R5cGVzJztcblxudHlwZSBOZWVkZWRQcm9wcyA9IFJlc29sdmVQcm9wcztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gcm91dGVyU3BvdXQ8UmVzb2x2ZVdpdGg+KG9wdGlvbnM6IHtcbiAgcmVzb2x2ZVdpdGg/OiBhbnk7XG4gIHVzZVJlc29sdmVXaXRoOiAoKSA9PiBSZXNvbHZlV2l0aDtcbiAgY3JlYXRlUm91dGVyOiBDcmVhdGVSb3V0ZXI8UmVzb2x2ZVdpdGg+O1xuICBvbkNoYW5nZT86ICh1cGRhdGU6IFVwZGF0ZSwgY2FsbGJhY2s6ICgpID0+IHZvaWQgfCB1bmRlZmluZWQpID0+IHZvaWQ7XG59KSB7XG4gIGNvbnN0IGNyZWF0ZVJvdXRlQ29tcG9uZW50ID0gKFxuICAgIHJvdXRlcjogUm91dGVDb250cm9sbGVyPFJvdXRlPFJlc29sdmVXaXRoLCBhbnk+PixcbiAgKSA9PlxuICAgIGZ1bmN0aW9uIFJvdXRlcih7IGNoaWxkcmVuIH06IHsgY2hpbGRyZW46IFJlYWN0LlJlYWN0Tm9kZSB9KSB7XG4gICAgICBjb25zdCByZXNvbHZlV2l0aCA9IG9wdGlvbnMudXNlUmVzb2x2ZVdpdGgoKTtcblxuICAgICAgcmV0dXJuIChcbiAgICAgICAgPFJvdXRlUHJvdmlkZXJcbiAgICAgICAgICByb3V0ZXI9e3JvdXRlcn1cbiAgICAgICAgICByZXNvbHZlV2l0aD17cmVzb2x2ZVdpdGh9XG4gICAgICAgICAgb25DaGFuZ2U9e29wdGlvbnMub25DaGFuZ2V9XG4gICAgICAgID5cbiAgICAgICAgICB7Y2hpbGRyZW59XG4gICAgICAgIDwvUm91dGVQcm92aWRlcj5cbiAgICAgICk7XG4gICAgfTtcblxuICByZXR1cm4gZnVuY3Rpb24gPFQgZXh0ZW5kcyBOZWVkZWRQcm9wcz4oXG4gICAgbmV4dDogKGluaXREYXRhOiBSZWNvcmQ8c3RyaW5nLCB1bmtub3duPikgPT4gUHJvbWlzZTxUPixcbiAgKSB7XG4gICAgcmV0dXJuIGFzeW5jIChpbml0RGF0YTogUmVjb3JkPHN0cmluZywgdW5rbm93bj4pID0+IHtcbiAgICAgIGNvbnN0IGhpc3RvcnkgPSBjcmVhdGVCcm93c2VySGlzdG9yeSgpO1xuICAgICAgY29uc3Qgcm91dGVyID0gb3B0aW9ucy5jcmVhdGVSb3V0ZXIoaGlzdG9yeSk7XG4gICAgICBjb25zdCBtYXRjaGVkUm91dGVzID0gcm91dGVyLmdldE1hdGNoZWRSb3V0ZXMoaGlzdG9yeS5sb2NhdGlvbi5wYXRobmFtZSk7XG5cbiAgICAgIGNvbnN0IG5leHRQcm9wcyA9IGF3YWl0IG5leHQoaW5pdERhdGEpO1xuXG4gICAgICBjb25zdCBSb3V0ZXIgPSBjcmVhdGVSb3V0ZUNvbXBvbmVudChyb3V0ZXIpO1xuICAgICAgcmV0dXJuIHtcbiAgICAgICAgLi4ubmV4dFByb3BzLFxuICAgICAgICBtYXRjaGVkUm91dGVzLFxuICAgICAgICByb3V0ZXIsXG4gICAgICAgIGFwcDogPFJvdXRlcj57bmV4dFByb3BzLmFwcH08L1JvdXRlcj4sXG4gICAgICB9O1xuICAgIH07XG4gIH07XG59XG4iXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBOztBQUNBOztBQUNBOztBQU9lLFNBQVNBLFdBQVQsQ0FBa0NDLE9BQWxDLEVBS1o7RUFDRCxNQUFNQyxvQkFBb0IsR0FDeEJDLE1BRDJCLElBRzNCLFNBQVNDLE1BQVQsQ0FBZ0I7SUFBRUM7RUFBRixDQUFoQixFQUE2RDtJQUMzRCxNQUFNQyxXQUFXLEdBQUdMLE9BQU8sQ0FBQ00sY0FBUixFQUFwQjtJQUVBLG9CQUNFLG1CQUFDLHFCQUFEO01BQ0UsTUFBTSxFQUFFSixNQURWO01BRUUsV0FBVyxFQUFFRyxXQUZmO01BR0UsUUFBUSxFQUFFTCxPQUFPLENBQUNPO0lBSHBCLFdBS0dILFFBTEgsQ0FERjtFQVNELENBZkg7O0VBaUJBLE9BQU8sVUFDTEksSUFESyxFQUVMO0lBQ0EsT0FBTyxNQUFPQyxRQUFQLElBQTZDO01BQ2xELE1BQU1DLE9BQU8sR0FBRyxJQUFBQyw2QkFBQSxHQUFoQjtNQUNBLE1BQU1ULE1BQU0sR0FBR0YsT0FBTyxDQUFDWSxZQUFSLENBQXFCRixPQUFyQixDQUFmO01BQ0EsTUFBTUcsYUFBYSxHQUFHWCxNQUFNLENBQUNZLGdCQUFQLENBQXdCSixPQUFPLENBQUNLLFFBQVIsQ0FBaUJDLFFBQXpDLENBQXRCO01BRUEsTUFBTUMsU0FBUyxHQUFHLE1BQU1ULElBQUksQ0FBQ0MsUUFBRCxDQUE1QjtNQUVBLE1BQU1OLE1BQU0sR0FBR0Ysb0JBQW9CLENBQUNDLE1BQUQsQ0FBbkM7TUFDQSxPQUFPLEVBQ0wsR0FBR2UsU0FERTtRQUVMSixhQUZLO1FBR0xYLE1BSEs7UUFJTGdCLEdBQUcsZUFBRSxtQkFBQyxNQUFELGNBQVNELFNBQVMsQ0FBQ0MsR0FBbkI7TUFKQSxDQUFQO0lBTUQsQ0FkRDtFQWVELENBbEJEO0FBbUJEIn0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJyb3V0ZXJTcG91dCIsIm9wdGlvbnMiLCJjcmVhdGVSb3V0ZUNvbXBvbmVudCIsInJvdXRlciIsIlJvdXRlciIsImNoaWxkcmVuIiwicmVzb2x2ZVdpdGgiLCJ1c2VSZXNvbHZlV2l0aCIsIm9uQ2hhbmdlIiwibmV4dCIsInByb3BzIiwiaGlzdG9yeSIsImNyZWF0ZUJyb3dzZXJIaXN0b3J5IiwiY3JlYXRlUm91dGVyIiwibWF0Y2hlZFJvdXRlcyIsImdldE1hdGNoZWRSb3V0ZXMiLCJsb2NhdGlvbiIsInBhdGhuYW1lIiwibmV4dFByb3BzIiwiYXBwIl0sInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Nwb3V0cy9yb3V0ZXIudHN4Il0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFJvdXRlLCBSb3V0ZVByb3ZpZGVyLCBSb3V0ZUNvbnRyb2xsZXIgfSBmcm9tICdAYW5hbnNpL3JvdXRlcic7XG5pbXBvcnQgUmVhY3QgZnJvbSAncmVhY3QnO1xuaW1wb3J0IHsgY3JlYXRlQnJvd3Nlckhpc3RvcnkgfSBmcm9tICdoaXN0b3J5JztcbmltcG9ydCB0eXBlIHsgVXBkYXRlIH0gZnJvbSAnaGlzdG9yeSc7XG5cbmltcG9ydCB0eXBlIHsgQ3JlYXRlUm91dGVyLCBDbGllbnRTcG91dCB9IGZyb20gJy4vdHlwZXMnO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiByb3V0ZXJTcG91dDxSZXNvbHZlV2l0aD4ob3B0aW9uczoge1xuICByZXNvbHZlV2l0aD86IGFueTtcbiAgdXNlUmVzb2x2ZVdpdGg6ICgpID0+IFJlc29sdmVXaXRoO1xuICBjcmVhdGVSb3V0ZXI6IENyZWF0ZVJvdXRlcjxSZXNvbHZlV2l0aD47XG4gIG9uQ2hhbmdlPzogKHVwZGF0ZTogVXBkYXRlLCBjYWxsYmFjazogKCkgPT4gdm9pZCB8IHVuZGVmaW5lZCkgPT4gdm9pZDtcbn0pOiBDbGllbnRTcG91dDxcbiAgUmVjb3JkPHN0cmluZywgdW5rbm93bj4sXG4gIHtcbiAgICBtYXRjaGVkUm91dGVzOiBSb3V0ZTxSZXNvbHZlV2l0aCwgYW55PltdO1xuICAgIHJvdXRlcjogUm91dGVDb250cm9sbGVyPFJvdXRlPFJlc29sdmVXaXRoLCBhbnk+PjtcbiAgfVxuPiB7XG4gIGNvbnN0IGNyZWF0ZVJvdXRlQ29tcG9uZW50ID0gKFxuICAgIHJvdXRlcjogUm91dGVDb250cm9sbGVyPFJvdXRlPFJlc29sdmVXaXRoLCBhbnk+PixcbiAgKSA9PlxuICAgIGZ1bmN0aW9uIFJvdXRlcih7IGNoaWxkcmVuIH06IHsgY2hpbGRyZW46IFJlYWN0LlJlYWN0Tm9kZSB9KSB7XG4gICAgICBjb25zdCByZXNvbHZlV2l0aCA9IG9wdGlvbnMudXNlUmVzb2x2ZVdpdGgoKTtcblxuICAgICAgcmV0dXJuIChcbiAgICAgICAgPFJvdXRlUHJvdmlkZXJcbiAgICAgICAgICByb3V0ZXI9e3JvdXRlcn1cbiAgICAgICAgICByZXNvbHZlV2l0aD17cmVzb2x2ZVdpdGh9XG4gICAgICAgICAgb25DaGFuZ2U9e29wdGlvbnMub25DaGFuZ2V9XG4gICAgICAgID5cbiAgICAgICAgICB7Y2hpbGRyZW59XG4gICAgICAgIDwvUm91dGVQcm92aWRlcj5cbiAgICAgICk7XG4gICAgfTtcblxuICByZXR1cm4gbmV4dCA9PiBhc3luYyBwcm9wcyA9PiB7XG4gICAgY29uc3QgaGlzdG9yeSA9IGNyZWF0ZUJyb3dzZXJIaXN0b3J5KCk7XG4gICAgY29uc3Qgcm91dGVyID0gb3B0aW9ucy5jcmVhdGVSb3V0ZXIoaGlzdG9yeSk7XG4gICAgY29uc3QgbWF0Y2hlZFJvdXRlcyA9IHJvdXRlci5nZXRNYXRjaGVkUm91dGVzKGhpc3RvcnkubG9jYXRpb24ucGF0aG5hbWUpO1xuXG4gICAgY29uc3QgbmV4dFByb3BzID0gYXdhaXQgbmV4dCh7IC4uLnByb3BzLCBtYXRjaGVkUm91dGVzLCByb3V0ZXIgfSk7XG5cbiAgICBjb25zdCBSb3V0ZXIgPSBjcmVhdGVSb3V0ZUNvbXBvbmVudChyb3V0ZXIpO1xuICAgIHJldHVybiB7XG4gICAgICAuLi5uZXh0UHJvcHMsXG4gICAgICBtYXRjaGVkUm91dGVzLFxuICAgICAgcm91dGVyLFxuICAgICAgYXBwOiA8Um91dGVyPntuZXh0UHJvcHMuYXBwfTwvUm91dGVyPixcbiAgICB9O1xuICB9O1xufVxuIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQTs7QUFDQTs7QUFDQTs7QUFLZSxTQUFTQSxXQUFULENBQWtDQyxPQUFsQyxFQVdiO0VBQ0EsTUFBTUMsb0JBQW9CLEdBQ3hCQyxNQUQyQixJQUczQixTQUFTQyxNQUFULENBQWdCO0lBQUVDO0VBQUYsQ0FBaEIsRUFBNkQ7SUFDM0QsTUFBTUMsV0FBVyxHQUFHTCxPQUFPLENBQUNNLGNBQVIsRUFBcEI7SUFFQSxvQkFDRSxtQkFBQyxxQkFBRDtNQUNFLE1BQU0sRUFBRUosTUFEVjtNQUVFLFdBQVcsRUFBRUcsV0FGZjtNQUdFLFFBQVEsRUFBRUwsT0FBTyxDQUFDTztJQUhwQixXQUtHSCxRQUxILENBREY7RUFTRCxDQWZIOztFQWlCQSxPQUFPSSxJQUFJLElBQUksTUFBTUMsS0FBTixJQUFlO0lBQzVCLE1BQU1DLE9BQU8sR0FBRyxJQUFBQyw2QkFBQSxHQUFoQjtJQUNBLE1BQU1ULE1BQU0sR0FBR0YsT0FBTyxDQUFDWSxZQUFSLENBQXFCRixPQUFyQixDQUFmO0lBQ0EsTUFBTUcsYUFBYSxHQUFHWCxNQUFNLENBQUNZLGdCQUFQLENBQXdCSixPQUFPLENBQUNLLFFBQVIsQ0FBaUJDLFFBQXpDLENBQXRCO0lBRUEsTUFBTUMsU0FBUyxHQUFHLE1BQU1ULElBQUksQ0FBQyxFQUFFLEdBQUdDLEtBQUw7TUFBWUksYUFBWjtNQUEyQlg7SUFBM0IsQ0FBRCxDQUE1QjtJQUVBLE1BQU1DLE1BQU0sR0FBR0Ysb0JBQW9CLENBQUNDLE1BQUQsQ0FBbkM7SUFDQSxPQUFPLEVBQ0wsR0FBR2UsU0FERTtNQUVMSixhQUZLO01BR0xYLE1BSEs7TUFJTGdCLEdBQUcsZUFBRSxtQkFBQyxNQUFELGNBQVNELFNBQVMsQ0FBQ0MsR0FBbkI7SUFKQSxDQUFQO0VBTUQsQ0FkRDtBQWVEIn0=

package/lib/spouts/router.server.d.ts

@@ -1,12 +1,11 @@
 import { Route, RouteController } from '@anansi/router';
-import type { ResolveProps, ServerProps, CreateRouter } from './types';
+import type { CreateRouter, ServerSpout } from './types';
 export default function routerSpout<ResolveWith>(options: {
     resolveWith?: any;
     useResolveWith: () => ResolveWith;
     createRouter: CreateRouter<ResolveWith>;
-}): <T extends ResolveProps>(next: (props: ServerProps) => Promise<T>) => (props: ServerProps) => Promise<T & {
-    matchedRoutes: Route<ResolveWith, any>[];
+}): ServerSpout<Record<string, unknown>, {
+    matchedRoutes: Route<ResolveWith>[];
     router: RouteController<Route<ResolveWith, any>>;
-    app: JSX.Element;
 }>;
 //# sourceMappingURL=router.server.d.ts.map

package/lib/spouts/router.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.server.d.ts","sourceRoot":"","sources":["../../src/spouts/router.server.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAiB,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAIvE,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAIvE,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,WAAW,EAAE,OAAO,EAAE;IACxD,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,cAAc,EAAE,MAAM,WAAW,CAAC;IAClC,YAAY,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;CACzC,0CAeiB,WAAW,4BAEJ,WAAW;;;;GAkBnC"}
+{"version":3,"file":"router.server.d.ts","sourceRoot":"","sources":["../../src/spouts/router.server.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAiB,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAIvE,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEzD,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,WAAW,EAAE,OAAO,EAAE;IACxD,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,cAAc,EAAE,MAAM,WAAW,CAAC;IAClC,YAAY,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;CACzC,GAAG,WAAW,CACb,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvB;IACE,aAAa,EAAE,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC;IACpC,MAAM,EAAE,eAAe,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC;CAClD,CACF,CAqCA"}

package/lib/spouts/router.server.js

@@ -24,21 +24,23 @@ function routerSpout(options) {
     }, void 0, children);
   };
 
-  return function (next) {
-    return async props => {
-      const url = props.req.url || '';
-      const router = options.createRouter((0, _history.createMemoryHistory)({
-        initialEntries: [url]
-      }));
-      const matchedRoutes = router.getMatchedRoutes(url);
-      const nextProps = await next(props);
-      const Router = createRouteComponent(router);
-      return { ...nextProps,
-        matchedRoutes,
-        router,
-        app: /*#__PURE__*/(0, _jsx2.default)(Router, {}, void 0, nextProps.app)
-      };
+  return next => async props => {
+    const url = props.req.url || '';
+    const router = options.createRouter((0, _history.createMemoryHistory)({
+      initialEntries: [url]
+    }));
+    const matchedRoutes = router.getMatchedRoutes(url);
+    const nextProps = await next({ ...props,
+      matchedRoutes,
+      router
+    });
+    const Router = createRouteComponent(router);
+    return { ...nextProps,
+      app: /*#__PURE__*/(0, _jsx2.default)(Router, {}, void 0, nextProps.app),
+      // TODO: figure out how to only inject in next and not have to also put here
+      matchedRoutes,
+      router
     };
   };
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJyb3V0ZXJTcG91dCIsIm9wdGlvbnMiLCJjcmVhdGVSb3V0ZUNvbXBvbmVudCIsInJvdXRlciIsIlJvdXRlciIsImNoaWxkcmVuIiwicmVzb2x2ZVdpdGgiLCJ1c2VSZXNvbHZlV2l0aCIsIm5leHQiLCJwcm9wcyIsInVybCIsInJlcSIsImNyZWF0ZVJvdXRlciIsImNyZWF0ZU1lbW9yeUhpc3RvcnkiLCJpbml0aWFsRW50cmllcyIsIm1hdGNoZWRSb3V0ZXMiLCJnZXRNYXRjaGVkUm91dGVzIiwibmV4dFByb3BzIiwiYXBwIl0sInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Nwb3V0cy9yb3V0ZXIuc2VydmVyLnRzeCJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBSb3V0ZSwgUm91dGVQcm92aWRlciwgUm91dGVDb250cm9sbGVyIH0gZnJvbSAnQGFuYW5zaS9yb3V0ZXInO1xuaW1wb3J0IFJlYWN0IGZyb20gJ3JlYWN0JztcbmltcG9ydCB7IGNyZWF0ZU1lbW9yeUhpc3RvcnkgfSBmcm9tICdoaXN0b3J5JztcblxuaW1wb3J0IHR5cGUgeyBSZXNvbHZlUHJvcHMsIFNlcnZlclByb3BzLCBDcmVhdGVSb3V0ZXIgfSBmcm9tICcuL3R5cGVzJztcblxudHlwZSBOZWVkZWRQcm9wcyA9IFJlc29sdmVQcm9wcztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gcm91dGVyU3BvdXQ8UmVzb2x2ZVdpdGg+KG9wdGlvbnM6IHtcbiAgcmVzb2x2ZVdpdGg/OiBhbnk7XG4gIHVzZVJlc29sdmVXaXRoOiAoKSA9PiBSZXNvbHZlV2l0aDtcbiAgY3JlYXRlUm91dGVyOiBDcmVhdGVSb3V0ZXI8UmVzb2x2ZVdpdGg+O1xufSkge1xuICBjb25zdCBjcmVhdGVSb3V0ZUNvbXBvbmVudCA9IChcbiAgICByb3V0ZXI6IFJvdXRlQ29udHJvbGxlcjxSb3V0ZTxSZXNvbHZlV2l0aCwgYW55Pj4sXG4gICkgPT5cbiAgICBmdW5jdGlvbiBSb3V0ZXIoeyBjaGlsZHJlbiB9OiB7IGNoaWxkcmVuOiBSZWFjdC5SZWFjdE5vZGUgfSkge1xuICAgICAgY29uc3QgcmVzb2x2ZVdpdGggPSBvcHRpb25zLnVzZVJlc29sdmVXaXRoKCk7XG5cbiAgICAgIHJldHVybiAoXG4gICAgICAgIDxSb3V0ZVByb3ZpZGVyIHJvdXRlcj17cm91dGVyfSByZXNvbHZlV2l0aD17cmVzb2x2ZVdpdGh9PlxuICAgICAgICAgIHtjaGlsZHJlbn1cbiAgICAgICAgPC9Sb3V0ZVByb3ZpZGVyPlxuICAgICAgKTtcbiAgICB9O1xuXG4gIHJldHVybiBmdW5jdGlvbiA8VCBleHRlbmRzIE5lZWRlZFByb3BzPihcbiAgICBuZXh0OiAocHJvcHM6IFNlcnZlclByb3BzKSA9PiBQcm9taXNlPFQ+LFxuICApIHtcbiAgICByZXR1cm4gYXN5bmMgKHByb3BzOiBTZXJ2ZXJQcm9wcykgPT4ge1xuICAgICAgY29uc3QgdXJsID0gcHJvcHMucmVxLnVybCB8fCAnJztcbiAgICAgIGNvbnN0IHJvdXRlciA9IG9wdGlvbnMuY3JlYXRlUm91dGVyKFxuICAgICAgICBjcmVhdGVNZW1vcnlIaXN0b3J5KHsgaW5pdGlhbEVudHJpZXM6IFt1cmxdIH0pLFxuICAgICAgKTtcbiAgICAgIGNvbnN0IG1hdGNoZWRSb3V0ZXM6IFJvdXRlPFJlc29sdmVXaXRoPltdID0gcm91dGVyLmdldE1hdGNoZWRSb3V0ZXModXJsKTtcblxuICAgICAgY29uc3QgbmV4dFByb3BzID0gYXdhaXQgbmV4dChwcm9wcyk7XG5cbiAgICAgIGNvbnN0IFJvdXRlciA9IGNyZWF0ZVJvdXRlQ29tcG9uZW50KHJvdXRlcik7XG4gICAgICByZXR1cm4ge1xuICAgICAgICAuLi5uZXh0UHJvcHMsXG4gICAgICAgIG1hdGNoZWRSb3V0ZXMsXG4gICAgICAgIHJvdXRlcixcbiAgICAgICAgYXBwOiA8Um91dGVyPntuZXh0UHJvcHMuYXBwfTwvUm91dGVyPixcbiAgICAgIH07XG4gICAgfTtcbiAgfTtcbn1cbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUE7O0FBQ0E7O0FBQ0E7O0FBTWUsU0FBU0EsV0FBVCxDQUFrQ0MsT0FBbEMsRUFJWjtFQUNELE1BQU1DLG9CQUFvQixHQUN4QkMsTUFEMkIsSUFHM0IsU0FBU0MsTUFBVCxDQUFnQjtJQUFFQztFQUFGLENBQWhCLEVBQTZEO0lBQzNELE1BQU1DLFdBQVcsR0FBR0wsT0FBTyxDQUFDTSxjQUFSLEVBQXBCO0lBRUEsb0JBQ0UsbUJBQUMscUJBQUQ7TUFBZSxNQUFNLEVBQUVKLE1BQXZCO01BQStCLFdBQVcsRUFBRUc7SUFBNUMsV0FDR0QsUUFESCxDQURGO0VBS0QsQ0FYSDs7RUFhQSxPQUFPLFVBQ0xHLElBREssRUFFTDtJQUNBLE9BQU8sTUFBT0MsS0FBUCxJQUE4QjtNQUNuQyxNQUFNQyxHQUFHLEdBQUdELEtBQUssQ0FBQ0UsR0FBTixDQUFVRCxHQUFWLElBQWlCLEVBQTdCO01BQ0EsTUFBTVAsTUFBTSxHQUFHRixPQUFPLENBQUNXLFlBQVIsQ0FDYixJQUFBQyw0QkFBQSxFQUFvQjtRQUFFQyxjQUFjLEVBQUUsQ0FBQ0osR0FBRDtNQUFsQixDQUFwQixDQURhLENBQWY7TUFHQSxNQUFNSyxhQUFtQyxHQUFHWixNQUFNLENBQUNhLGdCQUFQLENBQXdCTixHQUF4QixDQUE1QztNQUVBLE1BQU1PLFNBQVMsR0FBRyxNQUFNVCxJQUFJLENBQUNDLEtBQUQsQ0FBNUI7TUFFQSxNQUFNTCxNQUFNLEdBQUdGLG9CQUFvQixDQUFDQyxNQUFELENBQW5DO01BQ0EsT0FBTyxFQUNMLEdBQUdjLFNBREU7UUFFTEYsYUFGSztRQUdMWixNQUhLO1FBSUxlLEdBQUcsZUFBRSxtQkFBQyxNQUFELGNBQVNELFNBQVMsQ0FBQ0MsR0FBbkI7TUFKQSxDQUFQO0lBTUQsQ0FoQkQ7RUFpQkQsQ0FwQkQ7QUFxQkQifQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJyb3V0ZXJTcG91dCIsIm9wdGlvbnMiLCJjcmVhdGVSb3V0ZUNvbXBvbmVudCIsInJvdXRlciIsIlJvdXRlciIsImNoaWxkcmVuIiwicmVzb2x2ZVdpdGgiLCJ1c2VSZXNvbHZlV2l0aCIsIm5leHQiLCJwcm9wcyIsInVybCIsInJlcSIsImNyZWF0ZVJvdXRlciIsImNyZWF0ZU1lbW9yeUhpc3RvcnkiLCJpbml0aWFsRW50cmllcyIsIm1hdGNoZWRSb3V0ZXMiLCJnZXRNYXRjaGVkUm91dGVzIiwibmV4dFByb3BzIiwiYXBwIl0sInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Nwb3V0cy9yb3V0ZXIuc2VydmVyLnRzeCJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBSb3V0ZSwgUm91dGVQcm92aWRlciwgUm91dGVDb250cm9sbGVyIH0gZnJvbSAnQGFuYW5zaS9yb3V0ZXInO1xuaW1wb3J0IFJlYWN0IGZyb20gJ3JlYWN0JztcbmltcG9ydCB7IGNyZWF0ZU1lbW9yeUhpc3RvcnkgfSBmcm9tICdoaXN0b3J5JztcblxuaW1wb3J0IHR5cGUgeyBDcmVhdGVSb3V0ZXIsIFNlcnZlclNwb3V0IH0gZnJvbSAnLi90eXBlcyc7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHJvdXRlclNwb3V0PFJlc29sdmVXaXRoPihvcHRpb25zOiB7XG4gIHJlc29sdmVXaXRoPzogYW55O1xuICB1c2VSZXNvbHZlV2l0aDogKCkgPT4gUmVzb2x2ZVdpdGg7XG4gIGNyZWF0ZVJvdXRlcjogQ3JlYXRlUm91dGVyPFJlc29sdmVXaXRoPjtcbn0pOiBTZXJ2ZXJTcG91dDxcbiAgUmVjb3JkPHN0cmluZywgdW5rbm93bj4sXG4gIHtcbiAgICBtYXRjaGVkUm91dGVzOiBSb3V0ZTxSZXNvbHZlV2l0aD5bXTtcbiAgICByb3V0ZXI6IFJvdXRlQ29udHJvbGxlcjxSb3V0ZTxSZXNvbHZlV2l0aCwgYW55Pj47XG4gIH1cbj4ge1xuICBjb25zdCBjcmVhdGVSb3V0ZUNvbXBvbmVudCA9IChcbiAgICByb3V0ZXI6IFJvdXRlQ29udHJvbGxlcjxSb3V0ZTxSZXNvbHZlV2l0aCwgYW55Pj4sXG4gICkgPT5cbiAgICBmdW5jdGlvbiBSb3V0ZXIoeyBjaGlsZHJlbiB9OiB7IGNoaWxkcmVuOiBSZWFjdC5SZWFjdE5vZGUgfSkge1xuICAgICAgY29uc3QgcmVzb2x2ZVdpdGggPSBvcHRpb25zLnVzZVJlc29sdmVXaXRoKCk7XG5cbiAgICAgIHJldHVybiAoXG4gICAgICAgIDxSb3V0ZVByb3ZpZGVyIHJvdXRlcj17cm91dGVyfSByZXNvbHZlV2l0aD17cmVzb2x2ZVdpdGh9PlxuICAgICAgICAgIHtjaGlsZHJlbn1cbiAgICAgICAgPC9Sb3V0ZVByb3ZpZGVyPlxuICAgICAgKTtcbiAgICB9O1xuXG4gIHJldHVybiBuZXh0ID0+IGFzeW5jIHByb3BzID0+IHtcbiAgICBjb25zdCB1cmwgPSBwcm9wcy5yZXEudXJsIHx8ICcnO1xuICAgIGNvbnN0IHJvdXRlciA9IG9wdGlvbnMuY3JlYXRlUm91dGVyKFxuICAgICAgY3JlYXRlTWVtb3J5SGlzdG9yeSh7IGluaXRpYWxFbnRyaWVzOiBbdXJsXSB9KSxcbiAgICApO1xuICAgIGNvbnN0IG1hdGNoZWRSb3V0ZXM6IFJvdXRlPFJlc29sdmVXaXRoPltdID0gcm91dGVyLmdldE1hdGNoZWRSb3V0ZXModXJsKTtcblxuICAgIGNvbnN0IG5leHRQcm9wcyA9IGF3YWl0IG5leHQoe1xuICAgICAgLi4ucHJvcHMsXG4gICAgICBtYXRjaGVkUm91dGVzLFxuICAgICAgcm91dGVyLFxuICAgIH0pO1xuXG4gICAgY29uc3QgUm91dGVyID0gY3JlYXRlUm91dGVDb21wb25lbnQocm91dGVyKTtcblxuICAgIHJldHVybiB7XG4gICAgICAuLi5uZXh0UHJvcHMsXG4gICAgICBhcHA6IDxSb3V0ZXI+e25leHRQcm9wcy5hcHB9PC9Sb3V0ZXI+LFxuICAgICAgLy8gVE9ETzogZmlndXJlIG91dCBob3cgdG8gb25seSBpbmplY3QgaW4gbmV4dCBhbmQgbm90IGhhdmUgdG8gYWxzbyBwdXQgaGVyZVxuICAgICAgbWF0Y2hlZFJvdXRlcyxcbiAgICAgIHJvdXRlcixcbiAgICB9O1xuICB9O1xufVxuIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQTs7QUFDQTs7QUFDQTs7QUFJZSxTQUFTQSxXQUFULENBQWtDQyxPQUFsQyxFQVViO0VBQ0EsTUFBTUMsb0JBQW9CLEdBQ3hCQyxNQUQyQixJQUczQixTQUFTQyxNQUFULENBQWdCO0lBQUVDO0VBQUYsQ0FBaEIsRUFBNkQ7SUFDM0QsTUFBTUMsV0FBVyxHQUFHTCxPQUFPLENBQUNNLGNBQVIsRUFBcEI7SUFFQSxvQkFDRSxtQkFBQyxxQkFBRDtNQUFlLE1BQU0sRUFBRUosTUFBdkI7TUFBK0IsV0FBVyxFQUFFRztJQUE1QyxXQUNHRCxRQURILENBREY7RUFLRCxDQVhIOztFQWFBLE9BQU9HLElBQUksSUFBSSxNQUFNQyxLQUFOLElBQWU7SUFDNUIsTUFBTUMsR0FBRyxHQUFHRCxLQUFLLENBQUNFLEdBQU4sQ0FBVUQsR0FBVixJQUFpQixFQUE3QjtJQUNBLE1BQU1QLE1BQU0sR0FBR0YsT0FBTyxDQUFDVyxZQUFSLENBQ2IsSUFBQUMsNEJBQUEsRUFBb0I7TUFBRUMsY0FBYyxFQUFFLENBQUNKLEdBQUQ7SUFBbEIsQ0FBcEIsQ0FEYSxDQUFmO0lBR0EsTUFBTUssYUFBbUMsR0FBR1osTUFBTSxDQUFDYSxnQkFBUCxDQUF3Qk4sR0FBeEIsQ0FBNUM7SUFFQSxNQUFNTyxTQUFTLEdBQUcsTUFBTVQsSUFBSSxDQUFDLEVBQzNCLEdBQUdDLEtBRHdCO01BRTNCTSxhQUYyQjtNQUczQlo7SUFIMkIsQ0FBRCxDQUE1QjtJQU1BLE1BQU1DLE1BQU0sR0FBR0Ysb0JBQW9CLENBQUNDLE1BQUQsQ0FBbkM7SUFFQSxPQUFPLEVBQ0wsR0FBR2MsU0FERTtNQUVMQyxHQUFHLGVBQUUsbUJBQUMsTUFBRCxjQUFTRCxTQUFTLENBQUNDLEdBQW5CLENBRkE7TUFHTDtNQUNBSCxhQUpLO01BS0xaO0lBTEssQ0FBUDtFQU9ELENBdEJEO0FBdUJEIn0=

package/lib/spouts/types.d.ts

@@ -14,4 +14,6 @@ export declare type ResolveProps = {
     app: JSX.Element;
 };
 export declare type CreateRouter<T> = (history: History) => RouteController<Route<T, any>>;
+export declare type ServerSpout<NeededProps extends Record<string, unknown> = Record<string, unknown>, ProvidedProps extends Record<string, unknown> = Record<string, unknown>, NeededNext extends Record<string, unknown> = NeededProps> = <N extends NeededNext & ResolveProps, I extends NeededProps & ServerProps>(next: (props: I & ProvidedProps) => Promise<N>) => (props: I) => Promise<N & ProvidedProps>;
+export declare type ClientSpout<NeededProps extends Record<string, unknown> = Record<string, unknown>, ProvidedProps extends Record<string, unknown> = Record<string, unknown>, NeededNext extends Record<string, unknown> = NeededProps> = <N extends NeededNext & ResolveProps, I extends NeededProps>(next: (props: I & ProvidedProps) => Promise<N>) => (props: I) => Promise<N & ProvidedProps>;
 //# sourceMappingURL=types.d.ts.map

package/lib/spouts/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/spouts/types.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGxD,oBAAY,WAAW,GAAG;IACxB,GAAG,EAAE,OAAO,GAAG,eAAe,CAAC;IAC/B,GAAG,EAAE,QAAQ,GAAG,cAAc,CAAC;IAC/B,cAAc,EAAE,gBAAgB,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAGF,oBAAY,YAAY,GAAG;IACzB,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC;CAClB,CAAC;AAEF,oBAAY,YAAY,CAAC,CAAC,IAAI,CAC5B,OAAO,EAAE,OAAO,KACb,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/spouts/types.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGxD,oBAAY,WAAW,GAAG;IACxB,GAAG,EAAE,OAAO,GAAG,eAAe,CAAC;IAC/B,GAAG,EAAE,QAAQ,GAAG,cAAc,CAAC;IAC/B,cAAc,EAAE,gBAAgB,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAGF,oBAAY,YAAY,GAAG;IACzB,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC;CAClB,CAAC;AAEF,oBAAY,YAAY,CAAC,CAAC,IAAI,CAC5B,OAAO,EAAE,OAAO,KACb,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;AAGpC,oBAAY,WAAW,CACrB,WAAW,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrE,aAAa,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvE,UAAU,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,WAAW,IACtD,CAAC,CAAC,SAAS,UAAU,GAAG,YAAY,EAAE,CAAC,SAAS,WAAW,GAAG,WAAW,EAC3E,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,aAAa,KAAK,OAAO,CAAC,CAAC,CAAC,KAC3C,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC;AAG9C,oBAAY,WAAW,CACrB,WAAW,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrE,aAAa,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvE,UAAU,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,WAAW,IACtD,CAAC,CAAC,SAAS,UAAU,GAAG,YAAY,EAAE,CAAC,SAAS,WAAW,EAC7D,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,aAAa,KAAK,OAAO,CAAC,CAAC,CAAC,KAC3C,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC"}

package/lib/spouts/types.js

@@ -1,4 +1,4 @@
 "use strict";
 
 exports.__esModule = true;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6W10sInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Nwb3V0cy90eXBlcy50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmNvbWluZ01lc3NhZ2UsIFNlcnZlclJlc3BvbnNlIH0gZnJvbSAnaHR0cCc7XG5pbXBvcnQgeyBSZXF1ZXN0LCBSZXNwb25zZSB9IGZyb20gJ2V4cHJlc3MnO1xuaW1wb3J0IHR5cGUgeyBTdGF0c0NvbXBpbGF0aW9uIH0gZnJvbSAnd2VicGFjayc7XG5pbXBvcnQgeyBIaXN0b3J5IH0gZnJvbSAnaGlzdG9yeSc7XG5pbXBvcnQgeyBSb3V0ZSwgUm91dGVDb250cm9sbGVyIH0gZnJvbSAnQGFuYW5zaS9yb3V0ZXInO1xuXG4vKiBWYXJpYWJsZXMgZnJvbSB0aGUgcmVuZGVyaW5nIGNhbGwgKi9cbmV4cG9ydCB0eXBlIFNlcnZlclByb3BzID0ge1xuICByZXE6IFJlcXVlc3QgfCBJbmNvbWluZ01lc3NhZ2U7XG4gIHJlczogUmVzcG9uc2UgfCBTZXJ2ZXJSZXNwb25zZTtcbiAgY2xpZW50TWFuaWZlc3Q6IFN0YXRzQ29tcGlsYXRpb247XG4gIG5vbmNlOiBzdHJpbmc7XG59O1xuXG4vKiBCYXNlbGluZSBleHBlY3RhdGlvbnMgb2YgcmV0dXJuIHZhbHVlICovXG5leHBvcnQgdHlwZSBSZXNvbHZlUHJvcHMgPSB7XG4gIGFwcDogSlNYLkVsZW1lbnQ7XG59O1xuXG5leHBvcnQgdHlwZSBDcmVhdGVSb3V0ZXI8VD4gPSAoXG4gIGhpc3Rvcnk6IEhpc3RvcnksXG4pID0+IFJvdXRlQ29udHJvbGxlcjxSb3V0ZTxULCBhbnk+PjtcbiJdLCJtYXBwaW5ncyI6IiJ9
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6W10sInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Nwb3V0cy90eXBlcy50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmNvbWluZ01lc3NhZ2UsIFNlcnZlclJlc3BvbnNlIH0gZnJvbSAnaHR0cCc7XG5pbXBvcnQgeyBSZXF1ZXN0LCBSZXNwb25zZSB9IGZyb20gJ2V4cHJlc3MnO1xuaW1wb3J0IHR5cGUgeyBTdGF0c0NvbXBpbGF0aW9uIH0gZnJvbSAnd2VicGFjayc7XG5pbXBvcnQgeyBIaXN0b3J5IH0gZnJvbSAnaGlzdG9yeSc7XG5pbXBvcnQgeyBSb3V0ZSwgUm91dGVDb250cm9sbGVyIH0gZnJvbSAnQGFuYW5zaS9yb3V0ZXInO1xuXG4vKiBWYXJpYWJsZXMgZnJvbSB0aGUgcmVuZGVyaW5nIGNhbGwgKi9cbmV4cG9ydCB0eXBlIFNlcnZlclByb3BzID0ge1xuICByZXE6IFJlcXVlc3QgfCBJbmNvbWluZ01lc3NhZ2U7XG4gIHJlczogUmVzcG9uc2UgfCBTZXJ2ZXJSZXNwb25zZTtcbiAgY2xpZW50TWFuaWZlc3Q6IFN0YXRzQ29tcGlsYXRpb247XG4gIG5vbmNlOiBzdHJpbmc7XG59O1xuXG4vKiBCYXNlbGluZSBleHBlY3RhdGlvbnMgb2YgcmV0dXJuIHZhbHVlICovXG5leHBvcnQgdHlwZSBSZXNvbHZlUHJvcHMgPSB7XG4gIGFwcDogSlNYLkVsZW1lbnQ7XG59O1xuXG5leHBvcnQgdHlwZSBDcmVhdGVSb3V0ZXI8VD4gPSAoXG4gIGhpc3Rvcnk6IEhpc3RvcnksXG4pID0+IFJvdXRlQ29udHJvbGxlcjxSb3V0ZTxULCBhbnk+PjtcblxuLyogU3BvdXRzIGFyZSBtaWRkbGV3YXJlIGZvciBBbmFuc2kgKi9cbmV4cG9ydCB0eXBlIFNlcnZlclNwb3V0PFxuICBOZWVkZWRQcm9wcyBleHRlbmRzIFJlY29yZDxzdHJpbmcsIHVua25vd24+ID0gUmVjb3JkPHN0cmluZywgdW5rbm93bj4sXG4gIFByb3ZpZGVkUHJvcHMgZXh0ZW5kcyBSZWNvcmQ8c3RyaW5nLCB1bmtub3duPiA9IFJlY29yZDxzdHJpbmcsIHVua25vd24+LFxuICBOZWVkZWROZXh0IGV4dGVuZHMgUmVjb3JkPHN0cmluZywgdW5rbm93bj4gPSBOZWVkZWRQcm9wcyxcbj4gPSA8TiBleHRlbmRzIE5lZWRlZE5leHQgJiBSZXNvbHZlUHJvcHMsIEkgZXh0ZW5kcyBOZWVkZWRQcm9wcyAmIFNlcnZlclByb3BzPihcbiAgbmV4dDogKHByb3BzOiBJICYgUHJvdmlkZWRQcm9wcykgPT4gUHJvbWlzZTxOPixcbikgPT4gKHByb3BzOiBJKSA9PiBQcm9taXNlPE4gJiBQcm92aWRlZFByb3BzPjtcblxuLyogU3BvdXRzIGFyZSBtaWRkbGV3YXJlIGZvciBBbmFuc2kgKi9cbmV4cG9ydCB0eXBlIENsaWVudFNwb3V0PFxuICBOZWVkZWRQcm9wcyBleHRlbmRzIFJlY29yZDxzdHJpbmcsIHVua25vd24+ID0gUmVjb3JkPHN0cmluZywgdW5rbm93bj4sXG4gIFByb3ZpZGVkUHJvcHMgZXh0ZW5kcyBSZWNvcmQ8c3RyaW5nLCB1bmtub3duPiA9IFJlY29yZDxzdHJpbmcsIHVua25vd24+LFxuICBOZWVkZWROZXh0IGV4dGVuZHMgUmVjb3JkPHN0cmluZywgdW5rbm93bj4gPSBOZWVkZWRQcm9wcyxcbj4gPSA8TiBleHRlbmRzIE5lZWRlZE5leHQgJiBSZXNvbHZlUHJvcHMsIEkgZXh0ZW5kcyBOZWVkZWRQcm9wcz4oXG4gIG5leHQ6IChwcm9wczogSSAmIFByb3ZpZGVkUHJvcHMpID0+IFByb21pc2U8Tj4sXG4pID0+IChwcm9wczogSSkgPT4gUHJvbWlzZTxOICYgUHJvdmlkZWRQcm9wcz47XG4iXSwibWFwcGluZ3MiOiIifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anansi/core",
-  "version": "0.12.0",
+  "version": "0.14.1",
   "description": "React 18 Framework",
   "homepage": "https://github.com/ntucker/anansi/tree/master/packages/core#readme",
   "repository": {
@@ -65,22 +65,22 @@
     "browser"
   ],
   "devDependencies": {
-    "@anansi/babel-preset": "^3.2.5",
+    "@anansi/babel-preset": "^3.2.7",
     "@anansi/browserslist-config": "1.3.3",
-    "@anansi/webpack-config": "^11.6.5",
-    "@babel/cli": "7.17.10",
-    "@babel/core": "7.18.5",
+    "@anansi/webpack-config": "^11.6.7",
+    "@babel/cli": "7.18.6",
+    "@babel/core": "7.18.6",
     "@types/compression": "^1.7.2",
     "@types/source-map-support": "^0.5.4",
     "@types/tmp": "^0.2.3",
     "@types/webpack-hot-middleware": "^2.25.6",
-    "jest": "28.1.1",
+    "jest": "28.1.2",
     "rimraf": "^3.0.0",
     "webpack": "^5.72.1",
     "webpack-cli": "4.10.0"
   },
   "dependencies": {
-    "@anansi/router": "^0.6.3",
+    "@anansi/router": "^0.6.5",
     "@babel/runtime": "^7.10.5",
     "@rest-hooks/ssr": "^0.2.0",
     "chalk": "^4.0.0",
@@ -104,6 +104,7 @@
     "@types/react-dom": "^17.0.40 || ^18.0.0-0",
     "react": "^18.0.0-0",
     "react-dom": "^18.0.0-0",
+    "rest-hooks": "^6.0.0",
     "webpack": "^5.60.0"
   },
   "peerDependenciesMeta": {
@@ -115,6 +116,9 @@
     },
     "@types/react-dom": {
       "optional": true
+    },
+    "rest-hooks": {
+      "optional": true
     }
   },
   "engines": {

package/src/floodSpouts.tsx

@@ -1,12 +1,12 @@
 import { hydrateRoot } from 'react-dom/client';
 
 export default async function floodSpouts(
-  spouts: () => Promise<{
+  spouts: (props: Record<string, unknown>) => Promise<{
     app: JSX.Element;
   }>,
   { rootId = 'anansi-root' }: { rootId?: string } = {},
 ) {
-  const { app } = await spouts();
+  const { app } = await spouts({});
 
   hydrateRoot(document.getElementById(rootId) ?? document, app);
 }

package/src/index.server.ts

@@ -4,3 +4,6 @@ export { default as restHooksSpout } from './spouts/restHooks.server';
 export { default as routerSpout } from './spouts/router.server';
 export { default as prefetchSpout } from './spouts/prefetch.server';
 export { default as JSONSpout } from './spouts/json.server';
+export { default as appSpout } from './spouts/app.server';
+export type { ServerProps } from './spouts/types';
+export type { ServerSpout as Spout } from './spouts/types';

package/src/index.ts

@@ -3,3 +3,6 @@ export { default as documentSpout } from './spouts/document';
 export { default as restHooksSpout } from './spouts/restHooks';
 export { default as routerSpout } from './spouts/router';
 export { default as JSONSpout } from './spouts/json';
+export { default as appSpout } from './spouts/app';
+export type { ServerProps } from './spouts/types';
+export type { ClientSpout as Spout } from './spouts/types';

package/src/spouts/app.server.tsx

@@ -0,0 +1,8 @@
+import { ServerProps } from './types';
+
+const appSpout =
+  (app: JSX.Element) =>
+  <P extends ServerProps>(props: P) =>
+    Promise.resolve({ ...props, app });
+
+export default appSpout;

package/src/spouts/app.tsx

@@ -0,0 +1,6 @@
+const appSpout =
+  (app: JSX.Element) =>
+  <P extends Record<string, unknown>>(props: P) =>
+    Promise.resolve({ ...props, app });
+
+export default appSpout;

package/src/spouts/document.server.tsx

@@ -2,15 +2,15 @@ import React from 'react';
 import type { Route } from '@anansi/router';
 import { StatsChunkGroup } from 'webpack';
 
-import type { ServerProps, ResolveProps } from './types';
+import type { ServerSpout } from './types';
 import type { Policy } from './csp';
 import Document from './DocumentComponent';
 
-type NeededProps = {
+type NeededNext = {
   matchedRoutes: Route<any>[];
   title?: string;
   scripts?: React.ReactNode[];
-} & ResolveProps;
+};
 
 export default function DocumentSpout(options: {
   head?: React.ReactNode;
@@ -18,77 +18,73 @@ export default function DocumentSpout(options: {
   rootId?: string;
   charSet?: string;
   csPolicy?: Policy;
-}) {
-  return function <T extends NeededProps>(
-    next: (props: ServerProps) => Promise<T>,
-  ) {
-    return async (props: ServerProps) => {
-      const nextProps = await next(props);
+}): ServerSpout<Record<string, unknown>, Record<string, unknown>, NeededNext> {
+  return next => async props => {
+    const nextProps = await next(props);
 
-      const publicPath = props.clientManifest.publicPath;
+    const publicPath = props.clientManifest.publicPath;
 
-      if (
-        Object.keys(props.clientManifest?.entrypoints ?? {}).length < 1 ||
-        publicPath === undefined
-      )
-        throw new Error('Manifest missing entries needed');
+    if (
+      Object.keys(props.clientManifest?.entrypoints ?? {}).length < 1 ||
+      publicPath === undefined
+    )
+      throw new Error('Manifest missing entries needed');
 
-      // TODO: consider using this package for build stats in future:
-      // https://github.com/facebook/react/tree/main/packages/react-server-dom-webpack
-      const assetMap = (assets: { name: string; size?: number }[]) =>
-        assets.map(({ name }) => `${publicPath}${name}`);
+    // TODO: consider using this package for build stats in future:
+    // https://github.com/facebook/react/tree/main/packages/react-server-dom-webpack
+    const assetMap = (assets: { name: string; size?: number }[]) =>
+      assets.map(({ name }) => `${publicPath}${name}`);
 
-      const assetList: string[] = [];
-      Object.values(props.clientManifest?.entrypoints ?? {}).forEach(
-        entrypoint => {
-          assetList.push(...assetMap(entrypoint.assets ?? []));
-        },
-      );
-      new Set(
-        assetMap(
-          Object.values(props.clientManifest.namedChunkGroups ?? {})
-            .filter(({ name }) =>
-              nextProps.matchedRoutes.some(route => name?.includes(route.name)),
-            )
-            .flatMap(chunk => [
-              ...(chunk.assets ?? []),
-              // any chunk preloads
-              ...childrenAssets(chunk),
-            ]),
-        ),
-      ).forEach(asset => assetList.push(asset));
+    const assetList: string[] = [];
+    Object.values(props.clientManifest?.entrypoints ?? {}).forEach(
+      entrypoint => {
+        assetList.push(...assetMap(entrypoint.assets ?? []));
+      },
+    );
+    new Set(
+      assetMap(
+        Object.values(props.clientManifest.namedChunkGroups ?? {})
+          .filter(({ name }) =>
+            nextProps.matchedRoutes.some(route => name?.includes(route.name)),
+          )
+          .flatMap(chunk => [
+            ...(chunk.assets ?? []),
+            // any chunk preloads
+            ...childrenAssets(chunk),
+          ]),
+      ),
+    ).forEach(asset => assetList.push(asset));
 
-      // find additional assets to preload based on matched route
-      const assets: {
-        href: string;
-        as?: string | undefined;
-        rel?: string | undefined;
-      }[] = assetList
-        .filter(asset => !asset.endsWith('.hot-update.js'))
-        .map(asset =>
-          asset.endsWith('.css')
-            ? { href: asset, rel: 'stylesheet' }
-            : asset.endsWith('.js')
-            ? { href: asset, as: 'script' }
-            : { href: asset },
-        );
+    // find additional assets to preload based on matched route
+    const assets: {
+      href: string;
+      as?: string | undefined;
+      rel?: string | undefined;
+    }[] = assetList
+      .filter(asset => !asset.endsWith('.hot-update.js'))
+      .map(asset =>
+        asset.endsWith('.css')
+          ? { href: asset, rel: 'stylesheet' }
+          : asset.endsWith('.js')
+          ? { href: asset, as: 'script' }
+          : { href: asset },
+      );
 
-      return {
-        ...nextProps,
-        app: (
-          <Document
-            {...options}
-            title={nextProps.title ?? options.title}
-            assets={assets}
-            rootId={options.rootId}
-            nonce={props.nonce}
-            csPolicy={options.csPolicy}
-            scripts={nextProps.scripts}
-          >
-            {nextProps.app}
-          </Document>
-        ),
-      };
+    return {
+      ...nextProps,
+      app: (
+        <Document
+          {...options}
+          title={nextProps.title ?? options.title}
+          assets={assets}
+          rootId={options.rootId}
+          nonce={props.nonce}
+          csPolicy={options.csPolicy}
+          scripts={nextProps.scripts}
+        >
+          {nextProps.app}
+        </Document>
+      ),
     };
   };
 }

package/src/spouts/document.tsx

@@ -1,24 +1,15 @@
 import React from 'react';
 import type { Route } from '@anansi/router';
 
-import type { ResolveProps } from './types';
-
-type NeededProps = {
-  matchedRoutes: Route<any>[];
-  title?: string;
-} & ResolveProps;
+import type { ClientSpout } from './types';
 
 export default function documentSpout(options: {
   head?: React.ReactNode;
   title: string;
-}) {
-  return function <T extends NeededProps>(
-    next: (initData: Record<string, unknown>) => Promise<T>,
-  ) {
-    return async (initData: Record<string, unknown>) => {
-      const nextProps = await next(initData);
+}): ClientSpout {
+  return next => async props => {
+    const nextProps = await next(props);
 
-      return nextProps;
-    };
+    return nextProps;
   };
 }

package/src/spouts/json.server.tsx

@@ -1,27 +1,24 @@
 import React from 'react';
-import type { Route } from '@anansi/router';
-import { StatsChunkGroup } from 'webpack';
 
-import type { ServerProps, ResolveProps } from './types';
-import type { Policy } from './csp';
-import Document from './DocumentComponent';
+import type { ServerSpout } from './types';
 
-type NeededProps = {
+type NeededNext = {
   initData?: Record<string, () => unknown>;
   scripts?: React.ReactNode[];
-} & ResolveProps;
+};
 
 export default function JSONSpout({
   id = 'anansi-json',
-}: { id?: string } = {}) {
-  return function <T extends NeededProps>(
-    next: (props: ServerProps) => Promise<T>,
-  ) {
-    return async (props: ServerProps) => {
-      const nextProps = await next(props);
+}: { id?: string } = {}): ServerSpout<
+  Record<string, unknown>,
+  Record<string, unknown>,
+  NeededNext
+> {
+  return next => async props => {
+    const nextProps = await next(props);
 
-      const scripts: React.ReactNode[] = nextProps.scripts ?? [];
-      /*
+    const scripts: React.ReactNode[] = nextProps.scripts ?? [];
+    /*
       Object.entries(nextProps.initData ?? {}).forEach(([key, data]) => {
         try {
           const encoded = JSON.stringify(data);
@@ -41,37 +38,36 @@ export default function JSONSpout({
           console.error(e);
         }
       });*/
-      const Script = () => {
-        try {
-          const data: any = {};
-          Object.entries(nextProps.initData ?? {}).forEach(([key, getData]) => {
-            data[key] = getData();
-          });
-          const encoded = JSON.stringify(data);
-          return (
-            <script
-              key={id}
-              id={id}
-              type="application/json"
-              dangerouslySetInnerHTML={{
-                __html: encoded,
-              }}
-              nonce={props.nonce}
-            />
-          );
-        } catch (e) {
-          // TODO: Use unified logging
-          console.error('Error serializing json');
-          console.error(e);
-          return null;
-        }
-      };
-      scripts.push(<Script />);
+    const Script = () => {
+      try {
+        const data: any = {};
+        Object.entries(nextProps.initData ?? {}).forEach(([key, getData]) => {
+          data[key] = getData();
+        });
+        const encoded = JSON.stringify(data);
+        return (
+          <script
+            key={id}
+            id={id}
+            type="application/json"
+            dangerouslySetInnerHTML={{
+              __html: encoded,
+            }}
+            nonce={props.nonce}
+          />
+        );
+      } catch (e) {
+        // TODO: Use unified logging
+        console.error('Error serializing json');
+        console.error(e);
+        return null;
+      }
+    };
+    scripts.push(<Script />);
 
-      return {
-        ...nextProps,
-        scripts,
-      };
+    return {
+      ...nextProps,
+      scripts,
     };
   };
 }

package/src/spouts/json.tsx

@@ -1,22 +1,14 @@
-import React from 'react';
-import type { Route } from '@anansi/router';
-
-import type { ResolveProps } from './types';
-
-type NeededProps = ResolveProps;
+import type { ClientSpout } from './types';
 
 export default function JSONSpout({
   id = 'anansi-json',
-}: { id?: string } = {}) {
-  return function <T extends NeededProps>(
-    next: (initData: Record<string, unknown>) => Promise<T>,
-  ) {
-    return async () => {
-      const initData = getDatafromDOM(id);
-      const nextProps = await next(initData);
-
-      return nextProps;
-    };
+}: { id?: string } = {}): ClientSpout<
+  Record<string, unknown>,
+  { initData: Record<string, unknown> }
+> {
+  return next => async props => {
+    const initData = getDatafromDOM(id);
+    return { ...(await next({ ...props, initData })), initData };
   };
 }
 function getDatafromDOM(id: string): Record<string, unknown> {

package/src/spouts/prefetch.server.tsx

@@ -7,14 +7,18 @@ type NeededProps<RouteWith> = {
 } & ResolveProps;
 
 export default function prefetchSpout<F extends string>(field: F) {
-  return function <RouteWith, T extends NeededProps<RouteWith>>(
-    next: (props: ServerProps) => Promise<
+  return function <
+    RouteWith,
+    N extends NeededProps<RouteWith>,
+    I extends ServerProps,
+  >(
+    next: (props: I) => Promise<
       {
         [K in F]: RouteWith;
-      } & T
+      } & N
     >,
   ) {
-    return async (props: ServerProps) => {
+    return async (props: I) => {
       const nextProps = await next(props);
 
       try {