crelte 0.1.2 → 0.2.0

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,14 @@ 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';
+        if (req.search.get('x-craft-live-preview')) {
+            req.origin = 'live-preview-init';
         }
         window.history.scrollRestoration = 'manual';
-        this.open(route, false);
+        this.open(req, {}, false);
     }
     /**
      * Initializes the router when running on the server.
@@ -60,8 +64,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 +105,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
@@ -116,10 +119,12 @@ export default class InnerRouter {
      * @param 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 +135,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 +167,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() {
@@ -239,7 +247,7 @@ export default class InnerRouter {
             // 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);
+            this.open(route, {}, false);
         });
     }
     /**
@@ -248,8 +256,8 @@ export default class InnerRouter {
      * @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
      */
-    open(target, pushState = true) {
-        const req = this.targetToRequest(target);
+    open(target, opts = {}, pushState = true) {
+        const req = this.targetToRequest(target, opts);
         const current = this.route;
         if (current) {
             // if the scrollY would still be updated we clear the timeout
@@ -270,12 +278,12 @@ 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.onRoute(req, () => {
                 this.pushState(req.toRoute());
             });
         }
@@ -293,9 +301,7 @@ export default class InnerRouter {
      */
     setRoute(req) {
         this.route = req.toRoute();
-        if (req.site)
-            this.site = req.site;
-        this.onRoute(req, this.site, () => { });
+        this.onRoute(req, () => { });
     }
     /**
      * This pushes the state of the route without triggering a currentRoute
@@ -310,8 +316,6 @@ export default class InnerRouter {
         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;
     }
     /**
      * This replaces the state of the route without triggering a currentRoute
@@ -323,8 +327,6 @@ export default class InnerRouter {
         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;
     }
     /**
      * Preload a url
@@ -335,18 +337,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) {

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,7 @@ export type RequestOptions = {
     index?: number;
     origin?: RouteOrigin;
     disableScroll?: boolean;
+    statusCode?: number;
 };
 /**
  * A Request is a Route with some extra options
@@ -21,16 +22,20 @@ export default class Request extends Route {
      * @default false
      */
     disableScroll: 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 +73,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,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"}

package/dist/routing/Request.js

@@ -11,6 +11,10 @@ export default class Request extends Route {
      * @default false
      */
     disableScroll;
+    /**
+     * The Status code that should be returned for a redirect
+     */
+    statusCode;
     /** @hidden */
     _renderBarrier;
     /**
@@ -19,16 +23,18 @@ export default class Request extends Route {
     constructor(url, site, opts = {}) {
         super(url, site, opts);
         this.disableScroll = opts.disableScroll ?? 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 +77,7 @@ export default class Request extends Route {
             index: this.index,
             origin: this.origin,
             disableScroll: this.disableScroll,
+            statusCode: this.statusCode ?? undefined,
         });
     }
     /**
@@ -83,6 +90,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;

package/dist/routing/Route.d.ts

@@ -28,9 +28,16 @@ export default class Route {
      */
     url: URL;
     /**
-     * The site of the route if it could be defined
+     * The site of the route
+     *
+     * ## Note
+     * The site might not always match with the current route
+     * but be the site default site or one that matches the
+     * users language.
+     *
+     * If that is important call `route.siteMatches()` to verify
      */
-    site: Site | null;
+    site: Site;
     /**
      * The scroll position of the current route
      */
@@ -47,7 +54,7 @@ export default class Route {
     /**
      * Creates a new Route
      */
-    constructor(url: string | URL, site: Site | null, opts?: RouteOptions);
+    constructor(url: string | URL, site: Site, opts?: RouteOptions);
     /**
      * Returns the uri of the route
      *
@@ -55,12 +62,13 @@ export default class Route {
      *
      * ## Example
      * ```
-     * const route = new Route('https://example.com/foo/bar/', null);
-     * console.log(route.uri); // '/foo/bar'
+     * const site = _; // site with url https://example.com/fo
+     * const route = new Route('https://example.com/foo/bar/', site);
+     * console.log(route.uri); // '/bar'
      *
-     * const site = _; // site with url https://example.com/foo
-     * const route2 = new Route('https://example.com/foo/bar/?a=1', site);
-     * console.log(route2.uri); // '/bar'
+     * const site2 = _; // site with url https://example.com/other
+     * const route2 = new Route('https://example.com/foo/bar/?a=1', site2);
+     * console.log(route2.uri); // '/foo/bar'
      * ```
      */
     get uri(): string;
@@ -71,12 +79,13 @@ export default class Route {
      *
      * ## Example
      * ```
+     * const site = _; // site with url https://example.com/foo
      * const route = new Route('https://example.com/foo/bar/', null);
-     * console.log(route.baseUrl); // 'https://example.com'
+     * console.log(route.baseUrl); // 'https://example.com/foo'
      *
-     * const site = _; // site with url https://example.com/foo
-     * const route2 = new Route('https://example.com/foo/bar/', site);
-     * console.log(route2.baseUrl); // 'https://example.com/foo'
+     * const site2 = _; // site with url https://example.com/other
+     * const route2 = new Route('https://example.com/foo/bar/', site2);
+     * console.log(route2.baseUrl); // 'https://example.com'
      * ```
      */
     get baseUrl(): string;
@@ -103,6 +112,10 @@ 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
      *

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

@@ -1 +1 @@
-{"version":3,"file":"Route.d.ts","sourceRoot":"","sources":["../../../../src/routing/Route.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,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;;OAEG;IACH,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAElB;;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,GAAG,IAAI,EAAE,IAAI,GAAE,YAAiB;IASzE;;;;;;;;;;;;;;OAcG;IACH,IAAI,GAAG,IAAI,MAAM,CAShB;IAED;;;;;;;;;;;;;;OAcG;IACH,IAAI,OAAO,IAAI,MAAM,CAIpB;IAED;;;;;;;;;;;OAWG;IACH,IAAI,MAAM,IAAI,eAAe,CAE5B;IAED;;;;;;;;OAQG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;;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;;;;;;;;;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"}

package/dist/routing/Route.js

@@ -1,4 +1,4 @@
-import { trimSlashEnd } from './Router.js';
+import { trimSlashEnd } from './utils.js';
 /**
  * A Route contains information about the current page for example the url and
  * the site id
@@ -12,7 +12,14 @@ export default class Route {
      */
     url;
     /**
-     * The site of the route if it could be defined
+     * The site of the route
+     *
+     * ## Note
+     * The site might not always match with the current route
+     * but be the site default site or one that matches the
+     * users language.
+     *
+     * If that is important call `route.siteMatches()` to verify
      */
     site;
     /**
@@ -45,17 +52,17 @@ export default class Route {
      *
      * ## Example
      * ```
-     * const route = new Route('https://example.com/foo/bar/', null);
-     * console.log(route.uri); // '/foo/bar'
+     * const site = _; // site with url https://example.com/fo
+     * const route = new Route('https://example.com/foo/bar/', site);
+     * console.log(route.uri); // '/bar'
      *
-     * const site = _; // site with url https://example.com/foo
-     * const route2 = new Route('https://example.com/foo/bar/?a=1', site);
-     * console.log(route2.uri); // '/bar'
+     * const site2 = _; // site with url https://example.com/other
+     * const route2 = new Route('https://example.com/foo/bar/?a=1', site2);
+     * console.log(route2.uri); // '/foo/bar'
      * ```
      */
     get uri() {
-        // todo check if this is correct
-        if (this.site) {
+        if (this.siteMatches()) {
             return trimSlashEnd(this.url.pathname.substring(this.site.uri.length));
         }
         return trimSlashEnd(this.url.pathname);
@@ -67,16 +74,17 @@ export default class Route {
      *
      * ## Example
      * ```
+     * const site = _; // site with url https://example.com/foo
      * const route = new Route('https://example.com/foo/bar/', null);
-     * console.log(route.baseUrl); // 'https://example.com'
+     * console.log(route.baseUrl); // 'https://example.com/foo'
      *
-     * const site = _; // site with url https://example.com/foo
-     * const route2 = new Route('https://example.com/foo/bar/', site);
-     * console.log(route2.baseUrl); // 'https://example.com/foo'
+     * const site2 = _; // site with url https://example.com/other
+     * const route2 = new Route('https://example.com/foo/bar/', site2);
+     * console.log(route2.baseUrl); // 'https://example.com'
      * ```
      */
     get baseUrl() {
-        if (this.site)
+        if (this.siteMatches())
             return trimSlashEnd(this.site.url.href);
         return this.url.origin;
     }
@@ -107,6 +115,19 @@ export default class Route {
     get hash() {
         return this.url.hash;
     }
+    /**
+     * Returns if the site matches the url
+     */
+    siteMatches() {
+        if (this.url.origin !== this.site.url.origin)
+            return false;
+        // now we need to validate the pathname we should make sure both end with a slash
+        // todo can we do this better?
+        // make sure that urls like pathname: /abcbc and site: /abc don't match
+        return (this.url.pathname + '/').startsWith(
+        // uri never returns a slash at the end
+        this.site.uri + '/');
+    }
     /**
      * Checks if the route is equal to another route
      *

package/dist/routing/Router.d.ts

@@ -2,7 +2,7 @@ import Route from './Route.js';
 import Site, { SiteFromGraphQl } from './Site.js';
 import { LoadFn } from './PageLoader.js';
 import { Readable } from 'crelte-std/stores';
-import Request from './Request.js';
+import Request, { RequestOptions } from './Request.js';
 export type RouterOptions = {
     preloadOnMouseOver?: boolean;
     debugTiming?: boolean;
@@ -11,7 +11,7 @@ export type RouterOptions = {
  * internal only
  */
 type Internal = {
-    onLoaded: (success: boolean, req: Request, site: Site, ready: () => any) => void;
+    onLoaded: (success: boolean, req: Request, ready: () => any) => void;
     onLoad: LoadFn;
     domReady: (req: Request) => void;
     initClient: () => void;
@@ -21,10 +21,8 @@ type ServerInited = {
     success: boolean;
     redirect: boolean;
     req: Request;
-    site: Site;
     props: any;
 };
-export declare function trimSlashEnd(str: string): string;
 export default class Router {
     /**
      * The current route
@@ -89,7 +87,7 @@ export default class Router {
      * // the following page will be opened https://example.com/de/foo/bar
      * ```
      */
-    open(target: string | URL | Route): void;
+    open(target: string | URL | Route, opts?: RequestOptions): void;
     /**
      * This pushes the state of the route without triggering an event
      *
@@ -147,7 +145,7 @@ export default class Router {
      *
      * @returns a function to remove the listener
      */
-    onRoute(fn: (route: Route, site: Site) => void): () => void;
+    onRoute(fn: (route: Route) => void): () => void;
     /**
      * Add a listener for the onRequest event
      *
@@ -155,7 +153,7 @@ export default class Router {
      *
      * @returns a function to remove the listener
      */
-    onRequest(fn: (req: Request, site: Site) => void): () => void;
+    onRequest(fn: (req: Request) => void): () => void;
     private setNewRoute;
     private _initClient;
     private _initServer;

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

@@ -1 +1 @@
-{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../../../src/routing/Router.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../../../src/routing/Router.ts"],"names":[],"mappings":"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"}