crelte 0.4.4 → 0.4.6

package/dist/entry/index.d.ts

@@ -7,6 +7,11 @@ export type Entry = {
     typeHandle: string;
     [key: string]: any;
 };
+export type EntryQueryVars = {
+    uri: string;
+    siteId: number;
+    [key: string]: any;
+};
 export type EntryRequestOptions = RequestOptions & {
     params?: Map<string, string>;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/entry/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,WAAW,EAAE,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/E,OAAO,EAAE,WAAW,EAAE,KAAK,iBAAiB,EAAE,KAAK,WAAW,EAAE,CAAC;AAEjE,MAAM,MAAM,KAAK,GAAG;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,cAAc,GAAG;IAClD,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B,CAAC;AAEF,qBAAa,YAAa,SAAQ,OAAO;IACxC,OAAO,CAAC,MAAM,CAAsB;gBAExB,GAAG,EAAE,MAAM,GAAG,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,GAAE,mBAAwB;IAMzE;;;;;;;;;OASG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;CAGrC;AAED,qBAAa,kBAAmB,SAAQ,aAAa;IACpD,GAAG,EAAE,YAAY,CAAC;gBAEN,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,YAAY;CAI5C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/entry/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,WAAW,EAAE,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/E,OAAO,EAAE,WAAW,EAAE,KAAK,iBAAiB,EAAE,KAAK,WAAW,EAAE,CAAC;AAEjE,MAAM,MAAM,KAAK,GAAG;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,cAAc,GAAG;IAClD,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B,CAAC;AAEF,qBAAa,YAAa,SAAQ,OAAO;IACxC,OAAO,CAAC,MAAM,CAAsB;gBAExB,GAAG,EAAE,MAAM,GAAG,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,GAAE,mBAAwB;IAMzE;;;;;;;;;OASG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;CAGrC;AAED,qBAAa,kBAAmB,SAAQ,aAAa;IACpD,GAAG,EAAE,YAAY,CAAC;gBAEN,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,YAAY;CAI5C"}

package/dist/index.d.ts

@@ -11,6 +11,7 @@ import type { Readable } from 'crelte-std/stores';
 import { LoadData, LoadDataArray, LoadDataFn, LoadDataObj } from './loadData/index.js';
 import { Entry } from './entry/index.js';
 export { Crelte, CrelteRequest, type Config, type QueryOptions, type LoadData, type LoadDataFn, type LoadDataObj, type LoadDataArray, type Entry, };
+export type Init = (crelte: Crelte) => void;
 /**
  * Get Crelte from the current context
  *

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,oBAAoB,CAAC;AAC5C,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAC9C,OAAO,KAAK,IAAI,MAAM,mBAAmB,CAAC;AAC1C,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAC;AAChD,OAAO,MAAM,EAAE,EAAE,KAAK,YAAY,EAAE,KAAK,MAAM,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAC/C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EACN,QAAQ,EACR,aAAa,EACb,UAAU,EACV,WAAW,EACX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,OAAO,EACN,MAAM,EACN,aAAa,EACb,KAAK,MAAM,EACX,KAAK,YAAY,EACjB,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,aAAa,EAClB,KAAK,KAAK,GACV,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,IAAI,QAAQ,CAEtC;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,OAAO,CAEpC;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,IAAI,QAAQ,CAAC,KAAK,CAAC,CAK1C;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,CAKxC;AAED;;;;;;;GAOG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAAC;AACrD,wBAAgB,MAAM,CAAC,IAAI,EAAE,eAAe,GAAG,MAAM,CAAC;AACtD,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;AAKpD;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,QAAQ,CAAC,OAAO,CAAC,CAE9C;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,IAAI,QAAQ,CAAC,MAAM,CAAC,CAErD;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAEjE;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,OAAO,CAEpC;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,QAOjE;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,KAAK,IAAI,QAOxD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,oBAAoB,CAAC;AAC5C,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAC9C,OAAO,KAAK,IAAI,MAAM,mBAAmB,CAAC;AAC1C,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAC;AAChD,OAAO,MAAM,EAAE,EAAE,KAAK,YAAY,EAAE,KAAK,MAAM,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAC/C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EACN,QAAQ,EACR,aAAa,EACb,UAAU,EACV,WAAW,EACX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,OAAO,EACN,MAAM,EACN,aAAa,EACb,KAAK,MAAM,EACX,KAAK,YAAY,EACjB,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,aAAa,EAClB,KAAK,KAAK,GACV,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;AAE5C;;;;;GAKG;AACH,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,IAAI,QAAQ,CAEtC;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,OAAO,CAEpC;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,IAAI,QAAQ,CAAC,KAAK,CAAC,CAK1C;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,CAKxC;AAED;;;;;;;GAOG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAAC;AACrD,wBAAgB,MAAM,CAAC,IAAI,EAAE,eAAe,GAAG,MAAM,CAAC;AACtD,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;AAKpD;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,QAAQ,CAAC,OAAO,CAAC,CAE9C;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,IAAI,QAAQ,CAAC,MAAM,CAAC,CAErD;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAEjE;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,OAAO,CAEpC;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,QAOjE;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,KAAK,IAAI,QAOxD"}

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

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/init/client.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAKrD;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IACtB,4BAA4B;IAC5B,GAAG,EAAE,GAAG,CAAC;IACT,8BAA8B;IAC9B,SAAS,EAAE,GAAG,CAAC;IACf,iDAAiD;IACjD,UAAU,EAAE,YAAY,CAAC;IACzB,mDAAmD;IACnD,WAAW,CAAC,EAAE,YAAY,CAAC;CAC3B,CAAC;AAaF;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,IAAI,CAAC,IAAI,EAAE,QAAQ,iBA6IxC"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/init/client.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAKrD;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IACtB,4BAA4B;IAC5B,GAAG,EAAE,GAAG,CAAC;IACT,8BAA8B;IAC9B,SAAS,EAAE,GAAG,CAAC;IACf,iDAAiD;IACjD,UAAU,EAAE,YAAY,CAAC;IACzB,mDAAmD;IACnD,WAAW,CAAC,EAAE,YAAY,CAAC;CAC3B,CAAC;AAaF;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,IAAI,CAAC,IAAI,EAAE,QAAQ,iBA8IxC"}

package/dist/init/client.js

@@ -66,6 +66,7 @@ export async function main(data) {
     }
     // setup plugins
     setupPlugins(crelte, data.app.plugins ?? []);
+    data.app.init?.(crelte);
     const loadFn = await prepareLoadFn(crelte, data.app, data.entryQuery, data.globalQuery);
     // setup load Data
     crelte.router._internal.onLoad = (req, opts) => {

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

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/init/server.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAMrD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,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,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;IACT,iDAAiD;IACjD,UAAU,EAAE,YAAY,CAAC;IACzB,mDAAmD;IACnD,WAAW,CAAC,EAAE,YAAY,CAAC;IAE3B,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,CAgFD;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,CA0B5C"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/init/server.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAMrD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,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,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;IACT,iDAAiD;IACjD,UAAU,EAAE,YAAY,CAAC;IACzB,mDAAmD;IACnD,WAAW,CAAC,EAAE,YAAY,CAAC;IAE3B,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,CAoFD;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,CA0B5C"}

package/dist/init/server.js

@@ -40,6 +40,7 @@ export async function main(data) {
     const crelte = builder.build();
     // setup plugins
     setupPlugins(crelte, data.app.plugins ?? []);
+    data.app.init?.(crelte);
     const loadFn = await prepareLoadFn(crelte, data.app, data.entryQuery, data.globalQuery);
     // setup load Data
     crelte.router._internal.onLoad = req => {
@@ -72,7 +73,10 @@ export async function main(data) {
         .replace('<!--ssr-body-->', html);
     const entry = props.entry;
     return {
-        status: entry.sectionHandle === 'error' ? parseInt(entry.typeHandle) : 200,
+        status: req.statusCode ??
+            (entry.sectionHandle === 'error'
+                ? parseInt(entry.typeHandle)
+                : 200),
         html: finalHtml,
         setCookies: crelte.cookies._getSetCookiesHeaders(),
     };

package/dist/init/shared.d.ts

@@ -2,31 +2,24 @@ import Crelte from '../Crelte.js';
 import CrelteRequest from '../CrelteRequest.js';
 import { EntryRoutes } from '../entry/EntryRouter.js';
 import { GraphQlQuery } from '../graphql/GraphQl.js';
+import { Entry } from '../index.js';
 import { LoadData } from '../loadData/index.js';
 import { PluginCreator } from '../plugins/Plugins.js';
 import { LoadOptions } from '../routing/PageLoader.js';
-interface App<E, T> {
+interface App {
     loadGlobalData?: LoadData<null>;
-    loadEntryData?: LoadData<any>;
-    templates?: Record<string, LazyTemplateModule<E, T>>;
+    loadEntryData?: LoadData<Entry>;
+    templates?: Record<string, LazyTemplateModule>;
     entryRoutes?: EntryRoutes;
+    init?: (crelte: Crelte) => void;
 }
-interface TemplateModule<E, T> {
+interface TemplateModule {
     default: any;
-    loadData?(cr: CrelteRequest, entry: E): Promise<T>;
+    loadData?: LoadData<Entry>;
 }
-type LazyTemplateModule<E, T> = (() => Promise<TemplateModule<E, T>>) | TemplateModule<E, T>;
+type LazyTemplateModule = (() => Promise<TemplateModule>) | TemplateModule;
 export declare function setupPlugins(crelte: Crelte, plugins: PluginCreator[]): void;
 export declare function pluginsBeforeRender(cr: CrelteRequest): void;
-/**
- * Get the entry from the page
- *
- * entries should export sectionHandle and typeHandle
- *
- * products should alias productTypeHandle with typeHandle,
- * sectionHandle will be automatically set to product
- */
-export declare function getEntry(page: any): any;
-export declare function prepareLoadFn<E, T>(crelte: Crelte, app: App<E, T>, entryQuery: GraphQlQuery, globalQuery?: GraphQlQuery): Promise<(cr: CrelteRequest, loadOpts?: LoadOptions) => Promise<any>>;
+export declare function prepareLoadFn(crelte: Crelte, app: App, entryQuery: GraphQlQuery, globalQuery?: GraphQlQuery): Promise<(cr: CrelteRequest, loadOpts?: LoadOptions) => Promise<any>>;
 export {};
 //# sourceMappingURL=shared.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/init/shared.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAChD,OAAoB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAgB,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,UAAU,GAAG,CAAC,CAAC,EAAE,CAAC;IACjB,cAAc,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IAGhC,aAAa,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IAE9B,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAErD,WAAW,CAAC,EAAE,WAAW,CAAC;CAC1B;AAED,UAAU,cAAc,CAAC,CAAC,EAAE,CAAC;IAE5B,OAAO,EAAE,GAAG,CAAC;IAEb,QAAQ,CAAC,CAAC,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CACnD;AAED,KAAK,kBAAkB,CAAC,CAAC,EAAE,CAAC,IACzB,CAAC,MAAM,OAAO,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GACrC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAExB,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,QAKpE;AAED,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,aAAa,GAAG,IAAI,CAE3D;AAED;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,GAAG,GAAG,GAAG,CAYvC;AAGD,wBAAsB,aAAa,CAAC,CAAC,EAAE,CAAC,EACvC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EACd,UAAU,EAAE,YAAY,EACxB,WAAW,CAAC,EAAE,YAAY,GACxB,OAAO,CAAC,CAAC,EAAE,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,CAmBtE"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/init/shared.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAChD,OAAoB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEnE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAgB,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,UAAU,GAAG;IACZ,cAAc,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IAGhC,aAAa,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEhC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAE/C,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;CAChC;AAED,UAAU,cAAc;IAEvB,OAAO,EAAE,GAAG,CAAC;IAEb,QAAQ,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;CAC3B;AAED,KAAK,kBAAkB,GAAG,CAAC,MAAM,OAAO,CAAC,cAAc,CAAC,CAAC,GAAG,cAAc,CAAC;AAE3E,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,QAKpE;AAED,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,aAAa,GAAG,IAAI,CAE3D;AA2BD,wBAAsB,aAAa,CAClC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,YAAY,EACxB,WAAW,CAAC,EAAE,YAAY,GACxB,OAAO,CAAC,CAAC,EAAE,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,CAmBtE"}

package/dist/init/shared.js

@@ -9,6 +9,10 @@ export function setupPlugins(crelte, plugins) {
 export function pluginsBeforeRender(cr) {
     cr.events.trigger('beforeRender', cr);
 }
+const ERROR_404_ENTRY = {
+    sectionHandle: 'error',
+    typeHandle: '404',
+};
 /**
  * Get the entry from the page
  *
@@ -17,7 +21,7 @@ export function pluginsBeforeRender(cr) {
  * products should alias productTypeHandle with typeHandle,
  * sectionHandle will be automatically set to product
  */
-export function getEntry(page) {
+function getEntry(page) {
     if (page?.entry)
         return { ...page.entry };
     if (page?.product)
@@ -25,10 +29,7 @@ export function getEntry(page) {
             sectionHandle: 'product',
             ...page.product,
         };
-    return {
-        sectionHandle: 'error',
-        typeHandle: '404',
-    };
+    return null;
 }
 // todo it would be nice to call this only once per server start
 export async function prepareLoadFn(crelte, app, entryQuery, globalQuery) {
@@ -124,25 +125,45 @@ function parseFilename(path) {
     return [name, ext];
 }
 async function queryEntry(cr, app, entryRouter, entryQuery) {
-    // check
-    if (entryRouter) {
-        const entry = await entryRouter._handle(cr);
-        if (entry)
-            return entry;
-    }
+    let vars = null;
     if (cr.req.siteMatches()) {
         let uri = decodeURI(cr.req.uri);
         if (uri.startsWith('/'))
             uri = uri.substring(1);
         if (uri === '' || uri === '/')
             uri = '__home__';
-        const page = await cr.query(entryQuery, {
+        vars = {
             uri,
             siteId: cr.site.id,
-        });
-        return getEntry(page);
+        };
     }
-    return null;
+    if (vars) {
+        await Promise.all(cr.events.trigger('beforeQueryEntry', cr, vars));
+    }
+    // basic query function
+    let loadFn = async (vars) => {
+        if (entryRouter) {
+            const entry = await entryRouter._handle(cr);
+            if (entry)
+                return entry;
+        }
+        if (vars) {
+            const page = await cr.query(entryQuery, vars);
+            return getEntry(page);
+        }
+        return null;
+    };
+    // check if a plugin wants to override the query
+    const fns = cr.events.getListeners('queryEntry');
+    for (const fn of fns) {
+        const prevLoadFn = loadFn;
+        loadFn = async (vars) => {
+            return await fn(cr, vars, prevLoadFn);
+        };
+    }
+    const entry = (await loadFn(vars)) ?? ERROR_404_ENTRY;
+    await Promise.all(cr.events.trigger('afterQueryEntry', cr, entry));
+    return entry;
 }
 function prepareTemplates(rawModules) {
     // parse modules

package/dist/plugins/Events.d.ts

@@ -1,4 +1,5 @@
-import { CrelteRequest } from '../index.js';
+import { EntryQueryVars } from '../entry/index.js';
+import { CrelteRequest, Entry } from '../index.js';
 export default class Events {
     inner: Map<string, Set<any>>;
     constructor();
@@ -8,17 +9,32 @@ export default class Events {
      * @returns a function to remove the listener
      */
     on(ev: 'loadGlobalData', fn: (cr: CrelteRequest) => Promise<any>): () => void;
-    on(ev: 'loadData', fn: (cr: CrelteRequest, entry: any) => Promise<any>): () => void;
+    on(ev: 'loadData', fn: (cr: CrelteRequest, entry: Entry) => Promise<any>): () => void;
     on(ev: 'beforeRender', fn: (cr: CrelteRequest) => void): () => void;
+    on(ev: 'beforeQueryEntry', fn: (cr: CrelteRequest, vars: EntryQueryVars) => Promise<void> | void): () => void;
+    on(ev: 'queryEntry', fn: (cr: CrelteRequest, vars: EntryQueryVars | null, 
+    /** this might contain other plugin calls */
+    runQuery: (vars: EntryQueryVars | null) => Promise<Entry | null>) => Promise<Entry | null>): () => void;
+    on(ev: 'afterQueryEntry', fn: (cr: CrelteRequest, entry: Entry) => Promise<void> | void): () => void;
     /**
      * Remove a listener
      */
     remove(ev: string, fn: any): void;
+    /**
+     * Check if an event has listeners
+     */
+    has(ev: string): boolean;
     /**
      * Trigger an event
      */
     trigger(ev: 'loadGlobalData', cr: CrelteRequest): Promise<any>[];
-    trigger(ev: 'loadData', cr: CrelteRequest, entry: any): Promise<any>[];
+    trigger(ev: 'loadData', cr: CrelteRequest, entry: Entry): Promise<any>[];
     trigger(ev: 'beforeRender', cr: CrelteRequest): void[];
+    trigger(ev: 'beforeQueryEntry', cr: CrelteRequest, vars: EntryQueryVars): void[];
+    trigger(ev: 'afterQueryEntry', cr: CrelteRequest, entry: Entry): Promise<void>[];
+    /**
+     * Get all listeners for an event
+     */
+    getListeners(ev: 'queryEntry'): ((cr: CrelteRequest, vars: EntryQueryVars | null, runQuery: (vars: EntryQueryVars | null) => Promise<Entry | null>) => Promise<Entry | null>)[];
 }
 //# sourceMappingURL=Events.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Events.d.ts","sourceRoot":"","sources":["../../src/plugins/Events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,CAAC,OAAO,OAAO,MAAM;IAC1B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;;IAM7B;;;;OAIG;IAEH,EAAE,CACD,EAAE,EAAE,gBAAgB,EACpB,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,KAAK,OAAO,CAAC,GAAG,CAAC,GACrC,MAAM,IAAI;IACb,EAAE,CACD,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,GACjD,MAAM,IAAI;IACb,EAAE,CAAC,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,KAAK,IAAI,GAAG,MAAM,IAAI;IAenE;;OAEG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG;IAO1B;;OAEG;IACH,OAAO,CAAC,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,EAAE;IAChE,OAAO,CAAC,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,EAAE;IACtE,OAAO,CAAC,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE,aAAa,GAAG,IAAI,EAAE;CAOtD"}
+{"version":3,"file":"Events.d.ts","sourceRoot":"","sources":["../../src/plugins/Events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEnD,MAAM,CAAC,OAAO,OAAO,MAAM;IAC1B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;;IAM7B;;;;OAIG;IAEH,EAAE,CACD,EAAE,EAAE,gBAAgB,EACpB,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,KAAK,OAAO,CAAC,GAAG,CAAC,GACrC,MAAM,IAAI;IACb,EAAE,CACD,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,GAAG,CAAC,GACnD,MAAM,IAAI;IACb,EAAE,CAAC,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,KAAK,IAAI,GAAG,MAAM,IAAI;IACnE,EAAE,CACD,EAAE,EAAE,kBAAkB,EACtB,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,GACnE,MAAM,IAAI;IACb,EAAE,CACD,EAAE,EAAE,YAAY,EAChB,EAAE,EAAE,CACH,EAAE,EAAE,aAAa,EACjB,IAAI,EAAE,cAAc,GAAG,IAAI;IAC3B,4CAA4C;IAC5C,QAAQ,EAAE,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI,KAAK,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,KAC5D,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,GACxB,MAAM,IAAI;IACb,EAAE,CACD,EAAE,EAAE,iBAAiB,EACrB,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,GAC3D,MAAM,IAAI;IAeb;;OAEG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG;IAO1B;;OAEG;IACH,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAKxB;;OAEG;IACH,OAAO,CAAC,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,EAAE;IAChE,OAAO,CAAC,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,EAAE;IACxE,OAAO,CAAC,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE,aAAa,GAAG,IAAI,EAAE;IACtD,OAAO,CACN,EAAE,EAAE,kBAAkB,EACtB,EAAE,EAAE,aAAa,EACjB,IAAI,EAAE,cAAc,GAClB,IAAI,EAAE;IACT,OAAO,CACN,EAAE,EAAE,iBAAiB,EACrB,EAAE,EAAE,aAAa,EACjB,KAAK,EAAE,KAAK,GACV,OAAO,CAAC,IAAI,CAAC,EAAE;IAQlB;;OAEG;IACH,YAAY,CACX,EAAE,EAAE,YAAY,GACd,CAAC,CACH,EAAE,EAAE,aAAa,EACjB,IAAI,EAAE,cAAc,GAAG,IAAI,EAC3B,QAAQ,EAAE,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI,KAAK,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,KAC5D,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,EAAE;CAI7B"}

package/dist/plugins/Events.js

@@ -23,10 +23,20 @@ export default class Events {
             return;
         set.delete(fn);
     }
+    /**
+     * Check if an event has listeners
+     */
+    has(ev) {
+        const size = this.inner.get(ev)?.size ?? 0;
+        return size > 0;
+    }
     trigger(ev, ...args) {
         const set = this.inner.get(ev);
         if (!set)
             return [];
         return Array.from(set).map(fn => fn(...args));
     }
+    getListeners(ev) {
+        return Array.from(this.inner.get(ev) ?? []);
+    }
 }

package/package.json

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

package/src/entry/index.ts

@@ -10,6 +10,12 @@ export type Entry = {
 	[key: string]: any;
 };
 
+export type EntryQueryVars = {
+	uri: string;
+	siteId: number;
+	[key: string]: any;
+};
+
 export type EntryRequestOptions = RequestOptions & {
 	params?: Map<string, string>;
 };

package/src/index.ts

@@ -29,6 +29,8 @@ export {
 	type Entry,
 };
 
+export type Init = (crelte: Crelte) => void;
+
 /**
  * Get Crelte from the current context
  *

package/src/init/client.ts

@@ -96,6 +96,7 @@ export async function main(data: MainData) {
 
 	// setup plugins
 	setupPlugins(crelte, data.app.plugins ?? []);
+	data.app.init?.(crelte);
 
 	const loadFn = await prepareLoadFn(
 		crelte,

package/src/init/server.ts

@@ -82,6 +82,7 @@ export async function main(data: MainData): Promise<{
 
 	// setup plugins
 	setupPlugins(crelte, data.app.plugins ?? []);
+	data.app.init?.(crelte);
 
 	const loadFn = await prepareLoadFn(
 		crelte,
@@ -135,7 +136,10 @@ export async function main(data: MainData): Promise<{
 
 	return {
 		status:
-			entry.sectionHandle === 'error' ? parseInt(entry.typeHandle) : 200,
+			req.statusCode ??
+			(entry.sectionHandle === 'error'
+				? parseInt(entry.typeHandle)
+				: 200),
 		html: finalHtml,
 		setCookies: (crelte.cookies as ServerCookies)._getSetCookiesHeaders(),
 	};

package/src/init/shared.ts

@@ -1,32 +1,34 @@
 import Crelte from '../Crelte.js';
 import CrelteRequest from '../CrelteRequest.js';
 import EntryRouter, { EntryRoutes } from '../entry/EntryRouter.js';
+import { EntryQueryVars } from '../entry/index.js';
 import { GraphQlQuery } from '../graphql/GraphQl.js';
+import { Entry } from '../index.js';
 import { LoadData, callLoadData } from '../loadData/index.js';
 import { PluginCreator } from '../plugins/Plugins.js';
 import { LoadOptions } from '../routing/PageLoader.js';
 
-interface App<E, T> {
+interface App {
 	loadGlobalData?: LoadData<null>;
 
 	// todo: add a generic
-	loadEntryData?: LoadData<any>;
+	loadEntryData?: LoadData<Entry>;
 
-	templates?: Record<string, LazyTemplateModule<E, T>>;
+	templates?: Record<string, LazyTemplateModule>;
 
 	entryRoutes?: EntryRoutes;
+
+	init?: (crelte: Crelte) => void;
 }
 
-interface TemplateModule<E, T> {
+interface TemplateModule {
 	// svelte component
 	default: any;
 
-	loadData?(cr: CrelteRequest, entry: E): Promise<T>;
+	loadData?: LoadData<Entry>;
 }
 
-type LazyTemplateModule<E, T> =
-	| (() => Promise<TemplateModule<E, T>>)
-	| TemplateModule<E, T>;
+type LazyTemplateModule = (() => Promise<TemplateModule>) | TemplateModule;
 
 export function setupPlugins(crelte: Crelte, plugins: PluginCreator[]) {
 	for (const plugin of plugins) {
@@ -39,6 +41,11 @@ export function pluginsBeforeRender(cr: CrelteRequest): void {
 	cr.events.trigger('beforeRender', cr);
 }
 
+const ERROR_404_ENTRY: Entry = {
+	sectionHandle: 'error',
+	typeHandle: '404',
+};
+
 /**
  * Get the entry from the page
  *
@@ -47,7 +54,7 @@ export function pluginsBeforeRender(cr: CrelteRequest): void {
  * products should alias productTypeHandle with typeHandle,
  * sectionHandle will be automatically set to product
  */
-export function getEntry(page: any): any {
+function getEntry(page: any): Entry | null {
 	if (page?.entry) return { ...page.entry };
 	if (page?.product)
 		return {
@@ -55,16 +62,13 @@ export function getEntry(page: any): any {
 			...page.product,
 		};
 
-	return {
-		sectionHandle: 'error',
-		typeHandle: '404',
-	};
+	return null;
 }
 
 // todo it would be nice to call this only once per server start
-export async function prepareLoadFn<E, T>(
+export async function prepareLoadFn(
 	crelte: Crelte,
-	app: App<E, T>,
+	app: App,
 	entryQuery: GraphQlQuery,
 	globalQuery?: GraphQlQuery,
 ): Promise<(cr: CrelteRequest, loadOpts?: LoadOptions) => Promise<any>> {
@@ -88,10 +92,10 @@ export async function prepareLoadFn<E, T>(
 	};
 }
 
-async function loadFn<E, T>(
+async function loadFn(
 	cr: CrelteRequest,
-	app: App<E, T>,
-	templateModules: Map<string, LazyTemplateModule<E, T>>,
+	app: App,
+	templateModules: Map<string, LazyTemplateModule>,
 	entryRouter: EntryRouter | null,
 	entryQuery: GraphQlQuery,
 	globalQuery?: GraphQlQuery,
@@ -198,52 +202,79 @@ function parseFilename(path: string): [string, string] {
 	return [name, ext];
 }
 
-async function queryEntry<E, T>(
+async function queryEntry(
 	cr: CrelteRequest,
-	app: App<E, T>,
+	app: App,
 	entryRouter: EntryRouter | null,
 	entryQuery: GraphQlQuery,
-): Promise<any | null> {
-	// check
-	if (entryRouter) {
-		const entry = await entryRouter._handle(cr);
-		if (entry) return entry;
-	}
+): Promise<Entry> {
+	let vars: EntryQueryVars | null = null;
 
 	if (cr.req.siteMatches()) {
 		let uri = decodeURI(cr.req.uri);
 		if (uri.startsWith('/')) uri = uri.substring(1);
 		if (uri === '' || uri === '/') uri = '__home__';
 
-		const page = await cr.query(entryQuery, {
+		vars = {
 			uri,
 			siteId: cr.site.id,
-		});
+		};
+	}
 
-		return getEntry(page);
+	if (vars) {
+		await Promise.all(cr.events.trigger('beforeQueryEntry', cr, vars));
 	}
 
-	return null;
+	// basic query function
+	let loadFn = async (vars: EntryQueryVars | null) => {
+		if (entryRouter) {
+			const entry = await entryRouter._handle(cr);
+			if (entry) return entry;
+		}
+
+		if (vars) {
+			const page = await cr.query(entryQuery, vars);
+
+			return getEntry(page);
+		}
+
+		return null;
+	};
+
+	// check if a plugin wants to override the query
+	const fns = cr.events.getListeners('queryEntry');
+	for (const fn of fns) {
+		const prevLoadFn = loadFn;
+		loadFn = async vars => {
+			return await fn(cr, vars, prevLoadFn);
+		};
+	}
+
+	const entry = (await loadFn(vars)) ?? ERROR_404_ENTRY;
+
+	await Promise.all(cr.events.trigger('afterQueryEntry', cr, entry));
+
+	return entry;
 }
 
-function prepareTemplates<E, T>(
-	rawModules: Record<string, LazyTemplateModule<E, T>>,
-): Map<string, LazyTemplateModule<E, T>> {
+function prepareTemplates(
+	rawModules: Record<string, LazyTemplateModule>,
+): Map<string, LazyTemplateModule> {
 	// parse modules
 	return new Map(
 		Object.entries(rawModules)
 			.map(([path, mod]) => {
 				const [name, _ext] = parseFilename(path);
-				return [name, mod] as [string, LazyTemplateModule<E, T>];
+				return [name, mod] as [string, LazyTemplateModule];
 			})
 			.filter(([name, _mod]) => !!name),
 	);
 }
 
-async function loadTemplate<E, T>(
-	modules: Map<string, LazyTemplateModule<E, T>>,
-	entry: E,
-): Promise<TemplateModule<E, T>> {
+async function loadTemplate(
+	modules: Map<string, LazyTemplateModule>,
+	entry: Entry,
+): Promise<TemplateModule> {
 	const entr = entry as any;
 	const handle = `${entr.sectionHandle}-${entr.typeHandle}`;
 

package/src/plugins/Events.ts

@@ -1,4 +1,5 @@
-import { CrelteRequest } from '../index.js';
+import { EntryQueryVars } from '../entry/index.js';
+import { CrelteRequest, Entry } from '../index.js';
 
 export default class Events {
 	inner: Map<string, Set<any>>;
@@ -19,9 +20,26 @@ export default class Events {
 	): () => void;
 	on(
 		ev: 'loadData',
-		fn: (cr: CrelteRequest, entry: any) => Promise<any>,
+		fn: (cr: CrelteRequest, entry: Entry) => Promise<any>,
 	): () => void;
 	on(ev: 'beforeRender', fn: (cr: CrelteRequest) => void): () => void;
+	on(
+		ev: 'beforeQueryEntry',
+		fn: (cr: CrelteRequest, vars: EntryQueryVars) => Promise<void> | void,
+	): () => void;
+	on(
+		ev: 'queryEntry',
+		fn: (
+			cr: CrelteRequest,
+			vars: EntryQueryVars | null,
+			/** this might contain other plugin calls */
+			runQuery: (vars: EntryQueryVars | null) => Promise<Entry | null>,
+		) => Promise<Entry | null>,
+	): () => void;
+	on(
+		ev: 'afterQueryEntry',
+		fn: (cr: CrelteRequest, entry: Entry) => Promise<void> | void,
+	): () => void;
 	on(ev: string, fn: (...args: any[]) => any): () => void {
 		let set = this.inner.get(ev);
 		if (!set) {
@@ -46,16 +64,48 @@ export default class Events {
 		set.delete(fn);
 	}
 
+	/**
+	 * Check if an event has listeners
+	 */
+	has(ev: string): boolean {
+		const size = this.inner.get(ev)?.size ?? 0;
+		return size > 0;
+	}
+
 	/**
 	 * Trigger an event
 	 */
 	trigger(ev: 'loadGlobalData', cr: CrelteRequest): Promise<any>[];
-	trigger(ev: 'loadData', cr: CrelteRequest, entry: any): Promise<any>[];
+	trigger(ev: 'loadData', cr: CrelteRequest, entry: Entry): Promise<any>[];
 	trigger(ev: 'beforeRender', cr: CrelteRequest): void[];
+	trigger(
+		ev: 'beforeQueryEntry',
+		cr: CrelteRequest,
+		vars: EntryQueryVars,
+	): void[];
+	trigger(
+		ev: 'afterQueryEntry',
+		cr: CrelteRequest,
+		entry: Entry,
+	): Promise<void>[];
 	trigger(ev: string, ...args: any[]): any[] {
 		const set = this.inner.get(ev);
 		if (!set) return [];
 
 		return Array.from(set).map(fn => fn(...args));
 	}
+
+	/**
+	 * Get all listeners for an event
+	 */
+	getListeners(
+		ev: 'queryEntry',
+	): ((
+		cr: CrelteRequest,
+		vars: EntryQueryVars | null,
+		runQuery: (vars: EntryQueryVars | null) => Promise<Entry | null>,
+	) => Promise<Entry | null>)[];
+	getListeners(ev: string): any[] {
+		return Array.from(this.inner.get(ev) ?? []);
+	}
 }