@alepha/react 0.11.12 → 0.12.1

package/dist/i18n/index.js

@@ -15,7 +15,7 @@ import { RouterProvider } from "alepha/router";
 
 //#region src/i18n/providers/I18nProvider.ts
 var I18nProvider = class {
-	logger = $logger();
+	log = $logger();
 	alepha = $inject(Alepha);
 	dateTimeProvider = $inject(DateTimeProvider);
 	cookie = $cookie({
@@ -48,7 +48,14 @@ var I18nProvider = class {
 			if (this.alepha.isBrowser()) {
 				const cookieLang = this.cookie.get();
 				if (cookieLang) this.alepha.state.set("alepha.react.i18n.lang", cookieLang);
-				for (const item of this.registry) if (item.lang === this.lang || item.lang === this.options.fallbackLang) item.translations = await item.loader();
+				for (const item of this.registry) if (item.lang === this.lang || item.lang === this.options.fallbackLang) {
+					this.log.trace("Loading language", {
+						lang: item.lang,
+						name: item.name,
+						target: item.target
+					});
+					item.translations = await item.loader();
+				}
 				return;
 			}
 			for (const item of this.registry) item.translations = await item.loader();
@@ -90,17 +97,16 @@ var I18nProvider = class {
 		return this.alepha.state.get("alepha.react.i18n.lang") || this.options.fallbackLang;
 	}
 	translate = (key, args = []) => {
-		for (const item of this.registry) if (item.lang === this.lang) if (item.translations[key]) return this.render(item.translations[key], args);
-		else break;
-		for (const item of this.registry) if (item.lang === this.options.fallbackLang) if (item.translations[key]) return this.render(item.translations[key], args);
-		else break;
+		for (const item of this.registry) if (item.lang === this.lang) {
+			if (item.translations[key]) return this.render(item.translations[key], args);
+		}
+		for (const item of this.registry) if (item.lang === this.options.fallbackLang) {
+			if (item.translations[key]) return this.render(item.translations[key], args);
+		}
 		return key;
 	};
 	l = (value, options = {}) => {
-		if (typeof value === "number") {
-			if (options.number) return new Intl.NumberFormat(this.lang, options.number).format(value);
-			return this.numberFormat.format(value);
-		}
+		if (typeof value === "number") return new Intl.NumberFormat(this.lang, options.number).format(value);
 		if (value instanceof Date || this.dateTimeProvider.isDateTime(value) || typeof value === "string" && options.date) {
 			let dt = this.dateTimeProvider.of(value);
 			if (options.timezone) dt = dt.tz(options.timezone);
@@ -113,7 +119,7 @@ var I18nProvider = class {
 				timeZone: options.timezone
 			} : options.date).format(dt.toDate());
 			if (options.timezone) return new Intl.DateTimeFormat(this.lang, { timeZone: options.timezone }).format(dt.toDate());
-			return this.dateFormat.format(dt.toDate());
+			return new Intl.DateTimeFormat(this.lang).format(dt.toDate());
 		}
 		if (value instanceof TypeBoxError) return TypeProvider.translateError(value, this.lang);
 		return value;
@@ -170,9 +176,12 @@ var DictionaryDescriptor = class extends Descriptor {
 	provider = $inject(I18nProvider);
 	onInit() {
 		this.provider.registry.push({
+			target: this.config.service.name,
 			name: this.options.name ?? this.config.propertyKey,
 			lang: this.options.lang ?? this.config.propertyKey,
-			loader: () => this.options.lazy().then((it) => it.default),
+			loader: async () => {
+				return (await this.options.lazy()).default;
+			},
 			translations: {}
 		});
 	}
@@ -238,7 +247,7 @@ var ReactPageService = class {
 * const userProfile = $page({
 *   path: "/users/:id",
 *   schema: {
-*     params: t.object({ id: t.int() }),
+*     params: t.object({ id: t.integer() }),
 *     query: t.object({ tab: t.optional(t.text()) })
 *   },
 *   resolve: async ({ params }) => {
@@ -1694,7 +1703,7 @@ var ReactRouter = class {
 	path(name, config = {}) {
 		return this.pageApi.pathname(name, {
 			params: {
-				...this.state.params,
+				...this.state?.params,
 				...config.params
 			},
 			query: config.query