crelte 0.5.8 → 0.5.10

package/dist/translations/loadTranslations.js

@@ -0,0 +1,26 @@
+import { getTranslationsPlugin } from './translationsPlugin.js';
+/**
+ * Creates a translate store and loads the specified namespace.
+ *
+ * #### Example
+ * ```svelte
+ * <script module>
+ * 	import { loadTranslations } from 'crelte/translations';
+ * 	export const loadData = {
+ * 		t: cr => loadTranslations(cr, 'customNamespace')
+ * 	};
+ * </script>
+ *
+ * <script>
+ * 	let { t } = $props();
+ * </script>
+ *
+ * <h1>{$t('welcome_message')}</h1>
+ * ```
+ */
+export default async function loadTranslations(cr, namespace) {
+    const plugin = getTranslationsPlugin(cr);
+    // we don't need the return value here as it's cached
+    await plugin.load(cr, namespace);
+    return plugin.z_createTranslateStore(namespace);
+}

package/dist/translations/loader/GlobalLoader.d.ts

@@ -0,0 +1,34 @@
+import { Translations } from '../translationsPlugin.js';
+import { Crelte, CrelteRequest } from '../../crelte.js';
+import { LoaderCreator, TranslationsLoader } from '../index.js';
+export default class GlobalLoader implements TranslationsLoader {
+    private handle;
+    constructor(_crelte: Crelte, opts: {
+        handle?: string;
+    });
+    load(cr: CrelteRequest, namespace: string): Promise<Translations>;
+}
+/**
+ * Creates a loader that loads translations from a global set.
+ *
+ * ```ts
+ * import { createTranslations, createGlobalLoader } from 'crelte/translations';
+ *
+ * createTranslations({ loader: createGlobalLoader() });
+ * ```
+ *
+ * Then in you're global export a `translations` globalSet with namespaces
+ * as fields, at least `common`.
+ *
+ * ```graphql
+ * translations: globalSet(handle: "translations", siteId: $siteId) {
+ *   ... on translations_GlobalSet {
+ *     common
+ *   }
+ * }
+ */
+export declare function createGlobalLoader(opts?: {
+    /** the handle for the global set containing the namespaces (default = translations) */
+    handle?: string;
+}): LoaderCreator;
+//# sourceMappingURL=GlobalLoader.d.ts.map

package/dist/translations/loader/GlobalLoader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"GlobalLoader.d.ts","sourceRoot":"","sources":["../../../src/translations/loader/GlobalLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEhE,MAAM,CAAC,OAAO,OAAO,YAAa,YAAW,kBAAkB;IAC9D,OAAO,CAAC,MAAM,CAAS;gBAEX,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAIhD,IAAI,CAAC,EAAE,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;CAsBvE;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,kBAAkB,CACjC,IAAI,GAAE;IACL,uFAAuF;IACvF,MAAM,CAAC,EAAE,MAAM,CAAC;CACX,GACJ,aAAa,CAEf"}

package/dist/translations/loader/GlobalLoader.js

@@ -0,0 +1,45 @@
+export default class GlobalLoader {
+    handle;
+    constructor(_crelte, opts) {
+        this.handle = opts.handle ?? 'translations';
+    }
+    async load(cr, namespace) {
+        const globalSet = await cr.globals.getAsync(this.handle);
+        if (!globalSet || typeof globalSet !== 'object')
+            throw new Error(`missing globals \`${this.handle}\``);
+        const data = globalSet[namespace];
+        if (!data)
+            throw new Error(`could not find \`${namespace}\` in globals \`${this.handle}\``);
+        if (typeof data !== 'string')
+            return data;
+        try {
+            return JSON.parse(data);
+        }
+        catch (e) {
+            throw new Error(`could not parse \`${this.handle}.${namespace}\` as json \n\n` +
+                (e instanceof Error ? e.message : ''));
+        }
+    }
+}
+/**
+ * Creates a loader that loads translations from a global set.
+ *
+ * ```ts
+ * import { createTranslations, createGlobalLoader } from 'crelte/translations';
+ *
+ * createTranslations({ loader: createGlobalLoader() });
+ * ```
+ *
+ * Then in you're global export a `translations` globalSet with namespaces
+ * as fields, at least `common`.
+ *
+ * ```graphql
+ * translations: globalSet(handle: "translations", siteId: $siteId) {
+ *   ... on translations_GlobalSet {
+ *     common
+ *   }
+ * }
+ */
+export function createGlobalLoader(opts = {}) {
+    return crelte => new GlobalLoader(crelte, opts);
+}

package/dist/translations/loader/fileLoader/ClientFileLoader.d.ts

@@ -0,0 +1,10 @@
+import { CrelteRequest } from '../../../crelte.js';
+import SsrCache from '../../../ssr/SsrCache.js';
+import { Translations } from '../../translationsPlugin.js';
+import { TranslationsLoader } from '../index.js';
+export default class ClientFileLoader implements TranslationsLoader {
+    private readonly runNumber;
+    constructor(cache: SsrCache);
+    load(cr: CrelteRequest, namespace: string): Promise<Translations>;
+}
+//# sourceMappingURL=ClientFileLoader.d.ts.map

package/dist/translations/loader/fileLoader/ClientFileLoader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ClientFileLoader.d.ts","sourceRoot":"","sources":["../../../../src/translations/loader/fileLoader/ClientFileLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,QAAQ,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGjD,MAAM,CAAC,OAAO,OAAO,gBAAiB,YAAW,kBAAkB;IAClE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;gBAEvB,KAAK,EAAE,QAAQ;IAIrB,IAAI,CAAC,EAAE,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;CA0BvE"}

package/dist/translations/loader/fileLoader/ClientFileLoader.js

@@ -0,0 +1,24 @@
+import { SSR_RUN_NUMBER_KEY, translationFilePath } from './fileLoader.js';
+export default class ClientFileLoader {
+    runNumber;
+    constructor(cache) {
+        this.runNumber = cache.get(SSR_RUN_NUMBER_KEY) ?? '';
+    }
+    async load(cr, namespace) {
+        const lang = cr.site.language;
+        try {
+            const resp = await fetch(`${translationFilePath(lang, namespace)}?run=${this.runNumber}`);
+            if (!resp.ok) {
+                throw new Error(`Failed to fetch translations file for ${lang}/${namespace}`);
+            }
+            // todo: validate data
+            const data = await resp.json();
+            return data;
+        }
+        catch (e) {
+            console.error(e);
+            throw new Error('There is something wrong with your translations file. \n\n' +
+                (e instanceof Error ? e.message : ''));
+        }
+    }
+}

package/dist/translations/loader/fileLoader/NodeFileLoader.d.ts

@@ -0,0 +1,9 @@
+import { Translations } from '../../translationsPlugin.js';
+import SsrCache from '../../../ssr/SsrCache.js';
+import { CrelteRequest } from '../../../crelte.js';
+import { TranslationsLoader } from '../index.js';
+export default class NodeFileLoader implements TranslationsLoader {
+    constructor(cache: SsrCache);
+    load(cr: CrelteRequest, namespace: string): Promise<Translations>;
+}
+//# sourceMappingURL=NodeFileLoader.d.ts.map

package/dist/translations/loader/fileLoader/NodeFileLoader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"NodeFileLoader.d.ts","sourceRoot":"","sources":["../../../../src/translations/loader/fileLoader/NodeFileLoader.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,QAAQ,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,CAAC,OAAO,OAAO,cAAe,YAAW,kBAAkB;gBACpD,KAAK,EAAE,QAAQ;IAKrB,IAAI,CAAC,EAAE,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;CAiBvE"}

package/dist/translations/loader/fileLoader/NodeFileLoader.js

@@ -0,0 +1,21 @@
+import fs from 'node:fs/promises';
+import { SSR_RUN_NUMBER_KEY, translationFilePath } from './fileLoader.js';
+import { randomToken } from '../../utils.js';
+export default class NodeFileLoader {
+    constructor(cache) {
+        // store RUN_NUMBER in ssr store
+        cache.set(SSR_RUN_NUMBER_KEY, randomToken());
+    }
+    async load(cr, namespace) {
+        const lang = cr.site.language;
+        try {
+            const fileString = await fs.readFile(`./public${translationFilePath(lang, namespace)}`, 'utf-8');
+            // todo: validate data
+            return JSON.parse(fileString);
+        }
+        catch (e) {
+            throw new Error('There is something wrong with your translations file. \n\n' +
+                (e instanceof Error ? e.message : ''));
+        }
+    }
+}

package/dist/translations/loader/fileLoader/fileLoader.d.ts

@@ -0,0 +1,5 @@
+import { LoaderCreator } from '../index.js';
+export declare const SSR_RUN_NUMBER_KEY = "st-run-number";
+export declare function translationFilePath(lang: string, namespace: string): string;
+export declare function createFileLoader(): LoaderCreator;
+//# sourceMappingURL=fileLoader.d.ts.map

package/dist/translations/loader/fileLoader/fileLoader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fileLoader.d.ts","sourceRoot":"","sources":["../../../../src/translations/loader/fileLoader/fileLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAI5C,eAAO,MAAM,kBAAkB,kBAAkB,CAAC;AAIlD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAE3E;AAED,wBAAgB,gBAAgB,IAAI,aAAa,CAMhD"}

package/dist/translations/loader/fileLoader/fileLoader.js

@@ -0,0 +1,16 @@
+import ClientFileLoader from './ClientFileLoader.js';
+import NodeFileLoader from './NodeFileLoader.js';
+export const SSR_RUN_NUMBER_KEY = 'st-run-number';
+/// Returns a path to the translations file for the given language and namespace.
+/// Always prefixed with a slash.
+export function translationFilePath(lang, namespace) {
+    return `/translations/${lang}/${namespace}.json`;
+}
+export function createFileLoader() {
+    if (import.meta.env.SSR) {
+        return crelte => new NodeFileLoader(crelte.ssrCache);
+    }
+    else {
+        return crelte => new ClientFileLoader(crelte.ssrCache);
+    }
+}

package/dist/translations/loader/index.d.ts

@@ -0,0 +1,7 @@
+import { Translations } from '../translationsPlugin.js';
+import { Crelte, CrelteRequest } from '../../crelte.js';
+export interface TranslationsLoader {
+    load(cr: CrelteRequest, namespace: string): Promise<Translations>;
+}
+export type LoaderCreator = (crelte: Crelte) => TranslationsLoader;
+//# sourceMappingURL=index.d.ts.map

package/dist/translations/loader/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/translations/loader/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAExD,MAAM,WAAW,kBAAkB;IAClC,IAAI,CAAC,EAAE,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CAClE;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,kBAAkB,CAAC"}

package/dist/translations/loader/index.js

@@ -0,0 +1 @@
+export {};

package/dist/translations/translationsPlugin.d.ts

@@ -0,0 +1,64 @@
+import { LoaderCreator } from './loader/index.js';
+import { Plugin, PluginCreator } from '../plugins/Plugins.js';
+import { Crelte, CrelteRequest } from '../crelte.js';
+import Readable from '../std/stores/Readable.js';
+export type TranslateFunction = (key: string) => string;
+export type TranslateStore = Readable<TranslateFunction>;
+export type Translations = Record<string, string>;
+export type TranslationsPluginOptions = {
+    /** use either `createFileLoader()` or `createGlobalLoader()` */
+    loader: LoaderCreator;
+    /** The common namespace is always loaded  */
+    loadNamespaces?: string[];
+};
+export declare class TranslationsPlugin implements Plugin {
+    private crelte;
+    private translations;
+    private loader;
+    private firstLang;
+    get name(): string;
+    constructor(crelte: Crelte, opts: TranslationsPluginOptions);
+    /**
+     * load needs to take a CrelteRequest to be able to get the correct site
+     * and globals
+     *
+     * in crelte 0.5 this should also be possible without a CrelteRequest
+     * but with multiple plugin instances / Request State plugins
+     */
+    load(cr: CrelteRequest, namespace: string): Promise<Translations>;
+    get(lang: string, namespace: string): Translations | null;
+    /** @hidden */
+    z_createTranslateStore(namespace: string): TranslateStore;
+}
+/**
+ * Create the TranslationsPlugin
+ *
+ * #### Setup file loader
+ *
+ * ```ts
+ * import { createTranslations, createFileLoader } from 'crelte/translations';
+ *
+ * createTranslations({ loader: createFileLoader() });
+ * ```
+ *
+ * #### Setup global loader
+ * ```ts
+ * import { createTranslations, createGlobalLoader } from 'crelte/translations';
+ *
+ * createTranslations({ loader: createGlobalLoader() });
+ * ```
+ *
+ * Then in you're global export a `translations` globalSet with namespaces
+ * as fields, at least `common`.
+ *
+ * ```graphql
+ * translations: globalSet(handle: "translations", siteId: $siteId) {
+ *   ... on translations_GlobalSet {
+ *     common
+ *   }
+ * }
+ * ```
+ */
+export declare function createTranslations(opts: TranslationsPluginOptions): PluginCreator;
+export declare function getTranslationsPlugin(crelte?: Crelte): TranslationsPlugin;
+//# sourceMappingURL=translationsPlugin.d.ts.map

package/dist/translations/translationsPlugin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"translationsPlugin.d.ts","sourceRoot":"","sources":["../../src/translations/translationsPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAsB,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,QAAQ,MAAM,2BAA2B,CAAC;AAGjD,MAAM,MAAM,iBAAiB,GAAG,CAC/B,GAAG,EAAE,MAAM,KAEP,MAAM,CAAC;AACZ,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAC;AACzD,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAClD,MAAM,MAAM,yBAAyB,GAAG;IACvC,gEAAgE;IAChE,MAAM,EAAE,aAAa,CAAC;IACtB,6CAA6C;IAC7C,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AAIF,qBAAa,kBAAmB,YAAW,MAAM;IAChD,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,MAAM,CAAqB;IAGnC,OAAO,CAAC,SAAS,CAAgB;IAEjC,IAAI,IAAI,IAAI,MAAM,CAEjB;gBAEW,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,yBAAyB;IAyB3D;;;;;;OAMG;IACG,IAAI,CAAC,EAAE,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAiBvE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI;IAIzD,cAAc;IACd,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,cAAc;CAczD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,kBAAkB,CACjC,IAAI,EAAE,yBAAyB,GAC7B,aAAa,CAEf;AAED,wBAAgB,qBAAqB,CACpC,MAAM,GAAE,MAAoB,GAC1B,kBAAkB,CAEpB"}

package/dist/translations/translationsPlugin.js

@@ -0,0 +1,110 @@
+import { derived } from 'svelte/store';
+import Readable from '../std/stores/Readable.js';
+import { getCrelte } from '../index.js';
+const SSR_KEY = '_translations';
+export class TranslationsPlugin {
+    crelte;
+    /// Map<`lang-namespace`, Translations>
+    translations;
+    loader;
+    /// When the derived of site is used in the first loadData site is not defined
+    /// so we need to store the first language here
+    firstLang;
+    get name() {
+        return 'translations';
+    }
+    constructor(crelte, opts) {
+        this.crelte = crelte;
+        this.translations = new Map(crelte.ssrCache.get(SSR_KEY));
+        this.firstLang = null;
+        if (import.meta.env.DEV && typeof opts?.loader !== 'function') {
+            throw new Error('TranslationsPlugin requires a loader, use `createFileLoader()` or ' +
+                '`createGlobalLoader()`');
+        }
+        this.loader = opts.loader(crelte);
+        const loadNamespaces = opts.loadNamespaces ?? [];
+        // preload default translations
+        crelte.events.on('loadGlobalData', async (cr) => {
+            this.firstLang = cr.site.language;
+            await Promise.all([
+                this.load(cr, 'common'),
+                ...loadNamespaces.map(ns => this.load(cr, ns)),
+            ]);
+        });
+    }
+    /**
+     * load needs to take a CrelteRequest to be able to get the correct site
+     * and globals
+     *
+     * in crelte 0.5 this should also be possible without a CrelteRequest
+     * but with multiple plugin instances / Request State plugins
+     */
+    async load(cr, namespace) {
+        const lang = cr.site.language;
+        const key = `${lang}-${namespace}`;
+        const tData = this.translations.get(key);
+        if (tData)
+            return tData;
+        const data = await this.loader.load(cr, namespace);
+        this.translations.set(key, data);
+        if (import.meta.env.SSR) {
+            // only store the translations in the ssrCache during ssr
+            // since after that we wont read it again
+            cr.ssrCache.set(SSR_KEY, Array.from(this.translations.entries()));
+        }
+        return data;
+    }
+    get(lang, namespace) {
+        return this.translations.get(`${lang}-${namespace}`) ?? null;
+    }
+    /** @hidden */
+    z_createTranslateStore(namespace) {
+        const store = derived(this.crelte.router.site, site => {
+            return (key) => {
+                const lang = site?.language ?? this.firstLang;
+                if (!lang)
+                    throw new Error('no lang');
+                const data = this.get(lang, namespace);
+                if (!data)
+                    console.error(`namespace '${namespace}' not loaded`);
+                return data?.[key] || key;
+            };
+        });
+        return new Readable(store);
+    }
+}
+/**
+ * Create the TranslationsPlugin
+ *
+ * #### Setup file loader
+ *
+ * ```ts
+ * import { createTranslations, createFileLoader } from 'crelte/translations';
+ *
+ * createTranslations({ loader: createFileLoader() });
+ * ```
+ *
+ * #### Setup global loader
+ * ```ts
+ * import { createTranslations, createGlobalLoader } from 'crelte/translations';
+ *
+ * createTranslations({ loader: createGlobalLoader() });
+ * ```
+ *
+ * Then in you're global export a `translations` globalSet with namespaces
+ * as fields, at least `common`.
+ *
+ * ```graphql
+ * translations: globalSet(handle: "translations", siteId: $siteId) {
+ *   ... on translations_GlobalSet {
+ *     common
+ *   }
+ * }
+ * ```
+ */
+export function createTranslations(opts) {
+    return crelte => new TranslationsPlugin(crelte, opts);
+}
+export function getTranslationsPlugin(crelte = getCrelte()) {
+    return crelte.getPlugin('translations');
+}

package/dist/translations/utils.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Generates a random token of a specified length.
+ *
+ * @param length - The desired length of the token.
+ * @returns A random token.
+ */
+export declare function randomToken(length?: number): string;
+//# sourceMappingURL=utils.d.ts.map

package/dist/translations/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/translations/utils.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,GAAE,MAAU,GAAG,MAAM,CAMtD"}

package/dist/translations/utils.js

@@ -0,0 +1,15 @@
+const ALPHABET = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+const ALPHABET_LENGTH = ALPHABET.length;
+/**
+ * Generates a random token of a specified length.
+ *
+ * @param length - The desired length of the token.
+ * @returns A random token.
+ */
+export function randomToken(length = 8) {
+    let s = '';
+    for (let i = 0; i < length; i++) {
+        s += ALPHABET[Math.floor(Math.random() * ALPHABET_LENGTH)];
+    }
+    return s;
+}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/vite/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEN,MAAM,EAMN,MAAM,MAAM,CAAC;AA8Id,MAAM,MAAM,aAAa,GAAG;IAC3B,kEAAkE;IAClE,OAAO,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,MAAM,CAyK3D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/vite/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEN,MAAM,EAON,MAAM,MAAM,CAAC;AAkJd,MAAM,MAAM,aAAa,GAAG;IAC3B,kEAAkE;IAClE,OAAO,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,MAAM,CAyK3D"}

package/dist/vite/index.js

@@ -2,11 +2,12 @@ import { relative } from 'node:path';
 import MagicString from 'magic-string';
 import { build as viteBuild, } from 'vite';
 import fs from 'node:fs/promises';
-import { initEnvData, modRender, modRenderError, } from '../server/shared.js';
+import { initEnvData, initSites, modRender, modRenderError, } from '../server/shared.js';
 import ServerRouter from '../server/ServerRouter.js';
 import sveltePackage from 'svelte/package.json' with { type: 'json' };
 import { initQueryRoutes } from '../server/queries/queries.js';
 import { PLATFORM, requestToWebRequest, webResponseToResponse, } from '../node/utils.js';
+import QueryError from '../queries/QueryError.js';
 const VIRT_MOD_ID = 'virtual:crelte/svelteComponents';
 const RESOLVED_VIRT_MOD_ID = '\0' + VIRT_MOD_ID;
 async function readFile(path) {
@@ -253,60 +254,51 @@ export default function crelte(opts) {
     };
 }
 async function serveVite(env, vite) {
-    vite.middlewares.use(async (nReq, res, next) => {
+    let sites = null;
+    const handle = async (nReq, res) => {
         const protocol = vite.config.server.https ? 'https' : 'http';
         const baseUrl = protocol + '://' + nReq.headers['host'];
         const req = requestToWebRequest(baseUrl, nReq);
-        let thrownError = null;
-        let serverMod;
-        try {
-            serverMod = await vite.ssrLoadModule('./src/server.js', {
-                fixStacktrace: true,
-            });
-        }
-        catch (e) {
-            next(e);
-            return;
+        const serverMod = await vite.ssrLoadModule('./src/server.js');
+        if (!sites) {
+            sites = await initSites(env);
         }
-        // check if a route matches (todo can i move this out of the middleware?)
-        const router = new ServerRouter(env.endpointUrl, env.frontendUrl, env.env, env.sites, {
-            endpointToken: env.endpointToken,
-        });
+        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);
         }
-        try {
-            const response = await router.z_handle(req);
-            if (response) {
-                await webResponseToResponse(response, res);
-                return;
-            }
-        }
-        catch (e) {
-            vite.ssrFixStacktrace(e);
-            next(e);
+        const routeResp = await router.z_handle(req);
+        if (routeResp) {
+            await webResponseToResponse(routeResp, res);
             return;
         }
         let template = await readFile('./index.html');
         template = await vite.transformIndexHtml(nReq.originalUrl ?? '', template);
-        try {
-            const response = await modRender(env, serverMod, template, req);
-            await webResponseToResponse(response, res);
+        if (serverMod.debugError) {
+            let error;
+            if (typeof serverMod.debugError === 'number') {
+                error = new QueryError({ status: serverMod.debugError });
+            }
+            else if (typeof serverMod.debugError === 'function') {
+                error = serverMod.debugError(req);
+            }
+            else {
+                error = new Error('Simulated Error');
+            }
+            const errorResp = await modRenderError(env, serverMod, error, template, req, { debugError: true });
+            await webResponseToResponse(errorResp, res);
             return;
         }
-        catch (e) {
-            vite.ssrFixStacktrace(e);
-            if (typeof serverMod.renderError !== 'function')
-                return next(e);
-            thrownError = e;
-        }
+        const response = await modRender(env, sites, serverMod, template, req);
+        await webResponseToResponse(response, res);
+    };
+    vite.middlewares.use(async (nReq, res, next) => {
         try {
-            const response = await modRenderError(env, serverMod, thrownError, template, req);
-            await webResponseToResponse(response, res);
-            return;
+            await handle(nReq, res);
         }
         catch (e) {
+            vite.ssrFixStacktrace(e);
             next(e);
         }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "crelte",
-	"version": "0.5.8",
+	"version": "0.5.10",
 	"author": "Crelte <support@crelte.com>",
 	"type": "module",
 	"scripts": {
@@ -80,6 +80,10 @@
 			"types": "./dist/static/index.d.ts",
 			"default": "./dist/static/index.js"
 		},
+		"./translations": {
+			"types": "./dist/translations/index.d.ts",
+			"default": "./dist/translations/index.js"
+		},
 		"./std": {
 			"types": "./dist/std/index.d.ts",
 			"default": "./dist/std/index.js"
@@ -95,6 +99,10 @@
 		"./std/intl": {
 			"types": "./dist/std/intl/index.d.ts",
 			"default": "./dist/std/intl/index.js"
+		},
+		"./std/rand": {
+			"types": "./dist/std/rand/index.d.ts",
+			"default": "./dist/std/rand/index.js"
 		}
 	},
 	"dependencies": {