@pyreon/i18n 0.3.0 → 0.7.0

package/lib/types/index.d.ts

@@ -1,334 +1,244 @@
-import { computed, signal } from "@pyreon/reactivity";
-import { Fragment, createContext, h, onUnmount, popContext, pushContext, useContext } from "@pyreon/core";
-
-//#region src/interpolation.ts
+import * as _pyreon_core0 from "@pyreon/core";
+import { Props, VNode, VNodeChild } from "@pyreon/core";
+import { Computed, Signal } from "@pyreon/reactivity";
 
+//#region src/types.d.ts
+/** A nested dictionary of translation strings. */
+type TranslationDictionary = {
+  [key: string]: string | TranslationDictionary;
+};
+/** Map of locale → dictionary (or namespace → dictionary). */
+type TranslationMessages = Record<string, TranslationDictionary>;
 /**
-* Replace `{{key}}` placeholders in a string with values from the given record.
-* Supports optional whitespace inside braces: `{{ name }}` works too.
-* Unmatched placeholders are left as-is.
-*/
-function interpolate(template, values) {
-  if (!values || !template.includes("{{")) return template;
-  return template.replace(INTERPOLATION_RE, (_, key) => {
-    const trimmed = key.trim();
-    const value = values[trimmed];
-    if (value === void 0) return `{{${trimmed}}}`;
-    try {
-      return typeof value === "object" && value !== null ? JSON.stringify(value) : `${value}`;
-    } catch {
-      return `{{${trimmed}}}`;
-    }
-  });
+ * Async function that loads translations for a locale and namespace.
+ * Return the dictionary for that namespace, or undefined if not found.
+ */
+type NamespaceLoader = (locale: string, namespace: string) => Promise<TranslationDictionary | undefined>;
+/** Interpolation values for translation strings. */
+type InterpolationValues = Record<string, string | number>;
+/** Pluralization rules map — locale → function that picks the plural form. */
+type PluralRules = Record<string, (count: number) => string>;
+/** Options for creating an i18n instance. */
+interface I18nOptions {
+  /** The initial locale (e.g. "en"). */
+  locale: string;
+  /** Fallback locale used when a key is missing in the active locale. */
+  fallbackLocale?: string;
+  /** Static messages keyed by locale. */
+  messages?: Record<string, TranslationDictionary>;
+  /**
+   * Async loader for namespace-based translation loading.
+   * Called with (locale, namespace) when `loadNamespace()` is invoked.
+   */
+  loader?: NamespaceLoader;
+  /**
+   * Default namespace used when `t()` is called without a namespace prefix.
+   * Defaults to "common".
+   */
+  defaultNamespace?: string;
+  /**
+   * Custom plural rules per locale.
+   * If not provided, uses `Intl.PluralRules` where available.
+   */
+  pluralRules?: PluralRules;
+  /**
+   * Missing key handler — called when a translation key is not found.
+   * Useful for logging, reporting, or returning a custom fallback.
+   */
+  onMissingKey?: (locale: string, key: string, namespace?: string) => string | undefined;
 }
-
-//#endregion
-//#region src/pluralization.ts
-/**
-* Resolve the plural category for a given count and locale.
-*
-* Uses custom rules if provided, otherwise falls back to `Intl.PluralRules`.
-* Returns CLDR plural categories: "zero", "one", "two", "few", "many", "other".
-*/
-function resolvePluralCategory(locale, count, customRules) {
-  if (customRules?.[locale]) return customRules[locale](count);
-  if (typeof Intl !== "undefined" && Intl.PluralRules) try {
-    return new Intl.PluralRules(locale).select(count);
-  } catch {}
-  return count === 1 ? "one" : "other";
+/** The public i18n instance returned by `createI18n()`. */
+interface I18nInstance {
+  /**
+   * Translate a key with optional interpolation.
+   * Reads the current locale reactively — re-evaluates in effects/computeds.
+   *
+   * Key format: "key" (uses default namespace) or "namespace:key".
+   * Nested keys use dots: "user.greeting" or "auth:errors.invalid".
+   *
+   * Interpolation: "Hello {{name}}" + { name: "Alice" } → "Hello Alice"
+   * Pluralization: key with "_one", "_other" etc. suffixes + { count: N }
+   */
+  t: (key: string, values?: InterpolationValues) => string;
+  /** Current locale (reactive signal). */
+  locale: Signal<string>;
+  /**
+   * Load a namespace's translations for the given locale (or current locale).
+   * Returns a promise that resolves when loading is complete.
+   */
+  loadNamespace: (namespace: string, locale?: string) => Promise<void>;
+  /**
+   * Whether any namespace is currently being loaded.
+   */
+  isLoading: Computed<boolean>;
+  /**
+   * Set of namespaces that have been loaded for the current locale.
+   */
+  loadedNamespaces: Computed<Set<string>>;
+  /**
+   * Check if a translation key exists in the current locale.
+   */
+  exists: (key: string) => boolean;
+  /**
+   * Add translations for a locale (merged with existing).
+   * Useful for adding translations at runtime without async loading.
+   */
+  addMessages: (locale: string, messages: TranslationDictionary, namespace?: string) => void;
+  /**
+   * Get all available locales (those with any registered messages).
+   */
+  availableLocales: Computed<string[]>;
 }
-
 //#endregion
-//#region src/create-i18n.ts
-/**
-* Resolve a dot-separated key path in a nested dictionary.
-* E.g. "user.greeting" → dictionary.user.greeting
-*/
-function resolveKey(dict, keyPath) {
-  const parts = keyPath.split(".");
-  let current = dict;
-  for (const part of parts) {
-    if (current == null || typeof current === "string") return void 0;
-    current = current[part];
-  }
-  return typeof current === "string" ? current : void 0;
+//#region src/context.d.ts
+declare const I18nContext: _pyreon_core0.Context<I18nInstance | null>;
+interface I18nProviderProps extends Props {
+  instance: I18nInstance;
+  children?: VNodeChild;
 }
 /**
-* Deep-merge source into target (mutates target).
-*/
-function deepMerge(target, source) {
-  for (const key of Object.keys(source)) {
-    if (key === "__proto__" || key === "constructor" || key === "prototype") continue;
-    const sourceVal = source[key];
-    const targetVal = target[key];
-    if (typeof sourceVal === "object" && sourceVal !== null && typeof targetVal === "object" && targetVal !== null) deepMerge(targetVal, sourceVal);else target[key] = sourceVal;
-  }
-}
+ * Provide an i18n instance to the component tree.
+ *
+ * @example
+ * const i18n = createI18n({ locale: 'en', messages: { en: { hello: 'Hello' } } })
+ *
+ * // In JSX:
+ * <I18nProvider instance={i18n}>
+ *   <App />
+ * </I18nProvider>
+ */
+declare function I18nProvider(props: I18nProviderProps): VNode;
 /**
-* Create a reactive i18n instance.
-*
-* @example
-* const i18n = createI18n({
-*   locale: 'en',
-*   fallbackLocale: 'en',
-*   messages: {
-*     en: { greeting: 'Hello {{name}}!' },
-*     de: { greeting: 'Hallo {{name}}!' },
-*   },
-* })
-*
-* // Reactive translation — re-evaluates on locale change
-* i18n.t('greeting', { name: 'Alice' }) // "Hello Alice!"
-* i18n.locale.set('de')
-* i18n.t('greeting', { name: 'Alice' }) // "Hallo Alice!"
-*
-* @example
-* // Async namespace loading
-* const i18n = createI18n({
-*   locale: 'en',
-*   loader: async (locale, namespace) => {
-*     const mod = await import(`./locales/${locale}/${namespace}.json`)
-*     return mod.default
-*   },
-* })
-* await i18n.loadNamespace('auth')
-* i18n.t('auth:errors.invalid') // looks up "errors.invalid" in "auth" namespace
-*/
-function createI18n(options) {
-  const {
-    fallbackLocale,
-    loader,
-    defaultNamespace = "common",
-    pluralRules,
-    onMissingKey
-  } = options;
-  const locale = signal(options.locale);
-  const store = /* @__PURE__ */new Map();
-  const storeVersion = signal(0);
-  const pendingLoads = signal(0);
-  const loadedNsVersion = signal(0);
-  const pendingPromises = /* @__PURE__ */new Map();
-  const isLoading = computed(() => pendingLoads() > 0);
-  const loadedNamespaces = computed(() => {
-    loadedNsVersion();
-    const currentLocale = locale();
-    const nsMap = store.get(currentLocale);
-    return new Set(nsMap ? nsMap.keys() : []);
-  });
-  const availableLocales = computed(() => {
-    storeVersion();
-    return [...store.keys()];
-  });
-  if (options.messages) for (const [loc, dict] of Object.entries(options.messages)) {
-    const nsMap = /* @__PURE__ */new Map();
-    nsMap.set(defaultNamespace, dict);
-    store.set(loc, nsMap);
-  }
-  function getNamespaceMap(loc) {
-    let nsMap = store.get(loc);
-    if (!nsMap) {
-      nsMap = /* @__PURE__ */new Map();
-      store.set(loc, nsMap);
-    }
-    return nsMap;
-  }
-  function lookupKey(loc, namespace, keyPath) {
-    const nsMap = store.get(loc);
-    if (!nsMap) return void 0;
-    const dict = nsMap.get(namespace);
-    if (!dict) return void 0;
-    return resolveKey(dict, keyPath);
-  }
-  function resolveTranslation(key, values) {
-    const currentLocale = locale();
-    storeVersion();
-    let namespace = defaultNamespace;
-    let keyPath = key;
-    const colonIndex = key.indexOf(":");
-    if (colonIndex > 0) {
-      namespace = key.slice(0, colonIndex);
-      keyPath = key.slice(colonIndex + 1);
-    }
-    if (values && "count" in values) {
-      const category = resolvePluralCategory(currentLocale, Number(values.count), pluralRules);
-      const pluralKey = `${keyPath}_${category}`;
-      const pluralResult = lookupKey(currentLocale, namespace, pluralKey) ?? (fallbackLocale ? lookupKey(fallbackLocale, namespace, pluralKey) : void 0);
-      if (pluralResult) return interpolate(pluralResult, values);
-    }
-    const result = lookupKey(currentLocale, namespace, keyPath) ?? (fallbackLocale ? lookupKey(fallbackLocale, namespace, keyPath) : void 0);
-    if (result !== void 0) return interpolate(result, values);
-    if (onMissingKey) {
-      const custom = onMissingKey(currentLocale, key, namespace);
-      if (custom !== void 0) return custom;
-    }
-    return key;
-  }
-  const t = (key, values) => {
-    return resolveTranslation(key, values);
-  };
-  const loadNamespace = async (namespace, loc) => {
-    if (!loader) return;
-    const targetLocale = loc ?? locale.peek();
-    const cacheKey = `${targetLocale}:${namespace}`;
-    const nsMap = getNamespaceMap(targetLocale);
-    if (nsMap.has(namespace)) return;
-    const existing = pendingPromises.get(cacheKey);
-    if (existing) return existing;
-    pendingLoads.update(n => n + 1);
-    const promise = loader(targetLocale, namespace).then(dict => {
-      if (dict) {
-        nsMap.set(namespace, dict);
-        storeVersion.update(n => n + 1);
-        loadedNsVersion.update(n => n + 1);
-      }
-    }).finally(() => {
-      pendingPromises.delete(cacheKey);
-      pendingLoads.update(n => n - 1);
-    });
-    pendingPromises.set(cacheKey, promise);
-    return promise;
-  };
-  const exists = key => {
-    const currentLocale = locale.peek();
-    let namespace = defaultNamespace;
-    let keyPath = key;
-    const colonIndex = key.indexOf(":");
-    if (colonIndex > 0) {
-      namespace = key.slice(0, colonIndex);
-      keyPath = key.slice(colonIndex + 1);
-    }
-    return lookupKey(currentLocale, namespace, keyPath) !== void 0 || (fallbackLocale ? lookupKey(fallbackLocale, namespace, keyPath) !== void 0 : false);
-  };
-  const addMessages = (loc, messages, namespace) => {
-    const ns = namespace ?? defaultNamespace;
-    const nsMap = getNamespaceMap(loc);
-    const existing = nsMap.get(ns);
-    if (existing) deepMerge(existing, messages);else {
-      const cloned = {};
-      deepMerge(cloned, messages);
-      nsMap.set(ns, cloned);
-    }
-    storeVersion.update(n => n + 1);
-    loadedNsVersion.update(n => n + 1);
-  };
-  return {
-    t,
-    locale,
-    loadNamespace,
-    isLoading,
-    loadedNamespaces,
-    exists,
-    addMessages,
-    availableLocales
-  };
-}
-
+ * Access the i18n instance from the nearest I18nProvider.
+ * Must be called within a component tree wrapped by I18nProvider.
+ *
+ * @example
+ * function Greeting() {
+ *   const { t, locale } = useI18n()
+ *   return <h1>{t('greeting', { name: 'World' })}</h1>
+ * }
+ */
+declare function useI18n(): I18nInstance;
 //#endregion
-//#region src/context.ts
-
+//#region src/create-i18n.d.ts
 /**
-* Provide an i18n instance to the component tree.
-*
-* @example
-* const i18n = createI18n({ locale: 'en', messages: { en: { hello: 'Hello' } } })
-*
-* // In JSX:
-* <I18nProvider instance={i18n}>
-*   <App />
-* </I18nProvider>
-*/
-function I18nProvider(props) {
-  pushContext(new Map([[I18nContext.id, props.instance]]));
-  onUnmount(() => popContext());
-  const ch = props.children;
-  return typeof ch === "function" ? ch() : ch;
-}
+ * Create a reactive i18n instance.
+ *
+ * @example
+ * const i18n = createI18n({
+ *   locale: 'en',
+ *   fallbackLocale: 'en',
+ *   messages: {
+ *     en: { greeting: 'Hello {{name}}!' },
+ *     de: { greeting: 'Hallo {{name}}!' },
+ *   },
+ * })
+ *
+ * // Reactive translation — re-evaluates on locale change
+ * i18n.t('greeting', { name: 'Alice' }) // "Hello Alice!"
+ * i18n.locale.set('de')
+ * i18n.t('greeting', { name: 'Alice' }) // "Hallo Alice!"
+ *
+ * @example
+ * // Async namespace loading
+ * const i18n = createI18n({
+ *   locale: 'en',
+ *   loader: async (locale, namespace) => {
+ *     const mod = await import(`./locales/${locale}/${namespace}.json`)
+ *     return mod.default
+ *   },
+ * })
+ * await i18n.loadNamespace('auth')
+ * i18n.t('auth:errors.invalid') // looks up "errors.invalid" in "auth" namespace
+ */
+declare function createI18n(options: I18nOptions): I18nInstance;
+//#endregion
+//#region src/interpolation.d.ts
 /**
-* Access the i18n instance from the nearest I18nProvider.
-* Must be called within a component tree wrapped by I18nProvider.
-*
-* @example
-* function Greeting() {
-*   const { t, locale } = useI18n()
-*   return <h1>{t('greeting', { name: 'World' })}</h1>
-* }
-*/
-function useI18n() {
-  const instance = useContext(I18nContext);
-  if (!instance) throw new Error("[@pyreon/i18n] useI18n() must be used within an <I18nProvider>.");
-  return instance;
-}
-
+ * Replace `{{key}}` placeholders in a string with values from the given record.
+ * Supports optional whitespace inside braces: `{{ name }}` works too.
+ * Unmatched placeholders are left as-is.
+ */
+declare function interpolate(template: string, values?: InterpolationValues): string;
 //#endregion
-//#region src/trans.ts
-
+//#region src/pluralization.d.ts
 /**
-* Parse a translated string into an array of plain text and rich tag segments.
-*
-* @example
-* parseRichText("Hello <bold>world</bold>, click <link>here</link>")
-* // → ["Hello ", { tag: "bold", children: "world" }, ", click ", { tag: "link", children: "here" }]
-*/
-function parseRichText(text) {
-  const parts = [];
-  let lastIndex = 0;
-  for (const match of text.matchAll(TAG_RE)) {
-    const before = text.slice(lastIndex, match.index);
-    if (before) parts.push(before);
-    parts.push({
-      tag: match[1],
-      children: match[2]
-    });
-    lastIndex = match.index + match[0].length;
-  }
-  const after = text.slice(lastIndex);
-  if (after) parts.push(after);
-  return parts;
+ * Resolve the plural category for a given count and locale.
+ *
+ * Uses custom rules if provided, otherwise falls back to `Intl.PluralRules`.
+ * Returns CLDR plural categories: "zero", "one", "two", "few", "many", "other".
+ */
+declare function resolvePluralCategory(locale: string, count: number, customRules?: PluralRules): string;
+//#endregion
+//#region src/trans.d.ts
+interface RichPart {
+  tag: string;
+  children: string;
 }
 /**
-* Rich JSX interpolation component for translations.
-*
-* Allows embedding JSX components within translated strings using XML-like tags.
-* The `t` function resolves the translation and interpolates `{{values}}` first,
-* then `<tag>content</tag>` patterns are mapped to the provided components.
-*
-* @example
-* // Translation: "You have <bold>{{count}}</bold> unread messages"
-* const { t } = useI18n()
-* <Trans
-*   t={t}
-*   i18nKey="messages.unread"
-*   values={{ count: 5 }}
-*   components={{
-*     bold: (children) => <strong>{children}</strong>,
-*   }}
-* />
-* // Renders: You have <strong>5</strong> unread messages
-*
-* @example
-* // Translation: "Read our <terms>terms of service</terms> and <privacy>privacy policy</privacy>"
-* <Trans
-*   t={t}
-*   i18nKey="legal"
-*   components={{
-*     terms: (children) => <a href="/terms">{children}</a>,
-*     privacy: (children) => <a href="/privacy">{children}</a>,
-*   }}
-* />
-*/
-function Trans(props) {
-  const translated = props.t(props.i18nKey, props.values);
-  if (!props.components) return translated;
-  const parts = parseRichText(translated);
-  if (parts.length === 1 && typeof parts[0] === "string") return parts[0];
-  return h(Fragment, null, ...parts.map(part => {
-    if (typeof part === "string") return part;
-    const component = props.components[part.tag];
-    if (!component) return part.children;
-    return component(part.children);
-  }));
+ * Parse a translated string into an array of plain text and rich tag segments.
+ *
+ * @example
+ * parseRichText("Hello <bold>world</bold>, click <link>here</link>")
+ * // → ["Hello ", { tag: "bold", children: "world" }, ", click ", { tag: "link", children: "here" }]
+ */
+declare function parseRichText(text: string): (string | RichPart)[];
+interface TransProps extends Props {
+  /** Translation key (supports namespace:key syntax). */
+  i18nKey: string;
+  /** Interpolation values for {{placeholder}} syntax. */
+  values?: InterpolationValues;
+  /**
+   * Component map for rich interpolation.
+   * Keys match tag names in the translation string.
+   * Values are component functions: `(children: any) => VNode`
+   *
+   * @example
+   * // Translation: "Read the <terms>terms</terms> and <privacy>policy</privacy>"
+   * components={{
+   *   terms: (children) => <a href="/terms">{children}</a>,
+   *   privacy: (children) => <a href="/privacy">{children}</a>,
+   * }}
+   */
+  components?: Record<string, (children: any) => any>;
+  /**
+   * The i18n instance's `t` function.
+   * Can be obtained from `useI18n()` or passed directly.
+   */
+  t: (key: string, values?: InterpolationValues) => string;
 }
-
+/**
+ * Rich JSX interpolation component for translations.
+ *
+ * Allows embedding JSX components within translated strings using XML-like tags.
+ * The `t` function resolves the translation and interpolates `{{values}}` first,
+ * then `<tag>content</tag>` patterns are mapped to the provided components.
+ *
+ * @example
+ * // Translation: "You have <bold>{{count}}</bold> unread messages"
+ * const { t } = useI18n()
+ * <Trans
+ *   t={t}
+ *   i18nKey="messages.unread"
+ *   values={{ count: 5 }}
+ *   components={{
+ *     bold: (children) => <strong>{children}</strong>,
+ *   }}
+ * />
+ * // Renders: You have <strong>5</strong> unread messages
+ *
+ * @example
+ * // Translation: "Read our <terms>terms of service</terms> and <privacy>privacy policy</privacy>"
+ * <Trans
+ *   t={t}
+ *   i18nKey="legal"
+ *   components={{
+ *     terms: (children) => <a href="/terms">{children}</a>,
+ *     privacy: (children) => <a href="/privacy">{children}</a>,
+ *   }}
+ * />
+ */
+declare function Trans(props: TransProps): VNode | string;
 //#endregion
-export { I18nContext, I18nProvider, Trans, createI18n, interpolate, parseRichText, resolvePluralCategory, useI18n };
-//# sourceMappingURL=index.d.ts.map
+export { I18nContext, type I18nInstance, type I18nOptions, I18nProvider, type I18nProviderProps, type InterpolationValues, type NamespaceLoader, type PluralRules, Trans, type TransProps, type TranslationDictionary, type TranslationMessages, createI18n, interpolate, parseRichText, resolvePluralCategory, useI18n };
+//# sourceMappingURL=index2.d.ts.map

package/lib/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../../src/interpolation.ts","../../src/pluralization.ts","../../src/create-i18n.ts","../../src/context.ts","../../src/trans.ts"],"mappings":";;;;;;;;;;AASA,SAAgB,WAAA,CACd,QAAA,EACA,MAAA,EACQ;EACR,IAAI,CAAC,MAAA,IAAU,CAAC,QAAA,CAAS,QAAA,CAAS,IAAA,CAAK,EAAE,OAAO,QAAA;EAChD,OAAO,QAAA,CAAS,OAAA,CAAQ,gBAAA,EAAA,CAAmB,CAAA,EAAG,GAAA,KAAgB;IAC5D,MAAM,OAAA,GAAU,GAAA,CAAI,IAAA,CAAA,CAAM;IAC1B,MAAM,KAAA,GAAQ,MAAA,CAAO,OAAA,CAAA;IACrB,IAAI,KAAA,KAAU,KAAA,CAAA,EAAW,OAAO,KAAK,OAAA,IAAQ;IAE7C,IAAI;MACF,OAAO,OAAO,KAAA,KAAU,QAAA,IAAY,KAAA,KAAU,IAAA,GAC1C,IAAA,CAAK,SAAA,CAAU,KAAA,CAAM,GACrB,GAAG,KAAA,EAAA;YACD;MACN,OAAO,KAAK,OAAA,IAAQ;;IAEtB;;;;;;;;;;;AClBJ,SAAgB,qBAAA,CACd,MAAA,EACA,KAAA,EACA,WAAA,EACQ;EAER,IAAI,WAAA,GAAc,MAAA,CAAA,EAChB,OAAO,WAAA,CAAY,MAAA,CAAA,CAAQ,KAAA,CAAM;EAInC,IAAI,OAAO,IAAA,KAAS,WAAA,IAAe,IAAA,CAAK,WAAA,EACtC,IAAI;IAEF,OADW,IAAI,IAAA,CAAK,WAAA,CAAY,MAAA,CAAO,CAC7B,MAAA,CAAO,KAAA,CAAM;UACjB,CAAA;EAMV,OAAO,KAAA,KAAU,CAAA,GAAI,KAAA,GAAQ,OAAA;;;;;;;;;ACf/B,SAAS,UAAA,CACP,IAAA,EACA,OAAA,EACoB;EACpB,MAAM,KAAA,GAAQ,OAAA,CAAQ,KAAA,CAAM,GAAA,CAAI;EAChC,IAAI,OAAA,GAA0C,IAAA;EAE9C,KAAK,MAAM,IAAA,IAAQ,KAAA,EAAO;IACxB,IAAI,OAAA,IAAW,IAAA,IAAQ,OAAO,OAAA,KAAY,QAAA,EAAU,OAAO,KAAA,CAAA;IAC3D,OAAA,GAAU,OAAA,CAAQ,IAAA,CAAA;;EAGpB,OAAO,OAAO,OAAA,KAAY,QAAA,GAAW,OAAA,GAAU,KAAA,CAAA;;;;;AAMjD,SAAS,SAAA,CACP,MAAA,EACA,MAAA,EACM;EACN,KAAK,MAAM,GAAA,IAAO,MAAA,CAAO,IAAA,CAAK,MAAA,CAAO,EAAE;IACrC,IAAI,GAAA,KAAQ,WAAA,IAAe,GAAA,KAAQ,aAAA,IAAiB,GAAA,KAAQ,WAAA,EAC1D;IACF,MAAM,SAAA,GAAY,MAAA,CAAO,GAAA,CAAA;IACzB,MAAM,SAAA,GAAY,MAAA,CAAO,GAAA,CAAA;IACzB,IACE,OAAO,SAAA,KAAc,QAAA,IACrB,SAAA,KAAc,IAAA,IACd,OAAO,SAAA,KAAc,QAAA,IACrB,SAAA,KAAc,IAAA,EAEd,SAAA,CACE,SAAA,EACA,SAAA,CACD,CAAA,KAED,MAAA,CAAO,GAAA,CAAA,GAAO,SAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmCpB,SAAgB,UAAA,CAAW,OAAA,EAAoC;EAC7D,MAAM;IACJ,cAAA;IACA,MAAA;IACA,gBAAA,GAAmB,QAAA;IACnB,WAAA;IACA;EAAA,CAAA,GACE,OAAA;EAIJ,MAAM,MAAA,GAAS,MAAA,CAAO,OAAA,CAAQ,MAAA,CAAO;EAKrC,MAAM,KAAA,GAAA,eAAQ,IAAI,GAAA,CAAA,CAAiD;EACnE,MAAM,YAAA,GAAe,MAAA,CAAO,CAAA,CAAE;EAG9B,MAAM,YAAA,GAAe,MAAA,CAAO,CAAA,CAAE;EAC9B,MAAM,eAAA,GAAkB,MAAA,CAAO,CAAA,CAAE;EAGjC,MAAM,eAAA,GAAA,eAAkB,IAAI,GAAA,CAAA,CAA4B;EAExD,MAAM,SAAA,GAAY,QAAA,CAAA,MAAe,YAAA,CAAA,CAAc,GAAG,CAAA,CAAE;EACpD,MAAM,gBAAA,GAAmB,QAAA,CAAA,MAAe;IACtC,eAAA,CAAA,CAAiB;IACjB,MAAM,aAAA,GAAgB,MAAA,CAAA,CAAQ;IAC9B,MAAM,KAAA,GAAQ,KAAA,CAAM,GAAA,CAAI,aAAA,CAAc;IACtC,OAAO,IAAI,GAAA,CAAI,KAAA,GAAQ,KAAA,CAAM,IAAA,CAAA,CAAM,GAAG,EAAE,CAAC;IACzC;EACF,MAAM,gBAAA,GAAmB,QAAA,CAAA,MAAe;IACtC,YAAA,CAAA,CAAc;IACd,OAAO,CAAC,GAAG,KAAA,CAAM,IAAA,CAAA,CAAM,CAAC;IACxB;EAIF,IAAI,OAAA,CAAQ,QAAA,EACV,KAAK,MAAM,CAAC,GAAA,EAAK,IAAA,CAAA,IAAS,MAAA,CAAO,OAAA,CAAQ,OAAA,CAAQ,QAAA,CAAS,EAAE;IAC1D,MAAM,KAAA,GAAA,eAAQ,IAAI,GAAA,CAAA,CAAoC;IACtD,KAAA,CAAM,GAAA,CAAI,gBAAA,EAAkB,IAAA,CAAK;IACjC,KAAA,CAAM,GAAA,CAAI,GAAA,EAAK,KAAA,CAAM;;EAMzB,SAAS,eAAA,CAAgB,GAAA,EAAiD;IACxE,IAAI,KAAA,GAAQ,KAAA,CAAM,GAAA,CAAI,GAAA,CAAI;IAC1B,IAAI,CAAC,KAAA,EAAO;MACV,KAAA,GAAA,eAAQ,IAAI,GAAA,CAAA,CAAK;MACjB,KAAA,CAAM,GAAA,CAAI,GAAA,EAAK,KAAA,CAAM;;IAEvB,OAAO,KAAA;;EAGT,SAAS,SAAA,CACP,GAAA,EACA,SAAA,EACA,OAAA,EACoB;IACpB,MAAM,KAAA,GAAQ,KAAA,CAAM,GAAA,CAAI,GAAA,CAAI;IAC5B,IAAI,CAAC,KAAA,EAAO,OAAO,KAAA,CAAA;IACnB,MAAM,IAAA,GAAO,KAAA,CAAM,GAAA,CAAI,SAAA,CAAU;IACjC,IAAI,CAAC,IAAA,EAAM,OAAO,KAAA,CAAA;IAClB,OAAO,UAAA,CAAW,IAAA,EAAM,OAAA,CAAQ;;EAGlC,SAAS,kBAAA,CACP,GAAA,EACA,MAAA,EACQ;IAER,MAAM,aAAA,GAAgB,MAAA,CAAA,CAAQ;IAC9B,YAAA,CAAA,CAAc;IAGd,IAAI,SAAA,GAAY,gBAAA;IAChB,IAAI,OAAA,GAAU,GAAA;IAEd,MAAM,UAAA,GAAa,GAAA,CAAI,OAAA,CAAQ,GAAA,CAAI;IACnC,IAAI,UAAA,GAAa,CAAA,EAAG;MAClB,SAAA,GAAY,GAAA,CAAI,KAAA,CAAM,CAAA,EAAG,UAAA,CAAW;MACpC,OAAA,GAAU,GAAA,CAAI,KAAA,CAAM,UAAA,GAAa,CAAA,CAAE;;IAIrC,IAAI,MAAA,IAAU,OAAA,IAAW,MAAA,EAAQ;MAE/B,MAAM,QAAA,GAAW,qBAAA,CAAsB,aAAA,EADzB,MAAA,CAAO,MAAA,CAAO,KAAA,CAAM,EAC2B,WAAA,CAAY;MAGzE,MAAM,SAAA,GAAY,GAAG,OAAA,IAAW,QAAA,EAAA;MAChC,MAAM,YAAA,GACJ,SAAA,CAAU,aAAA,EAAe,SAAA,EAAW,SAAA,CAAU,KAC7C,cAAA,GACG,SAAA,CAAU,cAAA,EAAgB,SAAA,EAAW,SAAA,CAAU,GAC/C,KAAA,CAAA,CAAA;MAEN,IAAI,YAAA,EACF,OAAO,WAAA,CAAY,YAAA,EAAc,MAAA,CAAO;;IAK5C,MAAM,MAAA,GACJ,SAAA,CAAU,aAAA,EAAe,SAAA,EAAW,OAAA,CAAQ,KAC3C,cAAA,GACG,SAAA,CAAU,cAAA,EAAgB,SAAA,EAAW,OAAA,CAAQ,GAC7C,KAAA,CAAA,CAAA;IAEN,IAAI,MAAA,KAAW,KAAA,CAAA,EACb,OAAO,WAAA,CAAY,MAAA,EAAQ,MAAA,CAAO;IAIpC,IAAI,YAAA,EAAc;MAChB,MAAM,MAAA,GAAS,YAAA,CAAa,aAAA,EAAe,GAAA,EAAK,SAAA,CAAU;MAC1D,IAAI,MAAA,KAAW,KAAA,CAAA,EAAW,OAAO,MAAA;;IAInC,OAAO,GAAA;;EAKT,MAAM,CAAA,GAAA,CAAK,GAAA,EAAa,MAAA,KAAyC;IAC/D,OAAO,kBAAA,CAAmB,GAAA,EAAK,MAAA,CAAO;;EAGxC,MAAM,aAAA,GAAgB,MAAA,CACpB,SAAA,EACA,GAAA,KACkB;IAClB,IAAI,CAAC,MAAA,EAAQ;IAEb,MAAM,YAAA,GAAe,GAAA,IAAO,MAAA,CAAO,IAAA,CAAA,CAAM;IACzC,MAAM,QAAA,GAAW,GAAG,YAAA,IAAgB,SAAA,EAAA;IACpC,MAAM,KAAA,GAAQ,eAAA,CAAgB,YAAA,CAAa;IAG3C,IAAI,KAAA,CAAM,GAAA,CAAI,SAAA,CAAU,EAAE;IAG1B,MAAM,QAAA,GAAW,eAAA,CAAgB,GAAA,CAAI,QAAA,CAAS;IAC9C,IAAI,QAAA,EAAU,OAAO,QAAA;IAErB,YAAA,CAAa,MAAA,CAAQ,CAAA,IAAM,CAAA,GAAI,CAAA,CAAE;IAEjC,MAAM,OAAA,GAAU,MAAA,CAAO,YAAA,EAAc,SAAA,CAAU,CAC5C,IAAA,CAAM,IAAA,IAAS;MACd,IAAI,IAAA,EAAM;QACR,KAAA,CAAM,GAAA,CAAI,SAAA,EAAW,IAAA,CAAK;QAC1B,YAAA,CAAa,MAAA,CAAQ,CAAA,IAAM,CAAA,GAAI,CAAA,CAAE;QACjC,eAAA,CAAgB,MAAA,CAAQ,CAAA,IAAM,CAAA,GAAI,CAAA,CAAE;;MAEtC,CACD,OAAA,CAAA,MAAc;MACb,eAAA,CAAgB,MAAA,CAAO,QAAA,CAAS;MAChC,YAAA,CAAa,MAAA,CAAQ,CAAA,IAAM,CAAA,GAAI,CAAA,CAAE;MACjC;IAEJ,eAAA,CAAgB,GAAA,CAAI,QAAA,EAAU,OAAA,CAAQ;IACtC,OAAO,OAAA;;EAGT,MAAM,MAAA,GAAU,GAAA,IAAyB;IACvC,MAAM,aAAA,GAAgB,MAAA,CAAO,IAAA,CAAA,CAAM;IAEnC,IAAI,SAAA,GAAY,gBAAA;IAChB,IAAI,OAAA,GAAU,GAAA;IACd,MAAM,UAAA,GAAa,GAAA,CAAI,OAAA,CAAQ,GAAA,CAAI;IACnC,IAAI,UAAA,GAAa,CAAA,EAAG;MAClB,SAAA,GAAY,GAAA,CAAI,KAAA,CAAM,CAAA,EAAG,UAAA,CAAW;MACpC,OAAA,GAAU,GAAA,CAAI,KAAA,CAAM,UAAA,GAAa,CAAA,CAAE;;IAGrC,OACE,SAAA,CAAU,aAAA,EAAe,SAAA,EAAW,OAAA,CAAQ,KAAK,KAAA,CAAA,KAChD,cAAA,GACG,SAAA,CAAU,cAAA,EAAgB,SAAA,EAAW,OAAA,CAAQ,KAAK,KAAA,CAAA,GAClD,KAAA,CAAA;;EAIR,MAAM,WAAA,GAAA,CACJ,GAAA,EACA,QAAA,EACA,SAAA,KACS;IACT,MAAM,EAAA,GAAK,SAAA,IAAa,gBAAA;IACxB,MAAM,KAAA,GAAQ,eAAA,CAAgB,GAAA,CAAI;IAClC,MAAM,QAAA,GAAW,KAAA,CAAM,GAAA,CAAI,EAAA,CAAG;IAE9B,IAAI,QAAA,EACF,SAAA,CAAU,QAAA,EAAU,QAAA,CAAS,CAAA,KACxB;MAEL,MAAM,MAAA,GAAgC,CAAA,CAAE;MACxC,SAAA,CAAU,MAAA,EAAQ,QAAA,CAAS;MAC3B,KAAA,CAAM,GAAA,CAAI,EAAA,EAAI,MAAA,CAAO;;IAGvB,YAAA,CAAa,MAAA,CAAQ,CAAA,IAAM,CAAA,GAAI,CAAA,CAAE;IACjC,eAAA,CAAgB,MAAA,CAAQ,CAAA,IAAM,CAAA,GAAI,CAAA,CAAE;;EAGtC,OAAO;IACL,CAAA;IACA,MAAA;IACA,aAAA;IACA,SAAA;IACA,gBAAA;IACA,MAAA;IACA,WAAA;IACA;GACD;;;;;;;;;;;;;;;;;ACvRH,SAAgB,YAAA,CAAa,KAAA,EAAiC;EAE5D,WAAA,CADc,IAAI,GAAA,CAAI,CAAC,CAAC,WAAA,CAAY,EAAA,EAAI,KAAA,CAAM,QAAA,CAAS,CAAC,CAAC,CACvC;EAElB,SAAA,CAAA,MAAgB,UAAA,CAAA,CAAY,CAAC;EAE7B,MAAM,EAAA,GAAK,KAAA,CAAM,QAAA;EACjB,OAAQ,OAAO,EAAA,KAAO,UAAA,GAAc,EAAA,CAAA,CAAyB,GAAG,EAAA;;;;;;;;;;;;AAalE,SAAgB,OAAA,CAAA,EAAwB;EACtC,MAAM,QAAA,GAAW,UAAA,CAAW,WAAA,CAAY;EACxC,IAAI,CAAC,QAAA,EACH,MAAM,IAAI,KAAA,CACR,iEAAA,CACD;EAEH,OAAO,QAAA;;;;;;;;;;;;;ACrCT,SAAgB,aAAA,CAAc,IAAA,EAAqC;EACjE,MAAM,KAAA,GAA+B,EAAE;EACvC,IAAI,SAAA,GAAY,CAAA;EAEhB,KAAK,MAAM,KAAA,IAAS,IAAA,CAAK,QAAA,CAAS,MAAA,CAAO,EAAE;IACzC,MAAM,MAAA,GAAS,IAAA,CAAK,KAAA,CAAM,SAAA,EAAW,KAAA,CAAM,KAAA,CAAM;IACjD,IAAI,MAAA,EAAQ,KAAA,CAAM,IAAA,CAAK,MAAA,CAAO;IAC9B,KAAA,CAAM,IAAA,CAAK;MAAE,GAAA,EAAK,KAAA,CAAM,CAAA,CAAA;MAAK,QAAA,EAAU,KAAA,CAAM,CAAA;KAAK,CAAC;IACnD,SAAA,GAAY,KAAA,CAAM,KAAA,GAAS,KAAA,CAAM,CAAA,CAAA,CAAG,MAAA;;EAGtC,MAAM,KAAA,GAAQ,IAAA,CAAK,KAAA,CAAM,SAAA,CAAU;EACnC,IAAI,KAAA,EAAO,KAAA,CAAM,IAAA,CAAK,KAAA,CAAM;EAE5B,OAAO,KAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2DT,SAAgB,KAAA,CAAM,KAAA,EAAmC;EACvD,MAAM,UAAA,GAAa,KAAA,CAAM,CAAA,CAAE,KAAA,CAAM,OAAA,EAAS,KAAA,CAAM,MAAA,CAAO;EAEvD,IAAI,CAAC,KAAA,CAAM,UAAA,EAAY,OAAO,UAAA;EAE9B,MAAM,KAAA,GAAQ,aAAA,CAAc,UAAA,CAAW;EAGvC,IAAI,KAAA,CAAM,MAAA,KAAW,CAAA,IAAK,OAAO,KAAA,CAAM,CAAA,CAAA,KAAO,QAAA,EAAU,OAAO,KAAA,CAAM,CAAA,CAAA;EAUrE,OAAO,CAAA,CAAE,QAAA,EAAU,IAAA,EAAM,GARR,KAAA,CAAM,GAAA,CAAK,IAAA,IAAS;IACnC,IAAI,OAAO,IAAA,KAAS,QAAA,EAAU,OAAO,IAAA;IACrC,MAAM,SAAA,GAAY,KAAA,CAAM,UAAA,CAAY,IAAA,CAAK,GAAA,CAAA;IAEzC,IAAI,CAAC,SAAA,EAAW,OAAO,IAAA,CAAK,QAAA;IAC5B,OAAO,SAAA,CAAU,IAAA,CAAK,QAAA,CAAS;IAC/B,CAEmC"}
+{"version":3,"file":"index2.d.ts","names":[],"sources":["../../../src/types.ts","../../../src/context.ts","../../../src/create-i18n.ts","../../../src/interpolation.ts","../../../src/pluralization.ts","../../../src/trans.tsx"],"mappings":";;;;;;KAGY,qBAAA;EAAA,CACT,GAAA,oBAAuB,qBAAA;AAAA;AAD1B;AAAA,KAKY,mBAAA,GAAsB,MAAA,SAAe,qBAAA;;;;AAAjD;KAMY,eAAA,IACV,MAAA,UACA,SAAA,aACG,OAAA,CAAQ,qBAAA;;KAGD,mBAAA,GAAsB,MAAA;;KAGtB,WAAA,GAAc,MAAA,UAAgB,KAAA;;UAGzB,WAAA;EATL;EAWV,MAAA;EAZA;EAcA,cAAA;EAbW;EAeX,QAAA,GAAW,MAAA,SAAe,qBAAA;EAfM;AAGlC;;;EAiBE,MAAA,GAAS,eAAA;EAjB6B;AAGxC;;;EAmBE,gBAAA;EAnBqD;AAGvD;;;EAqBE,WAAA,GAAc,WAAA;EAfH;;;;EAoBX,YAAA,IACE,MAAA,UACA,GAAA,UACA,SAAA;AAAA;;UAKa,YAAA;EA5BJ;;;;;;;;;;EAuCX,CAAA,GAAI,GAAA,UAAa,MAAA,GAAS,mBAAA;EAhBN;EAmBpB,MAAA,EAAQ,MAAA;EAdO;;;;EAoBf,aAAA,GAAgB,SAAA,UAAmB,MAAA,cAAoB,OAAA;EAAA;;;EAKvD,SAAA,EAAW,QAAA;EAkBC;;;EAbZ,gBAAA,EAAkB,QAAA,CAAS,GAAA;EAnB3B;;;EAwBA,MAAA,GAAS,GAAA;EArBT;;;;EA2BA,WAAA,GACE,MAAA,UACA,QAAA,EAAU,qBAAA,EACV,SAAA;EAxBqD;;;EA8BvD,gBAAA,EAAkB,QAAA;AAAA;;;cC1GP,WAAA,EAAW,aAAA,CAAA,OAAA,CAAA,YAAA;AAAA,UAEP,iBAAA,SAA0B,KAAA;EACzC,QAAA,EAAU,YAAA;EACV,QAAA,GAAW,UAAA;AAAA;;;;ADAb;;;;;AAMA;;;iBCQgB,YAAA,CAAa,KAAA,EAAO,iBAAA,GAAoB,KAAA;;;;;;;ADFxD;;;;iBCmBgB,OAAA,CAAA,GAAW,YAAA;;;;;;;ADpC3B;;;;;AAKA;;;;;AAMA;;;;;;;;;;AAMA;;;;;AAGA;iBEgEgB,UAAA,CAAW,OAAA,EAAS,WAAA,GAAc,YAAA;;;;;;;AFpFlD;iBGMgB,WAAA,CACd,QAAA,UACA,MAAA,GAAS,mBAAA;;;;;;;AHRX;;iBIKgB,qBAAA,CACd,MAAA,UACA,KAAA,UACA,WAAA,GAAc,WAAA;;;UCNN,QAAA;EACR,GAAA;EACA,QAAA;AAAA;;;;;ALCF;;;iBKSgB,aAAA,CAAc,IAAA,qBAAyB,QAAA;AAAA,UAiBtC,UAAA,SAAmB,KAAA;ELpBxB;EKsBV,OAAA;;EAEA,MAAA,GAAS,mBAAA;ELvBT;;;;;;AAKF;;;;;AAGA;EK4BE,UAAA,GAAa,MAAA,UAAgB,QAAA;;;;ALzB/B;EK8BE,CAAA,GAAI,GAAA,UAAa,MAAA,GAAS,mBAAA;AAAA;;;;;;;;;;;;;;;;;;;;;;;ALI5B;;;;;;;;;iBK8BgB,KAAA,CAAM,KAAA,EAAO,UAAA,GAAa,KAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pyreon/i18n",
-  "version": "0.3.0",
+  "version": "0.7.0",
   "description": "Reactive internationalization for Pyreon with async namespace loading",
   "license": "MIT",
   "repository": {
@@ -45,7 +45,7 @@
     "typecheck": "tsc --noEmit"
   },
   "peerDependencies": {
-    "@pyreon/core": ">=0.4.0 <1.0.0",
-    "@pyreon/reactivity": ">=0.4.0 <1.0.0"
+    "@pyreon/core": ">=0.5.0 <1.0.0",
+    "@pyreon/reactivity": ">=0.5.0 <1.0.0"
   }
 }

package/src/context.ts

@@ -1,11 +1,5 @@
-import {
-  createContext,
-  pushContext,
-  popContext,
-  onUnmount,
-  useContext,
-} from '@pyreon/core'
-import type { VNodeChild, VNode, Props } from '@pyreon/core'
+import type { Props, VNode, VNodeChild } from '@pyreon/core'
+import { createContext, provide, useContext } from '@pyreon/core'
 import type { I18nInstance } from './types'
 
 export const I18nContext = createContext<I18nInstance | null>(null)
@@ -27,10 +21,7 @@ export interface I18nProviderProps extends Props {
  * </I18nProvider>
  */
 export function I18nProvider(props: I18nProviderProps): VNode {
-  const frame = new Map([[I18nContext.id, props.instance]])
-  pushContext(frame)
-
-  onUnmount(() => popContext())
+  provide(I18nContext, props.instance)
 
   const ch = props.children
   return (typeof ch === 'function' ? (ch as () => VNodeChild)() : ch) as VNode

package/src/create-i18n.ts

@@ -1,12 +1,12 @@
-import { signal, computed } from '@pyreon/reactivity'
+import { computed, signal } from '@pyreon/reactivity'
+import { interpolate } from './interpolation'
+import { resolvePluralCategory } from './pluralization'
 import type {
-  I18nOptions,
   I18nInstance,
-  TranslationDictionary,
+  I18nOptions,
   InterpolationValues,
+  TranslationDictionary,
 } from './types'
-import { interpolate } from './interpolation'
-import { resolvePluralCategory } from './pluralization'
 
 /**
  * Resolve a dot-separated key path in a nested dictionary.