@anansi/core 0.13.0 → 0.14.0

package/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.14.0](https://github.com/ntucker/anansi/compare/@anansi/core@0.13.0...@anansi/core@0.14.0) (2022-06-24)
+
+
+### 🚀 Features
+
+* Add Spout type for easy spout construction ([8f93eb3](https://github.com/ntucker/anansi/commit/8f93eb363f1bfe30d1ac30395df1a3d9fbd9cab3))
+
+
+
 ## [0.13.0](https://github.com/ntucker/anansi/compare/@anansi/core@0.12.0...@anansi/core@0.13.0) (2022-06-23)
 
 

package/dist/client.js

@@ -53,6 +53,7 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
   "JSONSpout": () => (/* reexport */ JSONSpout),
   "ServerProps": () => (/* reexport */ types_namespaceObject.ServerProps),
+  "Spout": () => (/* reexport */ types_namespaceObject.ClientSpout),
   "appSpout": () => (/* reexport */ app),
   "documentSpout": () => (/* reexport */ documentSpout),
   "floodSpouts": () => (/* reexport */ floodSpouts),
@@ -80,11 +81,9 @@ async function floodSpouts(spouts, {
 }
 ;// CONCATENATED MODULE: ./src/spouts/document.tsx
 function documentSpout(options) {
-  return function (next) {
-    return async props => {
-      const nextProps = await next(props);
-      return nextProps;
-    };
+  return next => async props => {
+    const nextProps = await next(props);
+    return nextProps;
   };
 }
 ;// CONCATENATED MODULE: external "react"
@@ -99,22 +98,20 @@ var _jsxFileName = "/home/ntucker/src/anansi/packages/core/src/spouts/restHooks.
 function restHooksSpout(options = {
   getManagers: () => [new core_namespaceObject.NetworkManager()]
 }) {
-  return function (next) {
-    return async props => {
-      const data = props.initData.resthooks;
-      const nextProps = await next(props);
-      return { ...nextProps,
-        app: /*#__PURE__*/external_react_default().createElement(core_namespaceObject.CacheProvider, {
-          initialState: data,
-          managers: options.getManagers(),
-          __self: this,
-          __source: {
-            fileName: _jsxFileName,
-            lineNumber: 28,
-            columnNumber: 11
-          }
-        }, nextProps.app)
-      };
+  return next => async props => {
+    const data = props.initData.resthooks;
+    const nextProps = await next(props);
+    return { ...nextProps,
+      app: /*#__PURE__*/external_react_default().createElement(core_namespaceObject.CacheProvider, {
+        initialState: data,
+        managers: options.getManagers(),
+        __self: this,
+        __source: {
+          fileName: _jsxFileName,
+          lineNumber: 23,
+          columnNumber: 9
+        }
+      }, nextProps.app)
     };
   };
 }
@@ -139,31 +136,32 @@ function routerSpout(options) {
       __self: this,
       __source: {
         fileName: router_jsxFileName,
-        lineNumber: 23,
+        lineNumber: 27,
         columnNumber: 9
       }
     }, children);
   };
 
-  return function (next) {
-    return async props => {
-      const history = (0,external_history_namespaceObject.createBrowserHistory)();
-      const router = options.createRouter(history);
-      const matchedRoutes = router.getMatchedRoutes(history.location.pathname);
-      const nextProps = await next(props);
-      const Router = createRouteComponent(router);
-      return { ...nextProps,
-        matchedRoutes,
-        router,
-        app: /*#__PURE__*/external_react_default().createElement(Router, {
-          __self: this,
-          __source: {
-            fileName: router_jsxFileName,
-            lineNumber: 48,
-            columnNumber: 14
-          }
-        }, nextProps.app)
-      };
+  return next => async props => {
+    const history = (0,external_history_namespaceObject.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__*/external_react_default().createElement(Router, {
+        __self: this,
+        __source: {
+          fileName: router_jsxFileName,
+          lineNumber: 49,
+          columnNumber: 12
+        }
+      }, nextProps.app)
     };
   };
 }
@@ -171,12 +169,12 @@ function routerSpout(options) {
 function JSONSpout({
   id = 'anansi-json'
 } = {}) {
-  return function (next) {
-    return async props => {
-      const initData = getDatafromDOM(id);
-      return await next({ ...props,
+  return next => async props => {
+    const initData = getDatafromDOM(id);
+    return { ...(await next({ ...props,
         initData
-      });
+      })),
+      initData
     };
   };
 }
@@ -201,6 +199,7 @@ const appSpout = app => props => Promise.resolve({ ...props,
 
 
 
+
 module.exports = __webpack_exports__;
 /******/ })()
 ;

package/dist/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","mappings":";;AAAA;AACA;AACA;;;;ACFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;ACPA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;ACPA;;;;;ACAA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;;;;;;;;;;;;ACNA;;ACAA;AAEA;AAIA;AAAA;AACA;;AACA;AAAA;AAAA;AAEA;AACA;;ACDA;AAIA;AAGA;AACA;AAEA;AACA;AACA;AACA;;ACvBA;;;ACAA;;;;ACAA;AAWA;AAGA;AAAA;AAEA;AAGA;AACA;AAEA;AAEA;AAEA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAHA;AAQA;AACA;AACA;;AClCA;;ACAA;;;ACAA;AACA;AACA;AAOA;AAMA;AAGA;AAAA;AACA;AAEA;AAEA;AACA;AACA;AAHA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAQA;;AAEA;AAGA;AACA;AACA;AACA;AAEA;AAEA;AACA;AAEA;AACA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAJA;AAMA;AACA;AACA;;AC/CA;AACA;AADA;AAGA;AAGA;AACA;AACA;AAAA;AAAA;AACA;AACA;AACA;;AACA;AACA;AACA;AACA;;ACnBA;AAGA;AAAA;;AAEA;;;;AELA;AACA;AACA;AACA;AACA;AACA","sources":["/home/ntucker/src/anansi/packages/core/webpack/bootstrap","/home/ntucker/src/anansi/packages/core/webpack/runtime/compat get default export","/home/ntucker/src/anansi/packages/core/webpack/runtime/define property getters","/home/ntucker/src/anansi/packages/core/webpack/runtime/hasOwnProperty shorthand","/home/ntucker/src/anansi/packages/core/webpack/runtime/make namespace object","/home/ntucker/src/anansi/packages/core/external commonjs \"react-dom/client\"","/home/ntucker/src/anansi/packages/core/src/floodSpouts.tsx","/home/ntucker/src/anansi/packages/core/src/spouts/document.tsx","/home/ntucker/src/anansi/packages/core/external commonjs \"react\"","/home/ntucker/src/anansi/packages/core/external commonjs \"@rest-hooks/core\"","/home/ntucker/src/anansi/packages/core/src/spouts/restHooks.tsx","/home/ntucker/src/anansi/packages/core/external commonjs \"@anansi/router\"","/home/ntucker/src/anansi/packages/core/external commonjs \"history\"","/home/ntucker/src/anansi/packages/core/src/spouts/router.tsx","/home/ntucker/src/anansi/packages/core/src/spouts/json.tsx","/home/ntucker/src/anansi/packages/core/src/spouts/app.tsx","/home/ntucker/src/anansi/packages/core/src/spouts/types.ts","/home/ntucker/src/anansi/packages/core/src/index.ts"],"sourcesContent":["// The require scope\nvar __webpack_require__ = {};\n\n","// getDefaultExport function for compatibility with non-harmony modules\n__webpack_require__.n = (module) => {\n\tvar getter = module && module.__esModule ?\n\t\t() => (module['default']) :\n\t\t() => (module);\n\t__webpack_require__.d(getter, { a: getter });\n\treturn getter;\n};","// define getter functions for harmony exports\n__webpack_require__.d = (exports, definition) => {\n\tfor(var key in definition) {\n\t\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\n\t\t\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\n\t\t}\n\t}\n};","__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))","// define __esModule on exports\n__webpack_require__.r = (exports) => {\n\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n\t}\n\tObject.defineProperty(exports, '__esModule', { value: true });\n};","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"react-dom/client\");","import { hydrateRoot } from 'react-dom/client';\n\nexport default async function floodSpouts(\n  spouts: (props: Record<string, unknown>) => Promise<{\n    app: JSX.Element;\n  }>,\n  { rootId = 'anansi-root' }: { rootId?: string } = {},\n) {\n  const { app } = await spouts({});\n\n  hydrateRoot(document.getElementById(rootId) ?? document, app);\n}\n","import React from 'react';\nimport type { Route } from '@anansi/router';\n\nimport type { ResolveProps } from './types';\n\ntype NeededNext = {\n  matchedRoutes: Route<any>[];\n  title?: string;\n} & ResolveProps;\n\nexport default function documentSpout(options: {\n  head?: React.ReactNode;\n  title: string;\n}) {\n  return function <N extends NeededNext, I extends Record<string, unknown>>(\n    next: (props: I) => Promise<N>,\n  ) {\n    return async (props: I) => {\n      const nextProps = await next(props);\n\n      return nextProps;\n    };\n  };\n}\n","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"react\");","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"@rest-hooks/core\");","import {\n  CacheProvider,\n  Manager,\n  NetworkManager,\n  State,\n} from '@rest-hooks/core';\n\nimport type { ResolveProps } from './types';\n\ntype NeededNext = ResolveProps;\n\nexport default function restHooksSpout(\n  options: {\n    getManagers: () => Manager[];\n  } = { getManagers: () => [new NetworkManager()] },\n) {\n  return function <N extends NeededNext, I extends Record<string, unknown>>(\n    next: (props: I) => Promise<N>,\n  ) {\n    return async (props: I & { initData: Record<string, unknown> }) => {\n      const data = props.initData.resthooks as State<unknown>;\n\n      const nextProps = await next(props);\n\n      return {\n        ...nextProps,\n        app: (\n          <CacheProvider initialState={data} managers={options.getManagers()}>\n            {nextProps.app}\n          </CacheProvider>\n        ),\n      };\n    };\n  };\n}\n","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"@anansi/router\");","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"history\");","import { Route, RouteProvider, RouteController } from '@anansi/router';\nimport React from 'react';\nimport { createBrowserHistory } from 'history';\nimport type { Update } from 'history';\n\nimport type { ResolveProps, CreateRouter } from './types';\n\ntype NeededNext = ResolveProps;\n\nexport default function routerSpout<ResolveWith>(options: {\n  resolveWith?: any;\n  useResolveWith: () => ResolveWith;\n  createRouter: CreateRouter<ResolveWith>;\n  onChange?: (update: Update, callback: () => void | undefined) => void;\n}) {\n  const createRouteComponent = (\n    router: RouteController<Route<ResolveWith, any>>,\n  ) =>\n    function Router({ children }: { children: React.ReactNode }) {\n      const resolveWith = options.useResolveWith();\n\n      return (\n        <RouteProvider\n          router={router}\n          resolveWith={resolveWith}\n          onChange={options.onChange}\n        >\n          {children}\n        </RouteProvider>\n      );\n    };\n\n  return function <N extends NeededNext, I extends Record<string, unknown>>(\n    next: (initData: Record<string, unknown>) => Promise<N>,\n  ) {\n    return async (props: I) => {\n      const history = createBrowserHistory();\n      const router = options.createRouter(history);\n      const matchedRoutes = router.getMatchedRoutes(history.location.pathname);\n\n      const nextProps = await next(props);\n\n      const Router = createRouteComponent(router);\n      return {\n        ...nextProps,\n        matchedRoutes,\n        router,\n        app: <Router>{nextProps.app}</Router>,\n      };\n    };\n  };\n}\n","import type { ResolveProps } from './types';\n\ntype NeededNext = ResolveProps;\n\nexport default function JSONSpout({\n  id = 'anansi-json',\n}: { id?: string } = {}) {\n  return function <N extends NeededNext, I extends Record<string, unknown>>(\n    next: (props: I & { initData: Record<string, unknown> }) => Promise<N>,\n  ) {\n    return async (props: I) => {\n      const initData = getDatafromDOM(id);\n      return await next({ ...props, initData });\n    };\n  };\n}\nfunction getDatafromDOM(id: string): Record<string, unknown> {\n  const element: HTMLScriptElement | null = document.querySelector(`#${id}`);\n  return element?.text ? JSON.parse(element?.text) : undefined;\n}\n","const appSpout =\n  (app: JSX.Element) =>\n  <P extends Record<string, unknown>>(props: P) =>\n    Promise.resolve({ ...props, app });\n\nexport default appSpout;\n","import { IncomingMessage, ServerResponse } from 'http';\nimport { Request, Response } from 'express';\nimport type { StatsCompilation } from 'webpack';\nimport { History } from 'history';\nimport { Route, RouteController } from '@anansi/router';\n\n/* Variables from the rendering call */\nexport type ServerProps = {\n  req: Request | IncomingMessage;\n  res: Response | ServerResponse;\n  clientManifest: StatsCompilation;\n  nonce: string;\n};\n\n/* Baseline expectations of return value */\nexport type ResolveProps = {\n  app: JSX.Element;\n};\n\nexport type CreateRouter<T> = (\n  history: History,\n) => RouteController<Route<T, any>>;\n","export { default as floodSpouts } from './floodSpouts';\nexport { default as documentSpout } from './spouts/document';\nexport { default as restHooksSpout } from './spouts/restHooks';\nexport { default as routerSpout } from './spouts/router';\nexport { default as JSONSpout } from './spouts/json';\nexport { default as appSpout } from './spouts/app';\nexport { ServerProps } from './spouts/types';\n"],"names":[],"sourceRoot":""}
+{"version":3,"file":"client.js","mappings":";;AAAA;AACA;AACA;;;;ACFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;ACPA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;ACPA;;;;;ACAA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;;;;;;;;;;;;;ACNA;;ACAA;AAEA;AAIA;AAAA;AACA;;AACA;AAAA;AAAA;AAEA;AACA;;ACNA;AAIA;AACA;AAEA;AACA;AACA;;ACdA;;;ACAA;;;;ACAA;AASA;AAGA;AAAA;AAEA;AACA;AAEA;AAEA;AAEA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAHA;AAQA;AACA;;AC5BA;;ACAA;;;ACAA;AACA;AACA;AAKA;AAYA;AAGA;AAAA;AACA;AAEA;AAEA;AACA;AACA;AAHA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAQA;;AAEA;AACA;AACA;AACA;AAEA;AAAA;AAAA;AAAA;AAEA;AACA;AAEA;AACA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAJA;AAMA;AACA;;ACjDA;AACA;AADA;AAMA;AACA;AACA;AAAA;AAAA;AAAA;AAAA;AACA;AACA;;AACA;AACA;AACA;AACA;;AChBA;AAGA;AAAA;;AAEA;;;;AELA;AACA;AACA;AACA;AACA;AACA;AACA","sources":["/home/ntucker/src/anansi/packages/core/webpack/bootstrap","/home/ntucker/src/anansi/packages/core/webpack/runtime/compat get default export","/home/ntucker/src/anansi/packages/core/webpack/runtime/define property getters","/home/ntucker/src/anansi/packages/core/webpack/runtime/hasOwnProperty shorthand","/home/ntucker/src/anansi/packages/core/webpack/runtime/make namespace object","/home/ntucker/src/anansi/packages/core/external commonjs \"react-dom/client\"","/home/ntucker/src/anansi/packages/core/src/floodSpouts.tsx","/home/ntucker/src/anansi/packages/core/src/spouts/document.tsx","/home/ntucker/src/anansi/packages/core/external commonjs \"react\"","/home/ntucker/src/anansi/packages/core/external commonjs \"@rest-hooks/core\"","/home/ntucker/src/anansi/packages/core/src/spouts/restHooks.tsx","/home/ntucker/src/anansi/packages/core/external commonjs \"@anansi/router\"","/home/ntucker/src/anansi/packages/core/external commonjs \"history\"","/home/ntucker/src/anansi/packages/core/src/spouts/router.tsx","/home/ntucker/src/anansi/packages/core/src/spouts/json.tsx","/home/ntucker/src/anansi/packages/core/src/spouts/app.tsx","/home/ntucker/src/anansi/packages/core/src/spouts/types.ts","/home/ntucker/src/anansi/packages/core/src/index.ts"],"sourcesContent":["// The require scope\nvar __webpack_require__ = {};\n\n","// getDefaultExport function for compatibility with non-harmony modules\n__webpack_require__.n = (module) => {\n\tvar getter = module && module.__esModule ?\n\t\t() => (module['default']) :\n\t\t() => (module);\n\t__webpack_require__.d(getter, { a: getter });\n\treturn getter;\n};","// define getter functions for harmony exports\n__webpack_require__.d = (exports, definition) => {\n\tfor(var key in definition) {\n\t\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\n\t\t\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\n\t\t}\n\t}\n};","__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))","// define __esModule on exports\n__webpack_require__.r = (exports) => {\n\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n\t}\n\tObject.defineProperty(exports, '__esModule', { value: true });\n};","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"react-dom/client\");","import { hydrateRoot } from 'react-dom/client';\n\nexport default async function floodSpouts(\n  spouts: (props: Record<string, unknown>) => Promise<{\n    app: JSX.Element;\n  }>,\n  { rootId = 'anansi-root' }: { rootId?: string } = {},\n) {\n  const { app } = await spouts({});\n\n  hydrateRoot(document.getElementById(rootId) ?? document, app);\n}\n","import React from 'react';\nimport type { Route } from '@anansi/router';\n\nimport type { ClientSpout } from './types';\n\nexport default function documentSpout(options: {\n  head?: React.ReactNode;\n  title: string;\n}): ClientSpout {\n  return next => async props => {\n    const nextProps = await next(props);\n\n    return nextProps;\n  };\n}\n","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"react\");","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"@rest-hooks/core\");","import {\n  CacheProvider,\n  Manager,\n  NetworkManager,\n  State,\n} from '@rest-hooks/core';\n\nimport type { ClientSpout } from './types';\n\nexport default function restHooksSpout(\n  options: {\n    getManagers: () => Manager[];\n  } = { getManagers: () => [new NetworkManager()] },\n): ClientSpout<{ initData: Record<string, unknown> }> {\n  return next => async props => {\n    const data = props.initData.resthooks as State<unknown>;\n\n    const nextProps = await next(props);\n\n    return {\n      ...nextProps,\n      app: (\n        <CacheProvider initialState={data} managers={options.getManagers()}>\n          {nextProps.app}\n        </CacheProvider>\n      ),\n    };\n  };\n}\n","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"@anansi/router\");","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"history\");","import { Route, RouteProvider, RouteController } from '@anansi/router';\nimport React from 'react';\nimport { createBrowserHistory } from 'history';\nimport type { Update } from 'history';\n\nimport type { CreateRouter, ClientSpout } from './types';\n\nexport default function routerSpout<ResolveWith>(options: {\n  resolveWith?: any;\n  useResolveWith: () => ResolveWith;\n  createRouter: CreateRouter<ResolveWith>;\n  onChange?: (update: Update, callback: () => void | undefined) => void;\n}): ClientSpout<\n  Record<string, unknown>,\n  {\n    matchedRoutes: Route<ResolveWith, any>[];\n    router: RouteController<Route<ResolveWith, any>>;\n  }\n> {\n  const createRouteComponent = (\n    router: RouteController<Route<ResolveWith, any>>,\n  ) =>\n    function Router({ children }: { children: React.ReactNode }) {\n      const resolveWith = options.useResolveWith();\n\n      return (\n        <RouteProvider\n          router={router}\n          resolveWith={resolveWith}\n          onChange={options.onChange}\n        >\n          {children}\n        </RouteProvider>\n      );\n    };\n\n  return next => async props => {\n    const history = createBrowserHistory();\n    const router = options.createRouter(history);\n    const matchedRoutes = router.getMatchedRoutes(history.location.pathname);\n\n    const nextProps = await next({ ...props, matchedRoutes, router });\n\n    const Router = createRouteComponent(router);\n    return {\n      ...nextProps,\n      matchedRoutes,\n      router,\n      app: <Router>{nextProps.app}</Router>,\n    };\n  };\n}\n","import type { ClientSpout } from './types';\n\nexport default function JSONSpout({\n  id = 'anansi-json',\n}: { id?: string } = {}): ClientSpout<\n  Record<string, unknown>,\n  { initData: Record<string, unknown> }\n> {\n  return next => async props => {\n    const initData = getDatafromDOM(id);\n    return { ...(await next({ ...props, initData })), initData };\n  };\n}\nfunction getDatafromDOM(id: string): Record<string, unknown> {\n  const element: HTMLScriptElement | null = document.querySelector(`#${id}`);\n  return element?.text ? JSON.parse(element?.text) : undefined;\n}\n","const appSpout =\n  (app: JSX.Element) =>\n  <P extends Record<string, unknown>>(props: P) =>\n    Promise.resolve({ ...props, app });\n\nexport default appSpout;\n","import { IncomingMessage, ServerResponse } from 'http';\nimport { Request, Response } from 'express';\nimport type { StatsCompilation } from 'webpack';\nimport { History } from 'history';\nimport { Route, RouteController } from '@anansi/router';\n\n/* Variables from the rendering call */\nexport type ServerProps = {\n  req: Request | IncomingMessage;\n  res: Response | ServerResponse;\n  clientManifest: StatsCompilation;\n  nonce: string;\n};\n\n/* Baseline expectations of return value */\nexport type ResolveProps = {\n  app: JSX.Element;\n};\n\nexport type CreateRouter<T> = (\n  history: History,\n) => RouteController<Route<T, any>>;\n\n/* Spouts are middleware for Anansi */\nexport type ServerSpout<\n  NeededProps extends Record<string, unknown> = Record<string, unknown>,\n  ProvidedProps extends Record<string, unknown> = Record<string, unknown>,\n  NeededNext extends Record<string, unknown> = NeededProps,\n> = <N extends NeededNext & ResolveProps, I extends NeededProps & ServerProps>(\n  next: (props: I & ProvidedProps) => Promise<N>,\n) => (props: I) => Promise<N & ProvidedProps>;\n\n/* Spouts are middleware for Anansi */\nexport type ClientSpout<\n  NeededProps extends Record<string, unknown> = Record<string, unknown>,\n  ProvidedProps extends Record<string, unknown> = Record<string, unknown>,\n  NeededNext extends Record<string, unknown> = NeededProps,\n> = <N extends NeededNext & ResolveProps, I extends NeededProps>(\n  next: (props: I & ProvidedProps) => Promise<N>,\n) => (props: I) => Promise<N & ProvidedProps>;\n","export { default as floodSpouts } from './floodSpouts';\nexport { default as documentSpout } from './spouts/document';\nexport { default as restHooksSpout } from './spouts/restHooks';\nexport { default as routerSpout } from './spouts/router';\nexport { default as JSONSpout } from './spouts/json';\nexport { default as appSpout } from './spouts/app';\nexport { ServerProps } from './spouts/types';\nexport { ClientSpout as Spout } from './spouts/types';\n"],"names":[],"sourceRoot":""}

package/dist/server.js

@@ -53,6 +53,7 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
   "JSONSpout": () => (/* reexport */ JSONSpout),
   "ServerProps": () => (/* reexport */ types_namespaceObject.ServerProps),
+  "Spout": () => (/* reexport */ types_namespaceObject.ServerSpout),
   "appSpout": () => (/* reexport */ app_server),
   "documentSpout": () => (/* reexport */ DocumentSpout),
   "laySpouts": () => (/* reexport */ laySpouts),
@@ -293,59 +294,57 @@ var document_server_jsxFileName = "/home/ntucker/src/anansi/packages/core/src/sp
 
 
 function DocumentSpout(options) {
-  return function (next) {
-    return async props => {
-      var _props$clientManifest, _props$clientManifest2, _props$clientManifest3, _props$clientManifest4, _props$clientManifest5, _nextProps$title;
+  return next => async props => {
+    var _props$clientManifest, _props$clientManifest2, _props$clientManifest3, _props$clientManifest4, _props$clientManifest5, _nextProps$title;
 
-      const nextProps = await next(props);
-      const publicPath = props.clientManifest.publicPath;
-      if (Object.keys((_props$clientManifest = (_props$clientManifest2 = props.clientManifest) === null || _props$clientManifest2 === void 0 ? void 0 : _props$clientManifest2.entrypoints) != null ? _props$clientManifest : {}).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 nextProps = await next(props);
+    const publicPath = props.clientManifest.publicPath;
+    if (Object.keys((_props$clientManifest = (_props$clientManifest2 = props.clientManifest) === null || _props$clientManifest2 === void 0 ? void 0 : _props$clientManifest2.entrypoints) != null ? _props$clientManifest : {}).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 => assets.map(({
-        name
-      }) => `${publicPath}${name}`);
+    const assetMap = assets => assets.map(({
+      name
+    }) => `${publicPath}${name}`);
 
-      const assetList = [];
-      Object.values((_props$clientManifest3 = (_props$clientManifest4 = props.clientManifest) === null || _props$clientManifest4 === void 0 ? void 0 : _props$clientManifest4.entrypoints) != null ? _props$clientManifest3 : {}).forEach(entrypoint => {
-        var _entrypoint$assets;
+    const assetList = [];
+    Object.values((_props$clientManifest3 = (_props$clientManifest4 = props.clientManifest) === null || _props$clientManifest4 === void 0 ? void 0 : _props$clientManifest4.entrypoints) != null ? _props$clientManifest3 : {}).forEach(entrypoint => {
+      var _entrypoint$assets;
 
-        assetList.push(...assetMap((_entrypoint$assets = entrypoint.assets) != null ? _entrypoint$assets : []));
-      });
-      new Set(assetMap(Object.values((_props$clientManifest5 = props.clientManifest.namedChunkGroups) != null ? _props$clientManifest5 : {}).filter(({
-        name
-      }) => nextProps.matchedRoutes.some(route => name === null || name === void 0 ? void 0 : name.includes(route.name))).flatMap(chunk => {
-        var _chunk$assets;
-
-        return [...((_chunk$assets = chunk.assets) != null ? _chunk$assets : []), // any chunk preloads
-        ...childrenAssets(chunk)];
-      }))).forEach(asset => assetList.push(asset)); // find additional assets to preload based on matched route
-
-      const assets = 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: /*#__PURE__*/external_react_default().createElement(Document, { ...options,
-          title: (_nextProps$title = nextProps.title) != null ? _nextProps$title : options.title,
-          assets: assets,
-          rootId: options.rootId,
-          nonce: props.nonce,
-          csPolicy: options.csPolicy,
-          scripts: nextProps.scripts,
-          __self: this,
-          __source: {
-            fileName: document_server_jsxFileName,
-            lineNumber: 56,
-            columnNumber: 14
-          }
-        }, nextProps.app)
-      };
+      assetList.push(...assetMap((_entrypoint$assets = entrypoint.assets) != null ? _entrypoint$assets : []));
+    });
+    new Set(assetMap(Object.values((_props$clientManifest5 = props.clientManifest.namedChunkGroups) != null ? _props$clientManifest5 : {}).filter(({
+      name
+    }) => nextProps.matchedRoutes.some(route => name === null || name === void 0 ? void 0 : name.includes(route.name))).flatMap(chunk => {
+      var _chunk$assets;
+
+      return [...((_chunk$assets = chunk.assets) != null ? _chunk$assets : []), // any chunk preloads
+      ...childrenAssets(chunk)];
+    }))).forEach(asset => assetList.push(asset)); // find additional assets to preload based on matched route
+
+    const assets = 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: /*#__PURE__*/external_react_default().createElement(Document, { ...options,
+        title: (_nextProps$title = nextProps.title) != null ? _nextProps$title : options.title,
+        assets: assets,
+        rootId: options.rootId,
+        nonce: props.nonce,
+        csPolicy: options.csPolicy,
+        scripts: nextProps.scripts,
+        __self: this,
+        __source: {
+          fileName: document_server_jsxFileName,
+          lineNumber: 55,
+          columnNumber: 12
+        }
+      }, nextProps.app)
     };
   };
 }
@@ -412,29 +411,27 @@ var restHooks_server_jsxFileName = "/home/ntucker/src/anansi/packages/core/src/s
 function restHooksSpout(options = {
   getManagers: () => [new core_namespaceObject.NetworkManager()]
 }) {
-  return function (next) {
-    return async props => {
-      const [ServerCacheProvider, controller, store] = createPersistedStore(options.getManagers());
-      const nextProps = await next({ ...props,
-        controller,
-        store
-      });
-      return { ...nextProps,
-        initData: { ...nextProps.initData,
-          resthooks: () => store.getState()
-        },
-        app: /*#__PURE__*/external_react_default().createElement(ServerCacheProvider, {
-          __self: this,
-          __source: {
-            fileName: restHooks_server_jsxFileName,
-            lineNumber: 36,
-            columnNumber: 14
-          }
-        }, nextProps.app),
-        // TODO: figure out how to only inject in next and not have to also put here
-        controller,
-        store
-      };
+  return next => async props => {
+    const [ServerCacheProvider, controller, store] = createPersistedStore(options.getManagers());
+    const nextProps = await next({ ...props,
+      controller,
+      store
+    });
+    return { ...nextProps,
+      initData: { ...nextProps.initData,
+        resthooks: () => store.getState()
+      },
+      app: /*#__PURE__*/external_react_default().createElement(ServerCacheProvider, {
+        __self: this,
+        __source: {
+          fileName: restHooks_server_jsxFileName,
+          lineNumber: 33,
+          columnNumber: 12
+        }
+      }, nextProps.app),
+      // TODO: figure out how to only inject in next and not have to also put here
+      controller,
+      store
     };
   };
 }
@@ -458,37 +455,35 @@ function routerSpout(options) {
       __self: this,
       __source: {
         fileName: router_server_jsxFileName,
-        lineNumber: 21,
+        lineNumber: 25,
         columnNumber: 9
       }
     }, children);
   };
 
-  return function (next) {
-    return async props => {
-      const url = props.req.url || '';
-      const router = options.createRouter((0,external_history_namespaceObject.createMemoryHistory)({
-        initialEntries: [url]
-      }));
-      const matchedRoutes = router.getMatchedRoutes(url);
-      const nextProps = await next({ ...props,
-        matchedRoutes,
-        router
-      });
-      const Router = createRouteComponent(router);
-      return { ...nextProps,
-        app: /*#__PURE__*/external_react_default().createElement(Router, {
-          __self: this,
-          __source: {
-            fileName: router_server_jsxFileName,
-            lineNumber: 52,
-            columnNumber: 14
-          }
-        }, nextProps.app),
-        // TODO: figure out how to only inject in next and not have to also put here
-        matchedRoutes,
-        router
-      };
+  return next => async props => {
+    const url = props.req.url || '';
+    const router = options.createRouter((0,external_history_namespaceObject.createMemoryHistory)({
+      initialEntries: [url]
+    }));
+    const matchedRoutes = router.getMatchedRoutes(url);
+    const nextProps = await next({ ...props,
+      matchedRoutes,
+      router
+    });
+    const Router = createRouteComponent(router);
+    return { ...nextProps,
+      app: /*#__PURE__*/external_react_default().createElement(Router, {
+        __self: this,
+        __source: {
+          fileName: router_server_jsxFileName,
+          lineNumber: 48,
+          columnNumber: 12
+        }
+      }, nextProps.app),
+      // TODO: figure out how to only inject in next and not have to also put here
+      matchedRoutes,
+      router
     };
   };
 }
@@ -520,13 +515,12 @@ var json_server_jsxFileName = "/home/ntucker/src/anansi/packages/core/src/spouts
 function JSONSpout({
   id = 'anansi-json'
 } = {}) {
-  return function (next) {
-    return async props => {
-      var _nextProps$scripts;
+  return next => async props => {
+    var _nextProps$scripts;
 
-      const nextProps = await next(props);
-      const scripts = (_nextProps$scripts = nextProps.scripts) != null ? _nextProps$scripts : [];
-      /*
+    const nextProps = await next(props);
+    const scripts = (_nextProps$scripts = nextProps.scripts) != null ? _nextProps$scripts : [];
+    /*
       Object.entries(nextProps.initData ?? {}).forEach(([key, data]) => {
         try {
           const encoded = JSON.stringify(data);
@@ -547,49 +541,48 @@ function JSONSpout({
         }
       });*/
 
-      const Script = () => {
-        try {
-          var _nextProps$initData;
+    const Script = () => {
+      try {
+        var _nextProps$initData;
 
-          const data = {};
-          Object.entries((_nextProps$initData = nextProps.initData) != null ? _nextProps$initData : {}).forEach(([key, getData]) => {
-            data[key] = getData();
-          });
-          const encoded = JSON.stringify(data);
-          return /*#__PURE__*/external_react_default().createElement("script", {
-            key: id,
-            id: id,
-            type: "application/json",
-            dangerouslySetInnerHTML: {
-              __html: encoded
-            },
-            nonce: props.nonce,
-            __self: this,
-            __source: {
-              fileName: json_server_jsxFileName,
-              lineNumber: 48,
-              columnNumber: 13
-            }
-          });
-        } catch (e) {
-          // TODO: Use unified logging
-          console.error('Error serializing json');
-          console.error(e);
-          return null;
-        }
-      };
+        const data = {};
+        Object.entries((_nextProps$initData = nextProps.initData) != null ? _nextProps$initData : {}).forEach(([key, getData]) => {
+          data[key] = getData();
+        });
+        const encoded = JSON.stringify(data);
+        return /*#__PURE__*/external_react_default().createElement("script", {
+          key: id,
+          id: id,
+          type: "application/json",
+          dangerouslySetInnerHTML: {
+            __html: encoded
+          },
+          nonce: props.nonce,
+          __self: this,
+          __source: {
+            fileName: json_server_jsxFileName,
+            lineNumber: 49,
+            columnNumber: 11
+          }
+        });
+      } catch (e) {
+        // TODO: Use unified logging
+        console.error('Error serializing json');
+        console.error(e);
+        return null;
+      }
+    };
 
-      scripts.push( /*#__PURE__*/external_react_default().createElement(Script, {
-        __self: this,
-        __source: {
-          fileName: json_server_jsxFileName,
-          lineNumber: 65,
-          columnNumber: 20
-        }
-      }));
-      return { ...nextProps,
-        scripts
-      };
+    scripts.push( /*#__PURE__*/external_react_default().createElement(Script, {
+      __self: this,
+      __source: {
+        fileName: json_server_jsxFileName,
+        lineNumber: 66,
+        columnNumber: 18
+      }
+    }));
+    return { ...nextProps,
+      scripts
     };
   };
 }
@@ -610,6 +603,7 @@ const appSpout = app => props => Promise.resolve({ ...props,
 
 
 
+
 module.exports = __webpack_exports__;
 /******/ })()
 ;