@fluenti/vue 0.2.0 → 0.3.0

package/dist/index.js

@@ -1,17 +1,15 @@
 import { Comment as e, Text as t, defineComponent as n, h as r, inject as i, isVNode as a, ref as o, shallowReactive as s } from "vue";
-import { buildICUMessage as c, formatDate as l, formatNumber as u, hashMessage as d, interpolate as f, msg as p, resolveDescriptorId as m } from "@fluenti/core";
+import { createDiagnostics as c, formatDate as l, formatNumber as u, msg as d } from "@fluenti/core";
+import { PLURAL_CATEGORIES as f, buildICUMessage as p, buildICUPluralMessage as m, buildICUSelectMessage as h, hashMessage as g, interpolate as _, normalizeSelectForms as v, offsetIndices as y, resolveDescriptorId as b } from "@fluenti/core/internal";
 //#region src/use-i18n.ts
-function h() {
-	let e = i(N);
-	if (!e) throw Error("[fluenti] useI18n() requires createFluentVue plugin");
+function x() {
+	let e = i(P);
+	if (!e) throw Error("[fluenti] useI18n() requires createFluenti plugin");
 	return e;
 }
 //#endregion
 //#region src/components/rich-text.ts
-function g(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 _(n) {
+function S(n) {
 	let r = [], i = "";
 	function o(n) {
 		if (n == null || typeof n == "boolean") return;
@@ -28,60 +26,42 @@ function _(n) {
 			i += typeof n.children == "string" ? n.children : "";
 			return;
 		}
-		let s = r.length, c = _(n.children);
-		r.push(n), r.push(...c.components), i += `<${s}>${g(c.message, s + 1)}</${s}>`;
+		let s = r.length, c = S(n.children);
+		r.push(n), r.push(...c.components), i += `<${s}>${y(c.message, s + 1)}</${s}>`;
 	}
 	return o(n), {
 		message: i,
 		components: r
 	};
 }
-function v(e, t) {
+function C(e, t) {
 	let n = /<(\d+)>([\s\S]*?)<\/\1>/g, i = [], a = 0, o;
 	for (n.lastIndex = 0, o = n.exec(e); o !== null;) {
 		o.index > a && i.push(e.slice(a, o.index));
-		let s = t[Number(o[1])], c = v(o[2], t);
+		let s = t[Number(o[1])], c = C(o[2], t);
 		s ? i.push(r(s.type, s.props ?? {}, Array.isArray(c) ? c : [c])) : i.push(o[2]), a = n.lastIndex, o = n.exec(e);
 	}
 	return a < e.length && i.push(e.slice(a)), i.length <= 1 ? i[0] ?? "" : i;
 }
-function y(e, t) {
+function w(e, t) {
 	let n = {}, r = [];
 	for (let i of e) {
 		let e = t[i];
 		if (e === void 0) continue;
-		let a = _(e);
-		n[i] = g(a.message, r.length), r.push(...a.components);
+		let a = S(e);
+		n[i] = y(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);
-		n[i] = g(t.message, r.length), r.push(...t.components);
+		let t = S(a);
+		n[i] = y(t.message, r.length), r.push(...t.components);
 	}
 	return {
 		messages: n,
 		components: r
 	};
 }
-function b(e) {
-	return `{value, select, ${Object.entries(e).map(([e, t]) => `${e} {${t}}`).join(" ")}}`;
-}
-function x(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
-	};
-}
-var S = n({
+var T = n({
 	name: "Trans",
 	props: {
 		id: String,
@@ -89,43 +69,24 @@ var S = n({
 		comment: String,
 		tag: {
 			type: String,
-			default: "span"
+			default: void 0
 		}
 	},
 	setup(e, { slots: t }) {
-		let { t: n } = h();
+		let { t: n } = x();
 		return () => {
 			let i = t.default?.();
 			if (!i) return null;
-			let { message: a, components: o } = _(i), s = n({
+			let { message: a, components: o } = S(i), s = n({
 				...e.id === void 0 ? {} : { id: e.id },
 				message: a,
 				...e.context === void 0 ? {} : { context: e.context },
 				...e.comment === void 0 ? {} : { comment: e.comment }
-			}), c = o.length > 0 ? v(s, o) : s;
-			return Array.isArray(c) ? c.length === 1 ? c[0] : r(e.tag, null, c) : c;
+			}), c = o.length > 0 ? C(s, o) : s;
+			return Array.isArray(c) ? c.length === 1 ? c[0] : e.tag ? r(e.tag, null, c) : c : c;
 		};
 	}
-}), C = [
-	"zero",
-	"one",
-	"two",
-	"few",
-	"many",
-	"other"
-];
-function w(e, t) {
-	let n = [];
-	for (let t of C) {
-		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 T = n({
+}), E = n({
 	name: "Plural",
 	props: {
 		value: {
@@ -142,16 +103,16 @@ var T = n({
 		many: String,
 		other: {
 			type: String,
-			default: void 0
+			required: !0
 		},
 		offset: Number,
 		tag: {
 			type: String,
-			default: "span"
+			default: void 0
 		}
 	},
 	setup(e, { slots: t }) {
-		let { t: n } = h();
+		let { t: n } = x();
 		return () => {
 			let i = {
 				zero: e.zero,
@@ -159,13 +120,13 @@ var T = n({
 				two: e.two,
 				few: e.few,
 				many: e.many,
-				other: e.other ?? ""
+				other: e.other
 			};
-			for (let e of C) {
+			for (let e of f) {
 				let n = t[e];
 				n && (i[e] = n({ count: "#" }));
 			}
-			let { messages: a, components: o } = y(C, i), s = w({
+			let { messages: a, components: o } = w(f, i), s = m({
 				...a.zero !== void 0 && { zero: a.zero },
 				...a.one !== void 0 && { one: a.one },
 				...a.two !== void 0 && { two: a.two },
@@ -173,15 +134,15 @@ var T = n({
 				...a.many !== void 0 && { many: a.many },
 				other: a.other ?? ""
 			}, e.offset), c = n({
-				id: e.id ?? (e.context === void 0 ? s : d(s, e.context)),
+				id: e.id ?? (e.context === void 0 ? s : g(s, e.context)),
 				message: s,
 				...e.context === void 0 ? {} : { context: e.context },
 				...e.comment === void 0 ? {} : { comment: e.comment }
-			}, { count: e.value }), l = o.length > 0 ? v(c, o) : c;
-			return r(e.tag, void 0, l ?? void 0);
+			}, { count: e.value }), l = o.length > 0 ? C(c, o) : c;
+			return e.tag ? r(e.tag, void 0, l ?? void 0) : l ?? null;
 		};
 	}
-}), E = n({
+}), D = n({
 	name: "Select",
 	inheritAttrs: !1,
 	props: {
@@ -194,7 +155,7 @@ var T = n({
 		comment: String,
 		other: {
 			type: String,
-			default: void 0
+			required: !0
 		},
 		options: {
 			type: Object,
@@ -202,31 +163,31 @@ var T = n({
 		},
 		tag: {
 			type: String,
-			default: "span"
+			default: void 0
 		}
 	},
 	setup(e, { attrs: t, slots: n }) {
-		let { t: i } = h();
+		let { t: i } = x();
 		return () => {
 			let a = {};
 			if (e.options !== void 0) {
 				for (let [t, n] of Object.entries(e.options)) a[t] = n;
-				a.other = e.other ?? "";
+				a.other = e.other;
 			} else {
 				for (let [e, n] of Object.entries(t)) typeof n == "string" && (a[e] = n);
-				a.other = e.other ?? "";
+				a.other = e.other;
 			}
 			for (let [e, t] of Object.entries(n)) e === "default" || !t || (a[e] = t({ value: "{value}" }));
-			let o = [...Object.keys(a).filter((e) => e !== "other"), "other"], { messages: s, components: c } = y(o, a), l = x(Object.fromEntries([...o].map((e) => [e, s[e] ?? ""]))), u = b(l.forms), f = i({
-				id: e.id ?? (e.context === void 0 ? u : d(u, e.context)),
+			let o = [...Object.keys(a).filter((e) => e !== "other"), "other"], { messages: s, components: c } = w(o, a), l = v(Object.fromEntries([...o].map((e) => [e, s[e] ?? ""]))), u = h(l.forms), d = i({
+				id: e.id ?? (e.context === void 0 ? u : g(u, e.context)),
 				message: u,
 				...e.context === void 0 ? {} : { context: e.context },
 				...e.comment === void 0 ? {} : { comment: e.comment }
-			}, { value: l.valueMap[e.value] ?? "other" }), p = c.length > 0 ? v(f, c) : f;
-			return r(e.tag, void 0, p ?? void 0);
+			}, { value: l.valueMap[e.value] ?? "other" }), f = c.length > 0 ? C(d, c) : d;
+			return e.tag ? r(e.tag, void 0, f ?? void 0) : f ?? null;
 		};
 	}
-}), D = n({
+}), O = n({
 	name: "DateTime",
 	props: {
 		value: {
@@ -243,10 +204,10 @@ var T = n({
 		}
 	},
 	setup(e) {
-		let { d: t } = h();
+		let { d: t } = x();
 		return () => r(e.tag, t(e.value, e.style));
 	}
-}), O = n({
+}), k = n({
 	name: "NumberFormat",
 	props: {
 		value: {
@@ -263,146 +224,171 @@ var T = n({
 		}
 	},
 	setup(e) {
-		let { n: t } = h();
+		let { n: t } = x();
 		return () => r(e.tag, t(e.value, e.style));
 	}
 });
 //#endregion
 //#region src/plugin.ts
-function k(e) {
+function A(e) {
 	return e.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/'/g, "&#39;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
-var A = Symbol.for("fluenti.runtime.vue");
-function j() {
-	let e = globalThis[A];
+var j = Symbol.for("fluenti.runtime.vue.v1");
+function M() {
+	let e = globalThis[j];
 	return typeof e == "object" && e ? e : null;
 }
-function M(e) {
+function N(e) {
 	return typeof e == "object" && e && "default" in e ? e.default : e;
 }
-var N = Symbol("fluenti");
-function P(e, t, n) {
-	return typeof e == "function" ? e(t) : f(e, t, n);
+var P = Symbol("fluenti");
+function F(e, t, n) {
+	return typeof e == "function" ? e(t) : _(e, t, n);
 }
-function F(e) {
+function I(e) {
 	let t = Object.keys(e).filter((e) => e !== "plural");
 	return t.length > 0 ? t[0] : void 0;
 }
-function I(e) {
-	let t = e.lazyLocaleLoading ?? e.splitting ?? !1, n = o(e.locale), r = s({ ...e.messages }), i = o(!1), a = new Set([e.locale]), d = o(new Set(a));
-	function p(e, t) {
-		let n = r[e];
+function L(e) {
+	let t = e.lazyLocaleLoading ?? e.splitting ?? !1, n = e.diagnostics ? c(e.diagnostics) : void 0, r = o(e.locale), i = s({ ...e.messages }), a = o(!1), d = new Set([e.locale]), f = o(new Set(d));
+	function m(e, t) {
+		let n = i[e];
 		if (n) return n[t];
 	}
-	function h(t, ...r) {
-		if (Array.isArray(t) && "raw" in t) return h(c(t, r), Object.fromEntries(r.map((e, t) => [String(t), e])));
-		let i = t, a = r[0], o, s;
-		typeof i == "object" && i ? (o = m(i) ?? "", s = i.message) : o = i;
-		let l = n.value, u = [l];
+	function h(t, ...i) {
+		if (Array.isArray(t) && "raw" in t) return h(p(t, i), Object.fromEntries(i.map((e, t) => [`arg${t}`, e])));
+		let a = t, o = i[0], s, c;
+		typeof a == "object" && a ? (s = b(a) ?? "", c = a.message) : s = a;
+		let l = r.value, u = [l];
 		if (e.fallbackLocale && !u.includes(e.fallbackLocale) && u.push(e.fallbackLocale), e.fallbackChain?.[l]) for (let t of e.fallbackChain[l]) u.includes(t) || u.push(t);
 		else if (e.fallbackChain?.["*"]) for (let t of e.fallbackChain["*"]) u.includes(t) || u.push(t);
 		for (let e of u) {
-			let t = p(e, o);
-			if (t !== void 0) return P(t, a, e);
+			let t = m(e, s);
+			if (t !== void 0) return e !== l && n?.fallbackUsed(l, e, s), F(t, o, e);
 		}
-		if (e.missing) {
-			let t = e.missing(l, o);
+		if (n?.missingKey(l, s), e.missing) {
+			let t = e.missing(l, s);
 			if (t !== void 0) return t;
 		}
-		return s ? f(s, a, l) : o.includes("{") ? f(o, a, l) : o;
+		return c ? _(c, o, l) : s.includes("{") ? _(s, o, l) : s;
 	}
-	async function g(o) {
+	let g = 0;
+	async function v(n) {
 		if (!t || !e.chunkLoader) {
-			n.value = o;
+			r.value = n;
 			return;
 		}
-		let s = j();
-		if (a.has(o)) {
-			s?.__switchLocale && await s.__switchLocale(o), n.value = o;
+		let o = M();
+		if (d.has(n)) {
+			o?.__switchLocale && await o.__switchLocale(n), r.value = n;
 			return;
 		}
-		i.value = !0;
+		let s = ++g;
+		a.value = !0;
 		try {
-			let t = M(await e.chunkLoader(o));
-			r[o] = {
-				...r[o],
+			let t = N(await e.chunkLoader(n));
+			if (s !== g) return;
+			i[n] = {
+				...i[n],
 				...t
-			}, a.add(o), d.value = new Set(a), s?.__switchLocale && await s.__switchLocale(o), n.value = o;
+			}, d.add(n), f.value = new Set(d), o?.__switchLocale && await o.__switchLocale(n), r.value = n;
 		} finally {
-			i.value = !1;
+			s === g && (a.value = !1);
 		}
 	}
-	function _(e, t) {
-		r[e] = {
-			...r[e],
+	function y(e, t) {
+		i[e] = {
+			...i[e],
 			...t
-		}, a.add(e), d.value = new Set(a);
+		}, d.add(e), f.value = new Set(d);
 	}
-	function v(n) {
-		if (!t || a.has(n) || !e.chunkLoader) return;
-		let i = j();
+	let x = /* @__PURE__ */ new Set();
+	function S(n) {
+		if (!t || d.has(n) || !e.chunkLoader || x.has(n)) return;
+		x.add(n);
+		let r = M();
 		e.chunkLoader(n).then(async (e) => {
-			let t = M(e);
-			r[n] = {
-				...r[n],
+			let t = N(e);
+			i[n] = {
+				...i[n],
 				...t
-			}, a.add(n), d.value = new Set(a), i?.__preloadLocale && await i.__preloadLocale(n);
+			}, d.add(n), f.value = new Set(d), r?.__preloadLocale && await r.__preloadLocale(n);
 		}).catch((e) => {
 			console.warn("[fluenti] preload failed:", n, e);
+		}).finally(() => {
+			x.delete(n);
 		});
 	}
-	function y() {
-		return Object.keys(r);
+	function C() {
+		return Object.keys(i);
 	}
-	function b(t, r) {
-		let i = n.value;
-		return l(t, i, r, e.dateFormats);
+	function w(t, n) {
+		let i = r.value;
+		return l(t, i, n, e.dateFormats);
 	}
-	function x(t, r) {
-		let i = n.value;
-		return u(t, i, r, e.numberFormats);
+	function j(t, n) {
+		let i = r.value;
+		return u(t, i, n, e.numberFormats);
 	}
-	function C(e, t) {
-		return P(e, t, n.value);
+	function L(e, t) {
+		return F(e, t, r.value);
 	}
-	function w(e, t, n) {
-		return k(n ? h(e, n) : h(e)).replace(/&lt;(\d+)&gt;([\s\S]*?)&lt;\/\1&gt;/g, (e, n, r) => {
-			let i = t[Number(n)];
-			if (!i) return r;
-			let a = Object.entries(i.attrs).map(([e, t]) => t ? `${k(e)}="${k(t)}"` : k(e)).join(" "), o = k(i.tag);
-			return `<${o}${a ? " " + a : ""}>${r}</${o}>`;
+	function R(e, t, n) {
+		let r = A(n ? h(e, n) : h(e));
+		function i(e) {
+			if (e.rawAttrs != null && e.rawAttrs !== "") {
+				let t = [], n = /([\w:@.!-]+)(?:\s*=\s*(?:"([^"]*)"|'([^']*)'))?/g, r;
+				for (; (r = n.exec(e.rawAttrs)) !== null;) {
+					let e = A(r[1]), n = r[2] ?? r[3];
+					t.push(n === void 0 ? e : `${e}="${A(n)}"`);
+				}
+				return t.join(" ");
+			}
+			return e.attrs ? Object.entries(e.attrs).map(([e, t]) => t ? `${A(e)}="${A(t)}"` : A(e)).join(" ") : "";
+		}
+		let a = r.replace(/&lt;(\d+)\/&gt;/g, (e, n) => {
+			let r = t[Number(n)];
+			if (!r) return "";
+			let a = A(r.tag), o = i(r);
+			return `<${a}${o ? " " + o : ""} />`;
 		});
+		return a = a.replace(/&lt;(\d+)&gt;([\s\S]*?)&lt;\/\1&gt;/g, (e, n, r) => {
+			let a = t[Number(n)];
+			if (!a) return r;
+			let o = A(a.tag), s = i(a);
+			return `<${o}${s ? " " + s : ""}>${r}</${o}>`;
+		}), a;
 	}
-	function A(e, t) {
-		return p(t ?? n.value, e) !== void 0;
+	function z(e, t) {
+		return m(t ?? r.value, e) !== void 0;
 	}
-	function I(e, t) {
-		return p(t ?? n.value, e);
+	function B(e, t) {
+		return m(t ?? r.value, e);
 	}
-	let L = {
+	let V = {
 		t: h,
-		locale: n,
-		setLocale: g,
-		loadMessages: _,
-		getLocales: y,
-		d: b,
-		n: x,
-		format: C,
-		isLoading: i,
-		loadedLocales: d,
-		preloadLocale: v,
-		te: A,
-		tm: I
+		locale: r,
+		setLocale: v,
+		loadMessages: y,
+		getLocales: C,
+		d: w,
+		n: j,
+		format: L,
+		isLoading: a,
+		loadedLocales: f,
+		preloadLocale: S,
+		te: z,
+		tm: B
 	};
 	return {
 		install(t) {
-			t.provide(N, L);
+			t.provide(P, V);
 			let n = e.componentPrefix ?? "";
-			t.component(`${n}Trans`, S), t.component(`${n}Plural`, T), t.component(`${n}Select`, E), t.component(`${n}DateTime`, D), t.component(`${n}NumberFormat`, O), t.config.globalProperties.$t = h, t.config.globalProperties.$d = b, t.config.globalProperties.$n = x, t.config.globalProperties.$vtRich = w;
+			t.component(`${n}Trans`, T), t.component(`${n}Plural`, E), t.component(`${n}Select`, D), t.component(`${n}DateTime`, O), t.component(`${n}NumberFormat`, k), e.injectGlobalProperties !== !1 && (t.config.globalProperties.$t = h, t.config.globalProperties.$d = w, t.config.globalProperties.$n = j, t.config.globalProperties.$vtRich = R);
 			let r = /* @__PURE__ */ new WeakMap();
 			t.directive("t", {
 				mounted(e, t) {
-					let n = F(t.modifiers);
+					let n = I(t.modifiers);
 					if (n) {
 						let t = e.getAttribute(n) ?? "";
 						r.set(e, t), e.setAttribute(n, h(t));
@@ -412,7 +398,7 @@ function I(e) {
 					}
 				},
 				updated(e, t) {
-					let n = F(t.modifiers);
+					let n = I(t.modifiers);
 					if (n) {
 						let t = r.get(e) ?? e.getAttribute(n) ?? "";
 						e.setAttribute(n, h(t));
@@ -420,15 +406,15 @@ function I(e) {
 				}
 			});
 		},
-		global: L
+		global: V
 	};
 }
 //#endregion
 //#region src/compile-time-t.ts
-var L = ((...e) => {
+var R = ((...e) => {
 	throw Error("[fluenti] `t` imported from '@fluenti/vue' is a compile-time API. Use it only with the Fluenti build transform inside <script setup> or setup(). For runtime lookups, use useI18n().t(...).");
 });
 //#endregion
-export { D as DateTime, N as FLUENTI_KEY, O as NumberFormat, T as Plural, E as Select, S as Trans, I as createFluentVue, p as msg, L as t, h as useI18n };
+export { O as DateTime, P as FLUENTI_KEY, k as NumberFormat, E as Plural, D as Select, T as Trans, L as createFluenti, d as msg, R as t, x as useI18n };
 
 //# sourceMappingURL=index.js.map