@fluenti/solid 0.2.1 → 0.3.1

package/src/types.ts

@@ -1,7 +1,8 @@
 import type { Accessor } from 'solid-js'
 import type {
-  FluentConfig,
+  FluentiCoreConfig,
   Locale,
+  LocalizedString,
   Messages,
   CompiledMessage,
   MessageDescriptor,
@@ -15,7 +16,7 @@ export type ChunkLoader = (
 ) => Promise<Record<string, CompiledMessage> | { default: Record<string, CompiledMessage> }>
 
 /** Extended config with lazy locale loading support */
-export interface I18nConfig extends FluentConfig {
+export interface FluentiConfig extends FluentiCoreConfig {
   /** Async chunk loader for lazy locale loading */
   chunkLoader?: ChunkLoader
   /** Enable lazy locale loading through chunkLoader */
@@ -27,25 +28,25 @@ export interface I18nConfig extends FluentConfig {
 }
 
 /** Reactive i18n context holding locale signal and translation utilities */
-export interface I18nContext {
+export interface FluentiContext {
   /** Reactive accessor for the current locale */
   locale(): Locale
   /** Set the active locale (async when lazy locale loading is enabled) */
   setLocale(locale: Locale): Promise<void>
   /** Translate a message by id with optional interpolation values */
-  t(id: string | MessageDescriptor, values?: Record<string, unknown>): string
+  t(id: string | MessageDescriptor, values?: Record<string, unknown>): LocalizedString
   /** Tagged template form: t`Hello ${name}` */
-  t(strings: TemplateStringsArray, ...exprs: unknown[]): string
+  t(strings: TemplateStringsArray, ...exprs: unknown[]): LocalizedString
   /** Merge additional messages into a locale catalog at runtime */
   loadMessages(locale: Locale, messages: Messages): void
   /** Return all locale codes that have loaded messages */
   getLocales(): Locale[]
   /** Format a date value for the current locale */
-  d(value: Date | number, style?: string): string
+  d(value: Date | number, style?: string): LocalizedString
   /** Format a number value for the current locale */
-  n(value: number, style?: string): string
+  n(value: number, style?: string): LocalizedString
   /** Format an ICU message string directly (no catalog lookup) */
-  format(message: string, values?: Record<string, unknown>): string
+  format(message: string, values?: Record<string, unknown>): LocalizedString
   /** Whether a locale chunk is currently being loaded */
   isLoading: Accessor<boolean>
   /** Set of locales whose messages have been loaded */

package/src/use-i18n.ts

@@ -1,30 +1,19 @@
 import { useContext } from 'solid-js'
 import { I18nCtx } from './provider'
-import { getGlobalI18nContext } from './context'
-import type { I18nContext } from './context'
+import type { FluentiContext } from './context'
 
 /**
- * Access the i18n context.
+ * Access the i18n context from the nearest `<I18nProvider>`.
  *
- * Resolution order:
- * 1. Nearest `<I18nProvider>` in the component tree
- * 2. Module-level singleton created by `createI18n()`
- *
- * Throws if neither is available.
+ * Throws if no provider is found in the component tree.
  */
-export function useI18n(): I18nContext {
+export function useI18n(): FluentiContext {
   const ctx = useContext(I18nCtx)
   if (ctx) {
     return ctx
   }
 
-  const global = getGlobalI18nContext()
-  if (global) {
-    return global
-  }
-
   throw new Error(
-    'useI18n requires either createI18n() to be called at startup, ' +
-    'or the component to be inside an <I18nProvider>.',
+    'useI18n() must be used inside an <I18nProvider>.',
   )
 }

package/src/vite-plugin.ts

@@ -7,7 +7,7 @@ export type { FluentiPluginOptions as FluentiSolidOptions } from '@fluenti/vite-
 
 export default function fluentiSolid(options?: FluentiPluginOptions): Plugin[] {
   return createFluentiPlugins(
-    { ...options, framework: 'solid' },
+    { ...(options?.config !== undefined ? { config: options.config } : {}), framework: 'solid' },
     [],
     solidRuntimeGenerator,
   )