@jant/core 0.3.23 → 0.3.25

package/src/app.tsx

@@ -11,7 +11,6 @@ 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 { hashPassword } from "better-auth/crypto";
 
 // Routes - Pages
@@ -21,6 +20,8 @@ import { pageRoutes } from "./routes/pages/page.js";
 import { collectionRoutes } from "./routes/pages/collection.js";
 import { archiveRoutes } from "./routes/pages/archive.js";
 import { searchRoutes } from "./routes/pages/search.js";
+import { featuredRoutes } from "./routes/pages/featured.js";
+import { collectionsPageRoutes } from "./routes/pages/collections.js";
 
 // Routes - Dashboard
 import { dashIndexRoutes } from "./routes/dash/index.js";
@@ -30,13 +31,17 @@ import { mediaRoutes as dashMediaRoutes } from "./routes/dash/media.js";
 import { settingsRoutes as dashSettingsRoutes } from "./routes/dash/settings.js";
 import { redirectsRoutes as dashRedirectsRoutes } from "./routes/dash/redirects.js";
 import { collectionsRoutes as dashCollectionsRoutes } from "./routes/dash/collections.js";
-import { navigationRoutes as dashNavigationRoutes } from "./routes/dash/navigation.js";
 
 // Routes - API
 import { postsApiRoutes } from "./routes/api/posts.js";
+import { pagesApiRoutes } from "./routes/api/pages.js";
+import { navItemsApiRoutes } from "./routes/api/nav-items.js";
+import { collectionsApiRoutes } from "./routes/api/collections.js";
+import { settingsApiRoutes } from "./routes/api/settings.js";
 import { uploadApiRoutes } from "./routes/api/upload.js";
 import { searchApiRoutes } from "./routes/api/search.js";
-import { timelineApiRoutes } from "./routes/api/timeline.js";
+// Routes - Compose
+import { composeRoutes } from "./routes/compose.js";
 
 // Routes - Feed
 import { rssRoutes } from "./routes/feed/rss.js";
@@ -47,7 +52,7 @@ import { requireAuth } from "./middleware/auth.js";
 import { requireOnboarding } from "./middleware/onboarding.js";
 
 // Layouts for auth pages
-import { BaseLayout } from "./theme/layouts/index.js";
+import { BaseLayout } from "./ui/layouts/BaseLayout.js";
 import { dsRedirect, dsToast } from "./lib/sse.js";
 import { getAvailableThemes, buildThemeStyle } from "./lib/theme.js";
 import { createStorageDriver, type StorageDriver } from "./lib/storage.js";
@@ -58,6 +63,8 @@ export interface AppVariables {
   auth: Auth;
   config: JantConfig;
   themeStyle: string;
+  customCSS: string;
+  isAuthenticated: boolean;
   storage: StorageDriver | null;
 }
 
@@ -78,29 +85,12 @@ export type App = Hono<{ Bindings: Bindings; Variables: AppVariables }>;
  * import { createApp } from "@jant/core";
  *
  * export default createApp({
- *   theme: { components: { PostPage: MyPostPage } },
+ *   cssVariables: { "--card-radius": "0" },
  * });
  * ```
  */
 export function createApp(config: JantConfig = {}): App {
-  // Merge with default minimal theme
-  const defaultTheme = minimalTheme();
-  const resolvedConfig: JantConfig = {
-    ...config,
-    theme: {
-      name: config.theme?.name ?? defaultTheme.name,
-      components: {
-        ...defaultTheme.components,
-        ...config.theme?.components,
-      },
-      cssVariables: {
-        ...defaultTheme.cssVariables,
-        ...config.theme?.cssVariables,
-      },
-      colorThemes: config.theme?.colorThemes ?? defaultTheme.colorThemes,
-      feed: config.theme?.feed,
-    },
-  };
+  const resolvedConfig: JantConfig = { ...config };
 
   const app = new Hono<{ Bindings: Bindings; Variables: AppVariables }>();
 
@@ -134,18 +124,37 @@ export function createApp(config: JantConfig = {}): App {
   // Onboarding gate — redirect to /setup if not yet initialized
   app.use("*", requireOnboarding());
 
-  // Theme middleware - resolve active color theme and build CSS
+  // Theme middleware - resolve active color theme, custom CSS, and auth state
   app.use("*", async (c, next) => {
-    const themeId = await c.var.services.settings.get(SETTINGS_KEYS.THEME);
+    const [themeId, customCSS] = await Promise.all([
+      c.var.services.settings.get(SETTINGS_KEYS.THEME),
+      c.var.services.settings.get(SETTINGS_KEYS.CUSTOM_CSS),
+    ]);
     const themes = getAvailableThemes(resolvedConfig);
     const activeTheme = themeId
       ? themes.find((t) => t.id === themeId)
       : undefined;
     const themeStyle = buildThemeStyle(
       activeTheme,
-      resolvedConfig.theme?.cssVariables,
+      resolvedConfig.cssVariables,
     );
     c.set("themeStyle", themeStyle);
+    c.set("customCSS", customCSS ?? "");
+
+    // Check auth state for data-authenticated attribute on <body>
+    let isAuthenticated = false;
+    if (c.var.auth) {
+      try {
+        const session = await c.var.auth.api.getSession({
+          headers: c.req.raw.headers,
+        });
+        isAuthenticated = !!session;
+      } catch {
+        // Not authenticated
+      }
+    }
+    c.set("isAuthenticated", isAuthenticated);
+
     await next();
   });
 
@@ -197,7 +206,10 @@ export function createApp(config: JantConfig = {}): App {
 
   // API Routes
   app.route("/api/posts", postsApiRoutes);
-  app.route("/api/timeline", timelineApiRoutes);
+  app.route("/api/pages", pagesApiRoutes);
+  app.route("/api/nav-items", navItemsApiRoutes);
+  app.route("/api/collections", collectionsApiRoutes);
+  app.route("/api/settings", settingsApiRoutes);
 
   // Setup page component
   const SetupContent: FC = () => {
@@ -340,6 +352,18 @@ export function createApp(config: JantConfig = {}): App {
 
       await c.var.services.settings.completeOnboarding();
 
+      // Seed default navigation items
+      await c.var.services.navItems.create({
+        type: "link",
+        label: "Featured",
+        url: "/featured",
+      });
+      await c.var.services.navItems.create({
+        type: "link",
+        label: "Collections",
+        url: "/collections",
+      });
+
       return dsRedirect("/signin?setup");
     } catch (err) {
       // eslint-disable-next-line no-console -- Error logging is intentional
@@ -720,7 +744,6 @@ export function createApp(config: JantConfig = {}): App {
   app.route("/dash/settings", dashSettingsRoutes);
   app.route("/dash/redirects", dashRedirectsRoutes);
   app.route("/dash/collections", dashCollectionsRoutes);
-  app.route("/dash/navigation", dashNavigationRoutes);
   // API routes
   app.route("/api/upload", uploadApiRoutes);
   app.route("/api/search", searchApiRoutes);
@@ -753,6 +776,9 @@ export function createApp(config: JantConfig = {}): App {
     return new Response(object.body, { headers });
   });
 
+  // Compose route (auth enforced in route middleware)
+  app.route("/compose", composeRoutes);
+
   // Feed routes
   app.route("/feed", rssRoutes);
   app.route("/", sitemapRoutes);
@@ -760,6 +786,8 @@ export function createApp(config: JantConfig = {}): App {
   // Frontend routes
   app.route("/search", searchRoutes);
   app.route("/archive", archiveRoutes);
+  app.route("/featured", featuredRoutes);
+  app.route("/collections", collectionsPageRoutes);
   app.route("/c", collectionRoutes);
   app.route("/p", postRoutes);
   app.route("/", homeRoutes);

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/0006_rename_slug_to_path.sql

@@ -0,0 +1,5 @@
+ALTER TABLE posts RENAME COLUMN slug TO path;
+--> statement-breakpoint
+DROP INDEX IF EXISTS posts_slug_unique;
+--> statement-breakpoint
+CREATE UNIQUE INDEX posts_path_unique ON posts (path);

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

@@ -36,6 +36,20 @@
       "when": 1770946168874,
       "tag": "0004_add_storage_provider",
       "breakpoints": true
+    },
+    {
+      "idx": 5,
+      "version": "6",
+      "when": 1771346168875,
+      "tag": "0005_v2_schema_migration",
+      "breakpoints": true
+    },
+    {
+      "idx": 6,
+      "version": "6",
+      "when": 1771746168876,
+      "tag": "0006_rename_slug_to_path",
+      "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),
+  path: text("path").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)
 // =============================================================================