crelte 0.5.14 → 0.5.15

package/dist/server/Request.d.ts

@@ -24,8 +24,8 @@ export default class ServerRequest extends Request {
      *
      * @example
      * ```js
-     * router.get('/blog/:slug', async (cs, req) => {
-     *     return Response.json({ slug: cs.getParam('slug') });
+     * router.get('/blog/:slug', async csr => {
+     *     return Response.json({ slug: csr.req.getParam('slug') });
      * });
      * ```
      */

package/dist/server/Request.js

@@ -27,8 +27,8 @@ export default class ServerRequest extends Request {
      *
      * @example
      * ```js
-     * router.get('/blog/:slug', async (cs, req) => {
-     *     return Response.json({ slug: cs.getParam('slug') });
+     * router.get('/blog/:slug', async csr => {
+     *     return Response.json({ slug: csr.req.getParam('slug') });
      * });
      * ```
      */

package/dist/static/index.d.ts

@@ -9,7 +9,7 @@ export type CrelteStaticRequest = CrelteRequest & {
      *
      * @example
      * ```js
-     * router.add('/blog/:slug', async (csr) => {
+     * router.add('/blog/:slug', async csr => {
      *     const blogData = await fetchBlogData(csr.getParam('slug'));
      *
      *     return {

package/dist/translations/index.d.ts

@@ -8,7 +8,7 @@ import { createFileLoader } from './loader/fileLoader/fileLoader.js';
 import { createGlobalLoader } from './loader/GlobalLoader.js';
 import { type TranslationsLoader, type LoaderCreator } from './loader/index.js';
 import loadTranslations from './loadTranslations.js';
-import { createTranslations, getTranslationsPlugin, type TranslateFunction, type TranslateStore, type Translations, TranslationsPlugin, type TranslationsPluginOptions } from './translationsPlugin.js';
+import { createTranslations, getTranslationsPlugin, type TranslateFunction, type TranslationVarValue, type TranslateStore, type Translations, TranslationsPlugin, type TranslationsPluginOptions } from './translationsPlugin.js';
 /**
  * Creates a translate store for the given namespace.
  *
@@ -24,5 +24,5 @@ import { createTranslations, getTranslationsPlugin, type TranslateFunction, type
  * ```
  */
 declare function getTranslations(namespace?: string): TranslateStore;
-export { createTranslations, TranslationsPluginOptions, loadTranslations, getTranslations, getTranslationsPlugin, Translations, TranslationsPlugin, TranslationsLoader, LoaderCreator, TranslateStore, TranslateFunction, createFileLoader, createGlobalLoader, };
+export { createTranslations, TranslationsPluginOptions, loadTranslations, getTranslations, getTranslationsPlugin, Translations, TranslationsPlugin, TranslationsLoader, LoaderCreator, TranslateStore, TranslateFunction, TranslationVarValue, createFileLoader, createGlobalLoader, };
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/translations/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,KAAK,kBAAkB,EAAE,KAAK,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAChF,OAAO,gBAAgB,MAAM,uBAAuB,CAAC;AACrD,OAAO,EACN,kBAAkB,EAClB,qBAAqB,EACrB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,kBAAkB,EAClB,KAAK,yBAAyB,EAC9B,MAAM,yBAAyB,CAAC;AAEjC;;;;;;;;;;;;;GAaG;AACH,iBAAS,eAAe,CAAC,SAAS,GAAE,MAAiB,GAAG,cAAc,CAGrE;AAED,OAAO,EACN,kBAAkB,EAClB,yBAAyB,EACzB,gBAAgB,EAChB,eAAe,EACf,qBAAqB,EACrB,YAAY,EACZ,kBAAkB,EAClB,kBAAkB,EAClB,aAAa,EACb,cAAc,EACd,iBAAiB,EAEjB,gBAAgB,EAChB,kBAAkB,GAClB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/translations/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,KAAK,kBAAkB,EAAE,KAAK,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAChF,OAAO,gBAAgB,MAAM,uBAAuB,CAAC;AACrD,OAAO,EACN,kBAAkB,EAClB,qBAAqB,EACrB,KAAK,iBAAiB,EACtB,KAAK,mBAAmB,EACxB,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,kBAAkB,EAClB,KAAK,yBAAyB,EAC9B,MAAM,yBAAyB,CAAC;AAEjC;;;;;;;;;;;;;GAaG;AACH,iBAAS,eAAe,CAAC,SAAS,GAAE,MAAiB,GAAG,cAAc,CAGrE;AAED,OAAO,EACN,kBAAkB,EAClB,yBAAyB,EACzB,gBAAgB,EAChB,eAAe,EACf,qBAAqB,EACrB,YAAY,EACZ,kBAAkB,EAClB,kBAAkB,EAClB,aAAa,EACb,cAAc,EACd,iBAAiB,EACjB,mBAAmB,EAEnB,gBAAgB,EAChB,kBAAkB,GAClB,CAAC"}

package/dist/translations/translationsPlugin.d.ts

@@ -2,7 +2,8 @@ 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 TranslateFunction = (key: string, vars?: Record<string, TranslationVarValue>) => string;
+export type TranslationVarValue = string | number;
 export type TranslateStore = Readable<TranslateFunction>;
 export type Translations = Record<string, string>;
 export type TranslationsPluginOptions = {
@@ -29,6 +30,8 @@ export declare class TranslationsPlugin implements Plugin {
     get(lang: string, namespace: string): Translations | null;
     /** @hidden */
     z_createTranslateStore(namespace: string): TranslateStore;
+    /** @hidden */
+    z_resolveVariables(text: string, vars?: Record<string, TranslationVarValue>): string;
 }
 /**
  * Create the TranslationsPlugin

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

@@ -1 +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"}
+{"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,EACX,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,KACtC,MAAM,CAAC;AACZ,MAAM,MAAM,mBAAmB,GAAG,MAAM,GAAG,MAAM,CAAC;AAClD,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;IAqBzD,cAAc;IACd,kBAAkB,CACjB,IAAI,EAAE,MAAM,EACZ,IAAI,GAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAM,GAC5C,MAAM;CA+BT;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

@@ -60,18 +60,48 @@ export class TranslationsPlugin {
     /** @hidden */
     z_createTranslateStore(namespace) {
         const store = derived(this.crelte.router.site, site => {
-            return (key) => {
+            return (key, vars) => {
                 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;
+                const text = data?.[key] || key;
+                if (!vars)
+                    return text;
+                return this.z_resolveVariables(text, vars);
             };
         });
         return new Readable(store);
     }
+    /** @hidden */
+    z_resolveVariables(text, vars = {}) {
+        let result = '';
+        let index = 0;
+        while (index < text.length) {
+            const openIndex = text.indexOf('{', index);
+            if (openIndex === -1) {
+                result += text.slice(index);
+                break;
+            }
+            const closeIndex = text.indexOf('}', openIndex + 1);
+            if (closeIndex === -1) {
+                result += text.slice(index);
+                break;
+            }
+            result += text.slice(index, openIndex);
+            const key = text.slice(openIndex + 1, closeIndex);
+            if (key in vars) {
+                result += vars[key];
+            }
+            else {
+                result += `{${key}}`;
+            }
+            index = closeIndex + 1;
+        }
+        return result;
+    }
 }
 /**
  * Create the TranslationsPlugin

package/package.json

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

package/src/server/Request.ts

@@ -33,8 +33,8 @@ export default class ServerRequest extends Request {
 	 *
 	 * @example
 	 * ```js
-	 * router.get('/blog/:slug', async (cs, req) => {
-	 *     return Response.json({ slug: cs.getParam('slug') });
+	 * router.get('/blog/:slug', async csr => {
+	 *     return Response.json({ slug: csr.req.getParam('slug') });
 	 * });
 	 * ```
 	 */

package/src/static/index.ts

@@ -12,7 +12,7 @@ export type CrelteStaticRequest = CrelteRequest & {
 	 *
 	 * @example
 	 * ```js
-	 * router.add('/blog/:slug', async (csr) => {
+	 * router.add('/blog/:slug', async csr => {
 	 *     const blogData = await fetchBlogData(csr.getParam('slug'));
 	 *
 	 *     return {

package/src/translations/index.ts

@@ -13,6 +13,7 @@ import {
 	createTranslations,
 	getTranslationsPlugin,
 	type TranslateFunction,
+	type TranslationVarValue,
 	type TranslateStore,
 	type Translations,
 	TranslationsPlugin,
@@ -50,6 +51,7 @@ export {
 	LoaderCreator,
 	TranslateStore,
 	TranslateFunction,
+	TranslationVarValue,
 	// loaders
 	createFileLoader,
 	createGlobalLoader,

package/src/translations/translationsPlugin.ts

@@ -7,8 +7,9 @@ import { getCrelte } from '../index.js';
 
 export type TranslateFunction = (
 	key: string,
-	// replacements?: Record<string, string>,
+	vars?: Record<string, TranslationVarValue>,
 ) => string;
+export type TranslationVarValue = string | number;
 export type TranslateStore = Readable<TranslateFunction>;
 export type Translations = Record<string, string>;
 export type TranslationsPluginOptions = {
@@ -89,18 +90,60 @@ export class TranslationsPlugin implements Plugin {
 	/** @hidden */
 	z_createTranslateStore(namespace: string): TranslateStore {
 		const store = derived(this.crelte.router.site, site => {
-			return (key: string) => {
+			return (
+				key: string,
+				vars?: Record<string, TranslationVarValue>,
+			) => {
 				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;
+
+				const text = data?.[key] || key;
+				if (!vars) return text;
+				return this.z_resolveVariables(text, vars);
 			};
 		});
 
 		return new Readable(store);
 	}
+
+	/** @hidden */
+	z_resolveVariables(
+		text: string,
+		vars: Record<string, TranslationVarValue> = {},
+	): string {
+		let result = '';
+		let index = 0;
+
+		while (index < text.length) {
+			const openIndex = text.indexOf('{', index);
+			if (openIndex === -1) {
+				result += text.slice(index);
+				break;
+			}
+
+			const closeIndex = text.indexOf('}', openIndex + 1);
+			if (closeIndex === -1) {
+				result += text.slice(index);
+				break;
+			}
+
+			result += text.slice(index, openIndex);
+
+			const key = text.slice(openIndex + 1, closeIndex);
+			if (key in vars) {
+				result += vars[key];
+			} else {
+				result += `{${key}}`;
+			}
+
+			index = closeIndex + 1;
+		}
+
+		return result;
+	}
 }
 
 /**