crelte 0.5.7 → 0.5.9

package/dist/init/server.d.ts

@@ -1,4 +1,5 @@
-import { RenderRequest, RenderResponse } from '../server/shared.js';
+import { RenderErrorRequest, RenderRequest, RenderResponse } from '../server/shared.js';
+export { type RenderRequest, type RenderResponse } from '../server/shared.js';
 export type ServerData = RenderRequest;
 /**
  * The main function to start the server side rendering
@@ -12,8 +13,8 @@ export type MainData = {
 /**
  * The main function to start the server side rendering
  *
- * ## Example
- * ```
+ * #### Example
+ * ```js
  * import * as app from './App.svelte';
  * import entryQuery from './queries/entry.graphql';
  * import globalQuery from './queries/global.graphql';
@@ -37,14 +38,14 @@ export type Error = {
 export type MainErrorData = {
     error: Error;
     errorPage: any;
-    serverData: ServerData;
+    serverData: RenderErrorRequest;
 };
 /**
  * The main function to start the server side rendering
  * if there was an error
  *
- * ## Example
- * ```
+ * #### Example
+ * ```js
  * import * as errorPage from './Error.svelte';
  *
  * export function renderError(error, serverData) {

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/init/server.ts"],"names":[],"mappings":"AAoBA,OAAO,EACN,kBAAkB,EAClB,aAAa,EACb,cAAc,EACd,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE9E,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,kBAAkB,CAAC;CAC/B,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

@@ -14,8 +14,8 @@ import { Writable } from '../std/stores/index.js';
 /**
  * The main function to start the server side rendering
  *
- * ## Example
- * ```
+ * #### Example
+ * ```js
  * import * as app from './App.svelte';
  * import entryQuery from './queries/entry.graphql';
  * import globalQuery from './queries/global.graphql';
@@ -95,7 +95,7 @@ export async function main(data) {
         context,
     });
     head += ssrComponents.toHead(data.serverData.ssrManifest);
-    head += crelte.ssrCache.exportToHead();
+    head += crelte.ssrCache.z_exportToHead();
     let htmlTemplate = data.serverData.htmlTemplate;
     htmlTemplate = htmlTemplate.replace('<!--page-lang-->', route.site.language);
     const finalHtml = htmlTemplate
@@ -117,8 +117,8 @@ export async function main(data) {
  * The main function to start the server side rendering
  * if there was an error
  *
- * ## Example
- * ```
+ * #### Example
+ * ```js
  * import * as errorPage from './Error.svelte';
  *
  * export function renderError(error, serverData) {
@@ -144,7 +144,7 @@ export async function mainError(data) {
         context,
     });
     head += ssrComponents.toHead(data.serverData.ssrManifest);
-    head += ssrCache.exportToHead();
+    head += ssrCache.z_exportToHead();
     let htmlTemplate = data.serverData.htmlTemplate;
     htmlTemplate = htmlTemplate.replace('<!--page-lang-->', 'de');
     const finalHtml = htmlTemplate

package/dist/loadData/Globals.d.ts

@@ -18,7 +18,7 @@ export default class Globals {
     /**
      * returns a globalValue
      *
-     * ## Note
+     * #### Note
      * This only works in loadData, in loadGlobalData this will
      * throw an error. In that context you should use `.getAsync`
      */
@@ -26,7 +26,7 @@ export default class Globals {
     /**
      * returns a store which contains a globalSet
      *
-     * ## Note
+     * #### Note
      * This only works in loadData, in loadGlobalData this will
      * always return null. In that context you should use
      * `.getAsync`
@@ -35,7 +35,7 @@ export default class Globals {
     /**
      * Get a store which contains a globalSet and wait until it is loaded
      *
-     * ## Note
+     * #### Note
      * This is only useful in loadGlobalData in all other cases
      * you can use `.get` which does not return a Promise
      */

package/dist/loadData/Globals.js

@@ -35,7 +35,7 @@ export default class Globals {
     /**
      * returns a globalValue
      *
-     * ## Note
+     * #### Note
      * This only works in loadData, in loadGlobalData this will
      * throw an error. In that context you should use `.getAsync`
      */
@@ -49,7 +49,7 @@ export default class Globals {
     /**
      * returns a store which contains a globalSet
      *
-     * ## Note
+     * #### Note
      * This only works in loadData, in loadGlobalData this will
      * always return null. In that context you should use
      * `.getAsync`
@@ -60,7 +60,7 @@ export default class Globals {
     /**
      * Get a store which contains a globalSet and wait until it is loaded
      *
-     * ## Note
+     * #### Note
      * This is only useful in loadGlobalData in all other cases
      * you can use `.get` which does not return a Promise
      */

package/dist/loadData/loadData.d.ts

@@ -13,11 +13,11 @@ export interface LoadDataArray<A1 = any> extends Array<LoadData<A1>> {
  *
  * There are three main ways `loadData` can be defined:
  *
- * ## Object
+ * #### Object
  * This is the most common way loadData will be used.
  * Each property should be a loadData type, each one is called in parallel.
  * And will be available to your component with the same name.
- * ```
+ * ```js
  * import entriesQuery from '@/queries/entries.graphql';
  * import { loadData as headerLoadData } from '@/layout/header.svelte';
  *
@@ -27,30 +27,20 @@ export interface LoadDataArray<A1 = any> extends Array<LoadData<A1>> {
  * };
  * ```
  *
- * ## GraphQl
+ * #### GraphQl
  * You can just export a graphql query as a loadData type.
  * This will export all queries from the graphql file as properties.
- * ```
+ * ```js
  * import blogsQuery from '@/queries/blogs.graphql';
  *
  * export const loadData = blogsQuery;
- *
- * // or another option
- * import { gql } from '@craft-svelte/core/graphql';
- *
- * export const loadData = gql`query {
- *   blogs: entries(section: "blogs") {
- *     title
- *     url
- *  }
- * }`;
  * ```
  *
- * ## Function
+ * #### Function
  * Using a function gives you the most flexibility but also is the
  * most cumbersome.
  *
- * ```
+ * ```js
  * import articlesQuery from '@/queries/articles.graphql';
  *
  * export async function loadData(cr, entry) {
@@ -79,8 +69,8 @@ export declare function callLoadData<A1 = any>(ld: LoadData<A1>, cr: CrelteReque
  *
  * Prefer to use the array syntax.
  *
- * ## Example
- * ```
+ * #### Example
+ * ```js
  * export const loadData = mergeLoadData(
  *     {
  * 	        filter: (cr) => cr.route.search.get('filter'),

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

@@ -1 +1 @@
-{"version":3,"file":"loadData.d.ts","sourceRoot":"","sources":["../../src/loadData/loadData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAW,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEvD,MAAM,WAAW,UAAU,CAAC,EAAE,GAAG,GAAG;IACnC,CAAC,EAAE,EAAE,aAAa,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;CAC1E;AAED,MAAM,WAAW,WAAW,CAAC,EAAE,GAAG,GAAG;IACpC,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;CAC5B;AAGD,MAAM,WAAW,aAAa,CAAC,EAAE,GAAG,GAAG,CAAE,SAAQ,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;CAAG;AAKvE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+DG;AACH,MAAM,MAAM,QAAQ,CAAC,EAAE,GAAG,GAAG,IAC1B,UAAU,CAAC,EAAE,CAAC,GACd,KAAK,GACL,WAAW,CAAC,EAAE,CAAC,GACf,aAAa,CAAC,EAAE,CAAC,GACjB,MAAM,GACN,MAAM,GACN,IAAI,GACJ,SAAS,CAAC;AAOb,wBAAsB,YAAY,CAAC,EAAE,GAAG,GAAG,EAC1C,EAAE,EAAE,QAAQ,CAAC,EAAE,CAAC,EAChB,EAAE,EAAE,aAAa,EACjB,IAAI,EAAE,EAAE,EACR,GAAG,IAAI,EAAE,GAAG,EAAE,GACZ,OAAO,CAAC,GAAG,CAAC,CA6Bd;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,aAAa,CAAC,EAAE,GAAG,GAAG,EACrC,GAAG,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,EAAE,GACpB,UAAU,CAAC,EAAE,CAAC,CAUhB"}
+{"version":3,"file":"loadData.d.ts","sourceRoot":"","sources":["../../src/loadData/loadData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAW,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEvD,MAAM,WAAW,UAAU,CAAC,EAAE,GAAG,GAAG;IACnC,CAAC,EAAE,EAAE,aAAa,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;CAC1E;AAED,MAAM,WAAW,WAAW,CAAC,EAAE,GAAG,GAAG;IACpC,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;CAC5B;AAGD,MAAM,WAAW,aAAa,CAAC,EAAE,GAAG,GAAG,CAAE,SAAQ,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;CAAG;AAKvE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDG;AACH,MAAM,MAAM,QAAQ,CAAC,EAAE,GAAG,GAAG,IAC1B,UAAU,CAAC,EAAE,CAAC,GACd,KAAK,GACL,WAAW,CAAC,EAAE,CAAC,GACf,aAAa,CAAC,EAAE,CAAC,GACjB,MAAM,GACN,MAAM,GACN,IAAI,GACJ,SAAS,CAAC;AAOb,wBAAsB,YAAY,CAAC,EAAE,GAAG,GAAG,EAC1C,EAAE,EAAE,QAAQ,CAAC,EAAE,CAAC,EAChB,EAAE,EAAE,aAAa,EACjB,IAAI,EAAE,EAAE,EACR,GAAG,IAAI,EAAE,GAAG,EAAE,GACZ,OAAO,CAAC,GAAG,CAAC,CA6Bd;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,aAAa,CAAC,EAAE,GAAG,GAAG,EACrC,GAAG,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,EAAE,GACpB,UAAU,CAAC,EAAE,CAAC,CAUhB"}

package/dist/loadData/loadData.js

@@ -29,8 +29,8 @@ export async function callLoadData(ld, cr, arg1, ...args) {
  *
  * Prefer to use the array syntax.
  *
- * ## Example
- * ```
+ * #### Example
+ * ```js
  * export const loadData = mergeLoadData(
  *     {
  * 	        filter: (cr) => cr.route.search.get('filter'),

package/dist/node/index.d.ts

@@ -1,2 +1,7 @@
+/**
+ * Create and start the server
+ *
+ * Generally this call should automatically happen via the vite build step.
+ */
 export default function createServer(serverMod: any, buildTime: string): Promise<void>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AAiCA,wBAA8B,YAAY,CAAC,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,iBAkF3E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AAiEA;;;;GAIG;AACH,wBAA8B,YAAY,CAAC,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,iBAmG3E"}

package/dist/node/index.js

@@ -2,11 +2,12 @@ import http from 'node:http';
 import path, { join } from 'node:path';
 import fs from 'node:fs/promises';
 import { createReadStream } from 'node:fs';
-import { initEnvData, modRender, modRenderError, } from '../server/shared.js';
+import { initEnvData, initSites, modRender, modRenderError, } from '../server/shared.js';
 import ServerRouter from '../server/ServerRouter.js';
 import { fileURLToPath } from 'node:url';
 import { initQueryRoutes } from '../server/queries/queries.js';
 import { PLATFORM, readFile, requestToWebRequest, webResponseToResponse, writeFile, } from './utils.js';
+import { timeout } from '../std/index.js';
 function localDir(...args) {
     return join(path.dirname(fileURLToPath(import.meta.url)), ...args);
 }
@@ -16,64 +17,112 @@ async function readSitesCache() {
 async function writeSitesCache(data) {
     return await writeFile(localDir('sites.json'), JSON.stringify(data));
 }
-export default async function createServer(serverMod, buildTime) {
-    const env = await initEnvData(PLATFORM, {
+async function initRouter(serverMod, env) {
+    const sites = await initSites(env, {
         enabled: process.env.NODE_ENV === 'production',
         writeSitesCache,
         readSitesCache,
     });
-    const template = await readFile(localDir('index.html'));
-    const globalEtag = '"' + buildTime + '"';
-    const ssrManifest = JSON.parse(await readFile(localDir('ssr-manifest.json')));
-    const router = new ServerRouter(env.endpointUrl, env.frontendUrl, env.env, env.sites, {
+    const router = new ServerRouter(env.endpointUrl, env.frontendUrl, env.env, sites, {
         endpointToken: env.endpointToken,
     });
     await initQueryRoutes(PLATFORM, serverMod, router);
     if (typeof serverMod.routes === 'function') {
         await serverMod.routes(router);
     }
+    return [sites, router];
+}
+/**
+ * Create and start the server
+ *
+ * Generally this call should automatically happen via the vite build step.
+ */
+export default async function createServer(serverMod, buildTime) {
+    const env = await initEnvData(PLATFORM);
+    const template = await readFile(localDir('index.html'));
+    const globalEtag = '"' + buildTime + '"';
+    const ssrManifest = JSON.parse(await readFile(localDir('ssr-manifest.json')));
+    let sites = null;
+    let router = null;
+    let routesError = null;
+    // let's try to init the router
+    // if it fails we start a retry loop
+    // this way the server can start even if the endpoint is not yet available
+    try {
+        [sites, router] = await initRouter(serverMod, env);
+    }
+    catch (e) {
+        routesError = e;
+        console.error('Failed to setup router:', e);
+        // retry loop
+        (async () => {
+            while (!router) {
+                await timeout(1000);
+                try {
+                    [sites, router] = await initRouter(serverMod, env);
+                    routesError = null;
+                }
+                catch (e) {
+                    routesError = e;
+                    console.error('Failed to setup router:', e);
+                }
+            }
+        })();
+    }
     const publicDir = localDir('public');
-    http.createServer(async (nReq, res) => {
-        if (await servePublic(nReq, res, publicDir, globalEtag))
+    const handle = async (req, res) => {
+        // if router is not set, just render the error page
+        if (routesError || !router || !sites) {
+            throw routesError ?? new Error('Router not initialized');
+        }
+        const routeResp = await router.z_handle(req);
+        if (routeResp) {
+            await webResponseToResponse(routeResp, res);
+            return;
+        }
+        if (await basicAuthCheck(req, res, env))
             return;
-        // todo this is not safe if we are not in a trusted environment
-        const baseUrl = (nReq.headers['x-forwarded-proto'] ?? 'http') +
-            '://' +
-            nReq.headers['host'];
-        const req = requestToWebRequest(baseUrl, nReq);
-        let thrownError = null;
+        const response = await modRender(env, sites, serverMod, template, req, {
+            ssrManifest,
+        });
+        await webResponseToResponse(response, res);
+    };
+    http.createServer(async (nodeReq, res) => {
+        let req = null;
+        let err;
         try {
-            const routeResp = await router.z_handle(req);
-            if (routeResp) {
-                await webResponseToResponse(routeResp, res);
-                return;
-            }
-            if (await basicAuthCheck(nReq, res, env))
+            if (await servePublic(nodeReq, res, publicDir, globalEtag))
                 return;
-            const response = await modRender(env, serverMod, template, req, {
-                ssrManifest,
-            });
-            await webResponseToResponse(response, res);
+            // todo this is not safe if we are not in a trusted environment
+            const baseUrl = (nodeReq.headers['x-forwarded-proto'] ?? 'http') +
+                '://' +
+                nodeReq.headers['host'];
+            req = requestToWebRequest(baseUrl, nodeReq);
+            await handle(req, res);
             return;
         }
         catch (e) {
-            if (typeof serverMod.renderError !== 'function') {
-                console.log('error', e);
-                throw e;
-            }
-            thrownError = e;
+            err = e;
+        }
+        if (typeof serverMod.renderError !== 'function' || !req) {
+            basicError(res, err);
+            return;
         }
         try {
-            const response = await modRenderError(env, serverMod, thrownError, template, req, { ssrManifest });
+            const response = await modRenderError(env, serverMod, err, template, req, { ssrManifest });
             await webResponseToResponse(response, res);
-            return;
         }
         catch (e) {
-            console.log('error', e);
-            throw e;
+            basicError(res, e);
         }
     }).listen(8080);
 }
+function basicError(res, err) {
+    console.error('Internal Server Error:', err);
+    res.statusCode = 500;
+    res.end('Internal Server Error: ' + err?.message);
+    return;
+}
 const MIME_TYPES = {
     '.html': 'text/html',
     '.css': 'text/css',
@@ -150,7 +199,7 @@ async function basicAuthCheck(req, res, { env }) {
     // ignore if one information is missing
     if (!user || !password)
         return false;
-    const authHeader = req.headers['authorization'];
+    const authHeader = req.headers.get('authorization');
     if (!authHeader || !authHeader.startsWith('Basic ')) {
         res.statusCode = 401;
         res.setHeader('WWW-Authenticate', 'Basic realm="Restricted"');

package/dist/plugins/Events.d.ts

@@ -7,23 +7,23 @@ export default class Events {
     /**
      * Listens for an event.
      *
-     * ## beforeRequest
+     * #### beforeRequest
      * Please prefer to return not return a promise only if you need to wait
      * for something. This allows a push request to be done without a microtask.
      * Allowing for a better DX.
      *
-     * ## loadEntry
+     * #### loadEntry
      * This will execute all listeners in sequence and stop on the first one
      * which returns an entry.
      * Will be executed in preload as well.
      *
-     * ## beforeQueryEntry
+     * #### beforeQueryEntry
      * This allows to modify the entry query variables before the entry query
      * is executed.
      * Will be executed in preload as well.
      *
      *
-     * ## afterLoadEntry
+     * #### afterLoadEntry
      * Will be executed in preload as well.
      *
      * @returns a function to remove the listener

package/dist/plugins/Plugins.d.ts

@@ -13,8 +13,8 @@ export interface Plugin {
  * a configurePluginname function which will be called by youre user and should
  * return a createPlugin function.
  *
- * ## Example App.svelte in module="context"
- * ```
+ * #### Example App.svelte in module="context"
+ * ```js
  * import { createPlugin, configurePlugin } from 'some-plugin';
  *
  * export plugins = [createPlugin, configurePlugin({ enableFeature: true })];

package/dist/plugins/index.d.ts

@@ -1,5 +1,4 @@
 import Events from './Events.js';
-import { Plugin, PluginCreator } from './Plugins.js';
-export type { Plugin, PluginCreator };
-export { Events };
+import Plugins, { type Plugin, type PluginCreator } from './Plugins.js';
+export { Plugins, Events, Plugin, PluginCreator };
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plugins/index.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAErD,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plugins/index.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,OAAO,EAAE,EAAE,KAAK,MAAM,EAAE,KAAK,aAAa,EAAE,MAAM,cAAc,CAAC;AAExE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC"}

package/dist/plugins/index.js

@@ -1,2 +1,3 @@
 import Events from './Events.js';
-export { Events };
+import Plugins from './Plugins.js';
+export { Plugins, Events };

package/dist/queries/Queries.d.ts

@@ -65,6 +65,15 @@ export default class Queries {
     private route;
     private request;
     private constructor();
+    /**
+     * Create a new Queries instance
+     *
+     * @param endpoint the craft GraphQl endpoint
+     * @param frontend the frontend url where the server queries are reachable
+     * @param ssrCache the ssrCache to use for caching
+     * @param opts options
+     * @returns
+     */
     static new(endpoint: string, frontend: string, ssrCache: SsrCache, opts?: QueriesOptions): Queries;
     /**
      * Run a GraphQl Query

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,WAAW,CAAC,GAAG,EAAE,OAAO;CAGxB"}
+{"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;;;;;;;;OAQG;IACH,MAAM,CAAC,GAAG,CACT,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,QAAQ,EAClB,IAAI,GAAE,cAAmB,GACvB,OAAO;IAQV;;;;;;;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;IA0BnB;;;OAGG;IACH,WAAW,CAAC,GAAG,EAAE,OAAO;CAGxB"}

package/dist/queries/Queries.js

@@ -22,6 +22,15 @@ export default class Queries {
         this.route = route;
         this.request = request;
     }
+    /**
+     * Create a new Queries instance
+     *
+     * @param endpoint the craft GraphQl endpoint
+     * @param frontend the frontend url where the server queries are reachable
+     * @param ssrCache the ssrCache to use for caching
+     * @param opts options
+     * @returns
+     */
     static new(endpoint, frontend, ssrCache, opts = {}) {
         return new Queries(new Inner(endpoint, frontend, ssrCache, opts), opts?.route ?? null, null);
     }
@@ -44,6 +53,7 @@ export default class Queries {
         // for convenience we set the siteId as variable if it is known
         if (siteId !== null)
             vars = { siteId, ...vars };
+        // todo, maybe we should set the XCraftSiteId, with the siteId from vars?
         return this.inner.query(query, vars, {
             previewToken,
             siteToken,
@@ -104,24 +114,20 @@ class Inner {
             if (key) {
                 // todo maybe we should objClone here?
                 this.ssrCache.set(key, resp);
-                // ! because the listeners get's in the previous if statement and will
-                // always be set when the key is set
+                // ! (never null) because the listeners get's in the previous
+                // if statement and will always be set when the key is set
                 const listeners = this.listeners.get(key);
-                listeners.forEach(([resolve, _error]) => {
-                    resolve(resp);
-                });
+                listeners.forEach(([resolve, _error]) => resolve(resp));
                 this.listeners.delete(key);
             }
             return resp;
         }
         catch (e) {
             if (key) {
-                // ! because the listeners get's in the previous if statement and will
-                // always be set when the key is set
+                // ! (never null) because the listeners get's in the previous
+                // if statement and will always be set when the key is set
                 const listeners = this.listeners.get(key);
-                listeners.forEach(([_resolve, error]) => {
-                    error(e);
-                });
+                listeners.forEach(([_resolve, error]) => error(e));
                 this.listeners.delete(key);
             }
             throw e;
@@ -163,11 +169,17 @@ class Inner {
         else {
             body = { query: query.query, variables: vars };
         }
-        const resp = await fetch(url, {
-            method: 'POST',
-            headers,
-            body: JSON.stringify(body),
-        });
+        let resp;
+        try {
+            resp = await fetch(url, {
+                method: 'POST',
+                headers,
+                body: JSON.stringify(body),
+            });
+        }
+        catch (e) {
+            throw new Error(`query to '${url}' failed with: ${e.message}`);
+        }
         if (!resp.ok) {
             throw new QueryError({ status: resp.status, body: await resp.text() }, 'resp not ok');
         }
@@ -184,8 +196,8 @@ class Inner {
             throw new QueryError({ status: resp.status }, e);
         }
         if ('errors' in jsonResp) {
-            console.log(logName + ' errors', jsonResp.errors);
-            throw new QueryError({ status: resp.status }, jsonResp.errors);
+            console.error(logName + ' errors', jsonResp.errors);
+            throw new QueryError({ status: resp.status, errors: jsonResp.errors }, 'received errors');
         }
         return jsonResp.data ?? null;
     }

package/dist/queries/QueryError.d.ts

@@ -1,6 +1,7 @@
 export type QueryErrorResponse = {
     status?: number;
     body?: string;
+    errors?: any[];
 };
 /**
  * A QueryError error
@@ -19,4 +20,5 @@ export default class QueryError extends Error {
      */
     get message(): string;
 }
+export declare function isQueryError(err: any): err is QueryError;
 //# sourceMappingURL=QueryError.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"QueryError.d.ts","sourceRoot":"","sources":["../../src/queries/QueryError.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,kBAAkB,GAAG;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAGF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,KAAK;IAC5C,IAAI,EAAE,kBAAkB,CAAC;IACzB,GAAG,EAAE,GAAG,CAAC;gBAGG,IAAI,EAAE,kBAAkB,EAAE,GAAG,GAAE,GAAU;IAOrD;;OAEG;IACH,MAAM,IAAI,MAAM;IAIhB,cAAc;IAEd;;OAEG;IACH,IAAI,OAAO,IAAI,MAAM,CAEpB;CACD"}
+{"version":3,"file":"QueryError.d.ts","sourceRoot":"","sources":["../../src/queries/QueryError.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,kBAAkB,GAAG;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;CACf,CAAC;AAGF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,KAAK;IAC5C,IAAI,EAAE,kBAAkB,CAAC;IACzB,GAAG,EAAE,GAAG,CAAC;gBAGG,IAAI,EAAE,kBAAkB,EAAE,GAAG,GAAE,GAAU;IAOrD;;OAEG;IACH,MAAM,IAAI,MAAM;IAIhB,cAAc;IAEd;;OAEG;IACH,IAAI,OAAO,IAAI,MAAM,CAEpB;CACD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,UAAU,CAMxD"}

package/dist/queries/QueryError.js

@@ -22,6 +22,11 @@ export default class QueryError extends Error {
      * The error message in string form
      */
     get message() {
-        return 'QueryError: ' + JSON.stringify(this.resp);
+        return 'QueryError: ' + JSON.stringify(this.resp, null, '  ');
     }
 }
+export function isQueryError(err) {
+    return (typeof err === 'object' &&
+        err !== null &&
+        typeof err.__QueryError__ === 'function');
+}

package/dist/queries/gql.d.ts

@@ -4,8 +4,8 @@ import { Query } from './Queries.js';
  * @param strings
  * @param keys
  *
- * ## Example
- * ```
+ * #### Example
+ * ```js
  * const query = gql`query ($id: ID!) { page(id: $id) { id } }`;
  * ```
  */

package/dist/queries/gql.js

@@ -4,8 +4,8 @@ import { isQuery } from './Queries.js';
  * @param strings
  * @param keys
  *
- * ## Example
- * ```
+ * #### Example
+ * ```js
  * const query = gql`query ($id: ID!) { page(id: $id) { id } }`;
  * ```
  */