@jant/core 0.2.12 → 0.2.13

package/src/i18n/README.md

@@ -14,7 +14,7 @@ dashRoute.get("/", async (c) => {
   return c.html(
     <I18nProvider c={c}>
       <YourApp />
-    </I18nProvider>
+    </I18nProvider>,
   );
 });
 ```
@@ -77,8 +77,11 @@ function DashboardContent({ postCount }: { postCount: number }) {
       {/* 2. With variables */}
       <p>
         {t(
-          { message: "You have {count} posts", comment: "@context: Post count message" },
-          { count: postCount }
+          {
+            message: "You have {count} posts",
+            comment: "@context: Post count message",
+          },
+          { count: postCount },
         )}
       </p>
 
@@ -102,7 +105,7 @@ dashRoute.get("/", async (c) => {
   return c.html(
     <I18nProvider c={c}>
       <DashboardContent postCount={posts.length} />
-    </I18nProvider>
+    </I18nProvider>,
   );
 });
 ```
@@ -122,7 +125,7 @@ dashRoute.get("/", async (c) => {
   return c.html(
     <Layout title={i18n._({ message: "Dashboard", comment: "@context: ..." })}>
       <MyComponent c={c} /> {/* Need to pass c prop */}
-    </Layout>
+    </Layout>,
   );
 });
 
@@ -143,7 +146,7 @@ dashRoute.get("/", async (c) => {
       <Layout>
         <MyComponent /> {/* No need to pass c prop */}
       </Layout>
-    </I18nProvider>
+    </I18nProvider>,
   );
 });
 
@@ -175,7 +178,7 @@ t({ message: "Dashboard" });
 c.html(
   <I18nProvider c={c}>
     <App />
-  </I18nProvider>
+  </I18nProvider>,
 );
 
 // ❌ Wrong - useLingui() will throw error
@@ -204,10 +207,17 @@ dashRoute.get("/", async (c) => {
 const { t } = useLingui();
 
 // ✅ Correct - values as second parameter
-t({ message: "Hello {name}", comment: "@context: Greeting" }, { name: "Alice" });
+t(
+  { message: "Hello {name}", comment: "@context: Greeting" },
+  { name: "Alice" },
+);
 
 // ❌ Wrong - values inside first parameter (not supported)
-t({ message: "Hello {name}", comment: "@context: Greeting", values: { name: "Alice" } });
+t({
+  message: "Hello {name}",
+  comment: "@context: Greeting",
+  values: { name: "Alice" },
+});
 ```
 
 ---

package/src/i18n/context.tsx

@@ -79,14 +79,11 @@ export function useLingui() {
   if (!currentI18n) {
     throw new Error(
       "useLingui() called outside of I18nProvider. " +
-        "Make sure your component is wrapped in <I18nProvider c={c}>...</I18nProvider>"
+        "Make sure your component is wrapped in <I18nProvider c={c}>...</I18nProvider>",
     );
   }
 
-  // Create translation function that accepts both pre-macro and post-macro formats
   const translate = (descriptor: TranslationDescriptor) => {
-    // The macro will add the id, or it's already present
-    // At runtime, we pass it to i18n._ which handles the descriptor with values
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- currentI18n is checked above
     return currentI18n!._(descriptor as MessageDescriptor);
   };

package/src/i18n/detect.ts

@@ -2,10 +2,7 @@
  * Language Detection Utilities
  */
 
-import type { Context } from "hono";
-import { locales, baseLocale, isLocale, type Locale } from "./locales.js";
-
-export const LANGUAGE_COOKIE_NAME = "lang";
+import { locales, isLocale, type Locale } from "./locales.js";
 
 /**
  * Get display name for a language code
@@ -35,66 +32,3 @@ export function getSupportedLanguages(): Array<{ code: Locale; name: string }> {
 export function isValidLanguage(lang: unknown): lang is Locale {
   return isLocale(lang);
 }
-
-/**
- * Parse Accept-Language header and return best matching locale
- */
-export function parseAcceptLanguage(header: string | null): Locale {
-  if (!header) return baseLocale;
-
-  // Parse "en-US,en;q=0.9,zh-CN;q=0.8" format
-  const languages = header
-    .split(",")
-    .map((part) => {
-      const [lang, qPart] = part.trim().split(";");
-      const q = qPart ? parseFloat(qPart.replace("q=", "")) : 1;
-      return { lang: lang?.trim() ?? "", q };
-    })
-    .sort((a, b) => b.q - a.q);
-
-  for (const { lang } of languages) {
-    // Direct match
-    if (isLocale(lang)) {
-      return lang;
-    }
-
-    // Map common variants
-    const normalized = lang.toLowerCase();
-    if (normalized.startsWith("zh-cn") || normalized.startsWith("zh-hans")) {
-      return "zh-Hans";
-    }
-    if (
-      normalized.startsWith("zh-tw") ||
-      normalized.startsWith("zh-hk") ||
-      normalized.startsWith("zh-hant")
-    ) {
-      return "zh-Hant";
-    }
-    if (normalized.startsWith("zh")) {
-      return "zh-Hans"; // Default Chinese to Simplified
-    }
-    if (normalized.startsWith("en")) {
-      return "en";
-    }
-  }
-
-  return baseLocale;
-}
-
-/**
- * Detect user's preferred language from Hono context
- * Priority: Cookie > Accept-Language header > Default
- */
-export function detectLanguage(c: Context): Locale {
-  // 1. Check cookie (using getCookie helper)
-  const cookies = c.req.raw.headers.get("Cookie") ?? "";
-  const cookieMatch = cookies.match(new RegExp(`${LANGUAGE_COOKIE_NAME}=([^;]+)`));
-  const cookieLang = cookieMatch?.[1];
-  if (cookieLang && isLocale(cookieLang)) {
-    return cookieLang;
-  }
-
-  // 2. Check Accept-Language header
-  const acceptLang = c.req.header("Accept-Language") ?? null;
-  return parseAcceptLanguage(acceptLang);
-}

package/src/i18n/i18n.ts

@@ -1,21 +1,12 @@
 /**
- * i18n Runtime using @lingui/core with Lingui macros
+ * i18n Runtime using @lingui/core
  *
- * Usage:
- *   import { msg } from "@lingui/core/macro";
- *   import { bindI18n } from "@/i18n";
- *
- *   const { i18n } = bindI18n(c.get("i18n"));
- *
- *   // Simple message
- *   i18n._(msg({ message: "Hello", comment: "@context: Greeting" }))
- *
- *   // With interpolation
- *   i18n._(msg({ message: "Welcome, {name}!", comment: "@context: Welcome" }), { name })
- *
- * The msg macro generates hash-based IDs at compile time, which match the compiled catalogs.
+ * The SWC Lingui plugin adds hash-based IDs to t() calls when imports come
+ * from @lingui/react/macro. The runtimeConfigModule setting rewrites those
+ * imports to our custom Hono JSX implementation at build time.
  */
 
+import type { Messages } from "@lingui/core";
 import { I18n } from "@lingui/core";
 import { locales, baseLocale, isLocale, type Locale } from "./locales.js";
 import { messages as messagesEn } from "./locales/en.js";
@@ -27,6 +18,13 @@ export { locales, baseLocale, isLocale, type Locale };
 // Export I18n type for convenience
 export type { I18n };
 
+// Pre-compute merged catalogs at module load time (done once, not per request)
+// For non-English locales, merge English as fallback so missing translations
+// fall back to English rather than showing hash IDs.
+const catalogEn: Messages = messagesEn;
+const catalogZhHans: Messages = { ...messagesEn, ...messagesZhHans };
+const catalogZhHant: Messages = { ...messagesEn, ...messagesZhHant };
+
 /**
  * Create a new i18n instance for a specific locale.
  * IMPORTANT: In Cloudflare Workers (concurrent environment), we must create
@@ -35,12 +33,10 @@ export type { I18n };
 export function createI18n(locale: Locale): I18n {
   const i18n = new I18n({});
 
-  // Load all catalogs with English as fallback
-  i18n.load("en", messagesEn);
-  i18n.load("zh-Hans", { ...messagesEn, ...messagesZhHans });
-  i18n.load("zh-Hant", { ...messagesEn, ...messagesZhHant });
+  i18n.load("en", catalogEn);
+  i18n.load("zh-Hans", catalogZhHans);
+  i18n.load("zh-Hant", catalogZhHant);
 
-  // Activate locale after loading messages to avoid warnings
   i18n.activate(locale);
 
   return i18n;

package/src/i18n/index.ts

@@ -53,12 +53,9 @@ export { Trans } from "./Trans.js";
 
 // Language detection utilities
 export {
-  detectLanguage,
   isValidLanguage,
-  parseAcceptLanguage,
   getLanguageDisplayName,
   getSupportedLanguages,
-  LANGUAGE_COOKIE_NAME,
 } from "./detect.js";
 
 // Hono middleware

package/src/i18n/middleware.ts

@@ -4,8 +4,7 @@
 
 import type { MiddlewareHandler } from "hono";
 import type { I18n } from "@lingui/core";
-import { detectLanguage } from "./detect.js";
-import { createI18n, isLocale, type Locale } from "./i18n.js";
+import { createI18n, isLocale, baseLocale, type Locale } from "./i18n.js";
 import type { Services } from "../services/index.js";
 
 declare module "hono" {
@@ -19,33 +18,22 @@ declare module "hono" {
  * Hono middleware for internationalization.
  * Creates a per-request i18n instance to avoid race conditions in concurrent environments.
  *
- * Language detection priority:
- * 1. Cookie (user preference)
- * 2. Database SITE_LANGUAGE setting (site default)
- * 3. Accept-Language header
- * 4. Default locale (en)
+ * Language is determined by the database SITE_LANGUAGE setting (single source of truth).
+ * Falls back to the default locale (en) if not set.
  */
 export function i18nMiddleware(): MiddlewareHandler {
   return async (c, next) => {
-    // First try cookie and Accept-Language header
-    let lang = detectLanguage(c);
+    let lang: Locale = baseLocale;
 
-    // If no cookie is set, check database SITE_LANGUAGE setting
-    const cookies = c.req.raw.headers.get("Cookie") ?? "";
-    const hasCookie = cookies.includes("lang=");
-
-    if (!hasCookie) {
-      // Check database setting
-      const services = c.get("services") as Services | undefined;
-      if (services) {
-        try {
-          const siteLang = await services.settings.get("SITE_LANGUAGE");
-          if (siteLang && isLocale(siteLang)) {
-            lang = siteLang;
-          }
-        } catch {
-          // Ignore errors, fall back to detected language
+    const services = c.get("services") as Services | undefined;
+    if (services) {
+      try {
+        const siteLang = await services.settings.get("SITE_LANGUAGE");
+        if (siteLang && isLocale(siteLang)) {
+          lang = siteLang;
         }
+      } catch {
+        // Ignore errors, fall back to default locale
       }
     }
 

package/src/lib/constants.ts

@@ -64,4 +64,5 @@ export const ONBOARDING_STATUS = {
   COMPLETED: "completed",
 } as const;
 
-export type OnboardingStatus = (typeof ONBOARDING_STATUS)[keyof typeof ONBOARDING_STATUS];
+export type OnboardingStatus =
+  (typeof ONBOARDING_STATUS)[keyof typeof ONBOARDING_STATUS];

package/src/lib/image-processor.ts

@@ -53,7 +53,10 @@ function readExifOrientation(buffer: ArrayBuffer): number {
       const exifOffset = offset + 4;
 
       // Check for "Exif\0\0"
-      if (view.getUint32(exifOffset) !== 0x45786966 || view.getUint16(exifOffset + 4) !== 0x0000) {
+      if (
+        view.getUint32(exifOffset) !== 0x45786966 ||
+        view.getUint16(exifOffset + 4) !== 0x0000
+      ) {
         return 1;
       }
 
@@ -112,7 +115,7 @@ function calculateDimensions(
   width: number,
   height: number,
   maxWidth: number,
-  maxHeight: number
+  maxHeight: number,
 ): { width: number; height: number } {
   if (width <= maxWidth && height <= maxHeight) {
     return { width, height };
@@ -128,7 +131,10 @@ function calculateDimensions(
 /**
  * Process image file
  */
-async function process(file: File, options: ProcessOptions = {}): Promise<Blob> {
+async function process(
+  file: File,
+  options: ProcessOptions = {},
+): Promise<Blob> {
   const opts = { ...DEFAULT_OPTIONS, ...options };
 
   // Read file buffer for EXIF
@@ -145,7 +151,12 @@ async function process(file: File, options: ProcessOptions = {}): Promise<Blob>
   const srcHeight = isRotated ? img.width : img.height;
 
   // Calculate output size
-  const { width, height } = calculateDimensions(srcWidth, srcHeight, opts.maxWidth, opts.maxHeight);
+  const { width, height } = calculateDimensions(
+    srcWidth,
+    srcHeight,
+    opts.maxWidth,
+    opts.maxHeight,
+  );
 
   // Create canvas
   const canvas = document.createElement("canvas");
@@ -184,7 +195,7 @@ async function process(file: File, options: ProcessOptions = {}): Promise<Blob>
         }
       },
       opts.mimeType,
-      opts.quality
+      opts.quality,
     );
   });
 }
@@ -192,7 +203,10 @@ async function process(file: File, options: ProcessOptions = {}): Promise<Blob>
 /**
  * Process file and create a new File object
  */
-async function processToFile(file: File, options: ProcessOptions = {}): Promise<File> {
+async function processToFile(
+  file: File,
+  options: ProcessOptions = {},
+): Promise<File> {
   const blob = await process(file, options);
 
   // Generate new filename with .webp extension
@@ -206,5 +220,7 @@ export const ImageProcessor = { process, processToFile };
 
 // Expose globally for inline scripts
 if (typeof window !== "undefined") {
-  (window as unknown as { ImageProcessor: typeof ImageProcessor }).ImageProcessor = ImageProcessor;
+  (
+    window as unknown as { ImageProcessor: typeof ImageProcessor }
+  ).ImageProcessor = ImageProcessor;
 }

package/src/lib/image.ts

@@ -51,7 +51,7 @@ export interface ImageOptions {
 export function getImageUrl(
   originalUrl: string,
   transformUrl?: string,
-  options?: ImageOptions
+  options?: ImageOptions,
 ): string {
   if (!transformUrl || !options || Object.keys(options).length === 0) {
     return originalUrl;
@@ -93,7 +93,11 @@ export function getImageUrl(
  * // Returns: "https://cdn.example.com/uploads/file.webp"
  * ```
  */
-export function getMediaUrl(mediaId: string, r2Key: string, r2PublicUrl?: string): string {
+export function getMediaUrl(
+  mediaId: string,
+  r2Key: string,
+  r2PublicUrl?: string,
+): string {
   if (r2PublicUrl) {
     return `${r2PublicUrl}/${r2Key}`;
   }

package/src/lib/schemas.ts

@@ -62,7 +62,11 @@ export const UpdatePostSchema = CreatePostSchema.partial();
  * // type is PostType, throws if invalid
  * ```
  */
-export function parseFormData<T>(formData: FormData, key: string, schema: z.ZodSchema<T>): T {
+export function parseFormData<T>(
+  formData: FormData,
+  key: string,
+  schema: z.ZodSchema<T>,
+): T {
   const value = formData.get(key);
   if (value === null) {
     throw new Error(`Missing required field: ${key}`);
@@ -82,7 +86,7 @@ export function parseFormData<T>(formData: FormData, key: string, schema: z.ZodS
 export function parseFormDataOptional<T>(
   formData: FormData,
   key: string,
-  schema: z.ZodSchema<T>
+  schema: z.ZodSchema<T>,
 ): T | undefined {
   const value = formData.get(key);
   if (value === null || value === "") {