@fluenti/solid 0.2.1 → 0.3.0

package/dist/index.js

@@ -1,22 +1,23 @@
-import { children as e, createContext as t, createMemo as n, createRoot as r, createSignal as i, useContext as a } from "solid-js";
-import { buildICUMessage as o, formatDate as s, formatNumber as c, hashMessage as l, interpolate as u, msg as d, resolveDescriptorId as f } from "@fluenti/core";
-import { Dynamic as p, createComponent as m, memo as h } from "solid-js/web";
+import { children as e, createContext as t, createMemo as n, createSignal as r, useContext as i } from "solid-js";
+import { createDiagnostics as a, formatDate as o, formatNumber as s, msg as c } from "@fluenti/core";
+import { PLURAL_CATEGORIES as l, buildICUMessage as u, buildICUPluralMessage as d, buildICUSelectMessage as f, hashMessage as p, interpolate as m, normalizeSelectForms as h, offsetIndices as g, resolveDescriptorId as _ } from "@fluenti/core/internal";
+import { Dynamic as v, createComponent as y, memo as b } from "solid-js/web";
 //#region src/context.ts
-var g = Symbol.for("fluenti.runtime.solid");
-function _() {
-	let e = globalThis[g];
+var x = Symbol.for("fluenti.runtime.solid.v1");
+function S() {
+	let e = globalThis[x];
 	return typeof e == "object" && e ? e : null;
 }
-function v(e) {
+function C(e) {
 	return typeof e == "object" && e && "default" in e ? e.default : e;
 }
-function y(e) {
-	let [t, n] = i(e.locale), [r, a] = i(!1), l = new Set([e.locale]), [d, p] = i(new Set(l)), m = { ...e.messages }, h = e, g = h.lazyLocaleLoading ?? e.splitting ?? !1;
+function w(e) {
+	let [t, n] = r(e.locale), [i, c] = r(!1), l = new Set([e.locale]), [d, f] = r(new Set(l)), p = { ...e.messages }, h = e, g = h.diagnostics ? a(h.diagnostics) : void 0, v = h.lazyLocaleLoading ?? e.splitting ?? !1;
 	function y(e, t, n) {
-		let r = m[t];
+		let r = p[t];
 		if (!r) return;
 		let i = r[e];
-		if (i !== void 0) return typeof i == "function" ? i(n) : typeof i == "string" && n ? u(i, n, t) : String(i);
+		if (i !== void 0) return typeof i == "function" ? i(n) : typeof i == "string" && n ? m(i, n, t) : String(i);
 	}
 	function b(t, n, r) {
 		let i = [n], a = new Set(i);
@@ -24,8 +25,8 @@ function y(e) {
 		let o = h.fallbackChain?.[n] ?? h.fallbackChain?.["*"];
 		if (o) for (let e of o) a.has(e) || (i.push(e), a.add(e));
 		for (let e of i) {
-			let n = y(t, e, r);
-			if (n !== void 0) return n;
+			let i = y(t, e, r);
+			if (i !== void 0) return e !== n && g?.fallbackUsed(n, e, t), i;
 		}
 	}
 	function x(t, n) {
@@ -33,91 +34,92 @@ function y(e) {
 		let r = e.missing(n, t);
 		if (r !== void 0) return r;
 	}
-	function S(e, t, n) {
+	function w(e, t, n) {
 		let r = b(e, t, n);
 		if (r !== void 0) return r;
+		g?.missingKey(t, e);
 		let i = x(e, t);
-		return i === void 0 ? e.includes("{") ? u(e, n, t) : e : i;
+		return i === void 0 ? e.includes("{") ? m(e, n, t) : e : i;
 	}
-	function C(e, ...n) {
-		if (Array.isArray(e) && "raw" in e) return C(o(e, n), Object.fromEntries(n.map((e, t) => [String(t), e])));
+	function T(e, ...n) {
+		if (Array.isArray(e) && "raw" in e) return T(u(e, n), Object.fromEntries(n.map((e, t) => [String(t), e])));
 		let r = e, i = n[0], a = t();
 		if (typeof r == "object" && r) {
-			let e = f(r);
+			let e = _(r);
 			if (e) {
 				let t = b(e, a, i);
 				if (t !== void 0) return t;
 				let n = x(e, a);
 				if (n !== void 0) return n;
 			}
-			return r.message === void 0 ? e ?? "" : u(r.message, i, a);
+			return r.message === void 0 ? e ?? "" : m(r.message, i, a);
 		}
-		return S(r, a, i);
+		return w(r, a, i);
 	}
 	return {
 		locale: t,
 		setLocale: async (e) => {
-			if (!g || !h.chunkLoader) {
+			if (!v || !h.chunkLoader) {
 				n(e);
 				return;
 			}
-			let t = _();
+			let t = S();
 			if (l.has(e)) {
 				t?.__switchLocale && await t.__switchLocale(e), n(e);
 				return;
 			}
-			a(!0);
+			c(!0);
 			try {
-				let r = v(await h.chunkLoader(e));
-				m[e] = {
-					...m[e],
+				let r = C(await h.chunkLoader(e));
+				p[e] = {
+					...p[e],
 					...r
-				}, l.add(e), p(new Set(l)), t?.__switchLocale && await t.__switchLocale(e), n(e);
+				}, l.add(e), f(new Set(l)), t?.__switchLocale && await t.__switchLocale(e), n(e);
 			} finally {
-				a(!1);
+				c(!1);
 			}
 		},
-		t: C,
+		t: T,
 		loadMessages: (e, t) => {
-			m[e] = {
-				...m[e],
+			p[e] = {
+				...p[e],
 				...t
-			}, l.add(e), p(new Set(l));
+			}, l.add(e), f(new Set(l));
 		},
-		getLocales: () => Object.keys(m),
-		d: (e, n) => s(e, t(), n, h.dateFormats),
-		n: (e, n) => c(e, t(), n, h.numberFormats),
-		format: (e, n) => u(e, n, t()),
-		isLoading: r,
+		getLocales: () => Object.keys(p),
+		d: (e, n) => o(e, t(), n, h.dateFormats),
+		n: (e, n) => s(e, t(), n, h.numberFormats),
+		format: (e, n) => m(e, n, t()),
+		isLoading: i,
 		loadedLocales: d,
 		preloadLocale: (e) => {
-			if (!g || l.has(e) || !h.chunkLoader) return;
-			let t = _();
+			if (!v || l.has(e) || !h.chunkLoader) return;
+			let t = S();
 			h.chunkLoader(e).then(async (n) => {
-				let r = v(n);
-				m[e] = {
-					...m[e],
+				let r = C(n);
+				p[e] = {
+					...p[e],
 					...r
-				}, l.add(e), p(new Set(l)), t?.__preloadLocale && await t.__preloadLocale(e);
+				}, l.add(e), f(new Set(l)), t?.__preloadLocale && await t.__preloadLocale(e);
 			}).catch((t) => {
 				console.warn("[fluenti] preload failed:", e, t);
 			});
+		},
+		te: (e, n) => {
+			let r = p[n ?? t()];
+			return r !== void 0 && e in r;
+		},
+		tm: (e, n) => {
+			let r = p[n ?? t()];
+			return r ? r[e] : void 0;
 		}
 	};
 }
-var b;
-function x(e) {
-	let t = r(() => y(e));
-	return typeof window < "u" ? b = t : console.warn("[fluenti] createI18n() detected SSR environment. Use <I18nProvider> for per-request isolation in SSR."), t;
-}
-function S() {
-	return b;
-}
 //#endregion
 //#region src/provider.tsx
-var C = t(), w = (e) => {
-	let t = y(e);
-	return m(C.Provider, {
+var T = t(), E = (e) => {
+	let t = w(e);
+	return y(T.Provider, {
 		value: t,
 		get children() {
 			return e.children;
@@ -126,33 +128,28 @@ var C = t(), w = (e) => {
 };
 //#endregion
 //#region src/use-i18n.ts
-function T() {
-	let e = a(C);
+function D() {
+	let e = i(T);
 	if (e) return e;
-	let t = S();
-	if (t) return t;
-	throw Error("useI18n requires either createI18n() to be called at startup, or the component to be inside an <I18nProvider>.");
+	throw Error("useI18n() must be used inside an <I18nProvider>.");
 }
 //#endregion
 //#region src/compile-time-t.ts
-var E = ((...e) => {
+var O = ((...e) => {
 	throw Error("[fluenti] `t` imported from '@fluenti/solid' is a compile-time API. Use it only with the Fluenti build transform inside a component or custom hook. For runtime lookups, use useI18n().t(...).");
 });
 //#endregion
 //#region src/rich-dom.tsx
-function D(e) {
+function k(e) {
 	return typeof Node < "u" && e instanceof Node;
 }
-function O(e) {
+function A(e) {
 	return typeof e == "function" && !e.length ? e() : e;
 }
-function k(e, t) {
-	return t === 0 ? e : e.replace(/<(\d+)(\/?>)/g, (e, n, r) => `<${Number(n) + t}${r}`).replace(/<\/(\d+)>/g, (e, n) => `</${Number(n) + t}>`);
-}
-function A(e) {
+function j(e) {
 	let t = [], n = "";
 	function r(e) {
-		let i = O(e);
+		let i = A(e);
 		if (i == null || typeof i == "boolean") return;
 		if (Array.isArray(i)) {
 			for (let e of i) r(e);
@@ -162,7 +159,7 @@ function A(e) {
 			n += String(i);
 			return;
 		}
-		if (!D(i)) return;
+		if (!k(i)) return;
 		if (i.nodeType === Node.TEXT_NODE) {
 			n += i.textContent ?? "";
 			return;
@@ -171,80 +168,66 @@ function A(e) {
 			r(Array.from(i.childNodes));
 			return;
 		}
-		let a = t.length, o = A(Array.from(i.childNodes));
-		t.push(i.cloneNode(!1)), t.push(...o.components), n += `<${a}>${k(o.message, a + 1)}</${a}>`;
+		let a = t.length, o = j(Array.from(i.childNodes));
+		t.push(i.cloneNode(!1)), t.push(...o.components), o.message === "" && o.components.length === 0 ? n += `<${a}/>` : n += `<${a}>${g(o.message, a + 1)}</${a}>`;
 	}
 	return r(e), {
 		message: n,
 		components: t
 	};
 }
-function j(e, t) {
-	let n = O(t);
+function M(e, t) {
+	let n = A(t);
 	if (!(n == null || typeof n == "boolean")) {
 		if (Array.isArray(n)) {
-			for (let t of n) j(e, t);
+			for (let t of n) M(e, t);
 			return;
 		}
 		if (typeof n == "string" || typeof n == "number") {
 			e.appendChild(document.createTextNode(String(n)));
 			return;
 		}
-		D(n) && e.appendChild(n);
+		k(n) && e.appendChild(n);
 	}
 }
-function M(e, t) {
-	let n = /<(\d+)>([\s\S]*?)<\/\1>/g, r = [], i = 0, a;
+function N(e, t) {
+	let n = /<(\d+)(?:\/>|(>)([\s\S]*?)<\/\1>)/g, r = [], i = 0, a;
 	for (n.lastIndex = 0, a = n.exec(e); a !== null;) {
 		a.index > i && r.push(e.slice(i, a.index));
-		let o = t[Number(a[1])], s = M(a[2], t);
-		if (o) {
-			let e = o.cloneNode(!1);
-			j(e, s), r.push(e);
-		} else r.push(a[2]);
+		let o = Number(a[1]), s = a[2] === void 0, c = t[o];
+		if (s) c && r.push(c.cloneNode(!1));
+		else {
+			let e = N(a[2] === void 0 ? "" : a[3], t);
+			if (c) {
+				let t = c.cloneNode(!1);
+				M(t, e), r.push(t);
+			} else r.push(a[3] ?? "");
+		}
 		i = n.lastIndex, a = n.exec(e);
 	}
 	return i < e.length && r.push(e.slice(i)), r.length <= 1 ? r[0] ?? "" : r;
 }
-function N(e, t) {
+function P(e, t) {
 	let n = {}, r = [];
 	for (let i of e) {
 		let e = t[i];
 		if (e === void 0) continue;
-		let a = A(e);
-		n[i] = k(a.message, r.length), r.push(...a.components);
+		let a = j(e);
+		n[i] = g(a.message, r.length), r.push(...a.components);
 	}
 	for (let [i, a] of Object.entries(t)) {
 		if (e.includes(i) || a === void 0) continue;
-		let t = A(a);
-		n[i] = k(t.message, r.length), r.push(...t.components);
+		let t = j(a);
+		n[i] = g(t.message, r.length), r.push(...t.components);
 	}
 	return {
 		messages: n,
 		components: r
 	};
 }
-function P(e) {
-	return `{value, select, ${Object.entries(e).map(([e, t]) => `${e} {${t}}`).join(" ")}}`;
-}
-function F(e) {
-	let t = {}, n = {}, r = 0;
-	for (let [i, a] of Object.entries(e)) {
-		if (i === "other") {
-			t.other = a;
-			continue;
-		}
-		let e = /^[A-Za-z0-9_]+$/.test(i) ? i : `case_${r++}`;
-		t[e] = a, n[i] = e;
-	}
-	return t.other === void 0 && (t.other = ""), {
-		forms: t,
-		valueMap: n
-	};
-}
 //#endregion
 //#region src/trans.tsx
-function I(e) {
+function F(e) {
 	let t = [], n = 0;
 	for (; n < e.length;) {
 		let r = e.indexOf("<", n);
@@ -276,7 +259,7 @@ function I(e) {
 			}), n = r + 1;
 			continue;
 		}
-		let o = a[1], s = r + a[0].length, c = L(e, o, s);
+		let o = a[1], s = r + a[0].length, c = I(e, o, s);
 		if (c === -1) {
 			t.push({
 				type: "text",
@@ -288,12 +271,12 @@ function I(e) {
 		t.push({
 			type: "tag",
 			name: o,
-			children: I(l)
+			children: F(l)
 		}), n = c + u.length;
 	}
 	return t;
 }
-function L(e, t, n) {
+function I(e, t, n) {
 	let r = `<${t}>`, i = `</${t}>`, a = 1, o = n;
 	for (; o < e.length && a > 0;) {
 		let t = e.indexOf(r, o), n = e.indexOf(i, o);
@@ -306,25 +289,25 @@ function L(e, t, n) {
 	}
 	return -1;
 }
-function R(e, t) {
+function L(e, t) {
 	let n = e.map((e) => {
 		if (e.type === "text") return e.value;
 		let n = t[e.name];
-		return n ? m(p, {
+		return n ? y(v, {
 			component: n,
-			children: e.children.length > 0 ? R(e.children, t) : void 0
-		}) : R(e.children, t);
+			children: e.children.length > 0 ? L(e.children, t) : void 0
+		}) : L(e.children, t);
 	});
 	return n.length === 1 ? n[0] : n;
 }
-var z = (t) => {
-	let { t: r } = T(), i = e(() => t.children), a = n(() => {
+var R = (t) => {
+	let { t: r } = D(), i = e(() => t.children), a = n(() => {
 		let e = t.__message ?? t.message;
 		return typeof e == "function" ? e() : e;
 	}), o = n(() => t.__components ?? t.components);
 	return (() => {
 		let e = a(), n = o();
-		if (e !== void 0 && n) return R(I(r({
+		if (e !== void 0 && n) return L(F(r({
 			...t.id === void 0 ? {} : { id: t.id },
 			message: e,
 			...t.context === void 0 ? {} : { context: t.context },
@@ -332,50 +315,31 @@ var z = (t) => {
 		})), n);
 		let s = i.toArray();
 		if (s.length === 0) return null;
-		let c = A(s), l = r({
+		let c = j(s), l = r({
 			...t.id === void 0 ? {} : { id: t.id },
 			message: c.message,
 			...t.context === void 0 ? {} : { context: t.context },
 			...t.comment === void 0 ? {} : { comment: t.comment }
-		}), u = c.components.length > 0 ? M(l, c.components) : l;
-		return Array.isArray(u) && u.length > 1 ? m(p, {
+		}), u = c.components.length > 0 ? N(l, c.components) : l;
+		return Array.isArray(u) && u.length > 1 && t.tag ? y(v, {
 			get component() {
-				return t.tag ?? "span";
+				return t.tag;
 			},
 			children: u
 		}) : u;
 	});
-}, B = [
-	"zero",
-	"one",
-	"two",
-	"few",
-	"many",
-	"other"
-];
-function V(e, t) {
-	let n = [];
-	for (let t of B) {
-		let r = e[t];
-		if (r !== void 0) {
-			let e = t === "zero" ? "=0" : t;
-			n.push(`${e} {${r}}`);
-		}
-	}
-	return `{count, plural, ${t ? `offset:${t} ` : ""}${n.join(" ")}}`;
-}
-var H = (e) => {
-	let { t } = T();
+}, z = (e) => {
+	let { t } = D();
 	function n(e) {
 		return typeof e == "function" ? e() : e;
 	}
 	return (() => {
 		let r = {};
-		for (let t of B) {
+		for (let t of l) {
 			let i = n(e[t]);
 			i !== void 0 && (r[t] = i);
 		}
-		let { messages: i, components: a } = N(B, r), o = V({
+		let { messages: i, components: a } = P(l, r), o = d({
 			...i.zero !== void 0 && { zero: i.zero },
 			...i.one !== void 0 && { one: i.one },
 			...i.two !== void 0 && { two: i.two },
@@ -383,22 +347,20 @@ var H = (e) => {
 			...i.many !== void 0 && { many: i.many },
 			other: i.other ?? ""
 		}, e.offset), s = t({
-			id: e.id ?? (e.context === void 0 ? o : l(o, e.context)),
+			id: e.id ?? (e.context === void 0 ? o : p(o, e.context)),
 			message: o,
 			...e.context === void 0 ? {} : { context: e.context },
 			...e.comment === void 0 ? {} : { comment: e.comment }
-		}, { count: e.value });
-		return m(p, {
+		}, { count: e.value }), c = a.length > 0 ? N(s, a) : s;
+		return e.tag ? y(v, {
 			get component() {
-				return e.tag ?? "span";
+				return e.tag;
 			},
-			get children() {
-				return h(() => a.length > 0)() ? M(s, a) : s;
-			}
-		});
+			children: c
+		}) : c;
 	});
-}, U = (e) => {
-	let { t } = T(), n = () => e.tag ?? "span", r = () => {
+}, B = (e) => {
+	let { t } = D(), n = () => {
 		let n = e.options === void 0 ? {
 			...Object.fromEntries(Object.entries(e).filter(([e]) => ![
 				"value",
@@ -413,36 +375,36 @@ var H = (e) => {
 		} : {
 			...e.options,
 			other: e.other
-		}, r = [...Object.keys(n).filter((e) => e !== "other"), "other"], { messages: i, components: a } = N(r, n), o = F(Object.fromEntries([...r].map((e) => [e, i[e] ?? ""]))), s = t({
-			id: e.id ?? (e.context === void 0 ? P(o.forms) : l(P(o.forms), e.context)),
-			message: P(o.forms),
+		}, r = [...Object.keys(n).filter((e) => e !== "other"), "other"], { messages: i, components: a } = P(r, n), o = h(Object.fromEntries([...r].map((e) => [e, i[e] ?? ""]))), s = t({
+			id: e.id ?? (e.context === void 0 ? f(o.forms) : p(f(o.forms), e.context)),
+			message: f(o.forms),
 			...e.context === void 0 ? {} : { context: e.context },
 			...e.comment === void 0 ? {} : { comment: e.comment }
 		}, { value: o.valueMap[e.value] ?? "other" });
-		return a.length > 0 ? M(s, a) : s;
+		return a.length > 0 ? N(s, a) : s;
 	};
-	return m(p, {
+	return (() => e.tag ? y(v, {
 		get component() {
-			return n();
+			return e.tag;
 		},
 		get children() {
-			return r();
+			return n();
 		}
-	});
+	}) : b(n));
 };
 //#endregion
 //#region src/components/DateTime.tsx
-function W(e) {
-	let { d: t } = T();
-	return h(() => t(e.value, e.style));
+function V(e) {
+	let { d: t } = D();
+	return b(() => t(e.value, e.style));
 }
 //#endregion
 //#region src/components/NumberFormat.tsx
-function G(e) {
-	let { n: t } = T();
-	return h(() => t(e.value, e.style));
+function H(e) {
+	let { n: t } = D();
+	return b(() => t(e.value, e.style));
 }
 //#endregion
-export { W as DateTime, C as I18nCtx, w as I18nProvider, G as NumberFormat, H as Plural, U as Select, z as Trans, x as createI18n, y as createI18nContext, d as msg, E as t, T as useI18n };
+export { V as DateTime, E as I18nProvider, H as NumberFormat, z as Plural, B as Select, R as Trans, w as createFluentiContext, c as msg, O as t, D as useI18n };
 
 //# sourceMappingURL=index.js.map