crelte 0.4.7 → 0.5.0-alpha.1

package/dist/init/shared.js

@@ -1,94 +1,82 @@
-import EntryRouter from '../entry/EntryRouter.js';
+import { isGraphQlQuery } from '../graphql/GraphQl.js';
 import { callLoadData } from '../loadData/index.js';
+import { isPromise } from '../utils.js';
 export function setupPlugins(crelte, plugins) {
     for (const plugin of plugins) {
         const p = plugin(crelte);
         crelte.plugins.add(p);
     }
 }
-export function pluginsBeforeRender(cr) {
-    cr.events.trigger('beforeRender', cr);
-}
-const ERROR_404_ENTRY = {
-    sectionHandle: 'error',
-    typeHandle: '404',
-};
-/**
- * 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
- */
-function getEntry(page) {
-    if (page?.entry)
-        return { ...page.entry };
-    if (page?.product)
-        return {
-            sectionHandle: 'product',
-            ...page.product,
-        };
-    return null;
-}
-// todo it would be nice to call this only once per server start
-export async function prepareLoadFn(crelte, app, entryQuery, globalQuery) {
-    const templateModules = prepareTemplates(app.templates ?? {});
-    let entryRouter = null;
-    if (app.entryRoutes) {
-        entryRouter = new EntryRouter(crelte);
-        await app.entryRoutes(entryRouter);
+export function pluginsBeforeRequest(cr) {
+    const res = cr.events.trigger('beforeRequest', cr);
+    // if one of them is a promise we need to wait for it
+    if (res.some(isPromise)) {
+        return Promise.all(res).then();
     }
-    return async (cr, loadOpts) => {
-        return await loadFn(cr, app, templateModules, entryRouter, entryQuery, globalQuery, loadOpts);
-    };
 }
-async function loadFn(cr, app, templateModules, entryRouter, entryQuery, globalQuery, loadOpts) {
-    let dataProm = null;
-    // @ts-ignore
-    if (app.loadData) {
-        throw new Error('loadData is ambigous, choose loadGlobalData or ' +
-            'loadEntryData depending on if you need access to entry or not?');
-    }
-    if (app.loadGlobalData) {
-        dataProm = callLoadData(app.loadGlobalData, cr, null);
-    }
+export function pluginsBeforeRender(cr, route) {
+    cr.events.trigger('beforeRender', cr, route);
+}
+// This should be onRequest or handleRequest
+//
+// it should also handle the site redirect and stuff like that
+// we should have a onRequest
+export async function loadFn(cr, app, loadOpts) {
+    const isCanceled = () => !!loadOpts?.isCanceled();
+    // loadGlobalData phase
     let globalProm = null;
-    if (globalQuery && !cr.globals._wasLoaded(cr.site.id)) {
+    if (app.loadGlobalData) {
+        // we need to set the globals as soon as loadGlobalData completes
+        // because other loadGlobalData functions might wait on the result
         globalProm = (async () => {
-            const res = await cr.query(globalQuery, {
-                siteId: cr.site.id,
-            });
-            // we need to do this sorcery here and can't wait until all
-            // globals functions are done, because some global function
-            // might want to use globals, and for that the function
-            // getAsync exists on Globals
-            cr.globals._setData(cr.site.id, res);
-            return res;
+            // todo theoretically we could if the loadData is a an LoadObject
+            // assign each to the global as soon as we have it. Which might
+            // prevent some deadlocks but i don't think this will happen
+            // often
+            const globals = await callLoadData(app.loadGlobalData, cr, null);
+            if (!globals)
+                return globals;
+            if (typeof globals !== 'object') {
+                throw new Error('loadGlobalData needs to return an object or nothing');
+            }
+            for (const [k, v] of Object.entries(globals)) {
+                cr.globals.set(k, v);
+            }
         })();
     }
-    const entryProm = queryEntry(cr, app, entryRouter, entryQuery);
+    // todo maybe each setting of the property on the request should be
+    // checked to be empty before doing it
+    const entryProm = (async () => {
+        let loadEntry = app.loadEntry;
+        if (isGraphQlQuery(loadEntry)) {
+            const entryQuery = loadEntry;
+            loadEntry = cr => queryEntry(cr, entryQuery);
+        }
+        let entry = await callLoadData(loadEntry, cr, null);
+        if (isCanceled())
+            return [];
+        cr.req.entry = entry;
+        await Promise.all(cr.events.trigger('afterLoadEntry', cr));
+        if (isCanceled())
+            return [];
+        entry = cr.req.entry;
+        const template = await app.loadTemplate(entry);
+        if (isCanceled())
+            return [];
+        cr.req.template = template;
+        return [entry, template];
+    })();
     const pluginsLoadGlobalData = cr.events.trigger('loadGlobalData', cr);
     // loading progress is at 20%
     loadOpts?.setProgress(0.2);
-    const [data, global, entry] = await Promise.all([
-        dataProm,
+    const [_global, [entry, template]] = await Promise.all([
         globalProm,
         entryProm,
         ...pluginsLoadGlobalData,
     ]);
-    // global is only set if !wasLoaded but we need to store something
-    // even if no globalQuery exists
-    if (global || !cr.globals._wasLoaded(cr.site.id)) {
-        cr.globals._setData(cr.site.id, global ?? {});
-    }
-    let template;
-    if (app.templates) {
-        template = await loadTemplate(templateModules, entry);
-    }
-    else {
-        throw new Error('App must export some templates');
-    }
+    if (isCanceled())
+        return;
+    cr.globals._globalsLoaded();
     // loading progress is at 60%
     loadOpts?.setProgress(0.6);
     const pluginsLoadData = cr.events.trigger('loadData', cr, entry);
@@ -105,92 +93,47 @@ async function loadFn(cr, app, templateModules, entryRouter, entryQuery, globalQ
         entryDataProm,
         ...pluginsLoadData,
     ]);
-    // loading progress is at 100%
-    loadOpts?.setProgress(1);
-    return {
-        ...data,
+    cr.req.loadedData = {
+        ...templateData,
         ...entryData,
-        entry,
-        template: template.default,
-        templateData: templateData,
     };
+    // loading progress is at 100%
+    loadOpts?.setProgress(1);
 }
-function parseFilename(path) {
-    // get filename with extension
-    const slash = path.lastIndexOf('/');
-    const filename = path.substring(slash + 1);
-    const extPos = filename.lastIndexOf('.');
-    const name = filename.substring(0, extPos);
-    const ext = filename.substring(extPos + 1);
-    return [name, ext];
-}
-async function queryEntry(cr, app, entryRouter, entryQuery) {
-    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__';
-        vars = {
-            uri,
-            siteId: cr.site.id,
-        };
-    }
-    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;
+export async function queryEntry(cr, entryQuery) {
+    if (!cr.req.siteMatches())
+        throw new Error('to run the entryQuery the request needs to have a matching site');
+    let uri = decodeURI(cr.req.uri);
+    if (uri.startsWith('/'))
+        uri = uri.substring(1);
+    if (uri === '' || uri === '/')
+        uri = '__home__';
+    const vars = {
+        uri,
+        siteId: cr.site.id,
     };
-    // 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
-    return new Map(Object.entries(rawModules)
-        .map(([path, mod]) => {
-        const [name, _ext] = parseFilename(path);
-        return [name, mod];
-    })
-        .filter(([name, _mod]) => !!name));
+    const page = await cr.query(entryQuery, vars);
+    return getEntry(page) ?? ERROR_404_ENTRY;
 }
-async function loadTemplate(modules, entry) {
-    const entr = entry;
-    const handle = `${entr.sectionHandle}-${entr.typeHandle}`;
-    if (
-    // @ts-ignore
-    import.meta.env.DEV &&
-        !modules.has(handle) &&
-        !modules.has(entr.sectionHandle)) {
-        console.error(`Template not found: <${handle}>, expecting file: ${handle}.svelte or ${entr.sectionHandle}.svelte`);
-    }
-    const loadMod = modules.get(handle) ??
-        modules.get(entr.sectionHandle) ??
-        modules.get('error-404');
-    if (!loadMod)
-        throw new Error('could not find error-404 template');
-    if (typeof loadMod === 'function') {
-        return await loadMod();
-    }
-    return loadMod;
+const ERROR_404_ENTRY = {
+    sectionHandle: 'error',
+    typeHandle: '404',
+};
+/**
+ * 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
+ */
+function getEntry(page) {
+    if (page?.entry)
+        return { ...page.entry };
+    if (page?.product)
+        return {
+            sectionHandle: 'product',
+            ...page.product,
+        };
+    return null;
 }

package/dist/init/svelteComponents.d.ts

@@ -0,0 +1,3 @@
+export declare function svelteMount(comp: any, options: any): any;
+export declare function svelteRender(comp: any, options: any): any;
+//# sourceMappingURL=svelteComponents.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"svelteComponents.d.ts","sourceRoot":"","sources":["../../src/init/svelteComponents.ts"],"names":[],"mappings":"AAKA,wBAAgB,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,GAAG,GAAG,CAExD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,GAAG,GAAG,CAEzD"}

package/dist/init/svelteComponents.js

@@ -0,0 +1,7 @@
+import { internalSvelteMount, internalSvelteRender, } from 'crelte-vite-plugin/svelteComponents.js';
+export function svelteMount(comp, options) {
+    return internalSvelteMount(comp, options);
+}
+export function svelteRender(comp, options) {
+    return internalSvelteRender(comp, options);
+}

package/dist/loadData/Globals.d.ts

@@ -1,11 +1,27 @@
-export type GlobalWaiters<T> = [(g: T | null) => void];
+import { Readable, Writable } from 'crelte-std/stores';
+export type GlobalWaiters<T> = ((g: T | null) => void)[];
+/**
+ * Globals is sort of a queue
+ *
+ * each time a new request get's started
+ * a copy of globals is created which references some properties of the original one
+ *
+ * then if everything is loaded th original globals is "overriden" with the new one
+ * and we get a new state
+ */
 export default class Globals {
     private waiters;
-    private data;
+    private newData;
     private stores;
-    private currentSiteId;
-    constructor();
-    get<T = any>(name: string, siteId: number): T | null;
+    constructor(stores?: Map<string, Writable<any>>);
+    /**
+     * returns a globalValue
+     *
+     * ## Note
+     * This only works in loadData, in loadGlobalData this will
+     * throw an error. In that context you should use `.getAsync`
+     */
+    get<T = any>(name: string): T | null;
     /**
      * returns a store which contains a globalSet
      *
@@ -14,43 +30,34 @@ export default class Globals {
      * always return null. In that context you should use
      * `.getAsync`
      */
-    getStore<T = any>(name: string): Global<T> | null;
+    getStore<T = any>(name: string): Readable<T> | null;
     /**
      * Get a store which contains a globalSet and wait until it is loaded
      *
      * ## Note
      * This is only useful in loadGlobalData in all other cases
-     * you can use `.getGlobal` which does return a Promise
+     * you can use `.get` which does not return a Promise
      */
-    getAsync<T = any>(name: string, siteId: number): Promise<T | null>;
-    /** @hidden */
-    _wasLoaded(siteId: number): boolean;
-    /** @hidden */
-    _setData(siteId: number, data: any): void;
-    /** @hidden */
-    _updateSiteId(siteId: number): void;
-}
-/**
- * A globalSet store
- */
-export declare class Global<T = any> {
-    /** @hidden */
-    private inner;
-    constructor(name: string, data: T);
+    getAsync<T = any>(name: string): Promise<T | null> | T | null;
     /**
-     * The function get's called once with the current value and then when the
-     * values changes
-     *
-     * @return a function which should be called to unsubscribe
+     * can only be called in loadGlobalData contexts
+     */
+    set<T>(name: string, data: T): void;
+    /**
+     * @hidden
+     * call this before starting the loadGlobalData phase
+     */
+    _toRequest(): Globals;
+    /**
+     * @hidden
+     * call this after the loadGlobalData phase
      */
-    subscribe(fn: (val: T) => void): () => void;
+    _globalsLoaded(): void;
     /**
-     * The current value
+     * @hidden
+     * call this after the loadData phase once the CrelteRequest
+     * gets completed
      */
-    get(): T;
-    /** @hidden */
-    _setSilent(value: T): void;
-    /** @hidden */
-    _notify(): void;
+    _syncToStores(): void;
 }
 //# sourceMappingURL=Globals.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Globals.d.ts","sourceRoot":"","sources":["../../src/loadData/Globals.ts"],"names":[],"mappings":"AAWA,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,KAAK,IAAI,CAAC,CAAC;AAEvD,MAAM,CAAC,OAAO,OAAO,OAAO;IAG3B,OAAO,CAAC,OAAO,CAA+C;IAC9D,OAAO,CAAC,IAAI,CAAgC;IAC5C,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,aAAa,CAAgB;;IASrC,GAAG,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC,GAAG,IAAI;IAIpD;;;;;;;OAOG;IACH,QAAQ,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI;IAIjD;;;;;;OAMG;IACH,QAAQ,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAqBlE,cAAc;IACd,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAQnC,cAAc;IACd,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;IAUlC,cAAc;IACd,aAAa,CAAC,MAAM,EAAE,MAAM;CAuB5B;AAED;;GAEG;AACH,qBAAa,MAAM,CAAC,CAAC,GAAG,GAAG;IAC1B,cAAc;IACd,OAAO,CAAC,KAAK,CAAc;gBAEf,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IAiBjC;;;;;OAKG;IACH,SAAS,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,IAAI,GAAG,MAAM,IAAI;IAI3C;;OAEG;IACH,GAAG,IAAI,CAAC;IAIR,cAAc;IACd,UAAU,CAAC,KAAK,EAAE,CAAC;IAInB,cAAc;IACd,OAAO;CAGP"}
+{"version":3,"file":"Globals.d.ts","sourceRoot":"","sources":["../../src/loadData/Globals.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAEvD,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;AAEzD;;;;;;;;GAQG;AACH,MAAM,CAAC,OAAO,OAAO,OAAO;IAK3B,OAAO,CAAC,OAAO,CAAyC;IAIxD,OAAO,CAAC,OAAO,CAA0B;IAGzC,OAAO,CAAC,MAAM,CAA6B;gBAE/B,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IAM/C;;;;;;OAMG;IACH,GAAG,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,GAAG,IAAI;IAmBpC;;;;;;;OAOG;IACH,QAAQ,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI;IAInD;;;;;;OAMG;IACH,QAAQ,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI;IAiB7D;;OAEG;IACH,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IA4B5B;;;OAGG;IACH,UAAU;IAQV;;;OAGG;IACH,cAAc;IAMd;;;;OAIG;IACH,aAAa;CAyBb"}

package/dist/loadData/Globals.js

@@ -7,21 +7,48 @@ cr.getGlobal('emergency')
 
 */
 import { Writable } from 'crelte-std/stores';
+/**
+ * Globals is sort of a queue
+ *
+ * each time a new request get's started
+ * a copy of globals is created which references some properties of the original one
+ *
+ * then if everything is loaded th original globals is "overriden" with the new one
+ * and we get a new state
+ */
 export default class Globals {
     // while the globals are not loaded if somebody calls
     // getAsync then we need to store the waiters
+    // this get's created as soon as a request was started
+    // and get's deleted as soon as all globals are loaded
     waiters;
-    data;
+    // this get's created as soon as a request was started
+    // and deleted once they are synced to the stores
+    newData;
+    // contains the current active globals
     stores;
-    currentSiteId;
-    constructor() {
-        this.waiters = new Map();
-        this.data = new Map();
-        this.stores = new Map();
-        this.currentSiteId = null;
+    constructor(stores) {
+        this.waiters = null;
+        this.newData = null;
+        this.stores = stores ?? new Map();
     }
-    get(name, siteId) {
-        return this.data.get(siteId)?.get(name) ?? null;
+    /**
+     * returns a globalValue
+     *
+     * ## Note
+     * This only works in loadData, in loadGlobalData this will
+     * throw an error. In that context you should use `.getAsync`
+     */
+    get(name) {
+        if (this.waiters)
+            throw new Error('calling get in loadGlobalData will not work. call getAsync');
+        if (!this.newData) {
+            throw new Error('calling get outside of a loadData is forbidden. use getStore');
+            // todo do we wan't to allow this?
+            // isn't it just a footgun?
+            // return this.getStore(name)?.get() ?? null;
+        }
+        return this.newData.get(name) ?? null;
     }
     /**
      * returns a store which contains a globalSet
@@ -32,78 +59,35 @@ export default class Globals {
      * `.getAsync`
      */
     getStore(name) {
-        return this.stores.get(name) ?? null;
+        return this.stores.get(name)?.readonly() ?? null;
     }
     /**
      * Get a store which contains a globalSet and wait until it is loaded
      *
      * ## Note
      * This is only useful in loadGlobalData in all other cases
-     * you can use `.getGlobal` which does return a Promise
+     * you can use `.get` which does not return a Promise
      */
-    getAsync(name, siteId) {
-        if (this._wasLoaded(siteId))
-            return Promise.resolve(this.get(name, siteId));
-        let listeners = this.waiters.get(siteId);
+    getAsync(name) {
+        if (this.newData)
+            return this.newData.get(name) ?? null;
+        if (!this.waiters)
+            throw new Error('calling getAsync in non loadGlobalData contexts is pointless. Use getStore instead');
+        let listeners = this.waiters.get(name);
         if (!listeners) {
-            listeners = new Map();
-            this.waiters.set(siteId, listeners);
+            listeners = [];
+            this.waiters.set(name, listeners);
         }
-        let waiter = listeners.get(name);
-        if (!waiter) {
-            waiter = [];
-            listeners.set(name, waiter);
-        }
-        return new Promise(resolve => {
-            waiter.push(resolve);
-        });
-    }
-    /** @hidden */
-    _wasLoaded(siteId) {
-        return this.data.has(siteId);
-    }
-    // data is the data from the global graphql
-    // so it contains some keys and data which should be parsed
-    // and created a store for each key
-    // do not call this if _wasLoaded returns true with the same siteId
-    /** @hidden */
-    _setData(siteId, data) {
-        const map = new Map(Object.entries(data));
-        this.data.set(siteId, map);
-        this.waiters.get(siteId)?.forEach((waiters, key) => {
-            waiters.forEach(waiter => waiter(map.get(key)));
-        });
-        this.waiters.delete(siteId);
-    }
-    /** @hidden */
-    _updateSiteId(siteId) {
-        if (this.currentSiteId === siteId)
-            return;
-        const data = this.data.get(siteId) ?? new Map();
-        // we set all global data to null via setSilent
-        // then set them all with the new data
-        // and update all of them
-        this.stores.forEach(global => global._setSilent(null));
-        data.forEach((value, key) => {
-            let global = this.stores.get(key);
-            if (global) {
-                global._setSilent(value);
-            }
-            else {
-                global = new Global(key, value);
-                this.stores.set(key, global);
-            }
-        });
-        this.stores.forEach(global => global._notify());
+        return new Promise(resolve => listeners.push(resolve));
     }
-}
-/**
- * A globalSet store
- */
-export class Global {
-    /** @hidden */
-    inner;
-    constructor(name, data) {
+    /**
+     * can only be called in loadGlobalData contexts
+     */
+    set(name, data) {
+        if (!this.newData) {
+            // this is not strictly necessary but
+            throw new Error('can only be called in loadGlobalData contexts');
+        }
         // todo remove in v1.0
         // In v0.2, we queried the global data for all sites.
         // We now check if the siteId is present and notify the user to remove it.
@@ -112,29 +96,56 @@ export class Global {
             throw new Error(`The global query ${name} should not include the siteId` +
                 ` property. Instead, use the siteId as a parameter.`);
         }
-        this.inner = new Writable(data);
+        this.newData?.set(name, data);
+        const listeners = this.waiters?.get(name);
+        if (listeners) {
+            this.waiters.delete(name);
+            listeners.forEach(fn => fn(data));
+        }
     }
     /**
-     * The function get's called once with the current value and then when the
-     * values changes
-     *
-     * @return a function which should be called to unsubscribe
+     * @hidden
+     * call this before starting the loadGlobalData phase
      */
-    subscribe(fn) {
-        return this.inner.subscribe(fn);
+    _toRequest() {
+        const nGlobals = new Globals(this.stores);
+        nGlobals.waiters = new Map();
+        nGlobals.newData = new Map();
+        return nGlobals;
     }
     /**
-     * The current value
+     * @hidden
+     * call this after the loadGlobalData phase
      */
-    get() {
-        return this.inner.get();
-    }
-    /** @hidden */
-    _setSilent(value) {
-        this.inner.setSilent(value);
+    _globalsLoaded() {
+        // todo should we check if there are still waiters?
+        // theoretically this should never happen
+        this.waiters = null;
     }
-    /** @hidden */
-    _notify() {
-        this.inner.notify();
+    /**
+     * @hidden
+     * call this after the loadData phase once the CrelteRequest
+     * gets completed
+     */
+    _syncToStores() {
+        const setToNull = new Set(this.stores.keys());
+        for (const [name, data] of this.newData.entries()) {
+            setToNull.delete(name);
+            const store = this.stores.get(name);
+            if (store) {
+                // todo should we do this check always?
+                if (store.get() !== data)
+                    store.set(data);
+            }
+            else {
+                this.stores.set(name, new Writable(data));
+            }
+        }
+        for (const name of setToNull) {
+            console.warn(`global ${name} was not modified setting to null and removing it`);
+            this.stores.get(name).set(null);
+            this.stores.delete(name);
+        }
+        this.newData = null;
     }
 }

package/dist/loadData/index.d.ts

@@ -1,8 +1,7 @@
 import CrelteRequest from '../CrelteRequest.js';
 import { type GraphQlQuery } from '../graphql/GraphQl.js';
 import type Globals from './Globals.js';
-import type { Global } from './Globals.js';
-export type { Globals, Global };
+export type { Globals };
 export interface LoadDataFn<A1 = any> {
     (cr: CrelteRequest, entryOrBlock: A1, ...args: any[]): Promise<any> | any;
 }
@@ -80,6 +79,8 @@ export declare function callLoadData<A1 = any>(ld: LoadData<A1>, cr: CrelteReque
 /**
  * Spread the data of two loadData functions.
  *
+ * Prefer to use the array syntax.
+ *
  * ## Example
  * ```
  * export const loadData = mergeLoadData(

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/loadData/index.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAkB,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,YAAY,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;AAEhC,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,YAAY,GACZ,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;;;;;;;;;;;;GAYG;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":"index.d.ts","sourceRoot":"","sources":["../../src/loadData/index.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAkB,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAExC,YAAY,EAAE,OAAO,EAAE,CAAC;AAExB,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,YAAY,GACZ,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"}