@jant/core 0.3.23 → 0.3.24

package/src/__tests__/helpers/db.ts

@@ -1,7 +1,7 @@
 /**
  * Test Database Helper
  *
- * Creates an in-memory SQLite database with all migrations applied.
+ * Creates an in-memory SQLite database with all migrations applied (up to v2).
  * Used for service integration tests.
  */
 
@@ -13,11 +13,22 @@ import { resolve } from "path";
 
 const MIGRATIONS_DIR = resolve(import.meta.dirname, "../../db/migrations");
 
+/**
+ * Applies a migration file, splitting on Drizzle statement breakpoints.
+ */
+function applyMigration(sqlite: Database.Database, filename: string) {
+  const migration = readFileSync(resolve(MIGRATIONS_DIR, filename), "utf-8");
+  for (const sql of migration.split("--> statement-breakpoint")) {
+    const trimmed = sql.trim();
+    if (trimmed) sqlite.exec(trimmed);
+  }
+}
+
 /**
  * Creates a fresh in-memory SQLite database with all migrations applied.
  * Each call returns an isolated database instance for test isolation.
  *
- * @param options.fts - Whether to apply FTS5 migration (default: false).
+ * @param options.fts - Whether to enable FTS5 for search tests (default: false).
  *   The trigram tokenizer used in production may not be available in all
  *   better-sqlite3 builds, so FTS is opt-in for tests that need it.
  */
@@ -28,87 +39,53 @@ export function createTestDatabase(options?: { fts?: boolean }) {
   sqlite.pragma("journal_mode = WAL");
   sqlite.pragma("foreign_keys = ON");
 
-  // Apply base schema migration
-  const migration0 = readFileSync(
-    resolve(MIGRATIONS_DIR, "0000_square_wallflower.sql"),
+  // Apply v1 base migrations (0000-0004)
+  applyMigration(sqlite, "0000_square_wallflower.sql");
+  // Skip 0001 (FTS) — v2 migration will create updated FTS if needed
+  applyMigration(sqlite, "0002_add_media_attachments.sql");
+  applyMigration(sqlite, "0003_add_navigation_links.sql");
+  applyMigration(sqlite, "0004_add_storage_provider.sql");
+
+  // Apply v2 schema migration (0005)
+  // Split FTS-related statements so we can handle them separately
+  const v2Migration = readFileSync(
+    resolve(MIGRATIONS_DIR, "0005_v2_schema_migration.sql"),
     "utf-8",
   );
 
-  // Drizzle migrations use --> statement-breakpoint as separator
-  for (const sql of migration0.split("--> statement-breakpoint")) {
-    const trimmed = sql.trim();
-    if (trimmed) sqlite.exec(trimmed);
-  }
+  for (const stmt of v2Migration.split("--> statement-breakpoint")) {
+    const trimmed = stmt.trim();
+    if (!trimmed) continue;
+
+    // Skip FTS-related statements if FTS not requested
+    const isFts = trimmed.includes("posts_fts");
+    if (!options?.fts && isFts) continue;
 
-  // Optionally apply FTS5 migration (with fallback tokenizer)
-  if (options?.fts) {
     try {
-      const migration1 = readFileSync(
-        resolve(MIGRATIONS_DIR, "0001_add_search_fts.sql"),
-        "utf-8",
-      );
-      sqlite.exec(migration1);
+      sqlite.exec(trimmed);
     } catch {
-      // Fallback: create FTS table with default tokenizer if trigram not available
-      sqlite.exec(`
-        CREATE VIRTUAL TABLE IF NOT EXISTS posts_fts USING fts5(
-          title,
-          content,
-          content='posts',
-          content_rowid='id'
-        );
-
-        CREATE TRIGGER IF NOT EXISTS posts_fts_insert AFTER INSERT ON posts
-        WHEN NEW.deleted_at IS NULL
-        BEGIN
-          INSERT INTO posts_fts(rowid, title, content)
-          VALUES (NEW.id, COALESCE(NEW.title, ''), COALESCE(NEW.content, ''));
-        END;
-
-        CREATE TRIGGER IF NOT EXISTS posts_fts_update AFTER UPDATE ON posts BEGIN
-          DELETE FROM posts_fts WHERE rowid = OLD.id;
-          INSERT INTO posts_fts(rowid, title, content)
-          SELECT NEW.id, COALESCE(NEW.title, ''), COALESCE(NEW.content, '')
-          WHERE NEW.deleted_at IS NULL;
-        END;
-
-        CREATE TRIGGER IF NOT EXISTS posts_fts_delete AFTER DELETE ON posts BEGIN
-          DELETE FROM posts_fts WHERE rowid = OLD.id;
-        END;
-      `);
+      // Handle trigram tokenizer failure for FTS virtual table
+      if (options?.fts && trimmed.includes("CREATE VIRTUAL TABLE")) {
+        sqlite.exec(`
+          CREATE VIRTUAL TABLE IF NOT EXISTS posts_fts USING fts5(
+            title,
+            body,
+            quote_text,
+            content='posts',
+            content_rowid='id'
+          );
+        `);
+      }
+      // Ignore DROP TRIGGER/TABLE IF EXISTS failures silently
+      else if (
+        !trimmed.startsWith("DROP TRIGGER") &&
+        !trimmed.startsWith("DROP TABLE")
+      ) {
+        throw new Error(`Migration statement failed: ${trimmed.slice(0, 100)}`);
+      }
     }
   }
 
-  // Apply media attachments migration (position + blurhash)
-  const migration2 = readFileSync(
-    resolve(MIGRATIONS_DIR, "0002_add_media_attachments.sql"),
-    "utf-8",
-  );
-  for (const sql of migration2.split("--> statement-breakpoint")) {
-    const trimmed = sql.trim();
-    if (trimmed) sqlite.exec(trimmed);
-  }
-
-  // Apply navigation links migration
-  const migration3 = readFileSync(
-    resolve(MIGRATIONS_DIR, "0003_add_navigation_links.sql"),
-    "utf-8",
-  );
-  for (const sql of migration3.split("--> statement-breakpoint")) {
-    const trimmed = sql.trim();
-    if (trimmed) sqlite.exec(trimmed);
-  }
-
-  // Apply storage provider migration
-  const migration4 = readFileSync(
-    resolve(MIGRATIONS_DIR, "0004_add_storage_provider.sql"),
-    "utf-8",
-  );
-  for (const sql of migration4.split("--> statement-breakpoint")) {
-    const trimmed = sql.trim();
-    if (trimmed) sqlite.exec(trimmed);
-  }
-
   const db = drizzle(sqlite, { schema });
 
   return { db, sqlite };

package/src/app.tsx

@@ -11,7 +11,7 @@ import { i18nMiddleware } from "./i18n/index.js";
 import { useLingui } from "@lingui/react/macro";
 import type { Bindings, JantConfig } from "./types.js";
 import { SETTINGS_KEYS } from "./lib/constants.js";
-import { theme as minimalTheme } from "./themes/minimal/index.js";
+import { theme as threadsTheme } from "./themes/threads/index.js";
 import { hashPassword } from "better-auth/crypto";
 
 // Routes - Pages
@@ -36,8 +36,6 @@ import { navigationRoutes as dashNavigationRoutes } from "./routes/dash/navigati
 import { postsApiRoutes } from "./routes/api/posts.js";
 import { uploadApiRoutes } from "./routes/api/upload.js";
 import { searchApiRoutes } from "./routes/api/search.js";
-import { timelineApiRoutes } from "./routes/api/timeline.js";
-
 // Routes - Feed
 import { rssRoutes } from "./routes/feed/rss.js";
 import { sitemapRoutes } from "./routes/feed/sitemap.js";
@@ -83,8 +81,8 @@ export type App = Hono<{ Bindings: Bindings; Variables: AppVariables }>;
  * ```
  */
 export function createApp(config: JantConfig = {}): App {
-  // Merge with default minimal theme
-  const defaultTheme = minimalTheme();
+  // Merge with default threads theme
+  const defaultTheme = threadsTheme();
   const resolvedConfig: JantConfig = {
     ...config,
     theme: {
@@ -93,6 +91,7 @@ export function createApp(config: JantConfig = {}): App {
         ...defaultTheme.components,
         ...config.theme?.components,
       },
+      timelineMore: config.theme?.timelineMore ?? defaultTheme.timelineMore,
       cssVariables: {
         ...defaultTheme.cssVariables,
         ...config.theme?.cssVariables,
@@ -197,7 +196,6 @@ export function createApp(config: JantConfig = {}): App {
 
   // API Routes
   app.route("/api/posts", postsApiRoutes);
-  app.route("/api/timeline", timelineApiRoutes);
 
   // Setup page component
   const SetupContent: FC = () => {

package/src/db/migrations/0005_v2_schema_migration.sql

@@ -0,0 +1,268 @@
+-- v2 Schema Migration
+-- Restructures posts, creates pages, updates collections, replaces navigation_links with nav_items
+
+-- Disable FK checks for migration (dropping/recreating tables with cross-references)
+PRAGMA foreign_keys = OFF;
+--> statement-breakpoint
+
+-- =============================================================================
+-- 1. Create pages table (before modifying posts, migrate type='page' data)
+-- =============================================================================
+
+CREATE TABLE `pages` (
+	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+	`slug` text NOT NULL,
+	`title` text,
+	`body` text,
+	`body_html` text,
+	`status` text DEFAULT 'published' NOT NULL,
+	`created_at` integer NOT NULL,
+	`updated_at` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `pages_slug_unique` ON `pages` (`slug`);
+--> statement-breakpoint
+
+-- Migrate type='page' posts into pages table
+INSERT INTO `pages` (`slug`, `title`, `body`, `body_html`, `status`, `created_at`, `updated_at`)
+SELECT
+  CASE
+    WHEN `path` IS NOT NULL AND `path` != '' THEN REPLACE(`path`, '/', '')
+    ELSE 'page-' || `id`
+  END,
+  `title`,
+  `content`,
+  `content_html`,
+  CASE WHEN `visibility` = 'draft' THEN 'draft' ELSE 'published' END,
+  `created_at`,
+  `updated_at`
+FROM `posts`
+WHERE `type` = 'page';
+--> statement-breakpoint
+
+-- =============================================================================
+-- 2. Restructure posts table (create new → migrate → drop old → rename)
+-- =============================================================================
+
+CREATE TABLE `posts_new` (
+	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+	`format` text DEFAULT 'note' NOT NULL,
+	`status` text DEFAULT 'published' NOT NULL,
+	`featured` integer DEFAULT 0 NOT NULL,
+	`pinned` integer DEFAULT 0 NOT NULL,
+	`slug` text,
+	`title` text,
+	`url` text,
+	`body` text,
+	`body_html` text,
+	`quote_text` text,
+	`rating` integer,
+	`collection_id` integer,
+	`reply_to_id` integer,
+	`thread_id` integer,
+	`deleted_at` integer,
+	`published_at` integer NOT NULL,
+	`created_at` integer NOT NULL,
+	`updated_at` integer NOT NULL,
+	FOREIGN KEY (`collection_id`) REFERENCES `collections`(`id`) ON UPDATE no action ON DELETE set null
+);
+--> statement-breakpoint
+
+-- Migrate data from old posts to new posts (excluding type='page')
+INSERT INTO `posts_new` (
+  `id`, `format`, `status`, `featured`, `pinned`,
+  `slug`, `title`, `url`, `body`, `body_html`, `quote_text`, `rating`,
+  `collection_id`, `reply_to_id`, `thread_id`,
+  `deleted_at`, `published_at`, `created_at`, `updated_at`
+)
+SELECT
+  `id`,
+  -- format mapping: article→note, image→note, note→note, link→link, quote→quote
+  CASE
+    WHEN `type` IN ('article', 'image', 'note') THEN 'note'
+    WHEN `type` = 'link' THEN 'link'
+    WHEN `type` = 'quote' THEN 'quote'
+    ELSE 'note'
+  END,
+  -- status mapping from visibility
+  CASE WHEN `visibility` = 'draft' THEN 'draft' ELSE 'published' END,
+  -- featured mapping from visibility
+  CASE WHEN `visibility` = 'featured' THEN 1 ELSE 0 END,
+  -- pinned: default 0
+  0,
+  -- slug: migrate from path (strip leading /)
+  CASE
+    WHEN `path` IS NOT NULL AND `path` != '' THEN REPLACE(`path`, '/', '')
+    ELSE NULL
+  END,
+  `title`,
+  `source_url`,
+  `content`,
+  `content_html`,
+  -- quote_text: for quote type, content was the quote; set to null (manual fix may be needed)
+  NULL,
+  -- rating: null
+  NULL,
+  -- collection_id: migrate from post_collections (take first collection for each post)
+  (SELECT `collection_id` FROM `post_collections` WHERE `post_collections`.`post_id` = `posts`.`id` LIMIT 1),
+  `reply_to_id`,
+  `thread_id`,
+  `deleted_at`,
+  `published_at`,
+  `created_at`,
+  `updated_at`
+FROM `posts`
+WHERE `type` != 'page';
+--> statement-breakpoint
+
+-- Update media references to point at new table (foreign keys reference posts)
+-- media.post_id still works since IDs are preserved
+--> statement-breakpoint
+
+-- Drop old posts table and rename new one
+DROP TABLE `posts`;
+--> statement-breakpoint
+ALTER TABLE `posts_new` RENAME TO `posts`;
+--> statement-breakpoint
+CREATE UNIQUE INDEX `posts_slug_unique` ON `posts` (`slug`);
+--> statement-breakpoint
+
+-- =============================================================================
+-- 3. Update collections table (add new columns, rename path→slug)
+-- =============================================================================
+
+CREATE TABLE `collections_new` (
+	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+	`slug` text NOT NULL,
+	`title` text NOT NULL,
+	`description` text,
+	`icon` text,
+	`sort_order` text DEFAULT 'newest' NOT NULL,
+	`position` integer DEFAULT 0 NOT NULL,
+	`show_divider` integer DEFAULT 0 NOT NULL,
+	`created_at` integer NOT NULL,
+	`updated_at` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `collections_new_slug_unique` ON `collections_new` (`slug`);
+--> statement-breakpoint
+
+INSERT INTO `collections_new` (`id`, `slug`, `title`, `description`, `icon`, `sort_order`, `position`, `show_divider`, `created_at`, `updated_at`)
+SELECT
+  `id`,
+  COALESCE(`path`, 'collection-' || `id`),
+  `title`,
+  `description`,
+  NULL,
+  'newest',
+  0,
+  0,
+  `created_at`,
+  `updated_at`
+FROM `collections`;
+--> statement-breakpoint
+
+DROP TABLE `collections`;
+--> statement-breakpoint
+ALTER TABLE `collections_new` RENAME TO `collections`;
+--> statement-breakpoint
+CREATE UNIQUE INDEX `collections_slug_unique` ON `collections` (`slug`);
+--> statement-breakpoint
+
+-- =============================================================================
+-- 4. Replace navigation_links with nav_items
+-- =============================================================================
+
+CREATE TABLE `nav_items` (
+	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+	`type` text DEFAULT 'link' NOT NULL,
+	`label` text NOT NULL,
+	`url` text NOT NULL,
+	`page_id` integer,
+	`position` integer DEFAULT 0 NOT NULL,
+	`created_at` integer NOT NULL,
+	`updated_at` integer NOT NULL,
+	FOREIGN KEY (`page_id`) REFERENCES `pages`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+
+-- Migrate existing navigation_links as type='link'
+INSERT INTO `nav_items` (`type`, `label`, `url`, `page_id`, `position`, `created_at`, `updated_at`)
+SELECT 'link', `label`, `url`, NULL, `position`, `created_at`, `updated_at`
+FROM `navigation_links`;
+--> statement-breakpoint
+
+DROP TABLE `navigation_links`;
+--> statement-breakpoint
+
+-- =============================================================================
+-- 5. Drop post_collections table (replaced by posts.collection_id)
+-- =============================================================================
+
+DROP TABLE `post_collections`;
+--> statement-breakpoint
+
+-- =============================================================================
+-- 6. Rebuild FTS5 (column rename: content→body, add quote_text)
+-- =============================================================================
+
+-- Drop old FTS triggers
+DROP TRIGGER IF EXISTS posts_fts_insert;
+--> statement-breakpoint
+DROP TRIGGER IF EXISTS posts_fts_update;
+--> statement-breakpoint
+DROP TRIGGER IF EXISTS posts_fts_delete;
+--> statement-breakpoint
+
+-- Drop old FTS table
+DROP TABLE IF EXISTS posts_fts;
+--> statement-breakpoint
+
+-- Create new FTS table with updated columns
+CREATE VIRTUAL TABLE IF NOT EXISTS posts_fts USING fts5(
+  title,
+  body,
+  quote_text,
+  content=posts,
+  content_rowid=id,
+  tokenize='trigram'
+);
+--> statement-breakpoint
+
+-- Populate FTS with migrated data
+INSERT INTO posts_fts(rowid, title, body, quote_text)
+SELECT id, COALESCE(title, ''), COALESCE(body, ''), COALESCE(quote_text, '')
+FROM posts WHERE deleted_at IS NULL;
+--> statement-breakpoint
+
+-- Trigger: sync FTS on INSERT
+CREATE TRIGGER posts_fts_insert AFTER INSERT ON posts
+WHEN NEW.deleted_at IS NULL
+BEGIN
+  INSERT INTO posts_fts(rowid, title, body, quote_text)
+  VALUES (NEW.id, COALESCE(NEW.title, ''), COALESCE(NEW.body, ''), COALESCE(NEW.quote_text, ''));
+END;
+--> statement-breakpoint
+
+-- Trigger: sync FTS on UPDATE
+CREATE TRIGGER posts_fts_update AFTER UPDATE ON posts BEGIN
+  DELETE FROM posts_fts WHERE rowid = OLD.id;
+  INSERT INTO posts_fts(rowid, title, body, quote_text)
+  SELECT NEW.id, COALESCE(NEW.title, ''), COALESCE(NEW.body, ''), COALESCE(NEW.quote_text, '')
+  WHERE NEW.deleted_at IS NULL;
+END;
+--> statement-breakpoint
+
+-- Trigger: sync FTS on DELETE
+CREATE TRIGGER posts_fts_delete AFTER DELETE ON posts BEGIN
+  DELETE FROM posts_fts WHERE rowid = OLD.id;
+END;
+--> statement-breakpoint
+
+-- =============================================================================
+-- 7. Re-enable FK checks and verify integrity
+-- =============================================================================
+
+PRAGMA foreign_keys = ON;
+--> statement-breakpoint
+PRAGMA foreign_key_check;

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

@@ -36,6 +36,13 @@
       "when": 1770946168874,
       "tag": "0004_add_storage_provider",
       "breakpoints": true
+    },
+    {
+      "idx": 5,
+      "version": "6",
+      "when": 1771346168875,
+      "tag": "0005_v2_schema_migration",
+      "breakpoints": true
     }
   ]
 }

package/src/db/schema.ts

@@ -1,15 +1,10 @@
 /**
  * Drizzle Schema
  *
- * Database schema for Jant
+ * Database schema for Jant v2
  */
 
-import {
-  sqliteTable,
-  text,
-  integer,
-  primaryKey,
-} from "drizzle-orm/sqlite-core";
+import { sqliteTable, text, integer } from "drizzle-orm/sqlite-core";
 
 // =============================================================================
 // Posts
@@ -17,21 +12,26 @@ import {
 
 export const posts = sqliteTable("posts", {
   id: integer("id").primaryKey({ autoIncrement: true }),
-  type: text("type", {
-    enum: ["note", "article", "link", "quote", "image", "page"],
+  format: text("format", {
+    enum: ["note", "link", "quote"],
   }).notNull(),
-  visibility: text("visibility", {
-    enum: ["featured", "quiet", "unlisted", "draft"],
+  status: text("status", {
+    enum: ["draft", "published"],
   })
     .notNull()
-    .default("quiet"),
+    .default("published"),
+  featured: integer("featured").notNull().default(0),
+  pinned: integer("pinned").notNull().default(0),
+  slug: text("slug").unique(),
   title: text("title"),
-  path: text("path"),
-  content: text("content"),
-  contentHtml: text("content_html"),
-  sourceUrl: text("source_url"),
-  sourceName: text("source_name"),
-  sourceDomain: text("source_domain"),
+  url: text("url"),
+  body: text("body"),
+  bodyHtml: text("body_html"),
+  quoteText: text("quote_text"),
+  rating: integer("rating"),
+  collectionId: integer("collection_id").references(() => collections.id, {
+    onDelete: "set null",
+  }),
   replyToId: integer("reply_to_id"),
   threadId: integer("thread_id"),
   deletedAt: integer("deleted_at"),
@@ -40,6 +40,25 @@ export const posts = sqliteTable("posts", {
   updatedAt: integer("updated_at").notNull(),
 });
 
+// =============================================================================
+// Pages
+// =============================================================================
+
+export const pages = sqliteTable("pages", {
+  id: integer("id").primaryKey({ autoIncrement: true }),
+  slug: text("slug").notNull().unique(),
+  title: text("title"),
+  body: text("body"),
+  bodyHtml: text("body_html"),
+  status: text("status", {
+    enum: ["draft", "published"],
+  })
+    .notNull()
+    .default("published"),
+  createdAt: integer("created_at").notNull(),
+  updatedAt: integer("updated_at").notNull(),
+});
+
 // =============================================================================
 // Media
 // =============================================================================
@@ -67,30 +86,41 @@ export const media = sqliteTable("media", {
 
 export const collections = sqliteTable("collections", {
   id: integer("id").primaryKey({ autoIncrement: true }),
-  path: text("path").unique(),
+  slug: text("slug").notNull().unique(),
   title: text("title").notNull(),
   description: text("description"),
+  icon: text("icon"),
+  sortOrder: text("sort_order", {
+    enum: ["newest", "oldest", "rating_desc", "rating_asc"],
+  })
+    .notNull()
+    .default("newest"),
+  position: integer("position").notNull().default(0),
+  showDivider: integer("show_divider").notNull().default(0),
   createdAt: integer("created_at").notNull(),
   updatedAt: integer("updated_at").notNull(),
 });
 
 // =============================================================================
-// Post-Collections (Many-to-Many)
+// Navigation Items
 // =============================================================================
 
-export const postCollections = sqliteTable(
-  "post_collections",
-  {
-    postId: integer("post_id")
-      .notNull()
-      .references(() => posts.id),
-    collectionId: integer("collection_id")
-      .notNull()
-      .references(() => collections.id),
-    addedAt: integer("added_at").notNull(),
-  },
-  (table) => [primaryKey({ columns: [table.postId, table.collectionId] })],
-);
+export const navItems = sqliteTable("nav_items", {
+  id: integer("id").primaryKey({ autoIncrement: true }),
+  type: text("type", {
+    enum: ["page", "link"],
+  })
+    .notNull()
+    .default("link"),
+  label: text("label").notNull(),
+  url: text("url").notNull(),
+  pageId: integer("page_id").references(() => pages.id, {
+    onDelete: "cascade",
+  }),
+  position: integer("position").notNull().default(0),
+  createdAt: integer("created_at").notNull(),
+  updatedAt: integer("updated_at").notNull(),
+});
 
 // =============================================================================
 // Redirects
@@ -104,19 +134,6 @@ export const redirects = sqliteTable("redirects", {
   createdAt: integer("created_at").notNull(),
 });
 
-// =============================================================================
-// Navigation Links
-// =============================================================================
-
-export const navigationLinks = sqliteTable("navigation_links", {
-  id: integer("id").primaryKey({ autoIncrement: true }),
-  label: text("label").notNull(),
-  url: text("url").notNull(),
-  position: integer("position").notNull().default(0),
-  createdAt: integer("created_at").notNull(),
-  updatedAt: integer("updated_at").notNull(),
-});
-
 // =============================================================================
 // Settings (Key-Value)
 // =============================================================================