@jant/core 0.3.23 → 0.3.25

package/dist/services/post.js

@@ -1,26 +1,29 @@
 /**
- * Post Service
+ * Post Service (v2)
  *
- * CRUD operations for posts with Thread support
- */ import { eq, and, isNull, desc, or, inArray, notInArray, sql } from "drizzle-orm";
+ * CRUD operations for posts with Thread support.
+ * Posts have format (note/link/quote), status (draft/published),
+ * featured flag, and pinned flag.
+ */ import { eq, and, isNull, desc, or, inArray, sql } from "drizzle-orm";
 import { posts } from "../db/schema.js";
 import { now } from "../lib/time.js";
-import { extractDomain } from "../lib/url.js";
 import { render as renderMarkdown } from "../lib/markdown.js";
 export function createPostService(db) {
-    // Helper to map DB row to Post type
     function toPost(row) {
         return {
             id: row.id,
-            type: row.type,
-            visibility: row.visibility,
-            title: row.title,
+            format: row.format,
+            status: row.status,
+            featured: row.featured,
+            pinned: row.pinned,
             path: row.path,
-            content: row.content,
-            contentHtml: row.contentHtml,
-            sourceUrl: row.sourceUrl,
-            sourceName: row.sourceName,
-            sourceDomain: row.sourceDomain,
+            title: row.title,
+            url: row.url,
+            body: row.body,
+            bodyHtml: row.bodyHtml,
+            quoteText: row.quoteText,
+            rating: row.rating,
+            collectionId: row.collectionId,
             replyToId: row.replyToId,
             threadId: row.threadId,
             deletedAt: row.deletedAt,
@@ -40,73 +43,103 @@ export function createPostService(db) {
         },
         async list (filters = {}) {
             const conditions = [];
-            // Visibility filter
-            if (filters.visibility) {
-                if (Array.isArray(filters.visibility)) {
-                    conditions.push(inArray(posts.visibility, filters.visibility));
-                } else {
-                    conditions.push(eq(posts.visibility, filters.visibility));
-                }
+            if (filters.status) {
+                conditions.push(eq(posts.status, filters.status));
             }
-            // Type filter
-            if (filters.type) {
-                conditions.push(eq(posts.type, filters.type));
+            if (filters.featured !== undefined) {
+                conditions.push(eq(posts.featured, filters.featured ? 1 : 0));
             }
-            // Exclude types filter
-            if (filters.excludeTypes && filters.excludeTypes.length > 0) {
-                conditions.push(notInArray(posts.type, filters.excludeTypes));
+            if (filters.pinned !== undefined) {
+                conditions.push(eq(posts.pinned, filters.pinned ? 1 : 0));
+            }
+            if (filters.format) {
+                conditions.push(eq(posts.format, filters.format));
+            }
+            if (filters.collectionId !== undefined) {
+                conditions.push(eq(posts.collectionId, filters.collectionId));
             }
-            // Thread filter
             if (filters.threadId) {
                 conditions.push(eq(posts.threadId, filters.threadId));
             }
-            // Exclude replies (posts that are part of a thread but not the root)
             if (filters.excludeReplies) {
                 conditions.push(isNull(posts.threadId));
             }
-            // Exclude deleted unless specified
             if (!filters.includeDeleted) {
                 conditions.push(isNull(posts.deletedAt));
             }
-            // Cursor pagination
             if (filters.cursor) {
                 conditions.push(sql`${posts.id} < ${filters.cursor}`);
             }
-            const query = db.select().from(posts).where(conditions.length > 0 ? and(...conditions) : undefined).orderBy(desc(posts.publishedAt), desc(posts.id)).limit(filters.limit ?? 100);
+            let query = db.select().from(posts).where(conditions.length > 0 ? and(...conditions) : undefined).orderBy(desc(posts.publishedAt), desc(posts.id)).limit(filters.limit ?? 100);
+            if (filters.offset !== undefined) {
+                query = query.offset(filters.offset);
+            }
             const rows = await query;
             return rows.map(toPost);
         },
+        async count (filters = {}) {
+            const conditions = [];
+            if (filters.status) {
+                conditions.push(eq(posts.status, filters.status));
+            }
+            if (filters.featured !== undefined) {
+                conditions.push(eq(posts.featured, filters.featured ? 1 : 0));
+            }
+            if (filters.pinned !== undefined) {
+                conditions.push(eq(posts.pinned, filters.pinned ? 1 : 0));
+            }
+            if (filters.format) {
+                conditions.push(eq(posts.format, filters.format));
+            }
+            if (filters.collectionId !== undefined) {
+                conditions.push(eq(posts.collectionId, filters.collectionId));
+            }
+            if (filters.threadId) {
+                conditions.push(eq(posts.threadId, filters.threadId));
+            }
+            if (filters.excludeReplies) {
+                conditions.push(isNull(posts.threadId));
+            }
+            if (!filters.includeDeleted) {
+                conditions.push(isNull(posts.deletedAt));
+            }
+            const result = await db.select({
+                count: sql`count(*)`.as("count")
+            }).from(posts).where(conditions.length > 0 ? and(...conditions) : undefined);
+            return result[0]?.count ?? 0;
+        },
         async create (data) {
             const timestamp = now();
-            // Process content
-            const contentHtml = data.content ? renderMarkdown(data.content) : null;
-            // Extract domain from source URL
-            const sourceDomain = data.sourceUrl ? extractDomain(data.sourceUrl) : null;
+            const bodyHtml = data.body ? renderMarkdown(data.body) : null;
             // Handle thread relationship
             let threadId = null;
-            let visibility = data.visibility ?? "quiet";
+            let status = data.status ?? "published";
+            let featured = data.featured ?? false;
             if (data.replyToId) {
                 const parent = await this.getById(data.replyToId);
                 if (parent) {
-                    // thread_id = parent's thread_id or parent's id (if parent is root)
                     threadId = parent.threadId ?? parent.id;
-                    // Inherit visibility from root
+                    // Inherit status and featured from root
                     const root = parent.threadId ? await this.getById(parent.threadId) : parent;
                     if (root) {
-                        visibility = root.visibility;
+                        status = root.status;
+                        featured = root.featured === 1;
                     }
                 }
             }
             const result = await db.insert(posts).values({
-                type: data.type,
-                visibility,
-                title: data.title ?? null,
+                format: data.format,
+                status,
+                featured: featured ? 1 : 0,
+                pinned: data.pinned ? 1 : 0,
                 path: data.path ?? null,
-                content: data.content ?? null,
-                contentHtml,
-                sourceUrl: data.sourceUrl ?? null,
-                sourceName: data.sourceName ?? null,
-                sourceDomain,
+                title: data.title ?? null,
+                url: data.url ?? null,
+                body: data.body ?? null,
+                bodyHtml,
+                quoteText: data.quoteText ?? null,
+                rating: data.rating ?? null,
+                collectionId: data.collectionId ?? null,
                 replyToId: data.replyToId ?? null,
                 threadId,
                 publishedAt: data.publishedAt ?? timestamp,
@@ -123,26 +156,27 @@ export function createPostService(db) {
             const updates = {
                 updatedAt: timestamp
             };
-            if (data.type !== undefined) updates.type = data.type;
-            if (data.title !== undefined) updates.title = data.title;
+            if (data.format !== undefined) updates.format = data.format;
             if (data.path !== undefined) updates.path = data.path;
+            if (data.title !== undefined) updates.title = data.title;
+            if (data.url !== undefined) updates.url = data.url;
+            if (data.quoteText !== undefined) updates.quoteText = data.quoteText;
+            if (data.rating !== undefined) updates.rating = data.rating;
+            if (data.collectionId !== undefined) updates.collectionId = data.collectionId;
             if (data.publishedAt !== undefined) updates.publishedAt = data.publishedAt;
-            if (data.sourceUrl !== undefined) {
-                updates.sourceUrl = data.sourceUrl;
-                updates.sourceDomain = data.sourceUrl ? extractDomain(data.sourceUrl) : null;
-            }
-            if (data.sourceName !== undefined) updates.sourceName = data.sourceName;
-            if (data.content !== undefined) {
-                updates.content = data.content;
-                updates.contentHtml = data.content ? renderMarkdown(data.content) : null;
-            }
-            // Handle visibility change - cascade to thread if this is root
-            if (data.visibility !== undefined && data.visibility !== existing.visibility) {
-                updates.visibility = data.visibility;
-                // If this is a root post, cascade visibility to all thread posts
-                if (!existing.threadId) {
-                    await this.updateThreadVisibility(id, data.visibility);
-                }
+            if (data.pinned !== undefined) updates.pinned = data.pinned ? 1 : 0;
+            if (data.body !== undefined) {
+                updates.body = data.body;
+                updates.bodyHtml = data.body ? renderMarkdown(data.body) : null;
+            }
+            // Handle status/featured change - cascade to thread if this is root
+            const statusChanged = data.status !== undefined && data.status !== existing.status;
+            const featuredChanged = data.featured !== undefined && (data.featured ? 1 : 0) !== existing.featured;
+            if (statusChanged) updates.status = data.status;
+            if (featuredChanged) updates.featured = data.featured ? 1 : 0;
+            // If this is a root post and status/featured changed, cascade to thread
+            if ((statusChanged || featuredChanged) && !existing.threadId) {
+                await this.updateThreadStatusAndFeatured(id, data.status ?? existing.status, data.featured !== undefined ? data.featured : existing.featured === 1);
             }
             const result = await db.update(posts).set(updates).where(eq(posts.id, id)).returning();
             return result[0] ? toPost(result[0]) : null;
@@ -158,7 +192,6 @@ export function createPostService(db) {
                     updatedAt: timestamp
                 }).where(or(eq(posts.id, id), eq(posts.threadId, id)));
             } else {
-                // Just delete this single post
                 await db.update(posts).set({
                     deletedAt: timestamp,
                     updatedAt: timestamp
@@ -170,10 +203,11 @@ export function createPostService(db) {
             const rows = await db.select().from(posts).where(and(or(eq(posts.id, rootId), eq(posts.threadId, rootId)), isNull(posts.deletedAt))).orderBy(posts.createdAt);
             return rows.map(toPost);
         },
-        async updateThreadVisibility (rootId, visibility) {
+        async updateThreadStatusAndFeatured (rootId, status, featured) {
             const timestamp = now();
             await db.update(posts).set({
-                visibility,
+                status,
+                featured: featured ? 1 : 0,
                 updatedAt: timestamp
             }).where(eq(posts.threadId, rootId));
         },
@@ -194,7 +228,6 @@ export function createPostService(db) {
         async getThreadPreviews (rootIds, previewCount = 3) {
             if (rootIds.length === 0) return new Map();
             const rows = await db.select().from(posts).where(and(inArray(posts.threadId, rootIds), isNull(posts.deletedAt))).orderBy(posts.threadId, posts.createdAt);
-            // Partition by threadId, take first previewCount per thread
             const result = new Map();
             for (const row of rows){
                 const post = toPost(row);

package/dist/services/search.js

@@ -1,5 +1,5 @@
 /**
- * Search Service
+ * Search Service (v2)
  *
  * Full-text search using FTS5
  */ export function createSearchService(d1) {
@@ -7,19 +7,21 @@
         async search (query, options = {}) {
             const limit = options.limit ?? 20;
             const offset = options.offset ?? 0;
-            const visibility = options.visibility ?? [
-                "featured",
-                "quiet"
+            const status = options.status ?? [
+                "published"
             ];
             // Escape and prepare the query for FTS5
-            // FTS5 uses * for prefix matching
             const ftsQuery = query.trim().split(/\s+/).filter((term)=>term.length > 0).map((term)=>`"${term.replace(/"/g, '""')}"*`).join(" ");
             if (!ftsQuery) {
                 return [];
             }
-            // Build visibility placeholders
-            const visibilityPlaceholders = visibility.map(()=>"?").join(", ");
-            // Query FTS5 table and join with posts using raw D1 query
+            // 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.*,
@@ -29,23 +31,27 @@
         JOIN posts ON posts.id = posts_fts.rowid
         WHERE posts_fts MATCH ?
           AND posts.deleted_at IS NULL
-          AND posts.visibility IN (${visibilityPlaceholders})
+          AND posts.status IN (${statusPlaceholders})
+          ${formatFilter}
         ORDER BY posts_fts.rank
         LIMIT ? OFFSET ?
       `);
-            const { results } = await stmt.bind(ftsQuery, ...visibility, limit, offset).all();
+            const { results } = await stmt.bind(ftsQuery, ...status, ...formatParams, limit, offset).all();
             return (results || []).map((row)=>({
                     post: {
                         id: row.id,
-                        type: row.type,
-                        visibility: row.visibility,
-                        title: row.title,
+                        format: row.format,
+                        status: row.status,
+                        featured: row.featured,
+                        pinned: row.pinned,
                         path: row.path,
-                        content: row.content,
-                        contentHtml: row.content_html,
-                        sourceUrl: row.source_url,
-                        sourceName: row.source_name,
-                        sourceDomain: row.source_domain,
+                        title: row.title,
+                        url: row.url,
+                        body: row.body,
+                        bodyHtml: row.body_html,
+                        quoteText: row.quote_text,
+                        rating: row.rating,
+                        collectionId: row.collection_id,
                         replyToId: row.reply_to_id,
                         threadId: row.thread_id,
                         deletedAt: row.deleted_at,

package/dist/types.js

@@ -1,53 +1,33 @@
 /**
- * Jant Type Definitions
+ * Jant Type Definitions (v2)
  */ // =============================================================================
 // Content Types
 // =============================================================================
-export const POST_TYPES = [
+export const FORMATS = [
     "note",
-    "article",
     "link",
-    "quote",
-    "image",
-    "page"
+    "quote"
+];
+export const STATUSES = [
+    "draft",
+    "published"
+];
+export const SORT_ORDERS = [
+    "newest",
+    "oldest",
+    "rating_desc",
+    "rating_asc"
+];
+export const NAV_ITEM_TYPES = [
+    "page",
+    "link"
 ];
 export const MAX_MEDIA_ATTACHMENTS = 20;
-/**
- * Media attachment rules per post type.
- * Each entry is [min, max] or null (no media allowed).
- */ export const POST_TYPE_MEDIA_RULES = {
-    note: [
-        0,
-        20
-    ],
-    article: [
-        0,
-        20
-    ],
-    image: [
-        1,
-        20
-    ],
-    link: [
-        0,
-        1
-    ],
-    quote: [
-        0,
-        20
-    ],
-    page: null
-};
+export const MAX_PINNED_POSTS = 3;
 export const STORAGE_DRIVERS = [
     "r2",
     "s3"
 ];
-export const VISIBILITY_LEVELS = [
-    "featured",
-    "quiet",
-    "unlisted",
-    "draft"
-];
 // =============================================================================
 // Configuration System
 // =============================================================================
@@ -58,8 +38,8 @@ export const VISIBILITY_LEVELS = [
  * Add new fields here, and they'll automatically work everywhere.
  *
  * Priority logic:
- * - envOnly: false → User-configurable (DB > ENV > Default)
- * - envOnly: true → Environment-only (ENV > Default)
+ * - envOnly: false -> User-configurable (DB > ENV > Default)
+ * - envOnly: true -> Environment-only (ENV > Default)
  */ export const CONFIG_FIELDS = {
     // User-configurable (can be modified in dashboard)
     SITE_NAME: {
@@ -99,6 +79,10 @@ export const VISIBILITY_LEVELS = [
         defaultValue: "",
         envOnly: true
     },
+    PAGE_SIZE: {
+        defaultValue: "20",
+        envOnly: true
+    },
     STORAGE_DRIVER: {
         defaultValue: "r2",
         envOnly: true