@feugene/fint-i18n 0.1.0 → 0.2.0

package/README.md

@@ -1,5 +1,11 @@
 # @feugene/fint-i18n
 
+[![codecov](https://codecov.io/gh/efureev/fint-i18n/branch/main/graph/badge.svg)](https://codecov.io/gh/efureev/fint-i18n)
+[![npm version](https://badge.fury.io/js/@feugene%2Ffint-i18n.svg)](https://badge.fury.io/js/@feugene%2Ffint-i18n)
+[![bundle size](https://badgen.net/bundlephobia/minzip/@feugene/fint-i18n)](https://bundlephobia.com/package/@feugene/fint-i18n)
+[![dependency count](https://badgen.net/bundlephobia/dependency-count/@feugene/fint-i18n)](https://bundlephobia.com/package/@feugene/fint-i18n)
+
+
 [Русская версия (Russian version)](./README.ru.md)
 
 Localization library for Vue 3 with lazy-loading blocks, template compilation, and extensible plugins.

package/README.ru.md

@@ -1,5 +1,8 @@
 # @feugene/fint-i18n
 
+[![codecov](https://codecov.io/gh/efureev/fint-i18n/branch/main/graph/badge.svg)](https://codecov.io/gh/efureev/fint-i18n)
+[![npm version](https://badge.fury.io/js/@feugene%2Ffint-i18n.svg)](https://badge.fury.io/js/@feugene%2Ffint-i18n)
+
 Библиотека локализации для Vue 3 с ленивой загрузкой блоков, компиляцией шаблонов и расширяемыми плагинами.
 
 ## Особенности

package/dist/chunks/{core-Dbw0feTs.js → core-gGqMvw8y.js}

@@ -59,10 +59,46 @@ var a = class {
 		}
 		return r;
 	}
-}, o = class {
+}, o = ".**", s = ".*";
+function c(e) {
+	return e.endsWith(s) || e.endsWith(o);
+}
+var l = class {
 	loaders;
+	knownBlockNames;
 	constructor(e) {
-		this.loaders = this.normalize(e);
+		this.loaders = this.normalize(e), this.knownBlockNames = this.collectKnownBlockNames(this.loaders);
+	}
+	getKnownBlockNames() {
+		return this.knownBlockNames;
+	}
+	expandPattern(e) {
+		let t = e.endsWith(o), n = !t && e.endsWith(s);
+		if (!t && !n) return [];
+		let r = e.slice(0, -(t ? 3 : 2));
+		if (!r) return [];
+		let i = `${r}.`, a = i.length, c = [];
+		for (let e = 0; e < this.knownBlockNames.length; e++) {
+			let n = this.knownBlockNames[e];
+			if (n.length <= a) continue;
+			let r = !0;
+			for (let e = 0; e < a; e++) if (n.charCodeAt(e) !== i.charCodeAt(e)) {
+				r = !1;
+				break;
+			}
+			if (r) {
+				if (!t) {
+					let e = !1;
+					for (let t = a; t < n.length; t++) if (n.charCodeAt(t) === 46) {
+						e = !0;
+						break;
+					}
+					if (e) continue;
+				}
+				c.push(n);
+			}
+		}
+		return c;
 	}
 	resolve(e, t) {
 		let n = this.loaders[e];
@@ -106,23 +142,31 @@ var a = class {
 	normalizeEntry(e) {
 		return Array.isArray(e) ? e : [e];
 	}
+	collectKnownBlockNames(e) {
+		let t = /* @__PURE__ */ new Set();
+		for (let n in e) {
+			let r = e[n];
+			for (let e in r) t.add(e);
+		}
+		return Array.from(t);
+	}
 };
 //#endregion
 //#region src/core/message-utils.ts
-function s(e) {
+function u(e) {
 	return !!e && typeof e == "object" && !Array.isArray(e);
 }
-function c(e, t) {
-	for (let n in t) s(t[n]) ? (s(e[n]) || (e[n] = {}), c(e[n], t[n])) : e[n] = t[n];
+function d(e, t) {
+	for (let n in t) u(t[n]) ? (u(e[n]) || (e[n] = {}), d(e[n], t[n])) : e[n] = t[n];
 }
-function l(e, n) {
-	if (s(e) && s(n)) {
+function f(e, n) {
+	if (u(e) && u(n)) {
 		let r = t({});
-		return c(r, e), c(r, n), r;
+		return d(r, e), d(r, n), r;
 	}
 	return n;
 }
-function u(e, t) {
+function p(e, t) {
 	let n = e, r = 0;
 	for (; n && typeof n == "object";) {
 		let e = t.indexOf(".", r), i = e === -1 ? t.slice(r) : t.slice(r, e);
@@ -132,7 +176,7 @@ function u(e, t) {
 }
 //#endregion
 //#region src/core/translate-params.ts
-function d(t) {
+function m(t) {
 	if (!t) return;
 	let n;
 	for (let r in t) {
@@ -143,7 +187,7 @@ function d(t) {
 }
 //#endregion
 //#region src/core/instance.ts
-var f = class {
+var h = class {
 	locale;
 	fallbackLocale;
 	globalInstall;
@@ -153,11 +197,12 @@ var f = class {
 	loadingBlocks = /* @__PURE__ */ new Map();
 	loadedBlocks = /* @__PURE__ */ new Map();
 	blockUsageCounters = /* @__PURE__ */ new Map();
+	patternExpansionCache = /* @__PURE__ */ new Map();
 	pendingUsedBlockLoads = /* @__PURE__ */ new Map();
 	skipNextUsedBlockLoadLocale = null;
 	hooks = new a();
 	constructor(e) {
-		this.locale = n(e.locale), this.fallbackLocale = e.fallbackLocale || "", this.loaderRegistry = new o(e.loaders), this.globalInstall = e.globalInstall !== !1, e.plugins && e.plugins.forEach((e) => e.install(this)), r(this.locale, (e, t) => {
+		this.locale = n(e.locale), this.fallbackLocale = e.fallbackLocale || "", this.loaderRegistry = new l(e.loaders), this.globalInstall = e.globalInstall !== !1, e.plugins && e.plugins.forEach((e) => e.install(this)), r(this.locale, (e, t) => {
 			if (e !== t) {
 				if (this.skipNextUsedBlockLoadLocale === e) {
 					this.skipNextUsedBlockLoadLocale = null;
@@ -168,11 +213,11 @@ var f = class {
 		}), this.hooks.emitSync("afterInit", void 0);
 	}
 	t = (e, t, n) => {
-		let r = this.locale.value, i = d(t), a = this.hooks.emitSync("onTranslate", {
+		let r = this.locale.value, i = m(t), a = this.hooks.emitSync("onTranslate", {
 			key: e,
 			params: i,
-			result: this.resolve(r, e, i) || e
-		}).result;
+			result: this.resolve(r, e, i)
+		}).result ?? e;
 		if (a === e) {
 			let t = n?.fallbackLocale || this.fallbackLocale;
 			if (t && t !== r) {
@@ -193,7 +238,7 @@ var f = class {
 		if (r) return r(n);
 		let a = this.messages[e];
 		if (!a) return;
-		let o = u(a, t);
+		let o = p(a, t);
 		if (typeof o == "string") {
 			let r = i(o);
 			return this.setCompiled(e, t, r), r(n);
@@ -207,8 +252,24 @@ var f = class {
 	setCompiled = (e, t, n) => {
 		this.compiledMessages[e] || (this.compiledMessages[e] = Object.create(null)), this.compiledMessages[e][t] = n;
 	};
+	expandPattern = (e) => {
+		let t = this.patternExpansionCache.get(e);
+		if (t) return t;
+		let n = this.loaderRegistry.expandPattern(e);
+		return this.patternExpansionCache.set(e, n), n;
+	};
 	loadBlock = async (e, t) => {
-		let n = t || this.locale.value, r = `${n}:${e}`;
+		let n = t || this.locale.value;
+		if (c(e)) {
+			let t = this.expandPattern(e);
+			if (t.length === 0) {
+				console.warn(`[fint-i18n] Pattern "${e}" did not match any registered block (locale "${n}")`);
+				return;
+			}
+			await Promise.all(t.map((e) => this.loadBlock(e, n)));
+			return;
+		}
+		let r = `${n}:${e}`;
 		if (this.isBlockLoaded(e, n)) return;
 		if (this.loadingBlocks.has(r)) return this.loadingBlocks.get(r);
 		await this.hooks.emit("beforeLoadBlock", e);
@@ -222,7 +283,7 @@ var f = class {
 				let r;
 				for (let e of t.loaders) {
 					let i = await e(), a = i.default || i;
-					this.mergeMessages(n, t.resolvedBlockName, a), r = r === void 0 ? a : l(r, a);
+					this.mergeMessages(n, t.resolvedBlockName, a), r = r === void 0 ? a : f(r, a);
 				}
 				this.markBlockLoaded(t.resolvedBlockName, n), await this.hooks.emit("afterLoadBlock", {
 					block: t.resolvedBlockName,
@@ -238,7 +299,7 @@ var f = class {
 	mergeMessages = (e, n, r) => {
 		this.messages[e] || (this.messages[e] = t({}));
 		let i = n.split("."), a = i[0];
-		if (i.length === 1) s(r) ? ((!this.messages[e][a] || typeof this.messages[e][a] != "object") && (this.messages[e][a] = t({})), c(this.messages[e][a], r)) : this.messages[e][a] = r;
+		if (i.length === 1) u(r) ? ((!this.messages[e][a] || typeof this.messages[e][a] != "object") && (this.messages[e][a] = t({})), d(this.messages[e][a], r)) : this.messages[e][a] = r;
 		else {
 			(!this.messages[e][a] || typeof this.messages[e][a] != "object") && (this.messages[e][a] = t({}));
 			let n = this.messages[e][a];
@@ -246,7 +307,7 @@ var f = class {
 				let r = i[e];
 				(!n[r] || typeof n[r] != "object") && (n[r] = t({})), n = n[r];
 			}
-			c(n, r);
+			d(n, r);
 		}
 		this.precompileBlock(e, n, r);
 	};
@@ -260,12 +321,12 @@ var f = class {
 			this.setCompiled(e, t, n);
 			return;
 		}
-		if (s(n)) for (let r in n) {
+		if (u(n)) for (let r in n) {
 			let a = n[r], o = `${t}.${r}`;
 			if (typeof a == "string") {
 				let t = i(a);
 				this.setCompiled(e, o, t);
-			} else typeof a == "function" ? this.setCompiled(e, o, a) : s(a) && this.precompileBlock(e, o, a);
+			} else typeof a == "function" ? this.setCompiled(e, o, a) : u(a) && this.precompileBlock(e, o, a);
 		}
 	};
 	isBlockLoaded = (e, t) => {
@@ -305,19 +366,39 @@ var f = class {
 		}));
 	};
 	registerUsage = (e) => {
-		let t = this.blockUsageCounters.get(e) || 0;
-		this.blockUsageCounters.set(e, t + 1);
+		if (c(e)) {
+			let t = this.expandPattern(e);
+			if (t.length === 0) {
+				console.warn(`[fint-i18n] Pattern "${e}" did not match any registered block`);
+				return;
+			}
+			for (let e = 0; e < t.length; e++) this.incrementUsage(t[e]);
+			return;
+		}
+		this.incrementUsage(e);
 	};
 	registerBlocks = (e) => {
-		e.forEach((e) => this.registerUsage(e));
+		for (let t = 0; t < e.length; t++) this.registerUsage(e[t]);
 	};
 	unregisterUsage = (e) => {
+		if (c(e)) {
+			let t = this.expandPattern(e);
+			for (let e = 0; e < t.length; e++) this.decrementUsage(t[e]);
+			return;
+		}
+		this.decrementUsage(e);
+	};
+	incrementUsage = (e) => {
+		let t = this.blockUsageCounters.get(e) || 0;
+		this.blockUsageCounters.set(e, t + 1);
+	};
+	decrementUsage = (e) => {
 		let t = this.blockUsageCounters.get(e) || 0;
 		t <= 1 ? this.blockUsageCounters.delete(e) : this.blockUsageCounters.set(e, t - 1);
 	};
 };
-function p(e) {
-	return new f(e);
+function g(e) {
+	return new h(e);
 }
 //#endregion
-export { i, p as n, a as r, f as t };
+export { i, g as n, a as r, h as t };

package/dist/core.js

@@ -1,2 +1,2 @@
-import { i as e, n as t, r as n, t as r } from "./chunks/core-Dbw0feTs.js";
+import { i as e, n as t, r as n, t as r } from "./chunks/core-gGqMvw8y.js";
 export { r as FintI18n, n as HookManager, e as compileTemplate, t as createFintI18n };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { i as e, n as t, r as n, t as r } from "./chunks/core-Dbw0feTs.js";
+import { i as e, n as t, r as n, t as r } from "./chunks/core-gGqMvw8y.js";
 import { FINT_I18N_KEY as i, createVTDirective as a, installI18n as o, useFintI18n as s, useI18nScope as c } from "./vue.js";
 import { BridgePlugin as l, HookLoggerPlugin as u, PersistencePlugin as d } from "./plugins.js";
 export { l as BridgePlugin, i as FINT_I18N_KEY, r as FintI18n, u as HookLoggerPlugin, n as HookManager, d as PersistencePlugin, e as compileTemplate, t as createFintI18n, a as createVTDirective, o as installI18n, s as useFintI18n, c as useI18nScope };

package/dist/plugins.js

@@ -12,7 +12,7 @@ var t = class {
 	}
 	install(e) {
 		let t = this.options.key, n = this.options.storage || (typeof window < "u" ? window.localStorage : void 0);
-		if (!n) return;
+		if (!n || typeof n.getItem != "function") return;
 		let r = n.getItem(t);
 		r && (e.locale.value = r), e.hooks.on("onLocaleChange", ({ locale: e }) => {
 			n.setItem(t, e);

package/dist/types/core/hooks.d.ts

@@ -21,7 +21,7 @@ export interface FintI18nHooks {
     'onTranslate': HookFn<{
         key: string;
         params?: any;
-        result: string;
+        result: string | undefined;
     }>;
 }
 export declare class HookManager {

package/dist/types/core/instance.d.ts

@@ -11,6 +11,7 @@ export declare class FintI18n {
     private loadingBlocks;
     private loadedBlocks;
     private blockUsageCounters;
+    private patternExpansionCache;
     private pendingUsedBlockLoads;
     private skipNextUsedBlockLoadLocale;
     hooks: HookManager;
@@ -18,6 +19,12 @@ export declare class FintI18n {
     t: (key: string, params?: Record<string, any>, options?: TranslateOptions) => string;
     private resolve;
     private setCompiled;
+    /**
+     * Развернуть wildcard-паттерн в список конкретных имён блоков.
+     * Результат кэшируется по строке паттерна (набор лоадеров неизменен).
+     * Не-паттерны возвращают пустой массив.
+     */
+    private expandPattern;
     loadBlock: (blockName: string, locale?: Locale) => Promise<void>;
     mergeMessages: (locale: Locale, blockName: string, messages: MessageValue) => void;
     private precompileBlock;
@@ -25,8 +32,22 @@ export declare class FintI18n {
     markBlockLoaded: (blockName: string, locale: Locale) => void;
     loadUsedBlocks: (locale: Locale) => Promise<void>;
     setLocale: (newLocale: Locale) => Promise<void>;
+    /**
+     * Зарегистрировать использование блока.
+     *
+     * Поддерживается wildcard-паттерн (`prefix.*`, `prefix.**`) — он разворачивается в
+     * конкретные имена зарегистрированных блоков (один раз, с кэшированием), и счётчик
+     * увеличивается для каждого из них. Если паттерн не дал совпадений — выводится warning.
+     */
     registerUsage: (blockName: string) => void;
     registerBlocks: (blockNames: string[]) => void;
+    /**
+     * Снять регистрацию использования блока.
+     * Wildcard-паттерн раскрывается тем же кэшем, что и в `registerUsage`,
+     * поэтому снимаются счётчики ровно у тех же child-блоков.
+     */
     unregisterUsage: (blockName: string) => void;
+    private incrementUsage;
+    private decrementUsage;
 }
 export declare function createFintI18n(options: FintI18nOptions): FintI18n;

package/dist/types/core/loader-registry.d.ts

@@ -3,11 +3,26 @@ export interface ResolvedLocaleBlockLoaders {
     resolvedBlockName: string;
     loaders: LocaleBlockLoader[];
 }
+export declare function isBlockPattern(name: string): boolean;
 export declare class LocaleLoaderRegistry {
     private readonly loaders;
+    private readonly knownBlockNames;
     constructor(source?: LocaleLoaderSource);
+    getKnownBlockNames(): readonly string[];
+    /**
+     * Развернуть wildcard-паттерн в список конкретных имён блоков.
+     *
+     * Поддерживаемые формы:
+     *  - `prefix.*`  — все блоки, у которых после `prefix.` ровно один сегмент (без точек).
+     *  - `prefix.**` — все блоки, начинающиеся с `prefix.` (любая глубина).
+     *
+     * Если паттерн некорректный или ничего не совпало — возвращается пустой массив.
+     * Сам литерал родителя (`prefix`) в результат НЕ включается.
+     */
+    expandPattern(pattern: string): string[];
     resolve(locale: Locale, blockName: string): ResolvedLocaleBlockLoaders | null;
     private normalize;
     private mergeCollection;
     private normalizeEntry;
+    private collectKnownBlockNames;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feugene/fint-i18n",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Lightweight Vue 3 i18n library with lazy-loading blocks and template caching",
   "author": "feugene <feugene@example.com>",
   "license": "MIT",
@@ -21,10 +21,6 @@
     "translation"
   ],
   "type": "module",
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
   "files": [
     "dist"
   ],
@@ -51,21 +47,23 @@
     "vue": "^3.5.32"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^7.7.3",
+    "@antfu/eslint-config": "^8.1.0",
+    "@codecov/vite-plugin": "^1.9.1",
     "@iconify-json/lucide": "^1.2.101",
     "@types/node": "^25.5.2",
-    "@unocss/eslint-plugin": "^66.6.7",
-    "@unocss/reset": "^66.6.7",
+    "@unocss/eslint-plugin": "^66.6.8",
+    "@unocss/reset": "^66.6.8",
     "@vitejs/plugin-vue": "^6.0.5",
+    "@vitest/coverage-v8": "^4.1.3",
     "@vue/test-utils": "^2.4.6",
     "eslint": "^10.2.0",
     "globals": "^17.4.0",
-    "jsdom": "^29.0.1",
+    "jsdom": "^29.0.2",
     "rollup-plugin-visualizer": "^7.0.1",
-    "typescript": "^5.9.3",
-    "unocss": "^66.6.7",
+    "typescript": "^6.0.2",
+    "unocss": "^66.6.8",
     "vite": "^8.0.5",
-    "vitest": "^4.1.2",
+    "vitest": "^4.1.3",
     "vue": "^3.5.32",
     "vue-tsc": "^3.2.6"
   },
@@ -76,10 +74,13 @@
     "build:analyze": "ANALYZE=true vite build && vue-tsc -p tsconfig.build.json",
     "build": "vite build && vue-tsc -p tsconfig.build.json",
     "prepublishOnly": "yarn build",
-    "bench": "mkdir -p dist/analysis && vitest bench --run --config vite.config.ts --environment node --outputJson dist/analysis/bench-results.json bench/core.bench.ts",
+    "bench": "mkdir -p dist/analysis && vitest bench --run --config vitest.config.ts --environment node --outputJson dist/analysis/bench-results.json bench/core.bench.ts",
     "type-check": "vue-tsc --noEmit",
     "test": "vitest",
     "test:run": "vitest run",
+    "test:coverage": "yarn test:coverage:package && yarn test:coverage:playground",
+    "test:coverage:package": "vitest run --coverage",
+    "test:coverage:playground": "vitest run --config playground/vitest.config.ts --coverage",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix"
   }