crelte 0.4.8 → 0.5.0-alpha.2

package/dist/init/client.js

@@ -1,7 +1,12 @@
 import { CrelteBuilder } from '../Crelte.js';
 import CrelteRequest from '../CrelteRequest.js';
-import { pluginsBeforeRender, prepareLoadFn, setupPlugins } from './shared.js';
+import { loadFn, pluginsBeforeRender, pluginsBeforeRequest, setupPlugins, } from './shared.js';
 import { tick } from 'svelte';
+import { svelteMount } from './svelteComponents.js';
+import ClientCookies from '../cookies/ClientCookies.js';
+import ClientRouter from '../routing/ClientRouter.js';
+import InternalApp from './InternalApp.js';
+import { Writable } from 'crelte-std/stores';
 const mainDataDefault = {
     preloadOnMouseOver: false,
     viewTransition: false,
@@ -32,108 +37,116 @@ const mainDataDefault = {
  */
 export async function main(data) {
     data = { ...mainDataDefault, ...data };
-    // rendering steps
-    // loadSites (first time)
-    // determine route (if site is empty on server redirect to correct language)
-    // loadData, entry (make globally available), pluginsData
-    // loadTemplate
-    // render
-    // on route change
-    // determine route
-    // entry, pluginsData
-    // loadTemplate
-    // update
-    // construct Crelte
+    // todo if entryQuery or globalQuery is present show a hint
+    // they should be added to App.svelte and removed from here
     const builder = new CrelteBuilder(data.app.config ?? {});
-    const endpoint = builder.ssrCache.get('ENDPOINT_URL');
-    builder.setupGraphQl(endpoint);
-    // on the client the cookies are always coming from document.cookie
-    builder.setupCookies('');
-    const csites = builder.ssrCache.get('crelteSites');
-    builder.setupRouter(csites);
-    const crelte = builder.build();
-    const serverError = crelte.ssrCache.get('ERROR');
+    const serverError = builder.ssrCache.get('ERROR');
     if (serverError) {
-        // should this be called??
-        crelte.router._internal.initClient();
-        new data.errorPage.default({
+        // todo should this init the client, but maybe we just
+        // want it as minimal as possible
+        svelteMount(data.errorPage.default, {
             target: document.body,
-            props: { ...serverError },
-            hydrate: true,
-            context: crelte._getContext(),
+            props: serverError,
         });
         return;
     }
+    const endpoint = builder.ssrCache.get('ENDPOINT_URL');
+    builder.setupGraphQl(endpoint);
+    // on the client the cookies are always coming from document.cookie
+    builder.setupCookies(new ClientCookies());
+    const csites = builder.ssrCache.get('crelteSites');
+    const router = new ClientRouter(csites, {
+        debugTiming: builder.config.debugTiming ?? false,
+        preloadOnMouseOver: builder.config.preloadOnMouseOver ?? false,
+    });
+    builder.setupRouter(router);
+    const crelte = builder.build();
+    const app = new InternalApp(data.app);
     // 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) => {
+    setupPlugins(crelte, app.plugins);
+    app.init(crelte);
+    router.onNewCrelteRequest = req => {
         const cr = new CrelteRequest(crelte, req);
-        return loadFn(cr, opts);
+        cr._setRouter(cr.router._toRequest(req));
+        cr._setGlobals(cr.globals._toRequest());
+        return cr;
     };
+    router.onBeforeRequest = pluginsBeforeRequest;
+    router.loadRunner.loadFn = (cr, opts) => loadFn(cr, app, opts);
     // render Space
     let appInstance;
-    const updateAppProps = (props) => {
-        if (!appInstance) {
-            appInstance = new data.app.default({
-                target: document.body,
-                props,
-                hydrate: true,
-                context: crelte._getContext(),
-                intro: builder.config.playIntro,
-            });
-        }
-        else {
-            appInstance.$set(props);
+    let routeProp;
+    const renderApp = (route) => {
+        if (appInstance) {
+            routeProp.set(route);
+            return;
         }
+        routeProp = new Writable(route);
+        appInstance = svelteMount(data.app.default, {
+            target: document.body,
+            props: { route: routeProp },
+            context: crelte._getContext(),
+            intro: builder.config.playIntro,
+        });
     };
-    let firstLoad = true;
-    crelte.router._internal.onLoaded = async (success, req, readyForProps) => {
-        const isFirstLoad = firstLoad;
-        firstLoad = false;
-        if (!success) {
-            // if this is not the first load we should reload the page
-            // we don't reload everytime because this might cause a reload loop
-            // and since the first load will probably just contain ssrCache data
-            // in almost all cases the first load will never faill
-            if (!isFirstLoad) {
-                // the load might contain a js error and we prefer the error
-                // page
-                window.location.reload();
-                return;
-            }
-            return handleLoadError(readyForProps());
+    router.onError = e => {
+        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();
+    };
+    // let firstLoad = true;
+    router.onRender = async (cr, readyForRoute, domUpdated) => {
+        if (appInstance && cr.req.disableLoadData) {
+            // if the app is already rendered and entry did not change
+            // we just wan't to run domUpdated because we don't wan't to update anything
+            const route = readyForRoute();
+            cr.router._requestCompleted();
+            // globals should not be run because they will be empty
+            // since nobody called loadGlobalData (todo maybe globals should also,
+            // know if it accepts updates)
+            // todo should we wait a tick here?
+            await tick();
+            domUpdated(cr, route);
+            return route;
         }
-        const cr = new CrelteRequest(crelte, req);
         const startTime = builder.config.debugTiming ? Date.now() : null;
         let render = async () => {
+            const route = readyForRoute();
+            cr.router._requestCompleted();
+            cr.globals._syncToStores();
             // we should trigger the route update here
-            pluginsBeforeRender(cr);
-            crelte.globals._updateSiteId(cr.site.id);
-            updateAppProps(readyForProps());
+            pluginsBeforeRender(cr, route);
+            renderApp(route);
             await tick();
             if (startTime) {
                 console.log('dom update took ' + (Date.now() - startTime) + 'ms');
             }
-            crelte.router._internal.domReady(cr.req);
+            domUpdated(cr, route);
+            return route;
         };
         // render with view Transition if enabled and not in hydration
         if (builder.config.viewTransition &&
             appInstance &&
             document.startViewTransition) {
-            render = () => document.startViewTransition(render);
+            const prevRender = render;
+            render = async () => new Promise(resolve => {
+                document.startViewTransition(async () => {
+                    resolve(await prevRender());
+                });
+            });
         }
-        await render();
+        return await render();
     };
-    crelte.router._internal.onNothingLoaded = async (req, ready) => {
-        crelte.globals._updateSiteId(req.site.id);
-        ready();
-        await tick();
-        crelte.router._internal.domReady(req);
-    };
-    crelte.router._internal.initClient();
+    try {
+        await router.init();
+    }
+    catch (e) {
+        // the first load we can't handle with a redirect since this might
+        // cause an infinite loop
+        // but since almost everything should be ssrCached nothing should fail
+        handleLoadError(e);
+    }
 }
 function handleLoadError(e) {
     console.log('loading or rendering the page failed with the error:');

package/dist/init/crelte-vite-plugin.d.ts

@@ -0,0 +1,5 @@
+declare module 'crelte-vite-plugin/svelteComponents.js' {
+	// Declarations for the internal functions imported from the plugin
+	export function internalSvelteMount(comp: any, options: any): any;
+	export function internalSvelteRender(comp: any, options: any): any;
+}

package/dist/init/server.d.ts

@@ -1,5 +1,4 @@
 import { SiteFromGraphQl } from '../routing/Site.js';
-import { GraphQlQuery } from '../graphql/GraphQl.js';
 export type ServerData = {
     url: string;
     htmlTemplate: string;
@@ -17,10 +16,6 @@ export type ServerData = {
 export type MainData = {
     /** The App.svelte module */
     app: any;
-    /** The entry query from queries/entry.graphql */
-    entryQuery: GraphQlQuery;
-    /** The global query from queries/global.graphql */
-    globalQuery?: GraphQlQuery;
     /** Server data provided by crelte-node */
     serverData: ServerData;
 };

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,CAuFD;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;AAgBrD,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;IAET,0CAA0C;IAC1C,UAAU,EAAE,UAAU,CAAC;CACvB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,IAAI,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC;IACnD,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC,CA6GD;AAED,MAAM,MAAM,KAAK,GAAG;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,GAAG,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAE3B,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,GAAG,CAAC;IAEf,UAAU,EAAE,UAAU,CAAC;CACvB,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,SAAS,CAC9B,IAAI,EAAE,aAAa,GACjB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAgC5C"}

package/dist/init/server.js

@@ -1,8 +1,13 @@
 import { CrelteBuilder } from '../Crelte.js';
-import { pluginsBeforeRender, prepareLoadFn, setupPlugins } from './shared.js';
+import { loadFn, pluginsBeforeRender, pluginsBeforeRequest, setupPlugins, } from './shared.js';
 import SsrComponents from '../ssr/SsrComponents.js';
 import SsrCache from '../ssr/SsrCache.js';
+import ServerCookies from '../cookies/ServerCookies.js';
 import CrelteRequest from '../CrelteRequest.js';
+import { svelteRender } from './svelteComponents.js';
+import { Writable } from 'crelte-std/stores';
+import ServerRouter from '../routing/ServerRouter.js';
+import InternalApp from './InternalApp.js';
 /**
  * The main function to start the server side rendering
  *
@@ -24,6 +29,8 @@ import CrelteRequest from '../CrelteRequest.js';
  * ```
  */
 export async function main(data) {
+    // todo if entryQuery or globalQuery is present show a hint
+    // they should be added to App.svelte and removed from here
     const builder = new CrelteBuilder(data.app.config ?? {});
     // setup viteEnv
     data.serverData.viteEnv.forEach((v, k) => {
@@ -34,23 +41,36 @@ export async function main(data) {
     builder.ssrCache.set('CRAFT_WEB_URL', data.serverData.craftWeb);
     builder.setupGraphQl(endpoint);
     const cookies = data.serverData.cookies ?? '';
-    builder.setupCookies(cookies);
+    builder.setupCookies(new ServerCookies(cookies));
     builder.ssrCache.set('crelteSites', data.serverData.sites);
-    builder.setupRouter(data.serverData.sites);
+    const router = new ServerRouter(data.serverData.sites, {
+        debugTiming: builder.config.debugTiming ?? false,
+    });
+    builder.setupRouter(router);
     const crelte = builder.build();
+    const app = new InternalApp(data.app);
     // 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 => {
+    setupPlugins(crelte, app.plugins);
+    app.init(crelte);
+    router.onNewCrelteRequest = req => {
         const cr = new CrelteRequest(crelte, req);
-        return loadFn(cr);
+        cr._setRouter(cr.router._toRequest(req));
+        cr._setGlobals(cr.globals._toRequest());
+        return cr;
+    };
+    router.onBeforeRequest = pluginsBeforeRequest;
+    router.loadRunner.loadFn = (cr, opts) => loadFn(cr, app, opts);
+    router.onRender = (cr, readyForRoute, _domUpdated) => {
+        const route = readyForRoute();
+        cr.router._requestCompleted();
+        cr.globals._syncToStores();
+        pluginsBeforeRender(cr, route);
+        return route;
     };
-    const { success, redirect, req, props } = await crelte.router._internal.initServer(data.serverData.url, data.serverData.acceptLang);
-    if (!success)
-        throw props;
-    if (redirect) {
+    // throws if there was an error
+    const [req, route] = await router.init(data.serverData.url, data.serverData.acceptLang);
+    // if redirect
+    if (!route) {
         return {
             status: req.statusCode ?? 302,
             location: req.url.toString(),
@@ -60,19 +80,23 @@ export async function main(data) {
     const context = crelte._getContext();
     const ssrComponents = new SsrComponents();
     ssrComponents.addToContext(context);
-    const cr = new CrelteRequest(crelte, req);
-    pluginsBeforeRender(cr);
-    crelte.globals._updateSiteId(cr.site.id);
+    // app should not use getRoute but use the route store
+    // received from the props, since it will only update when
+    // the entryChanges
+    const routeProp = new Writable(route);
     // eslint-disable-next-line prefer-const
-    let { html, head } = data.app.default.render(props, { context });
+    let { html, head } = svelteRender(data.app.default, {
+        props: { route: routeProp },
+        context,
+    });
     head += ssrComponents.toHead(data.serverData.ssrManifest);
     head += crelte.ssrCache._exportToHead();
     let htmlTemplate = data.serverData.htmlTemplate;
-    htmlTemplate = htmlTemplate.replace('<!--page-lang-->', cr.site.language);
+    htmlTemplate = htmlTemplate.replace('<!--page-lang-->', route.site.language);
     const finalHtml = htmlTemplate
         .replace('</head>', head + '\n\t</head>')
         .replace('<!--ssr-body-->', html);
-    const entry = props.entry;
+    const entry = route.entry;
     return {
         status: req.statusCode ??
             (entry.sectionHandle === 'error'
@@ -105,8 +129,13 @@ export async function mainError(data) {
     const ssrComponents = new SsrComponents();
     ssrComponents.addToContext(context);
     ssrCache.set('ERROR', data.error);
+    // todo on the client crelte is in the context
+    // but it should match this impl
     // eslint-disable-next-line prefer-const
-    let { html, head } = data.errorPage.default.render(data.error, { context });
+    let { html, head } = svelteRender(data.errorPage.default, {
+        props: data.error,
+        context,
+    });
     head += ssrComponents.toHead(data.serverData.ssrManifest);
     head += ssrCache._exportToHead();
     let htmlTemplate = data.serverData.htmlTemplate;

package/dist/init/shared.d.ts

@@ -1,25 +1,14 @@
 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 {
-    loadGlobalData?: LoadData<null>;
-    loadEntryData?: LoadData<Entry>;
-    templates?: Record<string, LazyTemplateModule>;
-    entryRoutes?: EntryRoutes;
-    init?: (crelte: Crelte) => void;
-}
-interface TemplateModule {
-    default: any;
-    loadData?: LoadData<Entry>;
-}
-type LazyTemplateModule = (() => Promise<TemplateModule>) | TemplateModule;
+import { LoadOptions } from '../routing/LoadRunner.js';
+import InternalApp from './InternalApp.js';
+import Route from '../routing/Route.js';
 export declare function setupPlugins(crelte: Crelte, plugins: PluginCreator[]): void;
-export declare function pluginsBeforeRender(cr: CrelteRequest): void;
-export declare function prepareLoadFn(crelte: Crelte, app: App, entryQuery: GraphQlQuery, globalQuery?: GraphQlQuery): Promise<(cr: CrelteRequest, loadOpts?: LoadOptions) => Promise<any>>;
-export {};
+export declare function pluginsBeforeRequest(cr: CrelteRequest): Promise<void> | void;
+export declare function pluginsBeforeRender(cr: CrelteRequest, route: Route): void;
+export declare function loadFn(cr: CrelteRequest, app: InternalApp, loadOpts?: LoadOptions): Promise<void>;
+export declare function queryEntry(cr: CrelteRequest, entryQuery: GraphQlQuery): Promise<Entry>;
 //# 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;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"}
+{"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,OAAO,EAAE,YAAY,EAAkB,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,WAA+B,MAAM,kBAAkB,CAAC;AAC/D,OAAO,KAAK,MAAM,qBAAqB,CAAC;AAExC,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,QAKpE;AAED,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAM5E;AAED,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI,CAEzE;AAOD,wBAAsB,MAAM,CAC3B,EAAE,EAAE,aAAa,EACjB,GAAG,EAAE,WAAW,EAChB,QAAQ,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,IAAI,CAAC,CAgGf;AAED,wBAAsB,UAAU,CAC/B,EAAE,EAAE,aAAa,EACjB,UAAU,EAAE,YAAY,GACtB,OAAO,CAAC,KAAK,CAAC,CAiBhB"}