@jant/core 0.3.35 → 0.3.37

package/src/services/search.ts

@@ -1,10 +1,13 @@
 /**
  * Search Service (v2)
  *
- * Full-text search using FTS5
+ * Full-text search using FTS5 trigram for queries ≥ 3 characters.
+ * Falls back to LIKE for shorter queries (common in CJK languages where
+ * 2-character words cannot form a trigram).
  */
 
 import type { Post, Status, Format, SearchResult } from "../types.js";
+import { escapeHtml } from "../lib/html.js";
 
 export type { SearchResult };
 
@@ -24,98 +27,182 @@ export interface SearchService {
 }
 
 interface RawSearchRow {
-  id: number;
+  id: string;
   format: string;
   status: string;
-  featured: number;
-  pinned: number;
-  path: string | null;
+  visibility: string | null;
+  effective_visibility: string | null;
+  pinned_at: number | null;
+  featured_at: number | null;
+  slug: string;
   title: string | null;
   url: string | null;
   body: string | null;
   body_html: string | null;
+  body_text: string | null;
   quote_text: string | null;
+  summary: string | null;
   rating: number | null;
-  collection_id: number | null;
-  reply_to_id: number | null;
-  thread_id: number | null;
+  collection_id: string | null;
+  reply_to_id: string | null;
+  thread_id: string;
   deleted_at: number | null;
-  published_at: number;
+  published_at: number | null;
+  last_activity_at: number | null;
   created_at: number;
   updated_at: number;
   rank: number;
-  snippet: string;
+  snippet: string | null;
+}
+
+function mapRow(row: RawSearchRow): SearchResult {
+  return {
+    post: {
+      id: row.id,
+      format: row.format as Post["format"],
+      status: row.status as Post["status"],
+      visibility: (row.effective_visibility ??
+        row.visibility) as Post["visibility"],
+      pinnedAt: row.pinned_at,
+      featuredAt: row.featured_at,
+      slug: row.slug,
+      title: row.title,
+      url: row.url,
+      body: row.body,
+      bodyHtml: row.body_html,
+      bodyText: row.body_text,
+      quoteText: row.quote_text,
+      summary: row.summary,
+      rating: row.rating,
+      replyToId: row.reply_to_id,
+      threadId: row.thread_id,
+      deletedAt: row.deleted_at,
+      publishedAt: row.published_at,
+      lastActivityAt:
+        row.last_activity_at ?? row.published_at ?? row.updated_at,
+      createdAt: row.created_at,
+      updatedAt: row.updated_at,
+    },
+    rank: row.rank,
+    snippet: row.snippet
+      ? escapeHtml(row.snippet)
+          .replaceAll(String.fromCharCode(2), "<mark>")
+          .replaceAll(String.fromCharCode(3), "</mark>")
+      : undefined,
+  };
 }
 
 export function createSearchService(d1: D1Database): SearchService {
+  async function searchFts(
+    query: string,
+    options: SearchOptions,
+  ): Promise<SearchResult[]> {
+    const limit = options.limit ?? 20;
+    const offset = options.offset ?? 0;
+    const status = options.status ?? ["published"];
+
+    const ftsQuery = query
+      .trim()
+      .split(/\s+/)
+      .filter((term) => term.length > 0)
+      .map((term) => `"${term.replace(/"/g, '""')}"*`)
+      .join(" ");
+
+    if (!ftsQuery) return [];
+
+    const statusPlaceholders = status.map(() => "?").join(", ");
+    const formatFilter = options.format ? "AND post.format = ?" : "";
+    const formatParams = options.format ? [options.format] : [];
+
+    const stmt = d1.prepare(`
+      SELECT
+        post.*,
+        COALESCE(post.visibility, root_post.visibility) AS effective_visibility,
+        path_registry.path AS slug,
+        post_fts.rank AS rank,
+        snippet(post_fts, 1, char(2), char(3), '...', 32) AS snippet
+      FROM post_fts
+      JOIN post ON post.rowid = post_fts.rowid
+      JOIN post AS root_post ON root_post.id = post.thread_id
+      JOIN path_registry
+        ON path_registry.post_id = post.id
+       AND path_registry.kind = 'slug'
+      WHERE post_fts MATCH ?
+        AND post.deleted_at IS NULL
+        AND post.status IN (${statusPlaceholders})
+        ${formatFilter}
+      ORDER BY post_fts.rank
+      LIMIT ? OFFSET ?
+    `);
+
+    const { results } = await stmt
+      .bind(ftsQuery, ...status, ...formatParams, limit, offset)
+      .all<RawSearchRow>();
+
+    return (results || []).map(mapRow);
+  }
+
+  async function searchLike(
+    query: string,
+    options: SearchOptions,
+  ): Promise<SearchResult[]> {
+    const limit = options.limit ?? 20;
+    const offset = options.offset ?? 0;
+    const status = options.status ?? ["published"];
+    const like = `%${query}%`;
+
+    const statusPlaceholders = status.map(() => "?").join(", ");
+    const formatFilter = options.format ? "AND post.format = ?" : "";
+    const formatParams = options.format ? [options.format] : [];
+
+    const stmt = d1.prepare(`
+      SELECT
+        post.*,
+        COALESCE(post.visibility, root_post.visibility) AS effective_visibility,
+        path_registry.path AS slug,
+        0 AS rank,
+        NULL AS snippet
+      FROM post
+      JOIN post AS root_post ON root_post.id = post.thread_id
+      JOIN path_registry
+        ON path_registry.post_id = post.id
+       AND path_registry.kind = 'slug'
+      WHERE (
+        post.title LIKE ? OR
+        post.body_text LIKE ? OR
+        post.quote_text LIKE ? OR
+        post.url LIKE ?
+      )
+      AND post.deleted_at IS NULL
+      AND post.status IN (${statusPlaceholders})
+      ${formatFilter}
+      ORDER BY post.published_at DESC
+      LIMIT ? OFFSET ?
+    `);
+
+    const { results } = await stmt
+      .bind(like, like, like, like, ...status, ...formatParams, limit, offset)
+      .all<RawSearchRow>();
+
+    return (results || []).map(mapRow);
+  }
+
   return {
     async search(query, options = {}) {
-      const limit = options.limit ?? 20;
-      const offset = options.offset ?? 0;
-      const status = options.status ?? ["published"];
-
-      // Escape and prepare the query for FTS5
-      const ftsQuery = query
-        .trim()
-        .split(/\s+/)
-        .filter((term) => term.length > 0)
-        .map((term) => `"${term.replace(/"/g, '""')}"*`)
-        .join(" ");
-
-      if (!ftsQuery) {
-        return [];
+      const trimmed = query.trim();
+      if (!trimmed) return [];
+
+      // Trigram FTS requires at least 3 characters.
+      // For shorter queries (common in CJK), fall back to LIKE.
+      const charCount = [...trimmed].length;
+      if (charCount < 3) {
+        return searchLike(trimmed, options);
       }
 
-      // Build status placeholders
-      const statusPlaceholders = status.map(() => "?").join(", ");
-
-      // Build format filter
-      const formatFilter = options.format ? "AND posts.format = ?" : "";
-      const formatParams = options.format ? [options.format] : [];
-
-      const stmt = d1.prepare(`
-        SELECT
-          posts.*,
-          posts_fts.rank AS rank,
-          snippet(posts_fts, 1, '<mark>', '</mark>', '...', 32) AS snippet
-        FROM posts_fts
-        JOIN posts ON posts.id = posts_fts.rowid
-        WHERE posts_fts MATCH ?
-          AND posts.deleted_at IS NULL
-          AND posts.status IN (${statusPlaceholders})
-          ${formatFilter}
-        ORDER BY posts_fts.rank
-        LIMIT ? OFFSET ?
-      `);
-
-      const { results } = await stmt
-        .bind(ftsQuery, ...status, ...formatParams, limit, offset)
-        .all<RawSearchRow>();
-
-      return (results || []).map((row) => ({
-        post: {
-          id: row.id,
-          format: row.format as Post["format"],
-          status: row.status as Post["status"],
-          featured: row.featured,
-          pinned: row.pinned,
-          path: row.path,
-          title: row.title,
-          url: row.url,
-          body: row.body,
-          bodyHtml: row.body_html,
-          quoteText: row.quote_text,
-          rating: row.rating,
-          replyToId: row.reply_to_id,
-          threadId: row.thread_id,
-          deletedAt: row.deleted_at,
-          publishedAt: row.published_at,
-          createdAt: row.created_at,
-          updatedAt: row.updated_at,
-        },
-        rank: row.rank,
-        snippet: row.snippet,
-      }));
+      const ftsResults = await searchFts(trimmed, options);
+      if (ftsResults.length > 0) return ftsResults;
+
+      return searchLike(trimmed, options);
     },
   };
 }

package/src/services/settings.ts

@@ -44,6 +44,7 @@ export interface AvatarUploadDeps {
   media: MediaService;
   storage: StorageDriver;
   storageProvider: string;
+  maxFileSizeMB: number;
 }
 
 export interface SettingsService {
@@ -194,7 +195,7 @@ export function createSettingsService(db: Database): SettingsService {
       // Header nav max visible: only update if provided (may be managed separately)
       if (data.headerNavMaxVisible !== undefined) {
         const navMax = parseInt(String(data.headerNavMaxVisible), 10);
-        if (!isNaN(navMax) && navMax !== 3) {
+        if (!isNaN(navMax) && navMax !== 2) {
           await this.set("HEADER_NAV_MAX_VISIBLE", String(navMax));
         } else {
           await this.remove("HEADER_NAV_MAX_VISIBLE");
@@ -215,7 +216,10 @@ export function createSettingsService(db: Database): SettingsService {
     },
 
     async uploadAvatar(data, deps) {
-      const uploadError = validateUploadFile(data.file as unknown as File);
+      const uploadError = validateUploadFile(data.file as unknown as File, {
+        imagesOnly: true,
+        maxFileSizeMB: deps.maxFileSizeMB,
+      });
       if (uploadError) {
         throw new ValidationError(uploadError);
       }