crelte 0.1.3 → 0.2.1

package/dist/routing/InnerRouter.d.ts

@@ -1,6 +1,6 @@
 import Site, { SiteFromGraphQl } from './Site.js';
 import History from './History.js';
-import Request from './Request.js';
+import Request, { RequestOptions } from './Request.js';
 import Route from './Route.js';
 export type InnerRouterOpts = {
     preloadOnMouseOver: boolean;
@@ -10,16 +10,21 @@ export type InnerRouterOpts = {
  */
 export default class InnerRouter {
     sites: Site[];
+    /**
+     * The current route
+     *
+     * ## Null
+     * It might be null on the first targetToRequest, open, and routeFromUrl call
+     */
     route: Route | null;
-    site: Site;
     history: History;
     preloadOnMouseOver: boolean;
     /**
      * @param changeHistory returns a function you need to call when you are ready to
      update the window history (note do not call this after another onRoute call was made)
      */
-    onRoute: (route: Request, site: Site, changeHistory: () => void) => void;
-    onPreload: (route: Request, site: Site) => void;
+    onRoute: (route: Request, changeHistory: () => void) => void;
+    onPreload: (route: Request) => void;
     private scrollDebounceTimeout;
     /**
      * Creates a new Router
@@ -39,8 +44,7 @@ export default class InnerRouter {
     /**
      * Get a site and if possible use the accept lang header.
      *
-     * @param {(string|null)} [acceptLang=null] Accept Language header.
-     * @return {Site}
+     * @param acceptLang Accept Language header.
      */
     siteByAcceptLang(acceptLang?: string | null): Site;
     /**
@@ -52,12 +56,13 @@ export default class InnerRouter {
      */
     siteById(id: number): Site | null;
     /**
-     * Resolve a url or Route and convert it to a Route
+     * Resolve a url or Route and convert it to a Request
      *
      * @param target
+     * @param opts, any option present will override the value in target
      * @return Returns null if the url does not match our host (the protocol get's ignored)
      */
-    targetToRequest(target: string | URL | Route | Request): Request;
+    targetToRequest(target: string | URL | Route | Request, opts?: RequestOptions): Request;
     /**
      * Resolve a url and convert it to a Route
      *
@@ -67,12 +72,16 @@ export default class InnerRouter {
     routeFromUrl(fullUrl: URL): Route;
     listen(): void;
     /**
-     * Open's a route
+     * Open a new route
      *
      * @param route a route object or an url or uri, never input the same route object again
      * @param pushState if true pushed the state to the window.history
+     *
+     * ## Important
+     * Make sure a req always has the correct origin,
+     * `push` and `replace` will cause this function to throw an error
      */
-    open(target: string | URL | Route | Request, pushState?: boolean): void;
+    open(req: Request): void;
     /**
      * Sets a route
      *
@@ -81,24 +90,25 @@ export default class InnerRouter {
      *
      * @param req
      */
-    setRoute(req: Request): void;
+    setRoute(req: Request, preventOnRoute?: boolean): void;
     /**
-     * This pushes the state of the route without triggering a currentRoute
-     * or currentSiteId change
+     * This pushes a new route to the history
      *
-     * You can use when using pagination for example change the route object
-     * (search argument) and then call pushState
+     * @param req, never input the same route object again
      *
-     * @param route, never input the same route object again
+     * ## Important
+     * Make sure the route has the correct origin
      */
-    pushState(route: Route): void;
+    push(req: Request, preventOnRoute?: boolean): void;
     /**
-     * This replaces the state of the route without triggering a currentRoute
-     * or currentSiteId change
+     * This replaces the current route
+     *
+     * @param req, never input the same route object again
      *
-     * @param route, never input the same route object again
+     * ## Important
+     * Make sure the route has the correct origin
      */
-    replaceState(route: Route): void;
+    replace(req: Request): void;
     /**
      * Preload a url
      *

package/dist/routing/InnerRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InnerRouter.d.ts","sourceRoot":"","sources":["../../../../src/routing/InnerRouter.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,EAAE,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,OAAO,OAAsB,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B,MAAM,MAAM,eAAe,GAAG;IAC7B,kBAAkB,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,WAAW;IAC/B,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,IAAI,EAAE,IAAI,CAAC;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,EAAE,OAAO,CAAC;IAC5B;;;OAGG;IACH,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IACzE,SAAS,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IAEhD,OAAO,CAAC,qBAAqB,CAAa;IAE1C;;;;;OAKG;gBACS,KAAK,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,eAAe;IAmB3D;;OAEG;IACH,UAAU;IAkBV;;OAEG;IACH,UAAU;IAEV;;;;;OAKG;IACH,gBAAgB,CAAC,UAAU,GAAE,MAAM,GAAG,IAAW,GAAG,IAAI;IAsCxD;;OAEG;IACH,WAAW,IAAI,IAAI;IAInB;;OAEG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAIjC;;;;;OAKG;IACH,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,GAAG,KAAK,GAAG,OAAO,GAAG,OAAO;IAqBhE;;;;;OAKG;IACH,YAAY,CAAC,OAAO,EAAE,GAAG,GAAG,KAAK;IA8BjC,MAAM;IA0FN;;;;;OAKG;IACH,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,GAAG,KAAK,GAAG,OAAO,EAAE,SAAS,GAAE,OAAc;IAyCtE;;;;;;;OAOG;IACH,QAAQ,CAAC,GAAG,EAAE,OAAO;IAOrB;;;;;;;;OAQG;IACH,SAAS,CAAC,KAAK,EAAE,KAAK;IAYtB;;;;;OAKG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK;IAYzB;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,GAAG,KAAK,GAAG,OAAO;IAoB9C,QAAQ,CAAC,GAAG,EAAE,OAAO;CAkErB"}
+{"version":3,"file":"InnerRouter.d.ts","sourceRoot":"","sources":["../../../../src/routing/InnerRouter.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,EAAE,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,OAAO,OAAO,EAAE,EAAa,cAAc,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B,MAAM,MAAM,eAAe,GAAG;IAC7B,kBAAkB,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,WAAW;IAC/B,KAAK,EAAE,IAAI,EAAE,CAAC;IACd;;;;;OAKG;IACH,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,EAAE,OAAO,CAAC;IAC5B;;;OAGG;IACH,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IAC7D,SAAS,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IAEpC,OAAO,CAAC,qBAAqB,CAAa;IAE1C;;;;;OAKG;gBACS,KAAK,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,eAAe;IAkB3D;;OAEG;IACH,UAAU;IAaV;;OAEG;IACH,UAAU;IAEV;;;;OAIG;IACH,gBAAgB,CAAC,UAAU,GAAE,MAAM,GAAG,IAAW,GAAG,IAAI;IAsCxD;;OAEG;IACH,WAAW,IAAI,IAAI;IAInB;;OAEG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAIjC;;;;;;OAMG;IACH,eAAe,CACd,MAAM,EAAE,MAAM,GAAG,GAAG,GAAG,KAAK,GAAG,OAAO,EACtC,IAAI,GAAE,cAAmB,GACvB,OAAO;IAwBV;;;;;OAKG;IACH,YAAY,CAAC,OAAO,EAAE,GAAG,GAAG,KAAK;IAgCjC,MAAM;IA6FN;;;;;;;;;OASG;IACH,IAAI,CAAC,GAAG,EAAE,OAAO;IAuCjB;;;;;;;OAOG;IACH,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,cAAc,UAAQ;IAM7C;;;;;;;OAOG;IACH,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,cAAc,UAAQ;IAsBzC;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,EAAE,OAAO;IAsBpB;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,GAAG,KAAK,GAAG,OAAO;IAW9C,QAAQ,CAAC,GAAG,EAAE,OAAO;CAsErB"}

package/dist/routing/InnerRouter.js

@@ -7,8 +7,13 @@ import Route from './Route.js';
  */
 export default class InnerRouter {
     sites;
+    /**
+     * The current route
+     *
+     * ## Null
+     * It might be null on the first targetToRequest, open, and routeFromUrl call
+     */
     route;
-    site;
     history;
     preloadOnMouseOver;
     /**
@@ -27,7 +32,6 @@ export default class InnerRouter {
     constructor(sites, opts) {
         this.sites = sites.map(s => new Site(s));
         this.route = null;
-        this.site = this.defaultSite();
         // @ts-ignore
         this.history = import.meta.env.SSR
             ? new ServerHistory()
@@ -44,14 +48,11 @@ export default class InnerRouter {
     initClient() {
         this.listen();
         // let's first try to load from the state
-        const route = this.targetToRequest(window.location.href);
-        route._fillFromState(window.history.state);
-        route.origin = 'init';
-        if (route.search.get('x-craft-live-preview')) {
-            route.origin = 'live-preview-init';
-        }
+        const req = this.targetToRequest(window.location.href);
+        req._fillFromState(window.history.state);
+        req.origin = 'init';
         window.history.scrollRestoration = 'manual';
-        this.open(route, false);
+        this.setRoute(req);
     }
     /**
      * Initializes the router when running on the server.
@@ -60,8 +61,7 @@ export default class InnerRouter {
     /**
      * Get a site and if possible use the accept lang header.
      *
-     * @param {(string|null)} [acceptLang=null] Accept Language header.
-     * @return {Site}
+     * @param acceptLang Accept Language header.
      */
     siteByAcceptLang(acceptLang = null) {
         if (!acceptLang)
@@ -102,7 +102,7 @@ export default class InnerRouter {
      * Get the default site
      */
     defaultSite() {
-        return this.sites[0];
+        return this.sites.find(s => s.primary) ?? this.sites[0];
     }
     /**
      * Tries to get a site by it's id
@@ -111,15 +111,18 @@ export default class InnerRouter {
         return this.sites.find(s => s.id === id) ?? null;
     }
     /**
-     * Resolve a url or Route and convert it to a Route
+     * Resolve a url or Route and convert it to a Request
      *
      * @param target
+     * @param opts, any option present will override the value in target
      * @return Returns null if the url does not match our host (the protocol get's ignored)
      */
-    targetToRequest(target) {
+    targetToRequest(target, opts = {}) {
         if (typeof target === 'string') {
             if (target.startsWith('/')) {
-                const site = this.site;
+                // todo should we use the language matching or throw if the route does not
+                // exists
+                const site = this.route?.site ?? this.defaultSite();
                 target = new URL(site.uri + target, site.url);
             }
             else {
@@ -130,8 +133,9 @@ export default class InnerRouter {
             target = this.routeFromUrl(target);
         }
         if (!isRequest(target)) {
-            return Request.fromRoute(target);
+            return Request.fromRoute(target, opts);
         }
+        target._updateOpts(opts);
         return target;
     }
     /**
@@ -161,7 +165,9 @@ export default class InnerRouter {
                 continue;
             site = s;
         }
-        route.site = site;
+        // todo should we throw if we can't find a site
+        // or use the site which matches the language
+        route.site = site ?? this.defaultSite();
         return route;
     }
     listen() {
@@ -177,11 +183,18 @@ export default class InnerRouter {
             if (!link.href.startsWith('http'))
                 return;
             e.preventDefault();
-            const route = this.routeFromUrl(link.href);
-            if (this.route?.eq(route))
+            const req = this.targetToRequest(link.href, { origin: 'click' });
+            const routeEq = this.route && this.route.eqUrl(req) && this.route.eqSearch(req);
+            // the route is the same don't do anything
+            // or maybe scroll the page to the hash? todo
+            if (routeEq && this.route?.eqHash(req))
                 return;
-            route.origin = 'click';
-            this.open(route);
+            // this means the hash did not match, so we wan't to just scroll but not load
+            // data
+            if (routeEq) {
+                req.disableLoadData = true;
+            }
+            this.open(req);
         });
         if (this.preloadOnMouseOver) {
             let currentMouseOver = null;
@@ -220,7 +233,7 @@ export default class InnerRouter {
                         return;
                     // use the latest state
                     this.history.replaceState(this.route._toState());
-                    if (current.origin === 'live-preview-init') {
+                    if (current.inLivePreview()) {
                         sessionStorage.setItem('live-preview-scroll', 
                         // use the latest scrollY
                         this.route.scrollY + '');
@@ -232,24 +245,26 @@ export default class InnerRouter {
         window.addEventListener('popstate', async (e) => {
             if (!('route' in e.state))
                 return;
-            const route = this.targetToRequest(window.location.href);
-            route._fillFromState(e.state);
-            route.origin = 'pop';
-            // since the pop event replaced our state we can't replace the state
-            // for the scrollY in our open call so we just clear the current
-            // route since it is now already the new route
-            this.route = null;
-            this.open(route, false);
+            const req = this.targetToRequest(window.location.href);
+            req._fillFromState(e.state);
+            req.origin = 'pop';
+            this.setRoute(req);
         });
     }
     /**
-     * Open's a route
+     * Open a new route
      *
      * @param route a route object or an url or uri, never input the same route object again
      * @param pushState if true pushed the state to the window.history
+     *
+     * ## Important
+     * Make sure a req always has the correct origin,
+     * `push` and `replace` will cause this function to throw an error
      */
-    open(target, pushState = true) {
-        const req = this.targetToRequest(target);
+    open(req) {
+        if (['push', 'replace'].includes(req.origin)) {
+            throw new Error('Do not use open with push or replace');
+        }
         const current = this.route;
         if (current) {
             // if the scrollY would still be updated we clear the timeout
@@ -270,18 +285,13 @@ export default class InnerRouter {
         if ((current && current.url.origin !== req.url.origin) ||
             // @ts-ignore
             import.meta.env.SSR) {
-            this.history.open(req.url.href);
+            this.history.open(req);
             return;
         }
-        if (pushState) {
-            req.index = (current?.index ?? 0) + 1;
-            this.onRoute(req, req.site ?? this.site, () => {
-                this.pushState(req.toRoute());
-            });
-        }
-        else {
-            this.setRoute(req);
-        }
+        req.index = (current?.index ?? 0) + 1;
+        this.onRoute(req, () => {
+            this.push(req, true);
+        });
     }
     /**
      * Sets a route
@@ -291,40 +301,56 @@ export default class InnerRouter {
      *
      * @param req
      */
-    setRoute(req) {
+    setRoute(req, preventOnRoute = false) {
         this.route = req.toRoute();
-        if (req.site)
-            this.site = req.site;
-        this.onRoute(req, this.site, () => { });
+        if (!preventOnRoute)
+            this.onRoute(req, () => { });
     }
     /**
-     * This pushes the state of the route without triggering a currentRoute
-     * or currentSiteId change
+     * This pushes a new route to the history
      *
-     * You can use when using pagination for example change the route object
-     * (search argument) and then call pushState
+     * @param req, never input the same route object again
      *
-     * @param route, never input the same route object again
+     * ## Important
+     * Make sure the route has the correct origin
      */
-    pushState(route) {
-        const url = route.url;
-        this.history.pushState(route._toState(), url.pathname + url.search + url.hash);
-        this.route = route;
-        if (route.site)
-            this.site = route.site;
+    push(req, preventOnRoute = false) {
+        const url = req.url;
+        // todo a push should also store the previous scrollY
+        let nReq = req;
+        if (req.scrollY === null) {
+            // if there is no scrollY stored we store the current scrollY
+            // since a push does not cause a scroll top
+            // todo: probably should refactor something probably
+            // should not be here
+            nReq = req.clone();
+            nReq.scrollY = this.history.scrollY();
+        }
+        this.history.pushState(nReq._toState(), url.pathname + url.search + url.hash);
+        this.setRoute(req, preventOnRoute);
     }
     /**
-     * This replaces the state of the route without triggering a currentRoute
-     * or currentSiteId change
+     * This replaces the current route
+     *
+     * @param req, never input the same route object again
      *
-     * @param route, never input the same route object again
+     * ## Important
+     * Make sure the route has the correct origin
      */
-    replaceState(route) {
-        const url = route.url;
-        this.history.replaceState(route._toState(), url.pathname + url.search + url.hash);
-        this.route = route;
-        if (route.site)
-            this.site = route.site;
+    replace(req) {
+        const url = req.url;
+        let nReq = req;
+        if (req.scrollY === null) {
+            // if there is no scrollY stored we store the current scrollY
+            // since a replace does not cause a scrollTo and we wan't
+            // history back to work as intended
+            // todo: probably should refactor something probably
+            // should not be here
+            nReq = req.clone();
+            nReq.scrollY = this.history.scrollY();
+        }
+        this.history.replaceState(nReq._toState(), url.pathname + url.search + url.hash);
+        this.setRoute(req);
     }
     /**
      * Preload a url
@@ -335,18 +361,11 @@ export default class InnerRouter {
      */
     preload(target) {
         const req = this.targetToRequest(target);
-        // todo, don't think this makes any sense
-        // if the domain of the current site is different than the domain of the
-        // new site id does not make sense to preload
-        if (this.site.url.origin !== req.url.origin) {
-            return;
-        }
         const current = this.route;
-        const site = req.site ?? this.site;
         // if the origin matches, the route will be able to be load
         // so let's preload it
         if (current && current.url.origin === req.url.origin) {
-            this.onPreload(req, site);
+            this.onPreload(req);
         }
     }
     domReady(req) {
@@ -356,7 +375,7 @@ export default class InnerRouter {
         let scrollTo = null;
         // if the route is a live preview init and we have a scrollY stored
         // scroll to that
-        if (req.origin === 'live-preview-init') {
+        if (req.inLivePreview()) {
             const scrollY = sessionStorage.getItem('live-preview-scroll');
             if (scrollY) {
                 scrollTo = {
@@ -386,6 +405,9 @@ export default class InnerRouter {
                 behavior: 'instant',
             };
         }
+        // make sure push and replace don't cause a scroll if it is not intended
+        if (!scrollTo && (req.origin === 'push' || req.origin === 'replace'))
+            return;
         // scroll to the top if nothing else matches
         if (!scrollTo) {
             scrollTo = {

package/dist/routing/PageLoader.d.ts

@@ -1,5 +1,4 @@
 import Request from './Request.js';
-import Site from './Site.js';
 export type PageLoaderOptions = {
     debugTiming: boolean;
 };
@@ -7,7 +6,7 @@ export type LoadResponse = {
     success: boolean;
     data: any;
 };
-export type LoadFn = (req: Request, site: Site, opts: LoadOptions) => Promise<any> | any;
+export type LoadFn = (req: Request, opts: LoadOptions) => Promise<any> | any;
 export type LoadOptions = {
     setProgress: (num: number) => void;
 };
@@ -18,7 +17,7 @@ export default class PageLoader<More> {
     private debugTiming;
     private preloadedUrls;
     private loadingVersion;
-    onLoaded: (resp: LoadResponse, req: Request, site: Site, more: More) => void;
+    onLoaded: (resp: LoadResponse, req: Request, more: More) => void;
     onProgress: (loading: boolean, progress?: number) => void;
     loadFn: LoadFn;
     /**
@@ -31,7 +30,7 @@ export default class PageLoader<More> {
      * Discard the current page load if one is happening
      */
     discard(): void;
-    load(req: Request, site: Site, more: More): Promise<void>;
-    preload(req: Request, site: Site): Promise<void>;
+    load(req: Request, more: More): Promise<void>;
+    preload(req: Request): Promise<void>;
 }
 //# sourceMappingURL=PageLoader.d.ts.map

package/dist/routing/PageLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PageLoader.d.ts","sourceRoot":"","sources":["../../../../src/routing/PageLoader.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,MAAM,MAAM,iBAAiB,GAAG;IAC/B,WAAW,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,GAAG,CAAC;CACV,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG,CACpB,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,WAAW,KACb,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;AAExB,MAAM,MAAM,WAAW,GAAG;IACzB,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU,CAAC,IAAI;IACnC,OAAO,CAAC,WAAW,CAAU;IAC7B,OAAO,CAAC,aAAa,CAAc;IAEnC,OAAO,CAAC,cAAc,CAAS;IAE/B,QAAQ,EAAE,CACT,IAAI,EAAE,YAAY,EAClB,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,IAAI,KACN,IAAI,CAAC;IACV,UAAU,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1D,MAAM,EAAE,MAAM,CAAC;IAEf;;;;OAIG;gBACS,OAAO,EAAE,iBAAiB;IAWtC;;OAEG;IACH,OAAO;IAKD,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;IAiCzC,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI;CActC"}
+{"version":3,"file":"PageLoader.d.ts","sourceRoot":"","sources":["../../../../src/routing/PageLoader.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,MAAM,MAAM,iBAAiB,GAAG;IAC/B,WAAW,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,GAAG,CAAC;CACV,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;AAE7E,MAAM,MAAM,WAAW,GAAG;IACzB,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU,CAAC,IAAI;IACnC,OAAO,CAAC,WAAW,CAAU;IAC7B,OAAO,CAAC,aAAa,CAAc;IAEnC,OAAO,CAAC,cAAc,CAAS;IAE/B,QAAQ,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IACjE,UAAU,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1D,MAAM,EAAE,MAAM,CAAC;IAEf;;;;OAIG;gBACS,OAAO,EAAE,iBAAiB;IAWtC;;OAEG;IACH,OAAO;IAKD,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI;IAiC7B,OAAO,CAAC,GAAG,EAAE,OAAO;CAc1B"}

package/dist/routing/PageLoader.js

@@ -28,7 +28,7 @@ export default class PageLoader {
         this.loadingVersion++;
         this.onProgress(false);
     }
-    async load(req, site, more) {
+    async load(req, more) {
         this.onProgress(true);
         const version = ++this.loadingVersion;
         const startTime = this.debugTiming ? Date.now() : null;
@@ -39,7 +39,7 @@ export default class PageLoader {
         };
         const resp = { success: false, data: null };
         try {
-            resp.data = await this.loadFn(req, site, { setProgress });
+            resp.data = await this.loadFn(req, { setProgress });
             resp.success = true;
         }
         catch (e) {
@@ -52,16 +52,16 @@ export default class PageLoader {
         if (this.loadingVersion !== version)
             return console.log('route changed quickly, ignoring response');
         this.onProgress(false);
-        this.onLoaded(resp, req, site, more);
+        this.onLoaded(resp, req, more);
     }
     // you don't need to wait on this call
-    async preload(req, site) {
+    async preload(req) {
         const url = req.url.origin + req.url.pathname;
         if (this.preloadedUrls.has(url))
             return;
         this.preloadedUrls.add(url);
         try {
-            await this.loadFn(req, site, { setProgress: () => null });
+            await this.loadFn(req, { setProgress: () => null });
         }
         catch (_e) {
             console.log('preload failed');

package/dist/routing/Request.d.ts

@@ -9,6 +9,8 @@ export type RequestOptions = {
     index?: number;
     origin?: RouteOrigin;
     disableScroll?: boolean;
+    disableLoadData?: boolean;
+    statusCode?: number;
 };
 /**
  * A Request is a Route with some extra options
@@ -21,16 +23,25 @@ export default class Request extends Route {
      * @default false
      */
     disableScroll: boolean;
+    /**
+     * Disable loading data
+     * @default false
+     */
+    disableLoadData: boolean;
+    /**
+     * The Status code that should be returned for a redirect
+     */
+    statusCode: number | null;
     /** @hidden */
     _renderBarrier: RenderBarrier;
     /**
      * Create a new Request
      */
-    constructor(url: string | URL, site: Site | null, opts?: RequestOptions);
+    constructor(url: string | URL, site: Site, opts?: RequestOptions);
     /**
      * Create a Request from a Route
      */
-    static fromRoute(route: Route): Request;
+    static fromRoute(route: Route, opts?: RequestOptions): Request;
     /**
      * With delayRender you can make sure that the render waits
      * until you are ready. This is useful for building page transitions.
@@ -68,6 +79,8 @@ export default class Request extends Route {
      * Create a Route from the Request
      */
     toRoute(): Route;
+    /** @hidden */
+    _updateOpts(opts?: RequestOptions): void;
 }
 export declare function isRequest(req: any): req is Request;
 declare class RenderBarrier {

package/dist/routing/Request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Request.d.ts","sourceRoot":"","sources":["../../../../src/routing/Request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,KAAK;IACzC;;;OAGG;IACH,aAAa,EAAE,OAAO,CAAC;IAEvB,cAAc;IACd,cAAc,EAAE,aAAa,CAAC;IAE9B;;OAEG;gBAEF,GAAG,EAAE,MAAM,GAAG,GAAG,EACjB,IAAI,EAAE,IAAI,GAAG,IAAI,EACjB,IAAI,GAAE,cAAmB;IAQ1B;;OAEG;IACH,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK;IAQ7B;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;IACH,WAAW,IAAI,WAAW;IAI1B;;OAEG;IACH,KAAK;IASL;;OAEG;IACH,OAAO;CAOP;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,OAAO,CAElD;AAED,cAAM,aAAa;IAClB,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,EAAE,WAAW,CAAC;;IAQlB,MAAM,IAAI,OAAO;IAIjB,GAAG,IAAI,WAAW;IAclB,cAAc;IACd,MAAM;IAQN,cAAc;IACd,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC;CAGzB;AAED;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG;IACzB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAE9B;;OAEG;IACH,MAAM,EAAE,MAAM,IAAI,CAAC;CACnB,CAAC"}
+{"version":3,"file":"Request.d.ts","sourceRoot":"","sources":["../../../../src/routing/Request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,KAAK;IACzC;;;OAGG;IACH,aAAa,EAAE,OAAO,CAAC;IAEvB;;;OAGG;IACH,eAAe,EAAE,OAAO,CAAC;IAEzB;;OAEG;IACH,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAE1B,cAAc;IACd,cAAc,EAAE,aAAa,CAAC;IAE9B;;OAEG;gBACS,GAAG,EAAE,MAAM,GAAG,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,GAAE,cAAmB;IASpE;;OAEG;IACH,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,GAAE,cAAmB;IASxD;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;IACH,WAAW,IAAI,WAAW;IAI1B;;OAEG;IACH,KAAK;IAUL;;OAEG;IACH,OAAO;IAQP,cAAc;IACd,WAAW,CAAC,IAAI,GAAE,cAAmB;CAOrC;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,OAAO,CAElD;AAED,cAAM,aAAa;IAClB,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,EAAE,WAAW,CAAC;;IAQlB,MAAM,IAAI,OAAO;IAIjB,GAAG,IAAI,WAAW;IAclB,cAAc;IACd,MAAM;IAQN,cAAc;IACd,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC;CAGzB;AAED;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG;IACzB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAE9B;;OAEG;IACH,MAAM,EAAE,MAAM,IAAI,CAAC;CACnB,CAAC"}

package/dist/routing/Request.js

@@ -11,6 +11,15 @@ export default class Request extends Route {
      * @default false
      */
     disableScroll;
+    /**
+     * Disable loading data
+     * @default false
+     */
+    disableLoadData;
+    /**
+     * The Status code that should be returned for a redirect
+     */
+    statusCode;
     /** @hidden */
     _renderBarrier;
     /**
@@ -19,16 +28,19 @@ export default class Request extends Route {
     constructor(url, site, opts = {}) {
         super(url, site, opts);
         this.disableScroll = opts.disableScroll ?? false;
+        this.disableLoadData = opts.disableLoadData ?? false;
+        this.statusCode = opts.statusCode ?? null;
         this._renderBarrier = new RenderBarrier();
     }
     /**
      * Create a Request from a Route
      */
-    static fromRoute(route) {
+    static fromRoute(route, opts = {}) {
         return new Request(route.url.href, route.site, {
             scrollY: route.scrollY ?? undefined,
             index: route.index,
             origin: route.origin,
+            ...opts,
         });
     }
     /**
@@ -71,6 +83,7 @@ export default class Request extends Route {
             index: this.index,
             origin: this.origin,
             disableScroll: this.disableScroll,
+            statusCode: this.statusCode ?? undefined,
         });
     }
     /**
@@ -83,6 +96,14 @@ export default class Request extends Route {
             origin: this.origin,
         });
     }
+    /** @hidden */
+    _updateOpts(opts = {}) {
+        this.scrollY = opts.scrollY ?? this.scrollY;
+        this.index = opts.index ?? this.index;
+        this.origin = opts.origin ?? this.origin;
+        this.disableScroll = opts.disableScroll ?? this.disableScroll;
+        this.statusCode = opts.statusCode ?? this.statusCode;
+    }
 }
 export function isRequest(req) {
     return typeof req === 'object' && req !== null && req instanceof Request;