@cedarjs/router 7.0.1-next.333 → 7.0.1-next.467

package/dist/Set.d.ts

@@ -1,16 +1,35 @@
-import type { ReactElement, ReactNode } from 'react';
+import type { ComponentType, ReactElement, ReactNode } from 'react';
 import React from 'react';
-export type WrapperType<WTProps> = (props: Omit<WTProps, 'wrap' | 'children'> & {
+/**
+ * The props `<Set>` gives each component in its `wrap` prop: the wrapped
+ * routes as `children`, and nothing else
+ */
+export interface WrapperProps {
     children: ReactNode;
-}) => ReactElement | null;
-type SetProps<P> = P & {
+}
+/**
+ * A component in a `<Set wrap>` prop, like a layout. The router renders it
+ * with {@link WrapperProps}, so it can't have any other required props.
+ * Optional props are fine.
+ *
+ * To render a layout with props, create a component that renders it with
+ * those props, and use that component in `wrap`:
+ *
+ *   function PostsScaffoldLayout({ children }: WrapperProps) {
+ *     return <ScaffoldLayout title="Posts" titleTo="posts">{children}</ScaffoldLayout>
+ *   }
+ *
+ *   <Set wrap={PostsScaffoldLayout}>
+ */
+export type WrapperType = ComponentType<WrapperProps>;
+interface SetProps {
     /**
-     * P is the interface for the props that are forwarded to the wrapper
-     * components. TypeScript will most likely infer this for you, but if you
-     * need to you can specify it yourself in your JSX like so:
-     *   <Set<{theme: string}> wrap={ThemableLayout} theme="dark">
+     * Components to wrap all routes in this set with, like layouts. The first
+     * one in an array is the outermost one.
+     *
+     *   <Set wrap={[MainLayout, DarkThemeLayout]}>
      */
-    wrap?: WrapperType<P> | WrapperType<P>[];
+    wrap?: WrapperType | readonly WrapperType[];
     /**
      *`Routes` nested in a `<Set>` with `private` specified require
      * authentication. When a user is not authenticated and attempts to visit
@@ -36,20 +55,22 @@ type SetProps<P> = P & {
     /** Loading state for auth to distinguish with whileLoading */
     whileLoadingAuth?: () => ReactElement | null;
     whileLoadingPage?: () => ReactElement | null;
-};
+}
 /**
- * TypeScript will often infer the type of the props you can forward to the
- * wrappers for you, but if you need to you can specify it yourself in your
- * JSX like so:
- *   <Set<{theme: string}> wrap={ThemeableLayout} theme="dark">
+ * Groups routes, to wrap them all in the same layouts or other components, or
+ * to give them all the same `whileLoadingPage` or `prerender` setting.
+ *
+ *   <Set wrap={MainLayout}>
+ *     <Route path="/" page={HomePage} name="home" />
+ *   </Set>
  */
-export declare function Set<WrapperProps>(props: SetProps<WrapperProps>): React.JSX.Element;
-type PrivateSetProps<P> = P & Omit<SetProps<P>, 'private' | 'unauthenticated'> & {
+export declare function Set(props: SetProps): React.JSX.Element;
+type PrivateSetProps = Omit<SetProps, 'private' | 'unauthenticated'> & {
     /** The page name where a user will be redirected when not authenticated */
     unauthenticated: string;
 };
 /** @deprecated Please use `<PrivateSet>` instead */
-export declare function Private<WrapperProps>(props: PrivateSetProps<WrapperProps>): React.JSX.Element;
+export declare function Private(props: PrivateSetProps): React.JSX.Element;
 /**
  * Wraps a set of routes that require the user to be authenticated before
  * rendering. Unauthenticated users are redirected to the route named by
@@ -58,9 +79,17 @@ export declare function Private<WrapperProps>(props: PrivateSetProps<WrapperProp
  * Coming from React Router or a similar library and looking for something
  * like `RequireAuth` or `ProtectedRoute`? This is the Cedar equivalent.
  */
-export declare function PrivateSet<WrapperProps>(props: PrivateSetProps<WrapperProps>): React.JSX.Element;
-export declare const isSetNode: (node: ReactNode) => node is ReactElement<SetProps<Record<string, unknown>>>;
-export declare const isPrivateSetNode: (node: ReactNode) => node is ReactElement<PrivateSetProps<unknown>>;
-export declare const isPrivateNode: (node: ReactNode) => node is ReactElement<SetProps<any>>;
+export declare function PrivateSet(props: PrivateSetProps): React.JSX.Element;
+export declare const isSetNode: (node: ReactNode) => node is ReactElement<SetProps>;
+export declare const isPrivateSetNode: (node: ReactNode) => node is ReactElement<PrivateSetProps>;
+export declare const isPrivateNode: (node: ReactNode) => node is ReactElement<PrivateSetProps>;
+/**
+ * Wraps `children` in all `wrappers`, with the first wrapper as the outermost
+ * one. Every wrapper gets `children` as its only prop.
+ *
+ *   wrapWithSetWrappers([A, B], '1', <Page />)
+ *   // => <A><B><Page /></B></A>
+ */
+export declare function wrapWithSetWrappers(wrappers: readonly WrapperType[], setId: string, children: ReactNode): ReactNode;
 export {};
 //# sourceMappingURL=Set.d.ts.map

package/dist/Set.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Set.d.ts","sourceRoot":"","sources":["../src/Set.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACpD,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,MAAM,MAAM,WAAW,CAAC,OAAO,IAAI,CACjC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC,GAAG;IAC1C,QAAQ,EAAE,SAAS,CAAA;CACpB,KACE,YAAY,GAAG,IAAI,CAAA;AAExB,KAAK,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG;IACrB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,EAAE,CAAA;IACxC;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IACzB,qCAAqC;IACrC,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,QAAQ,EAAE,SAAS,CAAA;IACnB,8DAA8D;IAC9D,gBAAgB,CAAC,EAAE,MAAM,YAAY,GAAG,IAAI,CAAA;IAC5C,gBAAgB,CAAC,EAAE,MAAM,YAAY,GAAG,IAAI,CAAA;CAC7C,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,GAAG,CAAC,YAAY,EAAE,KAAK,EAAE,QAAQ,CAAC,YAAY,CAAC,qBAI9D;AAED,KAAK,eAAe,CAAC,CAAC,IAAI,CAAC,GACzB,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,GAAG,iBAAiB,CAAC,GAAG;IACjD,2EAA2E;IAC3E,eAAe,EAAE,MAAM,CAAA;CACxB,CAAA;AAEH,oDAAoD;AACpD,wBAAgB,OAAO,CAAC,YAAY,EAAE,KAAK,EAAE,eAAe,CAAC,YAAY,CAAC,qBAIzE;AAED;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,YAAY,EAAE,KAAK,EAAE,eAAe,CAAC,YAAY,CAAC,qBAI5E;AAED,eAAO,MAAM,SAAS,GACpB,MAAM,SAAS,KACd,IAAI,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAOxD,CAAA;AAED,eAAO,MAAM,gBAAgB,GAC3B,MAAM,SAAS,KACd,IAAI,IAAI,YAAY,CAAC,eAAe,CAAC,OAAO,CAAC,CAE/C,CAAA;AAGD,eAAO,MAAM,aAAa,GACxB,MAAM,SAAS,KACd,IAAI,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAEpC,CAAA"}
+{"version":3,"file":"Set.d.ts","sourceRoot":"","sources":["../src/Set.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACnE,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,SAAS,CAAA;CACpB;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,WAAW,GAAG,aAAa,CAAC,YAAY,CAAC,CAAA;AAErD,UAAU,QAAQ;IAChB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS,WAAW,EAAE,CAAA;IAC3C;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IACzB,qCAAqC;IACrC,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,QAAQ,EAAE,SAAS,CAAA;IACnB,8DAA8D;IAC9D,gBAAgB,CAAC,EAAE,MAAM,YAAY,GAAG,IAAI,CAAA;IAC5C,gBAAgB,CAAC,EAAE,MAAM,YAAY,GAAG,IAAI,CAAA;CAC7C;AAED;;;;;;;GAOG;AACH,wBAAgB,GAAG,CAAC,KAAK,EAAE,QAAQ,qBAIlC;AAED,KAAK,eAAe,GAAG,IAAI,CAAC,QAAQ,EAAE,SAAS,GAAG,iBAAiB,CAAC,GAAG;IACrE,2EAA2E;IAC3E,eAAe,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,oDAAoD;AACpD,wBAAgB,OAAO,CAAC,KAAK,EAAE,eAAe,qBAI7C;AAED;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,qBAIhD;AAED,eAAO,MAAM,SAAS,GAAI,MAAM,SAAS,KAAG,IAAI,IAAI,YAAY,CAAC,QAAQ,CAOxE,CAAA;AAED,eAAO,MAAM,gBAAgB,GAC3B,MAAM,SAAS,KACd,IAAI,IAAI,YAAY,CAAC,eAAe,CAEtC,CAAA;AAGD,eAAO,MAAM,aAAa,GACxB,MAAM,SAAS,KACd,IAAI,IAAI,YAAY,CAAC,eAAe,CAEtC,CAAA;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,SAAS,WAAW,EAAE,EAChC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,SAAS,aAKpB"}

package/dist/Set.js

@@ -18,11 +18,17 @@ const isPrivateSetNode = (node) => {
 const isPrivateNode = (node) => {
   return React.isValidElement(node) && node.type === Private;
 };
+function wrapWithSetWrappers(wrappers, setId, children) {
+  return wrappers.reduceRight((acc, Wrapper, index) => {
+    return /* @__PURE__ */ React.createElement(Wrapper, { key: setId + "-" + index }, acc);
+  }, children);
+}
 export {
   Private,
   PrivateSet,
   Set,
   isPrivateNode,
   isPrivateSetNode,
-  isSetNode
+  isSetNode,
+  wrapWithSetWrappers
 };

package/dist/analyzeRoutes.d.ts

@@ -1,19 +1,27 @@
 import type { ReactElement, ReactNode } from 'react';
 import type { PageType } from './page.js';
+import type { WrapperType } from './Set.js';
 import { type ParamType } from './util.js';
 type WhileLoadingPage = () => ReactElement | null;
 export type GeneratedRoutesMap = {
     [key: string]: (args?: Record<string | number, string | number | boolean>) => string;
 };
-export type Wrappers = ((props: any) => ReactNode)[];
+export type Wrappers = readonly WrapperType[];
+/**
+ * The props of a `<Set>`, `<PrivateSet>` or `<Private>` that the router needs
+ * when rendering a route in it
+ */
+interface SetRenderProps {
+    private?: boolean;
+    unauthenticated?: string;
+    roles?: string | string[];
+    whileLoadingAuth?: () => ReactElement | null;
+}
 interface Set {
     id: string;
     wrappers: Wrappers;
     isPrivate: boolean;
-    props: {
-        private?: boolean;
-        [key: string]: unknown;
-    };
+    props: SetRenderProps;
 }
 type RoutePath = string;
 /**

package/dist/analyzeRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"analyzeRoutes.d.ts","sourceRoot":"","sources":["../src/analyzeRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAGpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAQzC,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,WAAW,CAAA;AAElB,KAAK,gBAAgB,GAAG,MAAM,YAAY,GAAG,IAAI,CAAA;AAIjD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,CAAC,GAAG,EAAE,MAAM,GAAG,CACb,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,KACtD,MAAM,CAAA;CACZ,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,EAAE,GAAG,KAAK,SAAS,CAAC,EAAE,CAAA;AAEpD,UAAU,GAAG;IACX,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,EAAE,QAAQ,CAAA;IAClB,SAAS,EAAE,OAAO,CAAA;IAClB,KAAK,EAAE;QACL,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KACvB,CAAA;CACF;AAED,KAAK,SAAS,GAAG,MAAM,CAAA;AAEvB;;;;GAIG;AACH,UAAU,aAAa;IACrB,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACnB,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;IACnC,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAA;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,IAAI,EAAE,GAAG,EAAE,CAAA;CACZ;AAED,UAAU,oBAAoB;IAC5B,eAAe,EAAE,MAAM,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;CAC3C;AAED,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,SAAS,EACnB,EAAE,eAAe,EAAE,cAAc,EAAE,EAAE,oBAAoB;;;;;;EA6K1D"}
+{"version":3,"file":"analyzeRoutes.d.ts","sourceRoot":"","sources":["../src/analyzeRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAGpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAQzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAC3C,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,WAAW,CAAA;AAElB,KAAK,gBAAgB,GAAG,MAAM,YAAY,GAAG,IAAI,CAAA;AAIjD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,CAAC,GAAG,EAAE,MAAM,GAAG,CACb,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,KACtD,MAAM,CAAA;CACZ,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG,SAAS,WAAW,EAAE,CAAA;AAE7C;;;GAGG;AACH,UAAU,cAAc;IACtB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,YAAY,GAAG,IAAI,CAAA;CAC7C;AAED,UAAU,GAAG;IACX,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,EAAE,QAAQ,CAAA;IAClB,SAAS,EAAE,OAAO,CAAA;IAClB,KAAK,EAAE,cAAc,CAAA;CACtB;AAuCD,KAAK,SAAS,GAAG,MAAM,CAAA;AAEvB;;;;GAIG;AACH,UAAU,aAAa;IACrB,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACnB,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;IACnC,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAA;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,IAAI,EAAE,GAAG,EAAE,CAAA;CACZ;AAED,UAAU,oBAAoB;IAC5B,eAAe,EAAE,MAAM,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;CAC3C;AAED,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,SAAS,EACnB,EAAE,eAAe,EAAE,cAAc,EAAE,EAAE,oBAAoB;;;;;;EAqK1D"}

package/dist/analyzeRoutes.js

@@ -11,6 +11,31 @@ import {
   replaceParams,
   validatePath
 } from "./util.js";
+function pickSetRenderProps(props) {
+  const picked = {};
+  if (props.private !== void 0) {
+    picked.private = props.private;
+  }
+  if (props.unauthenticated !== void 0) {
+    picked.unauthenticated = props.unauthenticated;
+  }
+  if (props.roles !== void 0) {
+    picked.roles = props.roles;
+  }
+  if (props.whileLoadingAuth !== void 0) {
+    picked.whileLoadingAuth = props.whileLoadingAuth;
+  }
+  return picked;
+}
+function toWrappersArray(wrap) {
+  if (!wrap) {
+    return [];
+  }
+  return isSingleWrapper(wrap) ? [wrap] : wrap;
+}
+function isSingleWrapper(wrap) {
+  return !Array.isArray(wrap);
+}
 function analyzeRoutes(children, { currentPathName, userParamTypes }) {
   const pathRouteMap = {};
   const namedRoutesMap = {};
@@ -78,13 +103,8 @@ function analyzeRoutes(children, { currentPathName, userParamTypes }) {
         const {
           children: children2,
           whileLoadingPage: whileLoadingPageFromCurrentSet,
-          wrap: wrapFromCurrentSet,
-          ...otherPropsFromCurrentSet
+          wrap: wrapFromCurrentSet
         } = node.props;
-        let wrapperComponentsArray = [];
-        if (wrapFromCurrentSet) {
-          wrapperComponentsArray = Array.isArray(wrapFromCurrentSet) ? wrapFromCurrentSet : [wrapFromCurrentSet];
-        }
         nextSetId = nextSetId + 1;
         recurseThroughRouter({
           nodes: Children.toArray(children2),
@@ -96,11 +116,11 @@ function analyzeRoutes(children, { currentPathName, userParamTypes }) {
             ...previousSets,
             {
               id: createSetId(nextSetId, previousSets),
-              wrappers: wrapperComponentsArray,
+              wrappers: toWrappersArray(wrapFromCurrentSet),
               isPrivate: isPrivateSetNode(node) || // The following two conditions can be removed when we remove
               // the deprecated private prop
-              isPrivateNode(node) || !!otherPropsFromCurrentSet.private,
-              props: otherPropsFromCurrentSet
+              isPrivateNode(node) || !!node.props.private,
+              props: pickSetRenderProps(node.props)
             }
           ]
         });

package/dist/index.d.ts

@@ -9,7 +9,7 @@ export { Router } from './router.js';
 export { Route } from './Route.js';
 export { namedRoutes as routes } from './namedRoutes.js';
 export { Set, Private, PrivateSet, isSetNode, isPrivateSetNode, isPrivateNode, } from './Set.js';
-export type { WrapperType } from './Set.js';
+export type { WrapperProps, WrapperType } from './Set.js';
 export { default as RouteAnnouncement } from './route-announcement.js';
 export * from './route-announcement.js';
 export { default as RouteFocus } from './route-focus.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EACL,qBAAqB,EACrB,0BAA0B,GAC3B,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,WAAW,IAAI,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAExD,OAAO,EACL,GAAG,EACH,OAAO,EACP,UAAU,EACV,SAAS,EACT,gBAAgB,EAChB,aAAa,GACd,MAAM,UAAU,CAAA;AACjB,YAAY,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAE3C,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AACtE,cAAc,yBAAyB,CAAA;AACvC,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,kBAAkB,CAAA;AACxD,cAAc,kBAAkB,CAAA;AAChC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA;AAE/B,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAE1E,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAE1D;;;;;;;;;GASG;AAGH,MAAM,WAAW,eAAe;CAAG;AAGnC,cAAc,uBAAuB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EACL,qBAAqB,EACrB,0BAA0B,GAC3B,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,WAAW,IAAI,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAExD,OAAO,EACL,GAAG,EACH,OAAO,EACP,UAAU,EACV,SAAS,EACT,gBAAgB,EAChB,aAAa,GACd,MAAM,UAAU,CAAA;AACjB,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAEzD,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AACtE,cAAc,yBAAyB,CAAA;AACvC,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,kBAAkB,CAAA;AACxD,cAAc,kBAAkB,CAAA;AAChC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA;AAE/B,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAE1E,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAE1D;;;;;;;;;GASG;AAGH,MAAM,WAAW,eAAe;CAAG;AAGnC,cAAc,uBAAuB,CAAA"}

package/dist/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,KAAwB,MAAM,OAAO,CAAA;AAY5C,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAA;AAIrE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAErD,MAAM,WAAW,WAAY,SAAQ,IAAI,CACvC,0BAA0B,EAC1B,QAAQ,GAAG,iBAAiB,CAC7B;IACC,eAAe,CAAC,EAAE,oBAAoB,CAAA;IACtC,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,SAAS,CAAA;CACpB;AAED,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CAoBxC,CAAA"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgB,SAAS,EAAE,MAAM,OAAO,CAAA;AACpD,OAAO,KAAwB,MAAM,OAAO,CAAA;AAY5C,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAA;AAKrE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAErD,MAAM,WAAW,WAAY,SAAQ,IAAI,CACvC,0BAA0B,EAC1B,QAAQ,GAAG,iBAAiB,CAC7B;IACC,eAAe,CAAC,EAAE,oBAAoB,CAAA;IACtC,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,SAAS,CAAA;CACpB;AAED,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CAoBxC,CAAA"}

package/dist/router.js

@@ -9,6 +9,7 @@ import { PageLoadingContextProvider } from "./PageLoadingContext.js";
 import { ParamsProvider } from "./params.js";
 import { Redirect } from "./redirect.js";
 import { RouterContextProvider } from "./router-context.js";
+import { wrapWithSetWrappers } from "./Set.js";
 import { SplashPage } from "./splash-page.js";
 import { matchPath, parseSearch, replaceParams, validatePath } from "./util.js";
 const Router = ({
@@ -141,13 +142,7 @@ const WrappedPage = memo(({ sets, children }) => {
     return children;
   }
   return sets.reduceRight((acc, set) => {
-    let wrapped = set.wrappers.reduceRight((acc2, Wrapper, index) => {
-      return React.createElement(
-        Wrapper,
-        { ...set.props, key: set.id + "-" + index },
-        acc2
-      );
-    }, acc);
+    let wrapped = wrapWithSetWrappers(set.wrappers, set.id, acc);
     if (set.isPrivate) {
       const unauthenticated = set.props.unauthenticated;
       if (!unauthenticated || typeof unauthenticated !== "string") {
@@ -155,7 +150,15 @@ const WrappedPage = memo(({ sets, children }) => {
           "You must specify an `unauthenticated` route when using PrivateSet"
         );
       }
-      wrapped = /* @__PURE__ */ React.createElement(AuthenticatedRoute, { ...set.props, unauthenticated }, wrapped);
+      wrapped = /* @__PURE__ */ React.createElement(
+        AuthenticatedRoute,
+        {
+          unauthenticated,
+          roles: set.props.roles,
+          whileLoadingAuth: set.props.whileLoadingAuth
+        },
+        wrapped
+      );
     }
     return wrapped;
   }, children);

package/dist/rsc/ServerRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ServerRouter.d.ts","sourceRoot":"","sources":["../../src/rsc/ServerRouter.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,KAAK,MAAM,OAAO,CAAA;AAQzB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAA;AAEtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAKtD,MAAM,WAAW,WAAY,SAAQ,IAAI,CACvC,0BAA0B,EAC1B,QAAQ,GAAG,iBAAiB,CAC7B;IACC,eAAe,CAAC,EAAE,oBAAoB,CAAA;IACtC,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,SAAS,CAAA;CACpB;AAED,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CA4GxC,CAAA"}
+{"version":3,"file":"ServerRouter.d.ts","sourceRoot":"","sources":["../../src/rsc/ServerRouter.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgB,SAAS,EAAE,MAAM,OAAO,CAAA;AACpD,OAAO,KAAK,MAAM,OAAO,CAAA;AAQzB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAA;AAGtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAKtD,MAAM,WAAW,WAAY,SAAQ,IAAI,CACvC,0BAA0B,EAC1B,QAAQ,GAAG,iBAAiB,CAC7B;IACC,eAAe,CAAC,EAAE,oBAAoB,CAAA;IACtC,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,SAAS,CAAA;CACpB;AAED,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CA4GxC,CAAA"}

package/dist/rsc/ServerRouter.js

@@ -3,6 +3,7 @@ import { getAuthState, getLocation } from "@cedarjs/server-store";
 import { analyzeRoutes } from "../analyzeRoutes.js";
 import { namedRoutes } from "../namedRoutes.js";
 import { normalizePage } from "../page.js";
+import { wrapWithSetWrappers } from "../Set.js";
 import { SplashPage } from "../splash-page.js";
 import { matchPath, parseSearch, replaceParams, validatePath } from "../util.js";
 import { ServerRouteLoader } from "./ServerRouteLoader.js";
@@ -112,13 +113,7 @@ const WrappedPage = ({ routeLoaderElement, sets }) => {
     return routeLoaderElement;
   }
   return sets.reduceRight((acc, set) => {
-    let wrapped = set.wrappers.reduceRight((acc2, Wrapper, index) => {
-      return React.createElement(
-        Wrapper,
-        { ...set.props, key: set.id + "-" + index },
-        acc2
-      );
-    }, acc);
+    let wrapped = wrapWithSetWrappers(set.wrappers, set.id, acc);
     if (set.isPrivate) {
       const unauthenticated = set.props.unauthenticated;
       if (!unauthenticated || typeof unauthenticated !== "string") {
@@ -126,7 +121,15 @@ const WrappedPage = ({ routeLoaderElement, sets }) => {
           "You must specify an `unauthenticated` route when using PrivateSet"
         );
       }
-      wrapped = /* @__PURE__ */ React.createElement(AuthenticatedRoute, { ...set.props, unauthenticated }, wrapped);
+      wrapped = /* @__PURE__ */ React.createElement(
+        AuthenticatedRoute,
+        {
+          unauthenticated,
+          roles: set.props.roles,
+          whileLoadingAuth: set.props.whileLoadingAuth
+        },
+        wrapped
+      );
     }
     return wrapped;
   }, routeLoaderElement);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/router",
-  "version": "7.0.1-next.333",
+  "version": "7.0.1-next.467",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -52,29 +52,29 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/project-config": "7.0.1-next.333",
-    "@cedarjs/server-store": "7.0.1-next.333",
+    "@cedarjs/project-config": "7.0.1-next.467",
+    "@cedarjs/server-store": "7.0.1-next.467",
     "react-server-dom-webpack": "19.3.0",
     "ts-toolbelt": "9.6.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.5",
-    "@cedarjs/auth": "7.0.1-next.333",
-    "@cedarjs/framework-tools": "7.0.1-next.333",
+    "@cedarjs/auth": "7.0.1-next.467",
+    "@cedarjs/framework-tools": "7.0.1-next.467",
     "@testing-library/jest-dom": "6.9.1",
     "@types/react": "^19.2.0",
     "@types/react-dom": "^19.2.0",
-    "concurrently": "9.2.4",
-    "publint": "0.3.24",
+    "concurrently": "9.2.5",
+    "publint": "0.3.25",
     "react": "19.3.0",
     "react-dom": "19.3.0",
     "tstyche": "5.0.2",
     "typescript": "5.9.3",
-    "vite": "7.3.6",
+    "vite": "7.3.7",
     "vitest": "4.1.11"
   },
   "peerDependencies": {
-    "@cedarjs/auth": "7.0.1-next.333",
+    "@cedarjs/auth": "7.0.1-next.467",
     "react": "19.3.0",
     "react-dom": "19.3.0"
   },