crelte 0.2.0 → 0.2.2

package/dist/cookies/ServerCookies.d.ts

@@ -1,5 +1,9 @@
 import { Cookies, SetOptions } from './index.js';
 import { type SetCookie } from './utils.js';
+/**
+ * ## Warning
+ * This is not stable and should only be used internally by crelte
+ */
 export default class ServerCookies implements Cookies {
     requestCookies: Map<string, string>;
     setCookies: Map<string, SetCookie>;

package/dist/cookies/ServerCookies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ServerCookies.d.ts","sourceRoot":"","sources":["../../../../src/cookies/ServerCookies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAgB,KAAK,SAAS,EAAqB,MAAM,YAAY,CAAC;AAE7E,MAAM,CAAC,OAAO,OAAO,aAAc,YAAW,OAAO;IACpD,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;;IAOnC,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAM5B,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAUhC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,UAAU,GAAG,IAAI;IAIzD,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI1B,qBAAqB,IAAI,MAAM,EAAE;CAKjC"}
+{"version":3,"file":"ServerCookies.d.ts","sourceRoot":"","sources":["../../../../src/cookies/ServerCookies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAgB,KAAK,SAAS,EAAqB,MAAM,YAAY,CAAC;AAE7E;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,aAAc,YAAW,OAAO;IACpD,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;;IAOnC,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAM5B,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAUhC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,UAAU,GAAG,IAAI;IAIzD,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI1B,qBAAqB,IAAI,MAAM,EAAE;CAKjC"}

package/dist/cookies/ServerCookies.js

@@ -1,4 +1,8 @@
 import { parseCookies, setCookieToString } from './utils.js';
+/**
+ * ## Warning
+ * This is not stable and should only be used internally by crelte
+ */
 export default class ServerCookies {
     requestCookies;
     setCookies;

package/dist/cookies/internal.d.ts

@@ -0,0 +1,3 @@
+import ServerCookies from './ServerCookies.js';
+export { ServerCookies };
+//# sourceMappingURL=internal.d.ts.map

package/dist/cookies/internal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../../../../src/cookies/internal.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,CAAC"}

package/dist/cookies/internal.js

@@ -0,0 +1,2 @@
+import ServerCookies from './ServerCookies.js';
+export { ServerCookies };

package/dist/index.d.ts

@@ -91,6 +91,7 @@ export declare function getGlobal<T extends GlobalData>(name: string): Global<T>
  * This only works during component initialisation.
  */
 export declare function getCookies(): Cookies;
+export declare function onRoute(fn: (route: Route, crelte: Crelte) => void): void;
 /**
  * Listen for requests
  *

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,oBAAoB,CAAC;AAC5C,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAC9C,OAAO,KAAK,IAAI,MAAM,mBAAmB,CAAC;AAC1C,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAC;AAChD,OAAO,MAAM,EAAE,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAC/C,OAAO,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EACN,QAAQ,EACR,aAAa,EACb,UAAU,EACV,WAAW,EACX,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACN,MAAM,EACN,aAAa,EACb,KAAK,YAAY,EACjB,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,aAAa,GAClB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,IAAI,QAAQ,CAEtC;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,OAAO,CAEpC;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,IAAI,QAAQ,CAAC,KAAK,CAAC,CAE1C;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,CAExC;AAED;;;;;;;GAOG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAAC;AACrD,wBAAgB,MAAM,CAAC,IAAI,EAAE,eAAe,GAAG,MAAM,CAAC;AACtD,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;AAKpD;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,QAAQ,CAAC,OAAO,CAAC,CAE9C;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,IAAI,QAAQ,CAAC,MAAM,CAAC,CAErD;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,UAAU,EAC7C,IAAI,EAAE,MAAM,GACV,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAElB;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,OAAO,CAEpC;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,KAAK,IAAI,QAOxD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,oBAAoB,CAAC;AAC5C,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAC9C,OAAO,KAAK,IAAI,MAAM,mBAAmB,CAAC;AAC1C,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAC;AAChD,OAAO,MAAM,EAAE,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAC/C,OAAO,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EACN,QAAQ,EACR,aAAa,EACb,UAAU,EACV,WAAW,EACX,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACN,MAAM,EACN,aAAa,EACb,KAAK,YAAY,EACjB,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,aAAa,GAClB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,IAAI,QAAQ,CAEtC;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,OAAO,CAEpC;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,IAAI,QAAQ,CAAC,KAAK,CAAC,CAE1C;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,CAExC;AAED;;;;;;;GAOG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAAC;AACrD,wBAAgB,MAAM,CAAC,IAAI,EAAE,eAAe,GAAG,MAAM,CAAC;AACtD,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;AAKpD;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,QAAQ,CAAC,OAAO,CAAC,CAE9C;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,IAAI,QAAQ,CAAC,MAAM,CAAC,CAErD;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,UAAU,EAC7C,IAAI,EAAE,MAAM,GACV,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAElB;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,OAAO,CAEpC;AAED,wBAAgB,OAAO,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,QAOjE;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,KAAK,IAAI,QAOxD"}

package/dist/index.js

@@ -95,6 +95,13 @@ export function getGlobal(name) {
 export function getCookies() {
     return getCrelte().cookies;
 }
+export function onRoute(fn) {
+    const crelte = getCrelte();
+    const rmListener = crelte.router.onRoute(route => {
+        fn(route, crelte);
+    });
+    onDestroy(rmListener);
+}
 /**
  * Listen for requests
  *

package/dist/init/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../src/init/client.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAKrD;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IACtB,4BAA4B;IAC5B,GAAG,EAAE,GAAG,CAAC;IACT,8BAA8B;IAC9B,SAAS,EAAE,GAAG,CAAC;IACf,iDAAiD;IACjD,UAAU,EAAE,YAAY,CAAC;IACzB,mDAAmD;IACnD,WAAW,CAAC,EAAE,YAAY,CAAC;IAI3B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAIpB,qCAAqC;IACrC,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,mDAAmD;IACnD,WAAW,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAYF;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,IAAI,CAAC,IAAI,EAAE,QAAQ,QAiIlC"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../src/init/client.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAKrD;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IACtB,4BAA4B;IAC5B,GAAG,EAAE,GAAG,CAAC;IACT,8BAA8B;IAC9B,SAAS,EAAE,GAAG,CAAC;IACf,iDAAiD;IACjD,UAAU,EAAE,YAAY,CAAC;IACzB,mDAAmD;IACnD,WAAW,CAAC,EAAE,YAAY,CAAC;IAI3B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAIpB,qCAAqC;IACrC,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,mDAAmD;IACnD,WAAW,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAYF;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,IAAI,CAAC,IAAI,EAAE,QAAQ,QA0IlC"}

package/dist/init/client.js

@@ -128,6 +128,12 @@ export function main(data) {
         }
         await render();
     };
+    crelte.router._internal.onNothingLoaded = async (req, ready) => {
+        crelte.globals._updateSiteId(req.site.id);
+        ready();
+        await tick();
+        crelte.router._internal.domReady(req);
+    };
     crelte.router._internal.initClient();
 }
 function handleLoadError(e) {

package/dist/routing/InnerRouter.d.ts

@@ -1,7 +1,7 @@
 import Site, { SiteFromGraphQl } from './Site.js';
 import History from './History.js';
 import Request, { RequestOptions } from './Request.js';
-import Route, { RouteOptions } from './Route.js';
+import Route from './Route.js';
 export type InnerRouterOpts = {
     preloadOnMouseOver: boolean;
 };
@@ -56,9 +56,10 @@ 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, opts?: RequestOptions): Request;
@@ -71,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, opts?: RouteOptions, pushState?: boolean): void;
+    open(req: Request): void;
     /**
      * Sets a route
      *
@@ -85,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,OAAO,EAAE,EAAa,cAAc,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,KAAK,EAAE,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAEjD,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;IAkBV;;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;;;;;OAKG;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;IA0FN;;;;;OAKG;IACH,IAAI,CACH,MAAM,EAAE,MAAM,GAAG,GAAG,GAAG,KAAK,GAAG,OAAO,EACtC,IAAI,GAAE,YAAiB,EACvB,SAAS,GAAE,OAAc;IA0C1B;;;;;;;OAOG;IACH,QAAQ,CAAC,GAAG,EAAE,OAAO;IAMrB;;;;;;;;OAQG;IACH,SAAS,CAAC,KAAK,EAAE,KAAK;IAWtB;;;;;OAKG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK;IAWzB;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,GAAG,KAAK,GAAG,OAAO;IAW9C,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

@@ -51,11 +51,8 @@ export default class InnerRouter {
         const req = this.targetToRequest(window.location.href);
         req._fillFromState(window.history.state);
         req.origin = 'init';
-        if (req.search.get('x-craft-live-preview')) {
-            req.origin = 'live-preview-init';
-        }
         window.history.scrollRestoration = 'manual';
-        this.open(req, {}, false);
+        this.setRoute(req);
     }
     /**
      * Initializes the router when running on the server.
@@ -114,9 +111,10 @@ 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, opts = {}) {
@@ -185,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;
@@ -228,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 + '');
@@ -240,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, opts = {}, pushState = true) {
-        const req = this.targetToRequest(target, opts);
+    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
@@ -281,15 +288,10 @@ export default class InnerRouter {
             this.history.open(req);
             return;
         }
-        if (pushState) {
-            req.index = (current?.index ?? 0) + 1;
-            this.onRoute(req, () => {
-                this.pushState(req.toRoute());
-            });
-        }
-        else {
-            this.setRoute(req);
-        }
+        req.index = (current?.index ?? 0) + 1;
+        this.onRoute(req, () => {
+            this.push(req, true);
+        });
     }
     /**
      * Sets a route
@@ -299,34 +301,56 @@ export default class InnerRouter {
      *
      * @param req
      */
-    setRoute(req) {
+    setRoute(req, preventOnRoute = false) {
         this.route = req.toRoute();
-        this.onRoute(req, () => { });
+        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;
+    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 route, never input the same route object again
+     * @param req, 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;
+    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
@@ -351,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 = {
@@ -381,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/Request.d.ts

@@ -9,6 +9,7 @@ export type RequestOptions = {
     index?: number;
     origin?: RouteOrigin;
     disableScroll?: boolean;
+    disableLoadData?: boolean;
     statusCode?: number;
 };
 /**
@@ -22,6 +23,11 @@ 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
      */

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;IACxB,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;;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;IAQpE;;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"}
+{"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,11 @@ 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
      */
@@ -23,6 +28,7 @@ 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();
     }

package/dist/routing/Route.d.ts

@@ -10,17 +10,18 @@ export type RouteOptions = {
  *
  * - `'init'`: is set on the first page load
  * - `'manual'`: is set when a route is triggered manually via `Router.open`
- * - `'live-preview-init'`: is set on the first page load in live preview mode
  * - `'click'`: is set when a route is triggered by a click event
  * - `'pop'`: is set when a route is triggered by a popstate event (back/forward)
+ * - `'replace'`: is set when a route is replaced via `Router.replaceState`
+ * - `'push'`: is set when a route is pushed via `Router.pushState`
+ *
+ * ## Note
+ * `replace` and `push` will not call loadData
  */
-export type RouteOrigin = 'init' | 'live-preview-init' | 'manual' | 'click' | 'pop';
+export type RouteOrigin = 'init' | 'manual' | 'click' | 'pop' | 'replace' | 'push';
 /**
  * A Route contains information about the current page for example the url and
- * the site id
- *
- * ## Note
- * Never update the route directly, clone it before
+ * the site
  */
 export default class Route {
     /**
@@ -40,6 +41,13 @@ export default class Route {
     site: Site;
     /**
      * The scroll position of the current route
+     *
+     * ## Note
+     * This does not have to represent the current scroll position
+     * should more be used internally.
+     *
+     * It might be useful for a new request to specify the wanted
+     * scroll position
      */
     scrollY: number | null;
     /**
@@ -112,17 +120,6 @@ export default class Route {
      * ```
      */
     get hash(): string;
-    /**
-     * Returns if the site matches the url
-     */
-    siteMatches(): boolean;
-    /**
-     * Checks if the route is equal to another route
-     *
-     * This checks all properties of the url but search params do not have to be
-     * in the same order
-     */
-    eq(route: Route): boolean;
     /**
      * Checks if there are previous routes which would allow it to go back
      */
@@ -151,6 +148,32 @@ export default class Route {
      * ```
      */
     setSearchParam(key: string, value?: string | number | null): void;
+    inLivePreview(): boolean;
+    /**
+     * Returns if the site matches the url
+     */
+    siteMatches(): boolean;
+    /**
+     * Checks if the route is equal to another route
+     *
+     * This checks all properties of the url but search params do not have to be
+     * in the same order
+     */
+    eq(route: Route | null): boolean | null;
+    /**
+     * Checks if the route is equal to another route
+     *
+     * This does not check the search params or hash
+     */
+    eqUrl(route: Route | null): boolean | null;
+    /**
+     * Checks if the search params are equal to another route
+     */
+    eqSearch(route: Route | null): boolean | null;
+    /**
+     * Checks if the hash is equal to another route
+     */
+    eqHash(route: Route | null): boolean | null;
     /**
      * Create a copy of the request
      */

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

@@ -1 +1 @@
-{"version":3,"file":"Route.d.ts","sourceRoot":"","sources":["../../../../src/routing/Route.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,MAAM,MAAM,YAAY,GAAG;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,WAAW,CAAC;CACrB,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,MAAM,WAAW,GACpB,MAAM,GACN,mBAAmB,GACnB,QAAQ,GACR,OAAO,GACP,KAAK,CAAC;AAET;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,KAAK;IACzB;;OAEG;IACH,GAAG,EAAE,GAAG,CAAC;IAET;;;;;;;;;OASG;IACH,IAAI,EAAE,IAAI,CAAC;IAEX;;OAEG;IACH,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAEvB;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,MAAM,EAAE,WAAW,CAAC;IAEpB;;OAEG;gBACS,GAAG,EAAE,MAAM,GAAG,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,GAAE,YAAiB;IASlE;;;;;;;;;;;;;;;OAeG;IACH,IAAI,GAAG,IAAI,MAAM,CAQhB;IAED;;;;;;;;;;;;;;;OAeG;IACH,IAAI,OAAO,IAAI,MAAM,CAIpB;IAED;;;;;;;;;;;OAWG;IACH,IAAI,MAAM,IAAI,eAAe,CAE5B;IAED;;;;;;;;OAQG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;OAEG;IACH,WAAW,IAAI,OAAO;IAatB;;;;;OAKG;IACH,EAAE,CAAC,KAAK,EAAE,KAAK;IAwBf;;OAEG;IACH,SAAS,IAAI,OAAO;IAIpB;;;;;;;;OAQG;IACH,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAI1C;;;;;;;;;;;;OAYG;IACH,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAQ1D;;OAEG;IACH,KAAK;IAQL,cAAc;IACd,cAAc,CAAC,KAAK,EAAE,GAAG;IAQzB,cAAc;IACd,QAAQ,IAAI,GAAG;CAQf"}
+{"version":3,"file":"Route.d.ts","sourceRoot":"","sources":["../../../../src/routing/Route.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,MAAM,MAAM,YAAY,GAAG;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,WAAW,CAAC;CACrB,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,WAAW,GACpB,MAAM,GACN,QAAQ,GACR,OAAO,GACP,KAAK,GACL,SAAS,GACT,MAAM,CAAC;AAEV;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,KAAK;IACzB;;OAEG;IACH,GAAG,EAAE,GAAG,CAAC;IAET;;;;;;;;;OASG;IACH,IAAI,EAAE,IAAI,CAAC;IAEX;;;;;;;;;OASG;IACH,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAEvB;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,MAAM,EAAE,WAAW,CAAC;IAEpB;;OAEG;gBACS,GAAG,EAAE,MAAM,GAAG,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,GAAE,YAAiB;IASlE;;;;;;;;;;;;;;;OAeG;IACH,IAAI,GAAG,IAAI,MAAM,CAQhB;IAED;;;;;;;;;;;;;;;OAeG;IACH,IAAI,OAAO,IAAI,MAAM,CAIpB;IAED;;;;;;;;;;;OAWG;IACH,IAAI,MAAM,IAAI,eAAe,CAE5B;IAED;;;;;;;;OAQG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;OAEG;IACH,SAAS,IAAI,OAAO;IAIpB;;;;;;;;OAQG;IACH,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAI1C;;;;;;;;;;;;OAYG;IACH,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAQ1D,aAAa,IAAI,OAAO;IAIxB;;OAEG;IACH,WAAW,IAAI,OAAO;IAatB;;;;;OAKG;IACH,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAStB;;;;OAIG;IACH,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAQzB;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAkB5B;;OAEG;IACH,MAAM,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAI1B;;OAEG;IACH,KAAK;IAQL,cAAc;IACd,cAAc,CAAC,KAAK,EAAE,GAAG;IAQzB,cAAc;IACd,QAAQ,IAAI,GAAG;CAQf"}