@jant/core 0.2.11 → 0.2.13

package/src/db/schema.ts

@@ -4,7 +4,12 @@
  * Database schema for Jant
  */
 
-import { sqliteTable, text, integer, primaryKey } from "drizzle-orm/sqlite-core";
+import {
+  sqliteTable,
+  text,
+  integer,
+  primaryKey,
+} from "drizzle-orm/sqlite-core";
 
 // =============================================================================
 // Posts
@@ -12,8 +17,12 @@ import { sqliteTable, text, integer, primaryKey } from "drizzle-orm/sqlite-core"
 
 export const posts = sqliteTable("posts", {
   id: integer("id").primaryKey({ autoIncrement: true }),
-  type: text("type", { enum: ["note", "article", "link", "quote", "image", "page"] }).notNull(),
-  visibility: text("visibility", { enum: ["featured", "quiet", "unlisted", "draft"] })
+  type: text("type", {
+    enum: ["note", "article", "link", "quote", "image", "page"],
+  }).notNull(),
+  visibility: text("visibility", {
+    enum: ["featured", "quiet", "unlisted", "draft"],
+  })
     .notNull()
     .default("quiet"),
   title: text("title"),
@@ -77,7 +86,7 @@ export const postCollections = sqliteTable(
       .references(() => collections.id),
     addedAt: integer("added_at").notNull(),
   },
-  (table) => [primaryKey({ columns: [table.postId, table.collectionId] })]
+  (table) => [primaryKey({ columns: [table.postId, table.collectionId] })],
 );
 
 // =============================================================================
@@ -111,7 +120,9 @@ export const user = sqliteTable("user", {
   id: text("id").primaryKey(),
   name: text("name").notNull(),
   email: text("email").notNull().unique(),
-  emailVerified: integer("email_verified", { mode: "boolean" }).notNull().default(false),
+  emailVerified: integer("email_verified", { mode: "boolean" })
+    .notNull()
+    .default(false),
   image: text("image"),
   role: text("role").default("admin"),
   createdAt: integer("created_at", { mode: "timestamp" }).notNull(),
@@ -141,8 +152,12 @@ export const account = sqliteTable("account", {
   accessToken: text("access_token"),
   refreshToken: text("refresh_token"),
   idToken: text("id_token"),
-  accessTokenExpiresAt: integer("access_token_expires_at", { mode: "timestamp" }),
-  refreshTokenExpiresAt: integer("refresh_token_expires_at", { mode: "timestamp" }),
+  accessTokenExpiresAt: integer("access_token_expires_at", {
+    mode: "timestamp",
+  }),
+  refreshTokenExpiresAt: integer("refresh_token_expires_at", {
+    mode: "timestamp",
+  }),
   scope: text("scope"),
   password: text("password"),
   createdAt: integer("created_at", { mode: "timestamp" }).notNull(),

package/src/i18n/EXAMPLES.md

@@ -14,7 +14,7 @@ dashRoute.get("/", async (c) => {
   return c.html(
     <I18nProvider c={c}>
       <MyApp />
-    </I18nProvider>
+    </I18nProvider>,
   );
 });
 
@@ -22,7 +22,9 @@ dashRoute.get("/", async (c) => {
 function MyApp() {
   const { t } = useLingui();
 
-  return <h1>{t({ message: "Dashboard", comment: "@context: Page title" })}</h1>;
+  return (
+    <h1>{t({ message: "Dashboard", comment: "@context: Page title" })}</h1>
+  );
 }
 ```
 
@@ -32,11 +34,11 @@ The `comment` field provides context for AI translators, improving translation q
 
 ```tsx
 // ✅ Good - clear context
-t({ message: "Dashboard", comment: "@context: Page title" })
-t({ message: "Dashboard", comment: "@context: Navigation link" })
+t({ message: "Dashboard", comment: "@context: Page title" });
+t({ message: "Dashboard", comment: "@context: Navigation link" });
 
 // ❌ Bad - no context (translator might choose wrong word)
-t({ message: "Dashboard" })
+t({ message: "Dashboard" });
 ```
 
 ---
@@ -53,12 +55,18 @@ dashRoute.get("/", async (c) => {
   return c.html(
     <I18nProvider c={c}>
       <Dashboard postCount={posts.length} username="Alice" />
-    </I18nProvider>
+    </I18nProvider>,
   );
 });
 
 // Component: use useLingui() hook
-function Dashboard({ postCount, username }: { postCount: number; username: string }) {
+function Dashboard({
+  postCount,
+  username,
+}: {
+  postCount: number;
+  username: string;
+}) {
   const { t } = useLingui();
 
   return (
@@ -69,23 +77,33 @@ function Dashboard({ postCount, username }: { postCount: number; username: strin
       {/* 2. With variables */}
       <p>
         {t(
-          { message: "Welcome back, {name}!", comment: "@context: Welcome message" },
-          { name: username }
+          {
+            message: "Welcome back, {name}!",
+            comment: "@context: Welcome message",
+          },
+          { name: username },
         )}
       </p>
 
       {/* 3. With dynamic values */}
       <p>
         {t(
-          { message: "You have {count} posts", comment: "@context: Post count" },
-          { count: postCount }
+          {
+            message: "You have {count} posts",
+            comment: "@context: Post count",
+          },
+          { count: postCount },
         )}
       </p>
 
       {/* 4. With embedded components */}
       <p>
         <Trans comment="@context: Help text">
-          Read the <a href="/docs" class="underline">documentation</a> for help
+          Read the{" "}
+          <a href="/docs" class="underline">
+            documentation
+          </a>{" "}
+          for help
         </Trans>
       </p>
     </div>
@@ -126,13 +144,16 @@ const { t } = useLingui();
 // For dynamic content, use t() with placeholders
 <p>
   {t(
-    { message: "Visit {linkStart}our website{linkEnd}", comment: "@context: Website link" },
+    {
+      message: "Visit {linkStart}our website{linkEnd}",
+      comment: "@context: Website link",
+    },
     {
       linkStart: '<a href="/" class="text-primary">',
-      linkEnd: '</a>',
-    }
+      linkEnd: "</a>",
+    },
   )}
-</p>
+</p>;
 ```
 
 ---
@@ -149,8 +170,8 @@ dashRoute.get("/", async (c) => {
 
   return c.html(
     <Layout>
-      <MyComponent c={c} />  {/* Must pass c prop */}
-    </Layout>
+      <MyComponent c={c} /> {/* Must pass c prop */}
+    </Layout>,
   );
 });
 
@@ -159,7 +180,7 @@ function MyComponent({ c }: { c: Context }) {
   const title = i18n._({ message: "Dashboard", comment: "@context: Title" });
   const greeting = i18n._(
     { message: "Hello {name}", comment: "@context: Greeting" },
-    { name: "Alice" }
+    { name: "Alice" },
   );
 
   return <h1>{title}</h1>;
@@ -175,9 +196,9 @@ dashRoute.get("/", async (c) => {
   return c.html(
     <I18nProvider c={c}>
       <Layout>
-        <MyComponent />  {/* No props needed */}
+        <MyComponent /> {/* No props needed */}
       </Layout>
-    </I18nProvider>
+    </I18nProvider>,
   );
 });
 
@@ -186,7 +207,7 @@ function MyComponent() {
   const title = t({ message: "Dashboard", comment: "@context: Title" });
   const greeting = t(
     { message: "Hello {name}", comment: "@context: Greeting" },
-    { name: "Alice" }
+    { name: "Alice" },
   );
 
   return <h1>{title}</h1>;
@@ -214,8 +235,9 @@ function MyComponent() {
 A: Lingui uses a build-time extraction process. The `t()` function expects a message descriptor object that gets transformed by Lingui's macro system during the build. If you pass a plain string, the extraction tool won't be able to find and extract the message for translation.
 
 You must use the object syntax:
+
 ```tsx
-t({ message: "Dashboard", comment: "@context: Page title" })
+t({ message: "Dashboard", comment: "@context: Page title" });
 ```
 
 ### Q: Can I use Lingui's official Trans component?

package/src/i18n/README.md

@@ -14,7 +14,7 @@ dashRoute.get("/", async (c) => {
   return c.html(
     <I18nProvider c={c}>
       <YourApp />
-    </I18nProvider>
+    </I18nProvider>,
   );
 });
 ```
@@ -77,15 +77,21 @@ 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>
 
       {/* 3. With embedded components - use Trans */}
       <p>
         <Trans comment="@context: Help text">
-          Read the <a href="/docs" class="underline">documentation</a>
+          Read the{" "}
+          <a href="/docs" class="underline">
+            documentation
+          </a>
         </Trans>
       </p>
     </div>
@@ -99,7 +105,7 @@ dashRoute.get("/", async (c) => {
   return c.html(
     <I18nProvider c={c}>
       <DashboardContent postCount={posts.length} />
-    </I18nProvider>
+    </I18nProvider>,
   );
 });
 ```
@@ -118,8 +124,8 @@ dashRoute.get("/", async (c) => {
 
   return c.html(
     <Layout title={i18n._({ message: "Dashboard", comment: "@context: ..." })}>
-      <MyComponent c={c} />  {/* Need to pass c prop */}
-    </Layout>
+      <MyComponent c={c} /> {/* Need to pass c prop */}
+    </Layout>,
   );
 });
 
@@ -138,14 +144,14 @@ dashRoute.get("/", async (c) => {
   return c.html(
     <I18nProvider c={c}>
       <Layout>
-        <MyComponent />  {/* No need to pass c prop */}
+        <MyComponent /> {/* No need to pass c prop */}
       </Layout>
-    </I18nProvider>
+    </I18nProvider>,
   );
 });
 
 function MyComponent() {
-  const { t } = useLingui();  // Like React hook
+  const { t } = useLingui(); // Like React hook
   return <h1>{t({ message: "Hello", comment: "@context: ..." })}</h1>;
 }
 ```
@@ -159,10 +165,10 @@ function MyComponent() {
 ```tsx
 // ✅ Correct - comment is crucial for AI translation
 const { t } = useLingui();
-t({ message: "Dashboard", comment: "@context: Page title" })
+t({ message: "Dashboard", comment: "@context: Page title" });
 
 // ❌ Wrong - missing comment reduces translation quality
-t({ message: "Dashboard" })
+t({ message: "Dashboard" });
 ```
 
 ### 2. **I18nProvider must wrap your app**
@@ -172,11 +178,11 @@ t({ message: "Dashboard" })
 c.html(
   <I18nProvider c={c}>
     <App />
-  </I18nProvider>
-)
+  </I18nProvider>,
+);
 
 // ❌ Wrong - useLingui() will throw error
-c.html(<App />)  // useLingui() inside App won't find i18n context
+c.html(<App />); // useLingui() inside App won't find i18n context
 ```
 
 ### 3. **useLingui() only works inside components**
@@ -201,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" },
+});
 ```
 
 ---
@@ -227,14 +240,14 @@ Provides i18n context to all child components. Must wrap your app in route handl
 
 ```tsx
 interface I18nProviderProps {
-  c: Context;  // Hono context
+  c: Context; // Hono context
   children: JSX.Element;
 }
 
 // Usage
 <I18nProvider c={c}>
   <YourApp />
-</I18nProvider>
+</I18nProvider>;
 ```
 
 ### `useLingui()`
@@ -243,10 +256,10 @@ Hook to access i18n functionality inside components. Must be used within `I18nPr
 
 ```tsx
 function useLingui(): {
-  i18n: I18n;  // Lingui i18n instance
+  i18n: I18n; // Lingui i18n instance
   t: (descriptor: MessageDescriptor, values?: Record<string, any>) => string;
   _: (descriptor: MessageDescriptor, values?: Record<string, any>) => string;
-}
+};
 
 // Usage
 function MyComponent() {
@@ -263,15 +276,15 @@ Component for translations with embedded JSX elements. Simplified implementation
 
 ```tsx
 interface TransProps {
-  comment?: string;  // @context comment for translators
-  id?: string;       // Optional message ID
-  children: JSX.Element;  // JSX content with embedded elements
+  comment?: string; // @context comment for translators
+  id?: string; // Optional message ID
+  children: JSX.Element; // JSX content with embedded elements
 }
 
 // Usage
 <Trans comment="@context: Help text">
   Read the <a href="/docs">documentation</a>
-</Trans>
+</Trans>;
 ```
 
 **Note**: This is a simplified implementation. For complex translations with dynamic content, use `t()` with placeholders instead.
@@ -290,6 +303,7 @@ This implementation mimics React's Context API but is optimized for Hono JSX SSR
 ### Why Global State is Safe
 
 Unlike React (client-side with multiple re-renders), Hono JSX renders once per request on the server:
+
 - Request arrives → I18nProvider sets global i18n → Components render → Response sent
 - Next request → New i18n instance → Components render → Response sent
 

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];