crelte 0.5.0-beta.2 → 0.5.0-beta.4

package/dist/cookies/ServerCookies.d.ts

@@ -7,10 +7,10 @@ import { type SetCookie } from './utils.js';
 export default class ServerCookies implements Cookies {
     requestCookies: Map<string, string>;
     setCookies: Map<string, SetCookie>;
-    constructor(cookies: string);
+    constructor(headers: Headers);
     get(name: string): string | null;
     set(name: string, value: string, opts?: SetOptions): void;
     remove(name: string, opts?: RemoveOptions): void;
-    _getSetCookiesHeaders(): string[];
+    _populateHeaders(headers: Headers): void;
 }
 //# sourceMappingURL=ServerCookies.d.ts.map

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,aAAa,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAChE,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;gBAEvB,OAAO,EAAE,MAAM;IAM3B,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,EAAE,IAAI,CAAC,EAAE,aAAa,GAAG,IAAI;IAIhD,qBAAqB,IAAI,MAAM,EAAE;CAKjC"}
+{"version":3,"file":"ServerCookies.d.ts","sourceRoot":"","sources":["../../src/cookies/ServerCookies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAChE,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;gBAEvB,OAAO,EAAE,OAAO;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,EAAE,IAAI,CAAC,EAAE,aAAa,GAAG,IAAI;IAIhD,gBAAgB,CAAC,OAAO,EAAE,OAAO;CAKjC"}

package/dist/cookies/ServerCookies.js

@@ -6,8 +6,8 @@ import { parseCookies, setCookieToString } from './utils.js';
 export default class ServerCookies {
     requestCookies;
     setCookies;
-    constructor(cookies) {
-        this.requestCookies = parseCookies(cookies);
+    constructor(headers) {
+        this.requestCookies = parseCookies(headers.get('cookie') ?? '');
         this.setCookies = new Map();
     }
     /// Rethrns the value of the cookie with the given name, or null if it doesn't exist.
@@ -25,7 +25,9 @@ export default class ServerCookies {
     remove(name, opts) {
         this.set(name, '', { ...opts, maxAge: 0 });
     }
-    _getSetCookiesHeaders() {
-        return Array.from(this.setCookies.values()).map(setCookie => setCookieToString(setCookie));
+    _populateHeaders(headers) {
+        for (const setCookie of this.setCookies.values()) {
+            headers.append('set-cookie', setCookieToString(setCookie));
+        }
     }
 }

package/dist/crelte.d.ts

@@ -97,6 +97,22 @@ export type Crelte = {
     getEnv(name: 'CRAFT_WEB_URL'): string;
     getEnv(name: 'FRONTEND_URL'): string;
     getEnv(name: string): string | null;
+    /**
+     * returns the frontend url with an optional path
+     *
+     * ## Note
+     * On the client this will always be the current origin
+     * and on the server it will be the from the env `FRONTEND_URL` env
+     * variable
+     */
+    frontendUrl(path?: string): URL;
+    /**
+     * returns the backend url with an optional path
+     *
+     * ## Note
+     * For the origin the `ENDPOINT_URL` env variable is used
+     */
+    backendUrl(path?: string): URL;
     /**
      * returns a store which contains a globalSet
      *

package/dist/crelte.d.ts.map

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

package/dist/crelte.js

@@ -1,4 +1,5 @@
 import { Request } from './routing/index.js';
+import { urlWithPath } from './utils.js';
 export function configWithDefaults(config = {}) {
     return {
         preloadOnMouseOver: config.preloadOnMouseOver ?? false,
@@ -21,6 +22,8 @@ export function newCrelte({ config, ssrCache, plugins, events, globals, router,
         cookies,
         getPlugin: name => plugins.get(name),
         getEnv: key => ssrCache.get(key),
+        frontendUrl: path => urlWithPath(ssrCache.get('FRONTEND_URL'), path),
+        backendUrl: path => urlWithPath(ssrCache.get('ENDPOINT_URL'), path),
         getGlobalStore: name => globals.getStore(name),
         toRequest(req) {
             // @ts-ignore

package/dist/init/client.js

@@ -114,7 +114,7 @@ export async function main(data) {
             const route = readyForRoute();
             cr.router._requestCompleted();
             if (route.entryChanged)
-                cr.globals._syncToStores();
+                cr.globals.z_syncToStores();
             // we should trigger the route update here
             pluginsBeforeRender(cr, route);
             renderApp(route);

package/dist/init/server.d.ts

@@ -1,16 +1,5 @@
-import { SiteFromGraphQl } from '../routing/Site.js';
-export type ServerData = {
-    url: string;
-    htmlTemplate: string;
-    ssrManifest: Record<string, string[]>;
-    acceptLang?: string;
-    endpoint: string;
-    craftWeb: string;
-    frontend: string;
-    viteEnv: Map<string, string>;
-    cookies: string;
-    sites: SiteFromGraphQl[];
-};
+import { RenderRequest, RenderResponse } from '../server/shared.js';
+export type ServerData = RenderRequest;
 /**
  * The main function to start the server side rendering
  */
@@ -40,12 +29,7 @@ export type MainData = {
  * }
  * ```
  */
-export declare function main(data: MainData): Promise<{
-    status: number;
-    location?: string;
-    html?: string;
-    setCookies?: string[];
-}>;
+export declare function main(data: MainData): Promise<RenderResponse>;
 export type Error = {
     status: number;
     message: any;

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

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/init/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAsBrD,MAAM,MAAM,UAAU,GAAG;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,eAAe,EAAE,CAAC;CACzB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IACtB,4BAA4B;IAC5B,GAAG,EAAE,GAAG,CAAC;IAET,0CAA0C;IAC1C,UAAU,EAAE,UAAU,CAAC;CACvB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,IAAI,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC;IACnD,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC,CAiHD;AAED,MAAM,MAAM,KAAK,GAAG;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,GAAG,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAE3B,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,GAAG,CAAC;IAEf,UAAU,EAAE,UAAU,CAAC;CACvB,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,SAAS,CAC9B,IAAI,EAAE,aAAa,GACjB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAgC5C"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/init/server.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEpE,MAAM,MAAM,UAAU,GAAG,aAAa,CAAC;AAEvC;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IACtB,4BAA4B;IAC5B,GAAG,EAAE,GAAG,CAAC;IAET,0CAA0C;IAC1C,UAAU,EAAE,UAAU,CAAC;CACvB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,IAAI,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,cAAc,CAAC,CAiHlE;AAED,MAAM,MAAM,KAAK,GAAG;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,GAAG,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAE3B,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,GAAG,CAAC;IAEf,UAAU,EAAE,UAAU,CAAC;CACvB,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,SAAS,CAC9B,IAAI,EAAE,aAAa,GACjB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAgC5C"}

package/dist/init/server.js

@@ -42,12 +42,9 @@ export async function main(data) {
     ssrCache.set('ENDPOINT_URL', endpoint);
     ssrCache.set('CRAFT_WEB_URL', data.serverData.craftWeb);
     ssrCache.set('FRONTEND_URL', data.serverData.frontend);
-    const cookiesData = data.serverData.cookies ?? '';
-    const cookies = new ServerCookies(cookiesData);
+    const cookies = new ServerCookies(data.serverData.headers);
     ssrCache.set('crelteSites', data.serverData.sites);
-    const router = new ServerRouter(data.serverData.sites, {
-        debugTiming: config.debugTiming ?? false,
-    });
+    const router = new ServerRouter(data.serverData.sites, data.serverData.headers.get('accept-language') ?? '', { debugTiming: config.debugTiming ?? false });
     const queries = newQueries(ssrCache, router.route.readonly(), config);
     const crelte = newCrelte({
         config,
@@ -69,18 +66,20 @@ export async function main(data) {
     router.onRender = (cr, readyForRoute, _domUpdated) => {
         const route = readyForRoute();
         cr.router._requestCompleted();
-        cr.globals._syncToStores();
+        cr.globals.z_syncToStores();
         pluginsBeforeRender(cr, route);
         return route;
     };
     // throws if there was an error
-    const [req, route] = await router.init(data.serverData.url, data.serverData.acceptLang);
+    const [req, route] = await router.init(data.serverData.url);
     // if redirect
     if (!route) {
+        const headers = new Headers();
+        crelte.cookies._populateHeaders(headers);
         return {
             status: req.statusCode ?? 302,
             location: req.url.toString(),
-            setCookies: crelte.cookies._getSetCookiesHeaders(),
+            headers,
         };
     }
     const context = new Map([['crelte', crelte]]);
@@ -96,20 +95,22 @@ export async function main(data) {
         context,
     });
     head += ssrComponents.toHead(data.serverData.ssrManifest);
-    head += crelte.ssrCache._exportToHead();
+    head += crelte.ssrCache.exportToHead();
     let htmlTemplate = data.serverData.htmlTemplate;
     htmlTemplate = htmlTemplate.replace('<!--page-lang-->', route.site.language);
     const finalHtml = htmlTemplate
         .replace('</head>', head + '\n\t</head>')
         .replace('<!--ssr-body-->', html);
     const entry = route.entry;
+    const headers = new Headers();
+    crelte.cookies._populateHeaders(headers);
     return {
         status: req.statusCode ??
             (entry.sectionHandle === 'error'
                 ? parseInt(entry.typeHandle)
                 : 200),
         html: finalHtml,
-        setCookies: crelte.cookies._getSetCookiesHeaders(),
+        headers,
     };
 }
 /**
@@ -143,7 +144,7 @@ export async function mainError(data) {
         context,
     });
     head += ssrComponents.toHead(data.serverData.ssrManifest);
-    head += ssrCache._exportToHead();
+    head += ssrCache.exportToHead();
     let htmlTemplate = data.serverData.htmlTemplate;
     htmlTemplate = htmlTemplate.replace('<!--page-lang-->', 'de');
     const finalHtml = htmlTemplate

package/dist/init/shared.js

@@ -35,9 +35,9 @@ export function onNewCrelteRequest(crelte, req) {
     // might refer to the wrong objects/classes
     const nCrelte = {
         ...crelte,
-        router: crelte.router._toRequest(req),
-        queries: crelte.queries._toRequest(req),
-        globals: crelte.globals._toRequest(),
+        router: crelte.router.z_toRequest(req),
+        queries: crelte.queries.z_toRequest(req),
+        globals: crelte.globals.z_toRequest(),
     };
     return crelteToRequest(nCrelte, req);
 }
@@ -120,12 +120,12 @@ export async function loadFn(cr, app, loadOpts) {
         !(await Promise.any([loadGlobalDataProm, timeout(2000)]))) {
         console.error('DEV: globals took longer than 2 seconds to load. ' +
             'Resolving globals now to fix potential deadlocks');
-        cr.globals._globalsLoaded();
+        cr.globals.z_globalsLoaded();
     }
     const [_global, [entry, template]] = await loadGlobalDataProm;
     if (isCanceled())
         return;
-    cr.globals._globalsLoaded();
+    cr.globals.z_globalsLoaded();
     // loading progress is at 60%
     loadOpts?.setProgress(0.6);
     const pluginsLoadData = cr.events.trigger('loadData', cr, entry);

package/dist/loadData/Globals.d.ts

@@ -48,17 +48,17 @@ export default class Globals {
      * @hidden
      * call this before starting the loadGlobalData phase
      */
-    _toRequest(): Globals;
+    z_toRequest(): Globals;
     /**
      * @hidden
      * call this after the loadGlobalData phase
      */
-    _globalsLoaded(): void;
+    z_globalsLoaded(): void;
     /**
      * @hidden
      * call this after the loadData phase once the CrelteRequest
      * gets completed
      */
-    _syncToStores(): void;
+    z_syncToStores(): 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":"AASA,OAAO,QAAQ,MAAM,2BAA2B,CAAC;AACjD,OAAO,QAAQ,MAAM,2BAA2B,CAAC;AAEjD,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;AAEzD;;;;;;;;GAQG;AACH,MAAM,CAAC,OAAO,OAAO,OAAO;IAK3B,OAAO,CAAC,OAAO,CAAyC;IAIxD,OAAO,CAAC,OAAO,CAA0B;IAGzC,OAAO,CAAC,MAAM,CAA6B;gBAE/B,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IAM/C;;;;;;OAMG;IACH,GAAG,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,GAAG,IAAI;IAWpC;;;;;;;OAOG;IACH,QAAQ,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI;IAInD;;;;;;OAMG;IACH,QAAQ,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI;IAkB7D;;OAEG;IACH,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IA4B5B;;;OAGG;IACH,UAAU;IAQV;;;OAGG;IACH,cAAc;IAYd;;;;OAIG;IACH,aAAa;CAyBb"}
+{"version":3,"file":"Globals.d.ts","sourceRoot":"","sources":["../../src/loadData/Globals.ts"],"names":[],"mappings":"AASA,OAAO,QAAQ,MAAM,2BAA2B,CAAC;AACjD,OAAO,QAAQ,MAAM,2BAA2B,CAAC;AAEjD,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;AAEzD;;;;;;;;GAQG;AACH,MAAM,CAAC,OAAO,OAAO,OAAO;IAK3B,OAAO,CAAC,OAAO,CAAyC;IAIxD,OAAO,CAAC,OAAO,CAA0B;IAGzC,OAAO,CAAC,MAAM,CAA6B;gBAE/B,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IAM/C;;;;;;OAMG;IACH,GAAG,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,GAAG,IAAI;IAWpC;;;;;;;OAOG;IACH,QAAQ,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI;IAInD;;;;;;OAMG;IACH,QAAQ,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI;IAkB7D;;OAEG;IACH,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IA4B5B;;;OAGG;IACH,WAAW;IAQX;;;OAGG;IACH,eAAe;IAYf;;;;OAIG;IACH,cAAc;CAyBd"}

package/dist/loadData/Globals.js

@@ -106,7 +106,7 @@ export default class Globals {
      * @hidden
      * call this before starting the loadGlobalData phase
      */
-    _toRequest() {
+    z_toRequest() {
         const nGlobals = new Globals(this.stores);
         nGlobals.waiters = new Map();
         nGlobals.newData = new Map();
@@ -116,7 +116,7 @@ export default class Globals {
      * @hidden
      * call this after the loadGlobalData phase
      */
-    _globalsLoaded() {
+    z_globalsLoaded() {
         if (!this.waiters)
             return;
         for (const [name, listeners] of this.waiters.entries()) {
@@ -131,7 +131,7 @@ export default class Globals {
      * call this after the loadData phase once the CrelteRequest
      * gets completed
      */
-    _syncToStores() {
+    z_syncToStores() {
         const setToNull = new Set(this.stores.keys());
         for (const [name, data] of this.newData.entries()) {
             setToNull.delete(name);

package/dist/node/index.js

@@ -43,7 +43,7 @@ export default async function createServer(serverMod, buildTime) {
         const req = requestToWebRequest(baseUrl, nReq);
         let thrownError = null;
         try {
-            const routeResp = await router._handle(req);
+            const routeResp = await router.z_handle(req);
             if (routeResp) {
                 await webResponseToResponse(routeResp, res);
                 return;

package/dist/queries/Queries.d.ts

@@ -79,6 +79,6 @@ export default class Queries {
      * @hidden
      * call this before starting the loadGlobalData phase
      */
-    _toRequest(req: Request): Queries;
+    z_toRequest(req: Request): Queries;
 }
 //# sourceMappingURL=Queries.d.ts.map

package/dist/queries/Queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Queries.d.ts","sourceRoot":"","sources":["../../src/queries/Queries.ts"],"names":[],"mappings":"AAAA,OAAO,QAAwC,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAa,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAEhE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAElD;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC5B,KAAK,CAAC,EAAE,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,KAAK,GACd;IACA,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACb,GACD;IACA,SAAS,EAAE,MAAM,CAAC;CACjB,CAAC;AAEL,0DAA0D;AAC1D,wBAAgB,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,KAAK,CAI9C;AAED;;;;;;;;;GASG;AACH,MAAM,MAAM,YAAY,GAAG;IAC1B;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,OAAO;IAC3B,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,KAAK,CAAgC;IAE7C,OAAO,CAAC,OAAO,CAAiB;IAEhC,OAAO;IAUP,MAAM,CAAC,GAAG,CACT,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,QAAQ,EAClB,IAAI,GAAE,cAAmB;IAS1B;;;;;;;OAOG;IACG,KAAK,CACV,KAAK,EAAE,KAAK,EACZ,IAAI,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EAClC,IAAI,GAAE,YAAiB,GACrB,OAAO,CAAC,OAAO,CAAC;IAwBnB;;;OAGG;IACH,UAAU,CAAC,GAAG,EAAE,OAAO;CAGvB"}
+{"version":3,"file":"Queries.d.ts","sourceRoot":"","sources":["../../src/queries/Queries.ts"],"names":[],"mappings":"AAAA,OAAO,QAAwC,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAa,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAEhE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAElD;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC5B,KAAK,CAAC,EAAE,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,KAAK,GACd;IACA,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACb,GACD;IACA,SAAS,EAAE,MAAM,CAAC;CACjB,CAAC;AAEL,0DAA0D;AAC1D,wBAAgB,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,KAAK,CAI9C;AAED;;;;;;;;;GASG;AACH,MAAM,MAAM,YAAY,GAAG;IAC1B;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,OAAO;IAC3B,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,KAAK,CAAgC;IAE7C,OAAO,CAAC,OAAO,CAAiB;IAEhC,OAAO;IAUP,MAAM,CAAC,GAAG,CACT,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,QAAQ,EAClB,IAAI,GAAE,cAAmB;IAS1B;;;;;;;OAOG;IACG,KAAK,CACV,KAAK,EAAE,KAAK,EACZ,IAAI,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EAClC,IAAI,GAAE,YAAiB,GACrB,OAAO,CAAC,OAAO,CAAC;IAwBnB;;;OAGG;IACH,WAAW,CAAC,GAAG,EAAE,OAAO;CAGxB"}

package/dist/queries/Queries.js

@@ -56,7 +56,7 @@ export default class Queries {
      * @hidden
      * call this before starting the loadGlobalData phase
      */
-    _toRequest(req) {
+    z_toRequest(req) {
         return new Queries(this.inner, this.route, req);
     }
 }

package/dist/queries/index.d.ts

@@ -1,6 +1,25 @@
 import Queries, { isQuery, QueriesOptions, Query, QueryOptions } from '../queries/Queries.js';
 import { gql } from './gql.js';
 import QueryError from './QueryError.js';
-import { isQueryVar, QueryVar, ValidIf, vars } from './vars.js';
-export { Queries, type QueriesOptions, type QueryOptions, type Query, isQuery, QueryError, gql, vars, type ValidIf, QueryVar, isQueryVar, };
+import { QueryVar, ValidIf, vars } from './vars.js';
+export { Queries, type QueriesOptions, type QueryOptions, type Query, isQuery, QueryError, gql, vars, type ValidIf, QueryVar, };
+type InferQueryVarType<T> = T extends QueryVar<infer U> ? U : never;
+type InferVariableTypes<T> = {
+    [K in keyof T]: InferQueryVarType<T[K]>;
+};
+/**
+ * ## Example
+ * ```ts
+ * import { vars, Caching } from 'crelte/queries';
+ *
+ * export const variables = {
+ *     siteId: vars.siteId(),
+ *     category: vars.id()
+ * };
+ *
+ * export const caching: Caching<typeof variables> =
+ *     (queryResponse, variables) => !!queryResponse.entries.length;
+ * ```
+ */
+export type Caching<T extends Record<string, QueryVar<any>> = Record<string, QueryVar<any>>> = boolean | ((response: any, vars: InferVariableTypes<T>) => boolean);
 //# sourceMappingURL=index.d.ts.map

package/dist/queries/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/queries/index.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EACf,OAAO,EACP,cAAc,EACd,KAAK,EACL,YAAY,EACZ,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,UAAU,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEhE,OAAO,EACN,OAAO,EACP,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,KAAK,EACV,OAAO,EACP,UAAU,EACV,GAAG,EACH,IAAI,EACJ,KAAK,OAAO,EACZ,QAAQ,EACR,UAAU,GACV,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/queries/index.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EACf,OAAO,EACP,cAAc,EACd,KAAK,EACL,YAAY,EACZ,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,UAAU,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEpD,OAAO,EACN,OAAO,EACP,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,KAAK,EACV,OAAO,EACP,UAAU,EACV,GAAG,EACH,IAAI,EACJ,KAAK,OAAO,EACZ,QAAQ,GACR,CAAC;AAEF,KAAK,iBAAiB,CAAC,CAAC,IAAI,CAAC,SAAS,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAEpE,KAAK,kBAAkB,CAAC,CAAC,IAAI;KAC3B,CAAC,IAAI,MAAM,CAAC,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACvC,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,OAAO,CAClB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,IACpE,OAAO,GAAG,CAAC,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC"}

package/dist/queries/index.js

@@ -1,5 +1,5 @@
 import Queries, { isQuery, } from '../queries/Queries.js';
 import { gql } from './gql.js';
 import QueryError from './QueryError.js';
-import { isQueryVar, QueryVar, vars } from './vars.js';
-export { Queries, isQuery, QueryError, gql, vars, QueryVar, isQueryVar, };
+import { QueryVar, vars } from './vars.js';
+export { Queries, isQuery, QueryError, gql, vars, QueryVar, };

package/dist/queries/vars.d.ts

@@ -3,6 +3,8 @@ export declare const vars: {
     any: () => QueryVar<any>;
     number: () => QueryVar<number>;
     string: () => QueryVar<string>;
+    id: () => QueryVar<number>;
+    ids: () => QueryVar<number[]>;
     siteId: () => QueryVar<number>;
 };
 export type ValidIf<T> = (v: T, cs: ServerRouter) => boolean;
@@ -14,6 +16,34 @@ export declare class QueryVar<T = any> {
     constructor();
     string(): QueryVar<string>;
     number(): QueryVar<number>;
+    /**
+     * Id is almost the same as number but will also parse
+     * strings, but only allow non negative integers
+     *
+     * ## Warning
+     * Ids are not automatically safe to be cached
+     * you need to validate the response to make sure filters
+     * with this id returned something
+     */
+    id(): QueryVar<number>;
+    /**
+     * Ids is an array of ids
+     * it will also convert a single id to an array with one element
+     * the returned array will **never be empty**, but might be null if
+     * allowed. Id's are always non negative integers
+     *
+     * ## Warning
+     * Ids are not automatically safe to be cached, it is also not
+     * enough to just check if the filter returned some results.
+     * Since for example a `relatedTo` filter works like an `or` and
+     * not an `and` meaning if you request ids `[1,2,3]` and
+     * only 1 and 3 have related entries you will get results
+     * even though id 2 did not return anything.
+     *
+     * To mitigate this you could do a second query with the filtered
+     * ids in the field, and check if the return matches the length.
+     */
+    ids(): QueryVar<number[]>;
     nullable(): QueryVar<T | null>;
     /**
      * Set a validation function for this variable
@@ -27,7 +57,7 @@ export declare class QueryVar<T = any> {
      * @hidden
      * Internal method to set the name of the variable
      */
-    _setName(name: string): QueryVar<T>;
+    z_setName(name: string): QueryVar<T>;
     __QueryVar__(): void;
 }
 export declare function isQueryVar(v: any): v is QueryVar;

package/dist/queries/vars.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vars.d.ts","sourceRoot":"","sources":["../../src/queries/vars.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,2BAA2B,CAAC;AAErD,eAAO,MAAM,IAAI;eACP,QAAQ,CAAC,GAAG,CAAC;kBACV,QAAQ,CAAC,MAAM,CAAC;kBAChB,QAAQ,CAAC,MAAM,CAAC;kBAChB,QAAQ,CAAC,MAAM,CAAC;CAM5B,CAAC;AAIF,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,YAAY,KAAK,OAAO,CAAC;AAE7D,qBAAa,QAAQ,CAAC,CAAC,GAAG,GAAG;IAC5B,OAAO,CAAC,IAAI,CAAgB;IAC5B,OAAO,CAAC,IAAI,CAA8B;IAC1C,OAAO,CAAC,YAAY,CAAU;IAC9B,OAAO,CAAC,SAAS,CAAa;;IAS9B,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC;IAK1B,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC;IAK1B,QAAQ,IAAI,QAAQ,CAAC,CAAC,GAAG,IAAI,CAAC;IAK9B;;;;;OAKG;IACH,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;IAKpC,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,YAAY,GAAG,CAAC,GAAG,IAAI;IAmC9C;;;OAGG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC;IAKnC,YAAY;CACZ;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,IAAI,QAAQ,CAEhD"}
+{"version":3,"file":"vars.d.ts","sourceRoot":"","sources":["../../src/queries/vars.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,2BAA2B,CAAC;AAErD,eAAO,MAAM,IAAI;eACP,QAAQ,CAAC,GAAG,CAAC;kBACV,QAAQ,CAAC,MAAM,CAAC;kBAChB,QAAQ,CAAC,MAAM,CAAC;cACpB,QAAQ,CAAC,MAAM,CAAC;eACf,QAAQ,CAAC,MAAM,EAAE,CAAC;kBACf,QAAQ,CAAC,MAAM,CAAC;CAM5B,CAAC;AAIF,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,YAAY,KAAK,OAAO,CAAC;AAE7D,qBAAa,QAAQ,CAAC,CAAC,GAAG,GAAG;IAC5B,OAAO,CAAC,IAAI,CAAgB;IAC5B,OAAO,CAAC,IAAI,CAA6C;IACzD,OAAO,CAAC,YAAY,CAAU;IAC9B,OAAO,CAAC,SAAS,CAAa;;IAS9B,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC;IAK1B,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC;IAK1B;;;;;;;;OAQG;IACH,EAAE,IAAI,QAAQ,CAAC,MAAM,CAAC;IAKtB;;;;;;;;;;;;;;;;OAgBG;IACH,GAAG,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;IAKzB,QAAQ,IAAI,QAAQ,CAAC,CAAC,GAAG,IAAI,CAAC;IAK9B;;;;;OAKG;IACH,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;IAKpC,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,YAAY,GAAG,CAAC,GAAG,IAAI;IAkE9C;;;OAGG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC;IAKpC,YAAY;CACZ;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,IAAI,QAAQ,CAEhD"}

package/dist/queries/vars.js

@@ -2,6 +2,8 @@ export const vars = {
     any: () => new QueryVar(),
     number: () => new QueryVar().number(),
     string: () => new QueryVar().string(),
+    id: () => new QueryVar().id(),
+    ids: () => new QueryVar().ids(),
     siteId: () => new QueryVar()
         .number()
         .validIf((num, router) => !!router.sites.find(site => site.id === num)),
@@ -25,6 +27,40 @@ export class QueryVar {
         this.type = 'number';
         return this;
     }
+    /**
+     * Id is almost the same as number but will also parse
+     * strings, but only allow non negative integers
+     *
+     * ## Warning
+     * Ids are not automatically safe to be cached
+     * you need to validate the response to make sure filters
+     * with this id returned something
+     */
+    id() {
+        this.type = 'id';
+        return this;
+    }
+    /**
+     * Ids is an array of ids
+     * it will also convert a single id to an array with one element
+     * the returned array will **never be empty**, but might be null if
+     * allowed. Id's are always non negative integers
+     *
+     * ## Warning
+     * Ids are not automatically safe to be cached, it is also not
+     * enough to just check if the filter returned some results.
+     * Since for example a `relatedTo` filter works like an `or` and
+     * not an `and` meaning if you request ids `[1,2,3]` and
+     * only 1 and 3 have related entries you will get results
+     * even though id 2 did not return anything.
+     *
+     * To mitigate this you could do a second query with the filtered
+     * ids in the field, and check if the return matches the length.
+     */
+    ids() {
+        this.type = 'ids';
+        return this;
+    }
     nullable() {
         this.flagNullable = true;
         return this;
@@ -59,6 +95,27 @@ export class QueryVar {
                 if (typeof v !== 'number')
                     throw new Error(`variable ${this.name} is not a number`);
                 break;
+            case 'id':
+                if (typeof v === 'string')
+                    v = parseInt(v);
+                if (!isValidId(v))
+                    throw new Error(`variable ${this.name} is not a valid id`);
+                break;
+            case 'ids':
+                if (typeof v === 'string' || typeof v === 'number')
+                    v = [v];
+                if (!Array.isArray(v))
+                    throw new Error(`variable ${this.name} is not an id or a list of ids`);
+                if (v.length <= 0) {
+                    if (this.flagNullable)
+                        return null;
+                    throw new Error(`variable ${this.name} is not allowed to be empty`);
+                }
+                // convert strings to numbers
+                v = v.map(v => (typeof v === 'string' ? parseInt(v) : v));
+                if (!v.every(isValidId))
+                    throw new Error(`variable ${this.name} is not a list of valid ids`);
+                break;
             default:
                 throw new Error('uknown type ' + this.type);
         }
@@ -70,7 +127,7 @@ export class QueryVar {
      * @hidden
      * Internal method to set the name of the variable
      */
-    _setName(name) {
+    z_setName(name) {
         this.name = name;
         return this;
     }
@@ -79,3 +136,7 @@ export class QueryVar {
 export function isQueryVar(v) {
     return v && typeof v === 'object' && typeof v.__QueryVar__ === 'function';
 }
+// does not do string to number conversion
+function isValidId(id) {
+    return typeof id === 'number' && Number.isInteger(id) && id >= 0;
+}

package/dist/routing/Site.d.ts

@@ -44,5 +44,5 @@ export default class Site {
      */
     get uri(): string;
 }
-export declare function siteFromUrl(url: URL, sites: Site[]): Site | null;
+export declare function siteFromUrl(sites: Site[], url: URL): Site | null;
 //# sourceMappingURL=Site.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Site.d.ts","sourceRoot":"","sources":["../../src/routing/Site.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,eAAe,GAAG;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,IAAI;IACxB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,GAAG,EAAE,GAAG,CAAC;IAET;;;;OAIG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAEpB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;gBAEL,GAAG,EAAE,eAAe;IAShC;;;;OAIG;IACH,IAAI,GAAG,IAAI,MAAM,CAEhB;CACD;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,GAAG,IAAI,CAsBhE"}
+{"version":3,"file":"Site.d.ts","sourceRoot":"","sources":["../../src/routing/Site.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,eAAe,GAAG;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,IAAI;IACxB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,GAAG,EAAE,GAAG,CAAC;IAET;;;;OAIG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAEpB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;gBAEL,GAAG,EAAE,eAAe;IAShC;;;;OAIG;IACH,IAAI,GAAG,IAAI,MAAM,CAEhB;CACD;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI,GAAG,IAAI,CAsBhE"}

package/dist/routing/Site.js

@@ -46,7 +46,7 @@ export default class Site {
         return trimSlashEnd(this.url.pathname);
     }
 }
-export function siteFromUrl(url, sites) {
+export function siteFromUrl(sites, url) {
     let site = null;
     // get the site which matches the url the most
     for (const s of sites) {

package/dist/routing/index.d.ts

@@ -3,5 +3,6 @@ import Route, { type RouteOptions } from './route/Route.js';
 import Request, { type RequestOptions, type DelayRender } from './route/Request.js';
 import Site from './Site.js';
 import BaseRoute from './route/BaseRoute.js';
-export { Router, UpdateRequest, BaseRoute, Route, RouteOptions, Site, Request, DelayRender, RequestOptions, };
+import { shouldInterceptClick } from './utils.js';
+export { Router, UpdateRequest, BaseRoute, Route, RouteOptions, Site, Request, DelayRender, RequestOptions, shouldInterceptClick, };
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/routing/index.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,EAAE,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,KAAK,EAAE,EAAE,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,OAAO,EAAE,EACf,KAAK,cAAc,EACnB,KAAK,WAAW,EAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,SAAS,MAAM,sBAAsB,CAAC;AAE7C,OAAO,EACN,MAAM,EACN,aAAa,EACb,SAAS,EACT,KAAK,EACL,YAAY,EACZ,IAAI,EACJ,OAAO,EACP,WAAW,EACX,cAAc,GACd,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/routing/index.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,EAAE,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,KAAK,EAAE,EAAE,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,OAAO,EAAE,EACf,KAAK,cAAc,EACnB,KAAK,WAAW,EAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,SAAS,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAElD,OAAO,EACN,MAAM,EACN,aAAa,EACb,SAAS,EACT,KAAK,EACL,YAAY,EACZ,IAAI,EACJ,OAAO,EACP,WAAW,EACX,cAAc,EACd,oBAAoB,GACpB,CAAC"}

package/dist/routing/index.js

@@ -3,4 +3,5 @@ import Route from './route/Route.js';
 import Request from './route/Request.js';
 import Site from './Site.js';
 import BaseRoute from './route/BaseRoute.js';
-export { Router, BaseRoute, Route, Site, Request, };
+import { shouldInterceptClick } from './utils.js';
+export { Router, BaseRoute, Route, Site, Request, shouldInterceptClick, };

package/dist/routing/route/BaseRoute.d.ts

@@ -1,6 +1,6 @@
 import Site from '../Site.js';
 export type BaseRouteOptions = {
-    scrollY?: number;
+    scrollY?: number | null;
     index?: number;
     origin?: RouteOrigin;
     state?: Record<string, any>;
@@ -65,7 +65,7 @@ export default class BaseRoute {
      * @hidden
      * State data that can be used to store additional information
      */
-    _state: Record<string, any>;
+    z_state: Record<string, any>;
     /**
      * @hidden
      * Any data that should be passed to onRoute and onRequest handlers
@@ -77,7 +77,7 @@ export default class BaseRoute {
      * Consider using state instead. This will not be cloned in the clone
      * call so will always be the same object
      */
-    _context: Record<string, any>;
+    z_context: Record<string, any>;
     /**
      * Creates a new Route
      */
@@ -248,8 +248,8 @@ export default class BaseRoute {
      */
     clone(): BaseRoute;
     /** @hidden */
-    _fillFromState(state: any): void;
+    z_fillFromState(state: any): void;
     /** @hidden */
-    _toState(): any;
+    z_toState(): any;
 }
 //# sourceMappingURL=BaseRoute.d.ts.map