crelte 0.5.0 → 0.5.2

package/dist/cookies/ServerCookies.js

@@ -7,7 +7,7 @@ export default class ServerCookies {
     requestCookies;
     setCookies;
     constructor(headers) {
-        this.requestCookies = parseCookies(headers.get('cookie') ?? '');
+        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.
@@ -27,7 +27,7 @@ export default class ServerCookies {
     }
     _populateHeaders(headers) {
         for (const setCookie of this.setCookies.values()) {
-            headers.append('set-cookie', setCookieToString(setCookie));
+            headers.append('Set-Cookie', setCookieToString(setCookie));
         }
     }
 }

package/dist/init/client.js

@@ -89,11 +89,11 @@ export async function main(data) {
             intro: config.playIntro,
         });
     };
-    router.onError = e => {
+    router.onError = (e, req) => {
         console.error('routing failed:', e, 'reloading trying to fix it');
         // since onError is called only on subsequent requests we should never
         // have an infinite loop here
-        window.location.reload();
+        window.location.href = req.url.href;
     };
     router.onRender = async (cr, readyForRoute, domUpdated) => {
         if (appInstance && cr.req.disableLoadData) {

package/dist/init/server.js

@@ -44,7 +44,7 @@ export async function main(data) {
     ssrCache.set('FRONTEND_URL', data.serverData.frontend);
     const cookies = new ServerCookies(data.serverData.headers);
     ssrCache.set('crelteSites', data.serverData.sites);
-    const router = new ServerRouter(data.serverData.sites, data.serverData.headers.get('accept-language') ?? '', { 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,

package/dist/queries/Queries.js

@@ -171,8 +171,8 @@ class Inner {
         if (!resp.ok) {
             throw new QueryError({ status: resp.status, body: await resp.text() }, 'resp not ok');
         }
-        if (resp.headers.get('x-debug-link'))
-            console.log('Debug link', resp.headers.get('x-debug-link'));
+        if (resp.headers.get('X-Debug-Link'))
+            console.log('Debug link', resp.headers.get('X-Debug-Link'));
         if (timing) {
             console.log(logName + ' completed took: ' + (Date.now() - timing) + 'ms', vars);
         }

package/dist/queries/index.d.ts

@@ -1,8 +1,8 @@
 import Queries, { isQuery, QueriesOptions, Query, QueryOptions } from '../queries/Queries.js';
 import { gql } from './gql.js';
 import QueryError from './QueryError.js';
-import { QueryVar, ValidIf, vars } from './vars.js';
-export { Queries, type QueriesOptions, type QueryOptions, type Query, isQuery, QueryError, gql, vars, type ValidIf, QueryVar, };
+import { QueryVar, ValidIf, vars, varsIdsEqual } from './vars.js';
+export { Queries, type QueriesOptions, type QueryOptions, type Query, isQuery, QueryError, gql, vars, type ValidIf, QueryVar, varsIdsEqual, };
 type InferQueryVarType<T> = T extends QueryVar<infer U> ? U : never;
 type InferVariableTypes<T> = {
     [K in keyof T]: InferQueryVarType<T[K]>;

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,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"}
+{"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,YAAY,EAAE,MAAM,WAAW,CAAC;AAElE,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,YAAY,GACZ,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 { QueryVar, vars } from './vars.js';
-export { Queries, isQuery, QueryError, gql, vars, QueryVar, };
+import { QueryVar, vars, varsIdsEqual } from './vars.js';
+export { Queries, isQuery, QueryError, gql, vars, QueryVar, varsIdsEqual, };

package/dist/queries/vars.d.ts

@@ -3,19 +3,6 @@ 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;
-export declare class QueryVar<T = any> {
-    private name;
-    private type;
-    private flagNullable;
-    private validIfFn;
-    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
@@ -25,13 +12,15 @@ export declare class QueryVar<T = any> {
      * you need to validate the response to make sure filters
      * with this id returned something
      */
-    id(): QueryVar<number>;
+    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
      *
+     * The numbers are always unique and sorted in ascending order
+     *
      * ## Warning
      * Ids are not automatically safe to be cached, it is also not
      * enough to just check if the filter returned some results.
@@ -43,6 +32,19 @@ export declare class QueryVar<T = any> {
      * 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[]>;
+    siteId: () => QueryVar<number>;
+};
+export type ValidIf<T> = (v: T, cs: ServerRouter) => boolean;
+export declare class QueryVar<T = any> {
+    private name;
+    private type;
+    private flagNullable;
+    private validIfFn;
+    constructor();
+    string(): QueryVar<string>;
+    number(): QueryVar<number>;
+    id(): QueryVar<number>;
     ids(): QueryVar<number[]>;
     nullable(): QueryVar<T | null>;
     /**
@@ -61,4 +63,36 @@ export declare class QueryVar<T = any> {
     __QueryVar__(): void;
 }
 export declare function isQueryVar(v: any): v is QueryVar;
+/**
+ * Checks if two id arrays are equal
+ *
+ * The first argument needs to come from a `vars.ids()` variable.
+ * The second argument should come from a query, where the output is trusted.
+ *
+ * ## Example
+ * ```
+ * export const variables = {
+ *     categories: vars.ids()
+ * };
+ *
+ * export const caching: Caching<typeof variables> = (res, vars) => {
+ *     // res is the graphql response
+ *     return varsIdsEqual(vars.categories, res.categories);
+ * };
+ * ```
+ *
+ * ## Note
+ * The following cases are considered equal:
+ * ```
+ * varsIdsEqual(null, null);
+ * varsIdsEqual([], null);
+ * varsIdsEqual([1,2], ['2',1]);
+ * ```
+ * These are not equal:
+ * ```
+ * varsIdsEqual([1], null);
+ * varsIdsEqual([2,1], [2,1]); // because the second arg gets ordered
+ * ```
+ */
+export declare function varsIdsEqual(a: number[] | null | undefined, b: (string | number)[] | null | undefined): boolean;
 //# sourceMappingURL=vars.d.ts.map

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;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"}
+{"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;IAE5B;;;;;;;;OAQG;cACK,QAAQ,CAAC,MAAM,CAAC;IAExB;;;;;;;;;;;;;;;;;;OAkBG;eACM,QAAQ,CAAC,MAAM,EAAE,CAAC;kBAEf,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,EAAE,IAAI,QAAQ,CAAC,MAAM,CAAC;IAKtB,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;IAqE9C;;;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;AAOD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAgB,YAAY,CAC3B,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,GAAG,SAAS,EAC9B,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GAAG,IAAI,GAAG,SAAS,GACvC,OAAO,CAWT"}

package/dist/queries/vars.js

@@ -2,7 +2,35 @@ export const vars = {
     any: () => new QueryVar(),
     number: () => new QueryVar().number(),
     string: () => new QueryVar().string(),
+    /**
+     * 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: () => new QueryVar().id(),
+    /**
+     * 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
+     *
+     * The numbers are always unique and sorted in ascending order
+     *
+     * ## 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: () => new QueryVar().ids(),
     siteId: () => new QueryVar()
         .number()
@@ -27,36 +55,10 @@ 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;
@@ -97,7 +99,7 @@ export class QueryVar {
                 break;
             case 'id':
                 if (typeof v === 'string')
-                    v = parseInt(v);
+                    v = Number(v);
                 if (!isValidId(v))
                     throw new Error(`variable ${this.name} is not a valid id`);
                 break;
@@ -112,9 +114,11 @@ export class QueryVar {
                     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));
+                v = v.map(Number);
                 if (!v.every(isValidId))
                     throw new Error(`variable ${this.name} is not a list of valid ids`);
+                // make unique and sort by number
+                v = Array.from(new Set(v)).sort((a, b) => a - b);
                 break;
             default:
                 throw new Error('uknown type ' + this.type);
@@ -140,3 +144,46 @@ export function isQueryVar(v) {
 function isValidId(id) {
     return typeof id === 'number' && Number.isInteger(id) && id >= 0;
 }
+/**
+ * Checks if two id arrays are equal
+ *
+ * The first argument needs to come from a `vars.ids()` variable.
+ * The second argument should come from a query, where the output is trusted.
+ *
+ * ## Example
+ * ```
+ * export const variables = {
+ *     categories: vars.ids()
+ * };
+ *
+ * export const caching: Caching<typeof variables> = (res, vars) => {
+ *     // res is the graphql response
+ *     return varsIdsEqual(vars.categories, res.categories);
+ * };
+ * ```
+ *
+ * ## Note
+ * The following cases are considered equal:
+ * ```
+ * varsIdsEqual(null, null);
+ * varsIdsEqual([], null);
+ * varsIdsEqual([1,2], ['2',1]);
+ * ```
+ * These are not equal:
+ * ```
+ * varsIdsEqual([1], null);
+ * varsIdsEqual([2,1], [2,1]); // because the second arg gets ordered
+ * ```
+ */
+export function varsIdsEqual(a, b) {
+    const aEmpty = !a?.length;
+    const bEmpty = !b?.length;
+    if (aEmpty && bEmpty)
+        return true;
+    if (aEmpty || bEmpty)
+        return false;
+    if (a.length !== b.length)
+        return false;
+    const nb = b.map(Number).sort((a, b) => a - b);
+    return a.every((v, i) => v === nb[i]);
+}

package/dist/routing/router/ClientRouter.d.ts

@@ -9,7 +9,7 @@ export type ClientRouterOptions = {
 export default class ClientRouter extends BaseRouter {
     private scrollDebounceTimeout;
     private preloadOnMouseOver;
-    onError: (e: any) => void;
+    onError: (e: any, req: Request) => void;
     constructor(sites: SiteFromGraphQl[], opts: ClientRouterOptions);
     /**
      * ## Throws

package/dist/routing/router/ClientRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClientRouter.d.ts","sourceRoot":"","sources":["../../../src/routing/router/ClientRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,UAAU,EAAE,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,MAAM,mBAAmB,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAG7C,MAAM,MAAM,mBAAmB,GAAG;IACjC,kBAAkB,EAAE,OAAO,CAAC;CAC5B,GAAG,iBAAiB,CAAC;AAEtB,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,UAAU;IACnD,OAAO,CAAC,qBAAqB,CAAa;IAC1C,OAAO,CAAC,kBAAkB,CAAU;IAEpC,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;gBAEd,KAAK,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,mBAAmB;IAQ/D;;OAEG;IACG,IAAI;IAuBV;;OAEG;IACG,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IA6ChD,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,GAAE,cAAmB;IAYpD,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,GAAE,cAAmB;IAiB7D;;;OAGG;IACG,qBAAqB,CAC1B,GAAG,EAAE,OAAO,EACZ,aAAa,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GACnC,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IASxB,MAAM;IAgEN,QAAQ;IAgCR,YAAY,CAAC,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,GAAG,IAAI;CAwEpD"}
+{"version":3,"file":"ClientRouter.d.ts","sourceRoot":"","sources":["../../../src/routing/router/ClientRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,UAAU,EAAE,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,MAAM,mBAAmB,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAG7C,MAAM,MAAM,mBAAmB,GAAG;IACjC,kBAAkB,EAAE,OAAO,CAAC;CAC5B,GAAG,iBAAiB,CAAC;AAEtB,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,UAAU;IACnD,OAAO,CAAC,qBAAqB,CAAa;IAC1C,OAAO,CAAC,kBAAkB,CAAU;IAEpC,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;gBAE5B,KAAK,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,mBAAmB;IAQ/D;;OAEG;IACG,IAAI;IAuBV;;OAEG;IACG,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IA6ChD,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,GAAE,cAAmB;IAYpD,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,GAAE,cAAmB;IAiB7D;;;OAGG;IACG,qBAAqB,CAC1B,GAAG,EAAE,OAAO,EACZ,aAAa,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GACnC,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IASxB,MAAM;IAgEN,QAAQ;IAgCR,YAAY,CAAC,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,GAAG,IAAI;CAwEpD"}

package/dist/routing/router/ClientRouter.js

@@ -97,7 +97,7 @@ export default class ClientRouter extends BaseRouter {
         }
         catch (e) {
             console.error('request failed', e);
-            this.onError(e);
+            this.onError(e, req);
         }
     }
     listen() {

package/dist/server/ServerRouter.js

@@ -82,7 +82,7 @@ export default class ServerRouter {
         const { params, handlers } = this.inner.find(req.method, new URL(req.url).pathname);
         if (!handlers.length)
             return null;
-        const languages = parseAcceptLanguage(req.headers.get('accept-language') ?? '').map(([l]) => l);
+        const languages = parseAcceptLanguage(req.headers.get('Accept-Language') ?? '').map(([l]) => l);
         const prefSite = preferredSite(this._sites, languages);
         const site = siteFromUrl(this._sites, new URL(req.url)) ??
             prefSite ??

package/dist/server/queries/routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../../src/server/queries/routes.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,oBAAoB,CAAC;AACrD,OAAO,cAAc,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAQ,MAAM,uBAAuB,CAAC;AAEvD,OAAO,YAAY,MAAM,oBAAoB,CAAC;AAG9C,MAAM,MAAM,SAAS,GAAG,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,OAAO,CAAC;AAG9E,qBAAa,UAAU;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC;IACtC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;gBAG3B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,IAAI,EACrC,SAAS,EAAE,SAAS,GAAG,IAAI;IAoB5B,OAAO,CAAC,iBAAiB;IAYzB,OAAO,CAAC,kBAAkB;IAO1B;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAgBzB;;;OAGG;IACH,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAexD,MAAM,CACX,OAAO,EAAE,cAAc,EACvB,GAAG,EAAE,mBAAmB,GACtB,OAAO,CAAC,QAAQ,CAAC;CAwGpB;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,QAAQ,CAEzD"}
+{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../../src/server/queries/routes.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,oBAAoB,CAAC;AACrD,OAAO,cAAc,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAQ,MAAM,uBAAuB,CAAC;AAEvD,OAAO,YAAY,MAAM,oBAAoB,CAAC;AAG9C,MAAM,MAAM,SAAS,GAAG,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,OAAO,CAAC;AAG9E,qBAAa,UAAU;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC;IACtC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;gBAG3B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,IAAI,EACrC,SAAS,EAAE,SAAS,GAAG,IAAI;IAoB5B,OAAO,CAAC,iBAAiB;IAYzB,OAAO,CAAC,kBAAkB;IAO1B;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAgBzB;;;OAGG;IACH,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAexD,MAAM,CACX,OAAO,EAAE,cAAc,EACvB,GAAG,EAAE,mBAAmB,GACtB,OAAO,CAAC,QAAQ,CAAC;CAiHpB;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,QAAQ,CAEzD"}

package/dist/server/queries/routes.js

@@ -79,6 +79,8 @@ export class QueryRoute {
         try {
             const reqVars = await csr.req.json();
             vars = this.validateVars(reqVars, caching.router);
+            if ('qName' in vars || 'xCraftSite' in vars)
+                throw new Error('qName and xCraftSite are reserved variable names');
         }
         catch (e) {
             return newError(e, 400);
@@ -96,10 +98,12 @@ export class QueryRoute {
         else if (reqSearch.has('siteToken')) {
             siteToken = reqSearch.get('siteToken');
         }
+        // check for x-craft-site header and pass it on
+        const xCraftSite = csr.req.headers.get('X-Craft-Site');
         let cacheKey = null;
         const useCache = !previewToken && caching.isEnabled();
         if (useCache) {
-            cacheKey = await calcKey({ name: this.name, ...vars });
+            cacheKey = await calcKey({ ...vars, qName: this.name, xCraftSite });
             const cached = await caching.getCache(cacheKey);
             if (logInfo)
                 console.log(`${logInfo} ${cached ? 'hit' : 'miss'}`);
@@ -121,6 +125,8 @@ export class QueryRoute {
         const xDebug = csr.req.headers.get('X-Debug');
         if (xDebug)
             headers['X-Debug'] = xDebug;
+        if (xCraftSite)
+            headers['X-Craft-Site'] = xCraftSite;
         // now execute the gql request
         let resp;
         try {
@@ -141,7 +147,7 @@ export class QueryRoute {
             return newError(e, 500);
         }
         const respHeaders = {};
-        const xDebugLink = resp.headers.get('x-debug-link');
+        const xDebugLink = resp.headers.get('X-Debug-Link');
         if (xDebugLink)
             respHeaders['X-Debug'] = xDebugLink;
         let jsonResp;

package/dist/server/shared.js

@@ -96,7 +96,7 @@ export async function modRender(env, mod, template, req, opts = {}) {
     return new Response(html, { status, headers: nHeaders });
 }
 export async function modRenderError(env, mod, thrownError, template, req, opts = {}) {
-    const acceptLang = req.headers.get('accept-language') ?? null;
+    const acceptLang = req.headers.get('Accept-Language') ?? null;
     // in the case of an error let's try to render a nice Error Page
     const error = {
         status: 500,

package/dist/vite/index.js

@@ -250,7 +250,7 @@ export default function crelte(opts) {
 async function serveVite(env, vite) {
     vite.middlewares.use(async (nReq, res, next) => {
         const protocol = vite.config.server.https ? 'https' : 'http';
-        const baseUrl = protocol + '://' + nReq.headers['host'];
+        const baseUrl = protocol + '://' + nReq.headers['Host'];
         const req = requestToWebRequest(baseUrl, nReq);
         let thrownError = null;
         let serverMod;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "crelte",
-	"version": "0.5.0",
+	"version": "0.5.2",
 	"author": "Crelte <support@crelte.com>",
 	"type": "module",
 	"scripts": {

package/src/cookies/ServerCookies.ts

@@ -10,7 +10,7 @@ export default class ServerCookies implements Cookies {
 	setCookies: Map<string, SetCookie>;
 
 	constructor(headers: Headers) {
-		this.requestCookies = parseCookies(headers.get('cookie') ?? '');
+		this.requestCookies = parseCookies(headers.get('Cookie') ?? '');
 		this.setCookies = new Map();
 	}
 
@@ -35,7 +35,7 @@ export default class ServerCookies implements Cookies {
 
 	_populateHeaders(headers: Headers) {
 		for (const setCookie of this.setCookies.values()) {
-			headers.append('set-cookie', setCookieToString(setCookie));
+			headers.append('Set-Cookie', setCookieToString(setCookie));
 		}
 	}
 }

package/src/init/client.ts

@@ -124,11 +124,11 @@ export async function main(data: MainData) {
 		});
 	};
 
-	router.onError = e => {
+	router.onError = (e, req) => {
 		console.error('routing failed:', e, 'reloading trying to fix it');
 		// since onError is called only on subsequent requests we should never
 		// have an infinite loop here
-		window.location.reload();
+		window.location.href = req.url.href;
 	};
 
 	router.onRender = async (cr, readyForRoute, domUpdated) => {

package/src/init/server.ts

@@ -73,7 +73,7 @@ export async function main(data: MainData): Promise<RenderResponse> {
 	ssrCache.set('crelteSites', data.serverData.sites);
 	const router = new ServerRouter(
 		data.serverData.sites,
-		data.serverData.headers.get('accept-language') ?? '',
+		data.serverData.headers.get('Accept-Language') ?? '',
 		{ debugTiming: config.debugTiming ?? false },
 	);
 

package/src/queries/Queries.ts

@@ -304,8 +304,8 @@ class Inner {
 			);
 		}
 
-		if (resp.headers.get('x-debug-link'))
-			console.log('Debug link', resp.headers.get('x-debug-link'));
+		if (resp.headers.get('X-Debug-Link'))
+			console.log('Debug link', resp.headers.get('X-Debug-Link'));
 
 		if (timing) {
 			console.log(

package/src/queries/index.ts

@@ -6,7 +6,7 @@ import Queries, {
 } from '../queries/Queries.js';
 import { gql } from './gql.js';
 import QueryError from './QueryError.js';
-import { QueryVar, ValidIf, vars } from './vars.js';
+import { QueryVar, ValidIf, vars, varsIdsEqual } from './vars.js';
 
 export {
 	Queries,
@@ -19,6 +19,7 @@ export {
 	vars,
 	type ValidIf,
 	QueryVar,
+	varsIdsEqual,
 };
 
 type InferQueryVarType<T> = T extends QueryVar<infer U> ? U : never;

package/src/queries/vars.ts

@@ -4,8 +4,39 @@ export const vars = {
 	any: (): QueryVar<any> => new QueryVar(),
 	number: (): QueryVar<number> => new QueryVar().number(),
 	string: (): QueryVar<string> => new QueryVar().string(),
+
+	/**
+	 * 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> => new QueryVar().id(),
+
+	/**
+	 * 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
+	 *
+	 * The numbers are always unique and sorted in ascending order
+	 *
+	 * ## 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[]> => new QueryVar().ids(),
+
 	siteId: (): QueryVar<number> =>
 		new QueryVar()
 			.number()
@@ -41,37 +72,11 @@ export class QueryVar<T = any> {
 		return this as unknown as 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> {
 		this.type = 'id';
 		return this as unknown as 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[]> {
 		this.type = 'ids';
 		return this as unknown as QueryVar<number[]>;
@@ -119,7 +124,7 @@ export class QueryVar<T = any> {
 				break;
 
 			case 'id':
-				if (typeof v === 'string') v = parseInt(v);
+				if (typeof v === 'string') v = Number(v);
 
 				if (!isValidId(v))
 					throw new Error(`variable ${this.name} is not a valid id`);
@@ -141,12 +146,15 @@ export class QueryVar<T = any> {
 				}
 
 				// convert strings to numbers
-				v = v.map(v => (typeof v === 'string' ? parseInt(v) : v));
+				v = v.map(Number);
 
 				if (!v.every(isValidId))
 					throw new Error(
 						`variable ${this.name} is not a list of valid ids`,
 					);
+
+				// make unique and sort by number
+				v = Array.from(new Set(v as number[])).sort((a, b) => a - b);
 				break;
 
 			default:
@@ -176,6 +184,53 @@ export function isQueryVar(v: any): v is QueryVar {
 }
 
 // does not do string to number conversion
-function isValidId(id: any): boolean {
+function isValidId(id: any): id is number {
 	return typeof id === 'number' && Number.isInteger(id) && id >= 0;
 }
+
+/**
+ * Checks if two id arrays are equal
+ *
+ * The first argument needs to come from a `vars.ids()` variable.
+ * The second argument should come from a query, where the output is trusted.
+ *
+ * ## Example
+ * ```
+ * export const variables = {
+ *     categories: vars.ids()
+ * };
+ *
+ * export const caching: Caching<typeof variables> = (res, vars) => {
+ *     // res is the graphql response
+ *     return varsIdsEqual(vars.categories, res.categories);
+ * };
+ * ```
+ *
+ * ## Note
+ * The following cases are considered equal:
+ * ```
+ * varsIdsEqual(null, null);
+ * varsIdsEqual([], null);
+ * varsIdsEqual([1,2], ['2',1]);
+ * ```
+ * These are not equal:
+ * ```
+ * varsIdsEqual([1], null);
+ * varsIdsEqual([2,1], [2,1]); // because the second arg gets ordered
+ * ```
+ */
+export function varsIdsEqual(
+	a: number[] | null | undefined,
+	b: (string | number)[] | null | undefined,
+): boolean {
+	const aEmpty = !a?.length;
+	const bEmpty = !b?.length;
+	if (aEmpty && bEmpty) return true;
+	if (aEmpty || bEmpty) return false;
+
+	if (a.length !== b.length) return false;
+
+	const nb = b.map(Number).sort((a, b) => a - b);
+
+	return a.every((v, i) => v === nb[i]);
+}

package/src/routing/router/ClientRouter.ts

@@ -13,7 +13,7 @@ export default class ClientRouter extends BaseRouter {
 	private scrollDebounceTimeout: any | null;
 	private preloadOnMouseOver: boolean;
 
-	onError: (e: any) => void;
+	onError: (e: any, req: Request) => void;
 
 	constructor(sites: SiteFromGraphQl[], opts: ClientRouterOptions) {
 		super(sites, navigator.languages.slice(), opts);
@@ -138,7 +138,7 @@ export default class ClientRouter extends BaseRouter {
 			return await this.handleRequest(req, updateHistory);
 		} catch (e) {
 			console.error('request failed', e);
-			this.onError(e);
+			this.onError(e, req);
 		}
 	}
 

package/src/server/ServerRouter.ts

@@ -121,7 +121,7 @@ export default class ServerRouter {
 		if (!handlers.length) return null;
 
 		const languages = parseAcceptLanguage(
-			req.headers.get('accept-language') ?? '',
+			req.headers.get('Accept-Language') ?? '',
 		).map(([l]) => l);
 		const prefSite = preferredSite(this._sites, languages);
 		const site =

package/src/server/queries/routes.ts

@@ -104,6 +104,10 @@ export class QueryRoute {
 		try {
 			const reqVars = await csr.req.json();
 			vars = this.validateVars(reqVars, caching.router);
+			if ('qName' in vars || 'xCraftSite' in vars)
+				throw new Error(
+					'qName and xCraftSite are reserved variable names',
+				);
 		} catch (e) {
 			return newError(e, 400);
 		}
@@ -124,10 +128,13 @@ export class QueryRoute {
 			siteToken = reqSearch.get('siteToken');
 		}
 
+		// check for x-craft-site header and pass it on
+		const xCraftSite = csr.req.headers.get('X-Craft-Site');
+
 		let cacheKey: string | null = null;
 		const useCache = !previewToken && caching.isEnabled();
 		if (useCache) {
-			cacheKey = await calcKey({ name: this.name, ...vars });
+			cacheKey = await calcKey({ ...vars, qName: this.name, xCraftSite });
 			const cached = await caching.getCache(cacheKey);
 
 			if (logInfo) console.log(`${logInfo} ${cached ? 'hit' : 'miss'}`);
@@ -150,6 +157,8 @@ export class QueryRoute {
 		const xDebug = csr.req.headers.get('X-Debug');
 		if (xDebug) headers['X-Debug'] = xDebug;
 
+		if (xCraftSite) headers['X-Craft-Site'] = xCraftSite;
+
 		// now execute the gql request
 		let resp: Response;
 		try {
@@ -170,7 +179,7 @@ export class QueryRoute {
 		}
 
 		const respHeaders: Record<string, string> = {};
-		const xDebugLink = resp.headers.get('x-debug-link');
+		const xDebugLink = resp.headers.get('X-Debug-Link');
 		if (xDebugLink) respHeaders['X-Debug'] = xDebugLink;
 
 		let jsonResp: Record<string, any>;

package/src/server/shared.ts

@@ -219,7 +219,7 @@ export async function modRenderError(
 	req: Request,
 	opts: ModRenderOptions = {},
 ): Promise<Response> {
-	const acceptLang = req.headers.get('accept-language') ?? null;
+	const acceptLang = req.headers.get('Accept-Language') ?? null;
 
 	// in the case of an error let's try to render a nice Error Page
 	const error = {

package/src/vite/index.ts

@@ -323,7 +323,7 @@ export default function crelte(opts?: CrelteOptions): Plugin {
 async function serveVite(env: EnvData, vite: ViteDevServer) {
 	vite.middlewares.use(async (nReq, res, next) => {
 		const protocol = vite.config.server.https ? 'https' : 'http';
-		const baseUrl = protocol + '://' + nReq.headers['host'];
+		const baseUrl = protocol + '://' + nReq.headers['Host'];
 
 		const req = requestToWebRequest(baseUrl, nReq);