@jant/core 0.6.14 → 0.6.15

package/src/db/migrations/pg/meta/_journal.json

@@ -176,6 +176,34 @@
       "when": 1781807044981,
       "tag": "0024_high_violations",
       "breakpoints": true
+    },
+    {
+      "idx": 25,
+      "version": "7",
+      "when": 1784131458842,
+      "tag": "0025_moaning_epoch",
+      "breakpoints": true
+    },
+    {
+      "idx": 26,
+      "version": "7",
+      "when": 1784343834845,
+      "tag": "0026_talented_killer_shrike",
+      "breakpoints": true
+    },
+    {
+      "idx": 27,
+      "version": "7",
+      "when": 1784436805462,
+      "tag": "0027_short_cannonball",
+      "breakpoints": true
+    },
+    {
+      "idx": 28,
+      "version": "7",
+      "when": 1784531392184,
+      "tag": "0028_perfect_sharon_carter",
+      "breakpoints": true
     }
   ]
 }

package/src/db/pg/schema.ts

@@ -19,6 +19,7 @@ import {
   customType,
 } from "drizzle-orm/pg-core";
 import { sql } from "drizzle-orm";
+import { SYSTEM_NAV_KEY_VALUES } from "../../types/constants.js";
 
 const SITE_STATUSES = ["active", "suspended"] as const;
 const SITE_DOMAIN_KINDS = ["primary", "alias"] as const;
@@ -27,16 +28,8 @@ const FORMATS = ["note", "link", "quote"] as const;
 const STATUSES = ["draft", "published"] as const;
 const VISIBILITIES = ["public", "latest_hidden", "private"] as const;
 const COLLECTION_SORT_ORDERS = ["newest", "oldest", "rating_desc"] as const;
-const NAV_ITEM_TYPES = ["link", "system", "collection"] as const;
+const NAV_ITEM_TYPES = ["link", "system", "collection", "page"] as const;
 const NAV_ITEM_PLACEMENTS = ["header", "more"] as const;
-const SYSTEM_NAV_KEYS = [
-  "latest",
-  "featured",
-  "collections",
-  "archive",
-  "rss",
-  "settings",
-] as const;
 const UPLOAD_SESSION_STATES = [
   "pending",
   "uploaded",
@@ -167,6 +160,7 @@ export const posts = pgTable(
     url: text("url"),
     body: text("body"),
     bodyHtml: text("body_html"),
+    bodyHtmlVersion: integer("body_html_version").notNull().default(1),
     bodyText: text("body_text"),
     quoteText: text("quote_text"),
     summary: text("summary"),
@@ -242,8 +236,8 @@ export const posts = pgTable(
       .where(
         sql`${table.replyToId} IS NOT NULL AND ${table.status} = 'published'`,
       ),
-    index("idx_post_site_featured_featured_at")
-      .on(table.siteId, table.featuredAt, table.threadId, table.id)
+    index("idx_post_site_featured_thread_published")
+      .on(table.siteId, table.threadId, table.publishedAt, table.id)
       .where(
         sql`${table.status} = 'published' AND ${table.featuredAt} IS NOT NULL`,
       ),
@@ -591,16 +585,16 @@ export const collectionDirectoryItems = pgTable(
 );
 
 // =============================================================================
-// Post-Collection Junction Table (M:N)
+// Thread-Collection Junction Table (M:N)
 // =============================================================================
 
-export const postCollections = pgTable(
-  "post_collection",
+export const threadCollections = pgTable(
+  "thread_collection",
   {
     siteId: text("site_id")
       .notNull()
       .references(() => sites.id, { onDelete: "cascade" }),
-    postId: text("post_id")
+    threadId: text("thread_id")
       .notNull()
       .references(() => posts.id, { onDelete: "cascade" }),
     collectionId: text("collection_id")
@@ -611,16 +605,16 @@ export const postCollections = pgTable(
     pinnedAt: integer("pinned_at"),
   },
   (table) => [
-    primaryKey({ columns: [table.siteId, table.postId, table.collectionId] }),
-    index("idx_post_collection_site_collection_id").on(
+    primaryKey({ columns: [table.siteId, table.threadId, table.collectionId] }),
+    index("idx_thread_collection_site_collection_id").on(
       table.siteId,
       table.collectionId,
     ),
-    index("idx_post_collection_site_collection_created_post").on(
+    index("idx_thread_collection_site_collection_created_thread").on(
       table.siteId,
       table.collectionId,
       table.createdAt,
-      table.postId,
+      table.threadId,
     ),
   ],
 );
@@ -642,11 +636,14 @@ export const navItems = pgTable(
       .notNull()
       .default("link"),
     systemKey: text("system_key", {
-      enum: SYSTEM_NAV_KEYS,
+      enum: SYSTEM_NAV_KEY_VALUES,
     }),
     collectionId: text("collection_id").references(() => collections.id, {
       onDelete: "cascade",
     }),
+    postId: text("post_id").references(() => posts.id, {
+      onDelete: "cascade",
+    }),
     label: text("label").notNull(),
     url: text("url").notNull(),
     placement: text("placement", {
@@ -673,14 +670,22 @@ export const navItems = pgTable(
         ${table.type} = 'link'
         AND ${table.systemKey} IS NULL
         AND ${table.collectionId} IS NULL
+        AND ${table.postId} IS NULL
       ) OR (
         ${table.type} = 'system'
         AND ${table.systemKey} IS NOT NULL
         AND ${table.collectionId} IS NULL
+        AND ${table.postId} IS NULL
       ) OR (
         ${table.type} = 'collection'
         AND ${table.systemKey} IS NULL
         AND ${table.collectionId} IS NOT NULL
+        AND ${table.postId} IS NULL
+      ) OR (
+        ${table.type} = 'page'
+        AND ${table.systemKey} IS NULL
+        AND ${table.collectionId} IS NULL
+        AND ${table.postId} IS NOT NULL
       )`,
     ),
     uniqueIndex("uq_nav_item_site_position").on(table.siteId, table.position),
@@ -690,6 +695,9 @@ export const navItems = pgTable(
     uniqueIndex("uq_nav_item_site_collection_id")
       .on(table.siteId, table.collectionId)
       .where(sql`${table.collectionId} IS NOT NULL`),
+    uniqueIndex("uq_nav_item_site_post_id")
+      .on(table.siteId, table.postId)
+      .where(sql`${table.postId} IS NOT NULL`),
   ],
 );
 

package/src/db/rehearsal-fixtures/demo-current.json

@@ -1,25 +1,60 @@
 {
   "name": "demo-current",
-  "baseMigrationTag": "0003_fts_site_aware",
+  "baseMigrationTag": "0026_absent_rhodey",
   "seedPath": "./demo-current.sql",
   "assertions": [
     {
       "name": "published posts exist",
       "sql": "SELECT COUNT(*) AS count FROM post",
       "column": "count",
-      "atLeast": 1
+      "equals": 3
     },
     {
       "name": "collections exist",
       "sql": "SELECT COUNT(*) AS count FROM collection",
       "column": "count",
-      "atLeast": 1
+      "equals": 2
     },
     {
       "name": "fts index populated",
       "sql": "SELECT COUNT(*) AS count FROM post_fts",
       "column": "count",
-      "atLeast": 1
+      "equals": 3
+    },
+    {
+      "name": "thread collection union preserves both collections",
+      "sql": "SELECT COUNT(*) AS count FROM thread_collection",
+      "column": "count",
+      "equals": 2
+    },
+    {
+      "name": "shared collection metadata is aggregated across the thread",
+      "sql": "SELECT COUNT(*) AS count FROM thread_collection WHERE site_id = 'sit_01kme7j7j1f4m7s2k8r5c9t0qb' AND thread_id = 'pst_01kme7ja2mf4m7s2k8r5c9t0qf' AND collection_id = 'col_01kme7j8f9f4m7s2k8r5c9t0qc' AND created_at = 1774200040 AND position = 1 AND pinned_at = 1774200500",
+      "column": "count",
+      "equals": 1
+    },
+    {
+      "name": "child-only collection becomes thread membership",
+      "sql": "SELECT COUNT(*) AS count FROM thread_collection WHERE site_id = 'sit_01kme7j7j1f4m7s2k8r5c9t0qb' AND thread_id = 'pst_01kme7ja2mf4m7s2k8r5c9t0qf' AND collection_id = 'col_01kme7j8f9f4m7s2k8r5c9t0qd' AND created_at = 1774200060 AND position = 4 AND pinned_at = 1774200600",
+      "column": "count",
+      "equals": 1
+    },
+    {
+      "name": "thread collection targets are roots",
+      "sql": "SELECT COUNT(*) AS count FROM thread_collection tc INNER JOIN post root ON root.site_id = tc.site_id AND root.id = tc.thread_id WHERE root.reply_to_id IS NOT NULL OR root.thread_id <> root.id",
+      "column": "count",
+      "equals": 0
+    },
+    {
+      "name": "legacy post collection table is removed",
+      "sql": "SELECT COUNT(*) AS count FROM sqlite_master WHERE type = 'table' AND name = 'post_collection'",
+      "column": "count",
+      "equals": 0
+    },
+    {
+      "name": "foreign keys remain valid",
+      "sql": "PRAGMA foreign_key_check",
+      "rowCount": 0
     }
   ]
 }

package/src/db/rehearsal-fixtures/demo-current.sql

@@ -31,6 +31,24 @@ INSERT INTO "collection" (
   1774200010
 );
 
+INSERT INTO "collection" (
+  "id",
+  "site_id",
+  "title",
+  "description",
+  "sort_order",
+  "created_at",
+  "updated_at"
+) VALUES (
+  'col_01kme7j8f9f4m7s2k8r5c9t0qd',
+  'sit_01kme7j7j1f4m7s2k8r5c9t0qb',
+  'Child-only Notes',
+  'Collection assigned only to a reply before the Thread migration.',
+  'newest',
+  1774200011,
+  1774200011
+);
+
 INSERT INTO "nav_item" (
   "id",
   "site_id",
@@ -149,18 +167,115 @@ INSERT INTO "post" (
   1774200020
 );
 
-INSERT INTO "post_collection" (
+INSERT INTO "post" (
+  "id",
   "site_id",
-  "post_id",
-  "collection_id",
-  "created_at"
+  "format",
+  "status",
+  "visibility",
+  "title",
+  "body",
+  "body_html",
+  "body_text",
+  "reply_to_id",
+  "thread_id",
+  "published_at",
+  "last_activity_at",
+  "created_at",
+  "updated_at"
 ) VALUES (
+  'pst_01kme7ja2mf4m7s2k8r5c9t0qh',
   'sit_01kme7j7j1f4m7s2k8r5c9t0qb',
+  'note',
+  'published',
+  NULL,
+  'First rehearsal reply',
+  '{"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","text":"First migration rehearsal reply."}]}]}',
+  '<p>First migration rehearsal reply.</p>',
+  'First migration rehearsal reply.',
   'pst_01kme7ja2mf4m7s2k8r5c9t0qf',
-  'col_01kme7j8f9f4m7s2k8r5c9t0qc',
-  1774200021
+  'pst_01kme7ja2mf4m7s2k8r5c9t0qf',
+  1774200030,
+  1774200030,
+  1774200030,
+  1774200030
 );
 
+INSERT INTO "post" (
+  "id",
+  "site_id",
+  "format",
+  "status",
+  "visibility",
+  "title",
+  "body",
+  "body_html",
+  "body_text",
+  "reply_to_id",
+  "thread_id",
+  "published_at",
+  "last_activity_at",
+  "created_at",
+  "updated_at"
+) VALUES (
+  'pst_01kme7ja2mf4m7s2k8r5c9t0qi',
+  'sit_01kme7j7j1f4m7s2k8r5c9t0qb',
+  'note',
+  'published',
+  NULL,
+  'Second rehearsal reply',
+  '{"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","text":"Second migration rehearsal reply."}]}]}',
+  '<p>Second migration rehearsal reply.</p>',
+  'Second migration rehearsal reply.',
+  'pst_01kme7ja2mf4m7s2k8r5c9t0qh',
+  'pst_01kme7ja2mf4m7s2k8r5c9t0qf',
+  1774200040,
+  1774200040,
+  1774200040,
+  1774200040
+);
+
+INSERT INTO "post_collection" (
+  "site_id",
+  "post_id",
+  "collection_id",
+  "created_at",
+  "position",
+  "pinned_at"
+) VALUES
+  (
+    'sit_01kme7j7j1f4m7s2k8r5c9t0qb',
+    'pst_01kme7ja2mf4m7s2k8r5c9t0qf',
+    'col_01kme7j8f9f4m7s2k8r5c9t0qc',
+    1774200021,
+    7,
+    1774200300
+  ),
+  (
+    'sit_01kme7j7j1f4m7s2k8r5c9t0qb',
+    'pst_01kme7ja2mf4m7s2k8r5c9t0qh',
+    'col_01kme7j8f9f4m7s2k8r5c9t0qc',
+    1774200040,
+    5,
+    NULL
+  ),
+  (
+    'sit_01kme7j7j1f4m7s2k8r5c9t0qb',
+    'pst_01kme7ja2mf4m7s2k8r5c9t0qi',
+    'col_01kme7j8f9f4m7s2k8r5c9t0qc',
+    1774200030,
+    1,
+    1774200500
+  ),
+  (
+    'sit_01kme7j7j1f4m7s2k8r5c9t0qb',
+    'pst_01kme7ja2mf4m7s2k8r5c9t0qh',
+    'col_01kme7j8f9f4m7s2k8r5c9t0qd',
+    1774200060,
+    4,
+    1774200600
+  );
+
 INSERT INTO "path_registry" (
   "id",
   "site_id",

package/src/db/schema.ts

@@ -15,6 +15,7 @@ import {
   check,
 } from "drizzle-orm/sqlite-core";
 import { sql } from "drizzle-orm";
+import { SYSTEM_NAV_KEY_VALUES } from "../types/constants.js";
 
 const SITE_STATUSES = ["active", "suspended"] as const;
 const SITE_DOMAIN_KINDS = ["primary", "alias"] as const;
@@ -23,16 +24,8 @@ const FORMATS = ["note", "link", "quote"] as const;
 const STATUSES = ["draft", "published"] as const;
 const VISIBILITIES = ["public", "latest_hidden", "private"] as const;
 const COLLECTION_SORT_ORDERS = ["newest", "oldest", "rating_desc"] as const;
-const NAV_ITEM_TYPES = ["link", "system", "collection"] as const;
+const NAV_ITEM_TYPES = ["link", "system", "collection", "page"] as const;
 const NAV_ITEM_PLACEMENTS = ["header", "more"] as const;
-const SYSTEM_NAV_KEYS = [
-  "latest",
-  "featured",
-  "collections",
-  "archive",
-  "rss",
-  "settings",
-] as const;
 const UPLOAD_SESSION_STATES = [
   "pending",
   "uploaded",
@@ -161,6 +154,7 @@ export const posts = sqliteTable(
     url: text("url"),
     body: text("body"),
     bodyHtml: text("body_html"),
+    bodyHtmlVersion: integer("body_html_version").notNull().default(1),
     bodyText: text("body_text"),
     quoteText: text("quote_text"),
     summary: text("summary"),
@@ -227,8 +221,8 @@ export const posts = sqliteTable(
       .where(
         sql`${table.replyToId} IS NOT NULL AND ${table.status} = 'published'`,
       ),
-    index("idx_post_site_featured_featured_at")
-      .on(table.siteId, table.featuredAt, table.threadId, table.id)
+    index("idx_post_site_featured_thread_published")
+      .on(table.siteId, table.threadId, table.publishedAt, table.id)
       .where(
         sql`${table.status} = 'published' AND ${table.featuredAt} IS NOT NULL`,
       ),
@@ -571,16 +565,16 @@ export const collectionDirectoryItems = sqliteTable(
 );
 
 // =============================================================================
-// Post-Collection Junction Table (M:N)
+// Thread-Collection Junction Table (M:N)
 // =============================================================================
 
-export const postCollections = sqliteTable(
-  "post_collection",
+export const threadCollections = sqliteTable(
+  "thread_collection",
   {
     siteId: text("site_id")
       .notNull()
       .references(() => sites.id, { onDelete: "cascade" }),
-    postId: text("post_id")
+    threadId: text("thread_id")
       .notNull()
       .references(() => posts.id, { onDelete: "cascade" }),
     collectionId: text("collection_id")
@@ -591,16 +585,16 @@ export const postCollections = sqliteTable(
     pinnedAt: integer("pinned_at"),
   },
   (table) => [
-    primaryKey({ columns: [table.siteId, table.postId, table.collectionId] }),
-    index("idx_post_collection_site_collection_id").on(
+    primaryKey({ columns: [table.siteId, table.threadId, table.collectionId] }),
+    index("idx_thread_collection_site_collection_id").on(
       table.siteId,
       table.collectionId,
     ),
-    index("idx_post_collection_site_collection_created_post").on(
+    index("idx_thread_collection_site_collection_created_thread").on(
       table.siteId,
       table.collectionId,
       table.createdAt,
-      table.postId,
+      table.threadId,
     ),
   ],
 );
@@ -622,11 +616,14 @@ export const navItems = sqliteTable(
       .notNull()
       .default("link"),
     systemKey: text("system_key", {
-      enum: SYSTEM_NAV_KEYS,
+      enum: SYSTEM_NAV_KEY_VALUES,
     }),
     collectionId: text("collection_id").references(() => collections.id, {
       onDelete: "cascade",
     }),
+    postId: text("post_id").references(() => posts.id, {
+      onDelete: "cascade",
+    }),
     label: text("label").notNull(),
     url: text("url").notNull(),
     placement: text("placement", {
@@ -653,14 +650,22 @@ export const navItems = sqliteTable(
         ${table.type} = 'link'
         AND ${table.systemKey} IS NULL
         AND ${table.collectionId} IS NULL
+        AND ${table.postId} IS NULL
       ) OR (
         ${table.type} = 'system'
         AND ${table.systemKey} IS NOT NULL
         AND ${table.collectionId} IS NULL
+        AND ${table.postId} IS NULL
       ) OR (
         ${table.type} = 'collection'
         AND ${table.systemKey} IS NULL
         AND ${table.collectionId} IS NOT NULL
+        AND ${table.postId} IS NULL
+      ) OR (
+        ${table.type} = 'page'
+        AND ${table.systemKey} IS NULL
+        AND ${table.collectionId} IS NULL
+        AND ${table.postId} IS NOT NULL
       )`,
     ),
     uniqueIndex("uq_nav_item_site_position").on(table.siteId, table.position),
@@ -670,6 +675,9 @@ export const navItems = sqliteTable(
     uniqueIndex("uq_nav_item_site_collection_id")
       .on(table.siteId, table.collectionId)
       .where(sql`${table.collectionId} IS NOT NULL`),
+    uniqueIndex("uq_nav_item_site_post_id")
+      .on(table.siteId, table.postId)
+      .where(sql`${table.postId} IS NOT NULL`),
   ],
 );
 

package/src/i18n/__tests__/detect.test.ts

@@ -18,8 +18,14 @@ describe("detectLocaleFromHeader", () => {
     expect(detectLocaleFromHeader("fr")).toBe("en");
   });
 
-  it("falls back to en for Chinese (not a supported UI locale)", () => {
-    expect(detectLocaleFromHeader("zh-CN")).toBe("en");
+  it("maps Simplified Chinese browser locales to zh-Hans", () => {
+    expect(detectLocaleFromHeader("zh-CN")).toBe("zh-Hans");
+    expect(detectLocaleFromHeader("zh-SG")).toBe("zh-Hans");
+  });
+
+  it("maps Traditional Chinese browser locales to zh-Hant", () => {
+    expect(detectLocaleFromHeader("zh-TW")).toBe("zh-Hant");
+    expect(detectLocaleFromHeader("zh-HK")).toBe("zh-Hant");
   });
 
   it("returns en for undefined", () => {

package/src/i18n/detect.ts

@@ -43,6 +43,11 @@ function mapTagToLocale(tag: string): Locale | undefined {
   const normalized = tag.trim().toLowerCase();
   if (!normalized) return undefined;
 
+  const cjkProfile = getCjkFontFromLanguageTag(normalized);
+  if (cjkProfile === "zh-Hans" || cjkProfile === "zh-Hant") {
+    return cjkProfile;
+  }
+
   const primary = normalized.split("-")[0];
   if (isLocale(primary)) return primary;
 
@@ -90,7 +95,7 @@ export function detectLocaleFromHeader(header: string | undefined): Locale {
   return baseLocale;
 }
 
-/** Valid CJK serif font locale values */
+/** Valid CJK font profile values */
 export const CJK_SERIF_FONT_VALUES = [
   "off",
   "zh-Hans",
@@ -111,12 +116,16 @@ export function isCjkSerifFont(value: unknown): value is CjkSerifFont {
 }
 
 /**
- * Map a BCP 47 language tag to a CJK serif font value.
+ * Map a BCP 47 language tag to a CJK font profile.
  *
  * @param tag - BCP 47 language tag (e.g. "zh-CN", "ja")
- * @returns CJK serif font value, or `undefined` if not a CJK language
+ * @returns CJK font profile, or `undefined` if not a CJK language
+ * @example
+ * getCjkFontFromLanguageTag("zh-TW") // "zh-Hant"
  */
-function mapTagToCjkFont(tag: string): CjkSerifFont | undefined {
+export function getCjkFontFromLanguageTag(
+  tag: string,
+): Exclude<CjkSerifFont, "off"> | undefined {
   const normalized = tag.trim().toLowerCase();
   if (!normalized) return undefined;
 
@@ -177,7 +186,7 @@ export function detectCjkFontFromHeader(
   entries.sort((a, b) => b.q - a.q);
 
   for (const { tag } of entries) {
-    const font = mapTagToCjkFont(tag);
+    const font = getCjkFontFromLanguageTag(tag);
     if (font) return font;
   }