crelte 0.2.2 → 0.3.1

package/dist/init/server.js

@@ -25,7 +25,7 @@ import { gql } from '../graphql/GraphQl.js';
  * ```
  */
 export async function main(data) {
-    const builder = new CrelteBuilder();
+    const builder = new CrelteBuilder(data.app.config ?? {});
     // setup viteEnv
     data.serverData.viteEnv.forEach((v, k) => {
         builder.ssrCache.set(k, v);
@@ -33,10 +33,7 @@ export async function main(data) {
     const endpoint = data.serverData.endpoint;
     builder.ssrCache.set('ENDPOINT_URL', endpoint);
     builder.ssrCache.set('CRAFT_WEB_URL', data.serverData.craftWeb);
-    builder.setupGraphQl(endpoint, {
-        debug: data.graphQlDebug,
-        debugTiming: data.debugTiming,
-    });
+    builder.setupGraphQl(endpoint);
     const cookies = data.serverData.cookies ?? '';
     builder.setupCookies(cookies);
     const csites = await loadSites(builder, data.serverData);

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

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../../src/init/shared.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAgB,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,UAAU,GAAG,CAAC,CAAC,EAAE,CAAC;IACjB,cAAc,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IAGhC,aAAa,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IAE9B,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;CACrD;AAED,UAAU,cAAc,CAAC,CAAC,EAAE,CAAC;IAE5B,OAAO,EAAE,GAAG,CAAC;IAEb,QAAQ,CAAC,CAAC,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CACnD;AAED,KAAK,kBAAkB,CAAC,CAAC,EAAE,CAAC,IACzB,CAAC,MAAM,OAAO,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GACrC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAExB,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,QAKpE;AAED,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,aAAa,GAAG,IAAI,CAE3D;AAED;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,GAAG,GAAG,GAAG,CAYvC;AAED,wBAAsB,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EACnC,EAAE,EAAE,aAAa,EACjB,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EACd,UAAU,EAAE,YAAY,EACxB,WAAW,CAAC,EAAE,YAAY,EAC1B,QAAQ,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,GAAG,CAAC,CAsGd"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../../src/init/shared.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAgB,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,UAAU,GAAG,CAAC,CAAC,EAAE,CAAC;IACjB,cAAc,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IAGhC,aAAa,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IAE9B,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;CACrD;AAED,UAAU,cAAc,CAAC,CAAC,EAAE,CAAC;IAE5B,OAAO,EAAE,GAAG,CAAC;IAEb,QAAQ,CAAC,CAAC,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CACnD;AAED,KAAK,kBAAkB,CAAC,CAAC,EAAE,CAAC,IACzB,CAAC,MAAM,OAAO,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GACrC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAExB,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,QAKpE;AAED,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,aAAa,GAAG,IAAI,CAE3D;AAED;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,GAAG,GAAG,GAAG,CAYvC;AAED,wBAAsB,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EACnC,EAAE,EAAE,aAAa,EACjB,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EACd,UAAU,EAAE,YAAY,EACxB,WAAW,CAAC,EAAE,YAAY,EAC1B,QAAQ,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,GAAG,CAAC,CAqGd"}

package/dist/init/shared.js

@@ -40,19 +40,21 @@ export async function loadFn(cr, app, entryQuery, globalQuery, loadOpts) {
         dataProm = callLoadData(app.loadGlobalData, cr, null);
     }
     let globalProm = null;
-    if (globalQuery && !cr.globals._wasLoaded()) {
+    if (globalQuery && !cr.globals._wasLoaded(cr.site.id)) {
         globalProm = (async () => {
-            const res = await cr.query(globalQuery);
+            const res = await cr.query(globalQuery, {
+                siteId: cr.site.id,
+            });
             // we need to do this sorcery here and can't wait until all
             // globals functions are done, because some global function
             // might want to use globals, and for that the function
-            // getOrWait exists on Globals
+            // getAsync exists on Globals
             cr.globals._setData(cr.site.id, res);
             return res;
         })();
     }
     let pageProm = null;
-    if (cr.req.site) {
+    if (cr.req.siteMatches()) {
         let uri = decodeURI(cr.req.uri);
         if (uri.startsWith('/'))
             uri = uri.substring(1);
@@ -60,7 +62,7 @@ export async function loadFn(cr, app, entryQuery, globalQuery, loadOpts) {
             uri = '__home__';
         pageProm = cr.query(entryQuery, {
             uri,
-            siteId: cr.req.site.id,
+            siteId: cr.site.id,
         });
     }
     const pluginsLoadGlobalData = cr.events.trigger('loadGlobalData', cr);
@@ -75,13 +77,11 @@ export async function loadFn(cr, app, entryQuery, globalQuery, loadOpts) {
     if (global) {
         cr.globals._setData(cr.site.id, global);
     }
-    else if (!cr.globals._wasLoaded()) {
+    else if (!cr.globals._wasLoaded(cr.site.id)) {
         // we need to set the global data to an empty object
         // so any waiters get's triggered
         cr.globals._setData(cr.site.id, {});
     }
-    // allow cr to get the global data
-    cr._globalDataLoaded();
     const entry = getEntry(page);
     let template;
     if (app.templates) {

package/dist/loadData/Globals.d.ts

@@ -1,19 +1,20 @@
-export type GlobalWaiters = [(g: Global<any> | null) => void];
+export type GlobalWaiters<T> = [(g: T | null) => void];
 export default class Globals {
     private waiters;
-    private entries;
-    private loaded;
-    private prevSiteId;
+    private data;
+    private stores;
+    private currentSiteId;
     constructor();
+    get<T = any>(name: string, siteId: number): T | null;
     /**
      * returns a store which contains a globalSet
      *
      * ## Note
      * This only works in loadData, in loadGlobalData this will
      * always return null. In that context you should use
-     * `.getGlobalAsync`
+     * `.getAsync`
      */
-    get<T extends GlobalData>(name: string): Global<T> | null;
+    getStore<T = any>(name: string): Global<T> | null;
     /**
      * Get a store which contains a globalSet and wait until it is loaded
      *
@@ -21,32 +22,21 @@ export default class Globals {
      * This is only useful in loadGlobalData in all other cases
      * you can use `.getGlobal` which does return a Promise
      */
-    getAsync<T extends GlobalData>(name: string): Promise<Global<T> | null> | Global<T> | null;
+    getAsync<T = any>(name: string, siteId: number): Promise<T | null>;
     /** @hidden */
-    _wasLoaded(): boolean;
+    _wasLoaded(siteId: number): boolean;
     /** @hidden */
     _setData(siteId: number, data: any): void;
     /** @hidden */
-    _globalsBySite(siteId: number): Map<string, any>;
-    /** @hidden */
     _updateSiteId(siteId: number): void;
 }
-/**
- * A globalSet Data
- *
- * Each global query should contain the siteId
- */
-export interface GlobalData {
-    siteId?: number;
-    [key: string]: any;
-}
 /**
  * A globalSet store
  */
-export declare class Global<T extends GlobalData> {
+export declare class Global<T = any> {
+    /** @hidden */
     private inner;
-    private languages;
-    constructor(name: string, data: T[] | T, siteId: number);
+    constructor(name: string, data: T);
     /**
      * The function get's called once with the current value and then when the
      * values changes
@@ -58,15 +48,9 @@ export declare class Global<T extends GlobalData> {
      * The current value
      */
     get(): T;
-    /**
-     * Get the value based on the siteId
-     *
-     * ## Note
-     * If you pass a siteId which comes from craft
-     * you will never receive null
-     */
-    bySiteId(siteId: number): T | null;
     /** @hidden */
-    _updateSiteId(siteId: number): void;
+    _setSilent(value: T): void;
+    /** @hidden */
+    _notify(): void;
 }
 //# sourceMappingURL=Globals.d.ts.map

package/dist/loadData/Globals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Globals.d.ts","sourceRoot":"","sources":["../../../../src/loadData/Globals.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,KAAK,IAAI,CAAC,CAAC;AAE9D,MAAM,CAAC,OAAO,OAAO,OAAO;IAG3B,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,UAAU,CAAgB;;IASlC;;;;;;;OAOG;IACH,GAAG,CAAC,CAAC,SAAS,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI;IAIzD;;;;;;OAMG;IACH,QAAQ,CAAC,CAAC,SAAS,UAAU,EAC5B,IAAI,EAAE,MAAM,GACV,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI;IAc/C,cAAc;IACd,UAAU,IAAI,OAAO;IAOrB,cAAc;IACd,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;IAgBlC,cAAc;IACd,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC;IAUhD,cAAc;IACd,aAAa,CAAC,MAAM,EAAE,MAAM;CAM5B;AAED;;;;GAIG;AACH,MAAM,WAAW,UAAU;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACnB;AAED;;GAEG;AACH,qBAAa,MAAM,CAAC,CAAC,SAAS,UAAU;IACvC,OAAO,CAAC,KAAK,CAAc;IAE3B,OAAO,CAAC,SAAS,CAAa;gBAElB,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM;IAsBvD;;;;;OAKG;IACH,SAAS,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,IAAI,GAAG,MAAM,IAAI;IAI3C;;OAEG;IACH,GAAG,IAAI,CAAC;IAIR;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,GAAG,IAAI;IAOlC,cAAc;IACd,aAAa,CAAC,MAAM,EAAE,MAAM;CAM5B"}
+{"version":3,"file":"Globals.d.ts","sourceRoot":"","sources":["../../../../src/loadData/Globals.ts"],"names":[],"mappings":"AAWA,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,KAAK,IAAI,CAAC,CAAC;AAEvD,MAAM,CAAC,OAAO,OAAO,OAAO;IAG3B,OAAO,CAAC,OAAO,CAA+C;IAC9D,OAAO,CAAC,IAAI,CAAgC;IAC5C,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,aAAa,CAAgB;;IASrC,GAAG,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC,GAAG,IAAI;IAIpD;;;;;;;OAOG;IACH,QAAQ,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI;IAIjD;;;;;;OAMG;IACH,QAAQ,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAqBlE,cAAc;IACd,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAQnC,cAAc;IACd,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;IAUlC,cAAc;IACd,aAAa,CAAC,MAAM,EAAE,MAAM;CAuB5B;AAED;;GAEG;AACH,qBAAa,MAAM,CAAC,CAAC,GAAG,GAAG;IAC1B,cAAc;IACd,OAAO,CAAC,KAAK,CAAc;gBAEf,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IAiBjC;;;;;OAKG;IACH,SAAS,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,IAAI,GAAG,MAAM,IAAI;IAI3C;;OAEG;IACH,GAAG,IAAI,CAAC;IAIR,cAAc;IACd,UAAU,CAAC,KAAK,EAAE,CAAC;IAInB,cAAc;IACd,OAAO;CAGP"}

package/dist/loadData/Globals.js

@@ -4,20 +4,24 @@ const emergency = getGlobal('emergency');
 
 // returns the data based on the current site (no store)
 cr.getGlobal('emergency')
+
 */
 import { Writable } from 'crelte-std/stores';
 export default class Globals {
     // while the globals are not loaded if somebody calls
-    // getOrWait then we need to store the waiters
+    // getAsync then we need to store the waiters
     waiters;
-    entries;
-    loaded;
-    prevSiteId;
+    data;
+    stores;
+    currentSiteId;
     constructor() {
         this.waiters = new Map();
-        this.entries = new Map();
-        this.loaded = false;
-        this.prevSiteId = null;
+        this.data = new Map();
+        this.stores = new Map();
+        this.currentSiteId = null;
+    }
+    get(name, siteId) {
+        return this.data.get(siteId)?.get(name) ?? null;
     }
     /**
      * returns a store which contains a globalSet
@@ -25,10 +29,10 @@ export default class Globals {
      * ## Note
      * This only works in loadData, in loadGlobalData this will
      * always return null. In that context you should use
-     * `.getGlobalAsync`
+     * `.getAsync`
      */
-    get(name) {
-        return this.entries.get(name) ?? null;
+    getStore(name) {
+        return this.stores.get(name) ?? null;
     }
     /**
      * Get a store which contains a globalSet and wait until it is loaded
@@ -37,78 +41,78 @@ export default class Globals {
      * This is only useful in loadGlobalData in all other cases
      * you can use `.getGlobal` which does return a Promise
      */
-    getAsync(name) {
-        if (this.loaded)
-            return this.get(name);
-        let waiter = this.waiters.get(name);
+    getAsync(name, siteId) {
+        if (this._wasLoaded(siteId))
+            return Promise.resolve(this.get(name, siteId));
+        let listeners = this.waiters.get(siteId);
+        if (!listeners) {
+            listeners = new Map();
+            this.waiters.set(siteId, listeners);
+        }
+        let waiter = listeners.get(name);
         if (!waiter) {
             waiter = [];
-            this.waiters.set(name, waiter);
+            listeners.set(name, waiter);
         }
         return new Promise(resolve => {
             waiter.push(resolve);
         });
     }
     /** @hidden */
-    _wasLoaded() {
-        return this.loaded;
+    _wasLoaded(siteId) {
+        return this.data.has(siteId);
     }
     // data is the data from the global graphql
     // so it contains some keys and data which should be parsed
     // and created a store for each key
+    // do not call this if _wasLoaded returns true with the same siteId
     /** @hidden */
     _setData(siteId, data) {
-        const wasLoaded = this.loaded;
-        this.loaded = true;
-        for (const [key, value] of Object.entries(data)) {
-            this.entries.set(key, new Global(key, value, siteId));
-        }
-        if (!wasLoaded) {
-            this.waiters.forEach((waiters, key) => {
-                waiters.forEach(waiter => waiter(this.get(key)));
-            });
-            this.waiters.clear();
-        }
-    }
-    /** @hidden */
-    _globalsBySite(siteId) {
-        const map = new Map();
-        for (const [key, global] of this.entries) {
-            map.set(key, global.bySiteId(siteId));
-        }
-        return map;
+        const map = new Map(Object.entries(data));
+        this.data.set(siteId, map);
+        this.waiters.get(siteId)?.forEach((waiters, key) => {
+            waiters.forEach(waiter => waiter(map.get(key)));
+        });
+        this.waiters.delete(siteId);
     }
     /** @hidden */
     _updateSiteId(siteId) {
-        // todo we should only trigger
-        if (this.prevSiteId === siteId)
+        if (this.currentSiteId === siteId)
             return;
-        this.entries.forEach(global => global._updateSiteId(siteId));
+        const data = this.data.get(siteId) ?? new Map();
+        // we set all global data to null via setSilent
+        // then set them all with the new data
+        // and update all of them
+        this.stores.forEach(global => global._setSilent(null));
+        data.forEach((value, key) => {
+            let global = this.stores.get(key);
+            if (global) {
+                global._setSilent(value);
+            }
+            else {
+                global = new Global(key, value);
+                this.stores.set(key, global);
+            }
+        });
+        this.stores.forEach(global => global._notify());
     }
 }
 /**
  * A globalSet store
  */
 export class Global {
+    /** @hidden */
     inner;
-    /// if languages is null this means we always have the same data
-    languages;
-    constructor(name, data, siteId) {
-        this.languages = null;
-        let inner;
-        if (Array.isArray(data)) {
-            // make sure the data contains an object with the property
-            // siteId
-            this.languages = data;
-            inner = data.find(d => d.siteId === siteId);
-            if (!inner?.siteId) {
-                throw new Error(`The global query ${name} does not contain the required siteId property`);
-            }
-        }
-        else {
-            inner = data;
+    constructor(name, data) {
+        // todo remove in v1.0
+        // In v0.2, we queried the global data for all sites.
+        // We now check if the siteId is present and notify the user to remove it.
+        if (typeof data.siteId === 'number' ||
+            (Array.isArray(data) && typeof data[0]?.siteId === 'number')) {
+            throw new Error(`The global query ${name} should not include the siteId` +
+                ` property. Instead, use the siteId as a parameter.`);
         }
-        this.inner = new Writable(inner);
+        this.inner = new Writable(data);
     }
     /**
      * The function get's called once with the current value and then when the
@@ -125,23 +129,12 @@ export class Global {
     get() {
         return this.inner.get();
     }
-    /**
-     * Get the value based on the siteId
-     *
-     * ## Note
-     * If you pass a siteId which comes from craft
-     * you will never receive null
-     */
-    bySiteId(siteId) {
-        if (this.languages)
-            return this.languages.find(d => d.siteId === siteId) ?? null;
-        return this.inner.get();
+    /** @hidden */
+    _setSilent(value) {
+        this.inner.setSilent(value);
     }
     /** @hidden */
-    _updateSiteId(siteId) {
-        if (!this.languages)
-            return;
-        const inner = this.languages.find(d => d.siteId === siteId);
-        this.inner.set(inner);
+    _notify() {
+        this.inner.notify();
     }
 }

package/dist/routing/InnerRouter.d.ts

@@ -82,15 +82,6 @@ export default class InnerRouter {
      * `push` and `replace` will cause this function to throw an error
      */
     open(req: Request): void;
-    /**
-     * Sets a route
-     *
-     * Will trigger an onRoute event but will not store any scroll progress
-     * or modify the history
-     *
-     * @param req
-     */
-    setRoute(req: Request, preventOnRoute?: boolean): void;
     /**
      * This pushes a new route to the history
      *
@@ -99,7 +90,7 @@ export default class InnerRouter {
      * ## Important
      * Make sure the route has the correct origin
      */
-    push(req: Request, preventOnRoute?: boolean): void;
+    push(req: Request): void;
     /**
      * This replaces the current route
      *

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,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"}
+{"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;IAgBV;;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;IAKjC;;;;;;OAMG;IACH,eAAe,CACd,MAAM,EAAE,MAAM,GAAG,GAAG,GAAG,KAAK,GAAG,OAAO,EACtC,IAAI,GAAE,cAAmB,GACvB,OAAO;IA0BV;;;;;OAKG;IACH,YAAY,CAAC,OAAO,EAAE,GAAG,GAAG,KAAK;IAgCjC,MAAM;IAoGN;;;;;;;;;OASG;IACH,IAAI,CAAC,GAAG,EAAE,OAAO;IA4CjB;;;;;;;OAOG;IACH,IAAI,CAAC,GAAG,EAAE,OAAO;IAuBjB;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,EAAE,OAAO;IAuBpB;;;;;;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

@@ -52,7 +52,10 @@ export default class InnerRouter {
         req._fillFromState(window.history.state);
         req.origin = 'init';
         window.history.scrollRestoration = 'manual';
-        this.setRoute(req);
+        // we set it now instead of waiting for the onRoute call
+        // because the window.history is already set
+        this.route = req.toRoute();
+        this.onRoute(req, () => { });
     }
     /**
      * Initializes the router when running on the server.
@@ -110,6 +113,7 @@ export default class InnerRouter {
     siteById(id) {
         return this.sites.find(s => s.id === id) ?? null;
     }
+    // keep this doc in sync with Router.targetToRequest
     /**
      * Resolve a url or Route and convert it to a Request
      *
@@ -125,6 +129,9 @@ export default class InnerRouter {
                 const site = this.route?.site ?? this.defaultSite();
                 target = new URL(site.uri + target, site.url);
             }
+            else if (!target) {
+                throw new Error('the url is not allowed to be empty');
+            }
             else {
                 target = new URL(target);
             }
@@ -205,7 +212,9 @@ export default class InnerRouter {
                     return;
                 if (link && link.target.toLowerCase() === '_blank')
                     return;
-                if (link && !link.hasAttribute('data-no-preload')) {
+                if (link &&
+                    !link.hasAttribute('data-no-preload') &&
+                    link.href) {
                     this.preload(link.href);
                 }
                 currentMouseOver = link;
@@ -243,12 +252,15 @@ export default class InnerRouter {
             });
         }
         window.addEventListener('popstate', async (e) => {
-            if (!('route' in e.state))
+            if (!e.state?.route)
                 return;
             const req = this.targetToRequest(window.location.href);
             req._fillFromState(e.state);
             req.origin = 'pop';
-            this.setRoute(req);
+            // we set it now instead of waiting for the onRoute call
+            // because the window.history was already modified
+            this.route = req.toRoute();
+            this.onRoute(req, () => { });
         });
     }
     /**
@@ -290,22 +302,11 @@ export default class InnerRouter {
         }
         req.index = (current?.index ?? 0) + 1;
         this.onRoute(req, () => {
-            this.push(req, true);
+            const url = req.url;
+            this.history.pushState(req._toState(), url.pathname + url.search + url.hash);
+            this.route = req.toRoute();
         });
     }
-    /**
-     * Sets a route
-     *
-     * Will trigger an onRoute event but will not store any scroll progress
-     * or modify the history
-     *
-     * @param req
-     */
-    setRoute(req, preventOnRoute = false) {
-        this.route = req.toRoute();
-        if (!preventOnRoute)
-            this.onRoute(req, () => { });
-    }
     /**
      * This pushes a new route to the history
      *
@@ -314,7 +315,7 @@ export default class InnerRouter {
      * ## Important
      * Make sure the route has the correct origin
      */
-    push(req, preventOnRoute = false) {
+    push(req) {
         const url = req.url;
         // todo a push should also store the previous scrollY
         let nReq = req;
@@ -326,8 +327,10 @@ export default class InnerRouter {
             nReq = req.clone();
             nReq.scrollY = this.history.scrollY();
         }
-        this.history.pushState(nReq._toState(), url.pathname + url.search + url.hash);
-        this.setRoute(req, preventOnRoute);
+        this.onRoute(req, () => {
+            this.history.pushState(req._toState(), url.pathname + url.search + url.hash);
+            this.route = req.toRoute();
+        });
     }
     /**
      * This replaces the current route
@@ -349,8 +352,10 @@ export default class InnerRouter {
             nReq = req.clone();
             nReq.scrollY = this.history.scrollY();
         }
-        this.history.replaceState(nReq._toState(), url.pathname + url.search + url.hash);
-        this.setRoute(req);
+        this.onRoute(req, () => {
+            this.history.replaceState(req._toState(), url.pathname + url.search + url.hash);
+            this.route = req.toRoute();
+        });
     }
     /**
      * Preload a url

package/dist/routing/Request.d.ts

@@ -8,6 +8,8 @@ export type RequestOptions = {
     scrollY?: number;
     index?: number;
     origin?: RouteOrigin;
+    state?: Record<string, any>;
+    context?: Record<string, any>;
     disableScroll?: boolean;
     disableLoadData?: boolean;
     statusCode?: number;

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,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"}
+{"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;AAG7B;;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,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,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;IAWxD;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;IACH,WAAW,IAAI,WAAW;IAI1B;;OAEG;IACH,KAAK;IAYL;;OAEG;IACH,OAAO;IAUP,cAAc;IACd,WAAW,CAAC,IAAI,GAAE,cAAmB;CASrC;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

@@ -1,5 +1,6 @@
 import { Barrier } from 'crelte-std/sync';
 import Route from './Route.js';
+import { objClone } from '../utils.js';
 /**
  * A Request is a Route with some extra options
  * you get a Request from the onRequest event or
@@ -40,6 +41,8 @@ export default class Request extends Route {
             scrollY: route.scrollY ?? undefined,
             index: route.index,
             origin: route.origin,
+            state: route._state,
+            context: route._context,
             ...opts,
         });
     }
@@ -82,6 +85,8 @@ export default class Request extends Route {
             scrollY: this.scrollY ?? undefined,
             index: this.index,
             origin: this.origin,
+            state: objClone(this._state),
+            context: this._context,
             disableScroll: this.disableScroll,
             statusCode: this.statusCode ?? undefined,
         });
@@ -94,6 +99,8 @@ export default class Request extends Route {
             scrollY: this.scrollY ?? undefined,
             index: this.index,
             origin: this.origin,
+            state: objClone(this._state),
+            context: this._context,
         });
     }
     /** @hidden */
@@ -101,6 +108,8 @@ export default class Request extends Route {
         this.scrollY = opts.scrollY ?? this.scrollY;
         this.index = opts.index ?? this.index;
         this.origin = opts.origin ?? this.origin;
+        this._state = opts.state ?? this._state;
+        this._context = opts.context ?? this._context;
         this.disableScroll = opts.disableScroll ?? this.disableScroll;
         this.statusCode = opts.statusCode ?? this.statusCode;
     }