@jant/core 0.3.22 → 0.3.24

package/src/routes/api/__tests__/posts.test.ts

@@ -22,16 +22,15 @@ describe("Posts API Routes", () => {
       app.route("/api/posts", postsApiRoutes);
 
       await services.posts.create({
-        type: "note",
-        content: "Hello world",
-        visibility: "featured",
+        format: "note",
+        body: "Hello world",
       });
 
       const res = await app.request("/api/posts");
       const body = await res.json();
 
       expect(body.posts).toHaveLength(1);
-      expect(body.posts[0].content).toBe("Hello world");
+      expect(body.posts[0].body).toBe("Hello world");
       expect(body.posts[0].sqid).toBeTruthy();
     });
 
@@ -40,9 +39,8 @@ describe("Posts API Routes", () => {
       app.route("/api/posts", postsApiRoutes);
 
       const post = await services.posts.create({
-        type: "note",
-        content: "with media",
-        visibility: "featured",
+        format: "note",
+        body: "with media",
       });
 
       const media = await services.media.create({
@@ -68,26 +66,25 @@ describe("Posts API Routes", () => {
       expect(body.posts[0].mediaAttachments[0].position).toBe(0);
     });
 
-    it("filters by visibility", async () => {
+    it("filters by status", async () => {
       const { app, services } = createTestApp();
       app.route("/api/posts", postsApiRoutes);
 
       await services.posts.create({
-        type: "note",
-        content: "featured",
-        visibility: "featured",
+        format: "note",
+        body: "published post",
       });
       await services.posts.create({
-        type: "note",
-        content: "draft",
-        visibility: "draft",
+        format: "note",
+        body: "draft post",
+        status: "draft",
       });
 
-      const res = await app.request("/api/posts?visibility=draft");
+      const res = await app.request("/api/posts?status=draft");
       const body = await res.json();
 
       expect(body.posts).toHaveLength(1);
-      expect(body.posts[0].visibility).toBe("draft");
+      expect(body.posts[0].status).toBe("draft");
     });
 
     it("supports limit parameter", async () => {
@@ -96,9 +93,8 @@ describe("Posts API Routes", () => {
 
       for (let i = 0; i < 5; i++) {
         await services.posts.create({
-          type: "note",
-          content: `post ${i}`,
-          visibility: "featured",
+          format: "note",
+          body: `post ${i}`,
         });
       }
 
@@ -116,9 +112,8 @@ describe("Posts API Routes", () => {
       app.route("/api/posts", postsApiRoutes);
 
       const post = await services.posts.create({
-        type: "note",
-        content: "test post",
-        visibility: "featured",
+        format: "note",
+        body: "test post",
       });
       const id = sqid.encode(post.id);
 
@@ -126,7 +121,7 @@ describe("Posts API Routes", () => {
       expect(res.status).toBe(200);
 
       const body = await res.json();
-      expect(body.content).toBe("test post");
+      expect(body.body).toBe("test post");
       expect(body.sqid).toBe(id);
     });
 
@@ -135,9 +130,8 @@ describe("Posts API Routes", () => {
       app.route("/api/posts", postsApiRoutes);
 
       const post = await services.posts.create({
-        type: "note",
-        content: "with media",
-        visibility: "featured",
+        format: "note",
+        body: "with media",
       });
 
       const media = await services.media.create({
@@ -183,9 +177,8 @@ describe("Posts API Routes", () => {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
-          type: "note",
-          content: "test",
-          visibility: "quiet",
+          format: "note",
+          body: "test",
         }),
       });
 
@@ -200,16 +193,15 @@ describe("Posts API Routes", () => {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
-          type: "note",
-          content: "Hello from API",
-          visibility: "quiet",
+          format: "note",
+          body: "Hello from API",
         }),
       });
 
       expect(res.status).toBe(201);
 
       const body = await res.json();
-      expect(body.content).toBe("Hello from API");
+      expect(body.body).toBe("Hello from API");
       expect(body.sqid).toBeTruthy();
       expect(body.mediaAttachments).toEqual([]);
     });
@@ -237,9 +229,8 @@ describe("Posts API Routes", () => {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
-          type: "note",
-          content: "with images",
-          visibility: "quiet",
+          format: "note",
+          body: "with images",
           mediaIds: [m1.id, m2.id],
         }),
       });
@@ -253,54 +244,6 @@ describe("Posts API Routes", () => {
       expect(body.mediaAttachments[1].position).toBe(1);
     });
 
-    it("returns 400 for image type without media", async () => {
-      const { app } = createTestApp({ authenticated: true });
-      app.route("/api/posts", postsApiRoutes);
-
-      const res = await app.request("/api/posts", {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({
-          type: "image",
-          content: "should fail",
-          visibility: "quiet",
-          mediaIds: [],
-        }),
-      });
-
-      expect(res.status).toBe(400);
-      const body = await res.json();
-      expect(body.error).toContain("image posts require at least 1");
-    });
-
-    it("returns 400 for page type with media", async () => {
-      const { app, services } = createTestApp({ authenticated: true });
-      app.route("/api/posts", postsApiRoutes);
-
-      const m1 = await services.media.create({
-        filename: "a.jpg",
-        originalName: "a.jpg",
-        mimeType: "image/jpeg",
-        size: 1024,
-        storageKey: "media/2025/01/a.jpg",
-      });
-
-      const res = await app.request("/api/posts", {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({
-          type: "page",
-          content: "test",
-          visibility: "quiet",
-          mediaIds: [m1.id],
-        }),
-      });
-
-      expect(res.status).toBe(400);
-      const body = await res.json();
-      expect(body.error).toContain("page posts do not allow");
-    });
-
     it("returns 400 for invalid media IDs", async () => {
       const { app } = createTestApp({ authenticated: true });
       app.route("/api/posts", postsApiRoutes);
@@ -309,9 +252,8 @@ describe("Posts API Routes", () => {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
-          type: "note",
-          content: "test",
-          visibility: "quiet",
+          format: "note",
+          body: "test",
           mediaIds: ["nonexistent-id"],
         }),
       });
@@ -328,7 +270,7 @@ describe("Posts API Routes", () => {
       const res = await app.request("/api/posts", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ type: "invalid-type" }),
+        body: JSON.stringify({ format: "invalid-type" }),
       });
 
       expect(res.status).toBe(400);
@@ -356,14 +298,14 @@ describe("Posts API Routes", () => {
       app.route("/api/posts", postsApiRoutes);
 
       const post = await services.posts.create({
-        type: "note",
-        content: "original",
+        format: "note",
+        body: "original",
       });
 
       const res = await app.request(`/api/posts/${sqid.encode(post.id)}`, {
         method: "PUT",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ content: "updated" }),
+        body: JSON.stringify({ body: "updated" }),
       });
 
       expect(res.status).toBe(401);
@@ -374,19 +316,19 @@ describe("Posts API Routes", () => {
       app.route("/api/posts", postsApiRoutes);
 
       const post = await services.posts.create({
-        type: "note",
-        content: "original",
+        format: "note",
+        body: "original",
       });
 
       const res = await app.request(`/api/posts/${sqid.encode(post.id)}`, {
         method: "PUT",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ content: "updated" }),
+        body: JSON.stringify({ body: "updated" }),
       });
 
       expect(res.status).toBe(200);
       const body = await res.json();
-      expect(body.content).toBe("updated");
+      expect(body.body).toBe("updated");
       expect(body.mediaAttachments).toEqual([]);
     });
 
@@ -395,8 +337,8 @@ describe("Posts API Routes", () => {
       app.route("/api/posts", postsApiRoutes);
 
       const post = await services.posts.create({
-        type: "note",
-        content: "test",
+        format: "note",
+        body: "test",
       });
 
       const m1 = await services.media.create({
@@ -434,8 +376,8 @@ describe("Posts API Routes", () => {
       app.route("/api/posts", postsApiRoutes);
 
       const post = await services.posts.create({
-        type: "note",
-        content: "test",
+        format: "note",
+        body: "test",
       });
 
       const m1 = await services.media.create({
@@ -451,7 +393,7 @@ describe("Posts API Routes", () => {
       const res = await app.request(`/api/posts/${sqid.encode(post.id)}`, {
         method: "PUT",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ content: "updated content" }),
+        body: JSON.stringify({ body: "updated content" }),
       });
 
       expect(res.status).toBe(200);
@@ -467,7 +409,7 @@ describe("Posts API Routes", () => {
       const res = await app.request(`/api/posts/${sqid.encode(9999)}`, {
         method: "PUT",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ content: "test" }),
+        body: JSON.stringify({ body: "test" }),
       });
 
       expect(res.status).toBe(404);
@@ -478,14 +420,14 @@ describe("Posts API Routes", () => {
       app.route("/api/posts", postsApiRoutes);
 
       const post = await services.posts.create({
-        type: "note",
-        content: "test",
+        format: "note",
+        body: "test",
       });
 
       const res = await app.request(`/api/posts/${sqid.encode(post.id)}`, {
         method: "PUT",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ type: "invalid-type" }),
+        body: JSON.stringify({ format: "invalid-type" }),
       });
 
       expect(res.status).toBe(400);
@@ -498,8 +440,8 @@ describe("Posts API Routes", () => {
       app.route("/api/posts", postsApiRoutes);
 
       const post = await services.posts.create({
-        type: "note",
-        content: "test",
+        format: "note",
+        body: "test",
       });
 
       const res = await app.request(`/api/posts/${sqid.encode(post.id)}`, {
@@ -514,8 +456,8 @@ describe("Posts API Routes", () => {
       app.route("/api/posts", postsApiRoutes);
 
       const post = await services.posts.create({
-        type: "note",
-        content: "to be deleted",
+        format: "note",
+        body: "to be deleted",
       });
 
       const res = await app.request(`/api/posts/${sqid.encode(post.id)}`, {

package/src/routes/api/__tests__/search.test.ts

@@ -39,9 +39,8 @@ describe("Search API Routes", () => {
     app.route("/api/search", searchApiRoutes);
 
     await services.posts.create({
-      type: "note",
-      content: "Testing search functionality in jant",
-      visibility: "featured",
+      format: "note",
+      body: "Testing search functionality in jant",
     });
 
     const res = await app.request("/api/search?q=jant");

package/src/routes/api/posts.ts

@@ -3,13 +3,13 @@
  */
 
 import { Hono } from "hono";
-import type { Bindings, PostType, Visibility, Media } from "../../types.js";
+import type { Bindings, Format, Status, Media } from "../../types.js";
 import type { AppVariables } from "../../app.js";
 import * as sqid from "../../lib/sqid.js";
 import {
   CreatePostSchema,
   UpdatePostSchema,
-  validateMediaForPostType,
+  validateMediaCount,
 } from "../../lib/schemas.js";
 import { requireAuthApi } from "../../middleware/auth.js";
 import {
@@ -59,14 +59,14 @@ function toMediaAttachment(
 
 // List posts
 postsApiRoutes.get("/", async (c) => {
-  const type = c.req.query("type") as PostType | undefined;
-  const visibility = c.req.query("visibility") as Visibility | undefined;
+  const format = c.req.query("format") as Format | undefined;
+  const status = c.req.query("status") as Status | undefined;
   const cursor = c.req.query("cursor");
   const limit = parseInt(c.req.query("limit") ?? "100", 10);
 
   const posts = await c.var.services.posts.list({
-    type,
-    visibility: visibility ? [visibility] : ["featured", "quiet"],
+    format,
+    status: status ?? "published",
     cursor: cursor ? (sqid.decode(cursor) ?? undefined) : undefined,
     limit,
   });
@@ -131,9 +131,9 @@ postsApiRoutes.post("/", requireAuthApi(), async (c) => {
 
   const body = parseResult.data;
 
-  // Validate media for post type
+  // Validate media count
   if (body.mediaIds) {
-    const mediaError = validateMediaForPostType(body.type, body.mediaIds);
+    const mediaError = validateMediaCount(body.mediaIds);
     if (mediaError) {
       return c.json({ error: mediaError }, 400);
     }
@@ -148,13 +148,17 @@ postsApiRoutes.post("/", requireAuthApi(), async (c) => {
   }
 
   const post = await c.var.services.posts.create({
-    type: body.type,
+    format: body.format,
     title: body.title,
-    content: body.content,
-    visibility: body.visibility,
-    sourceUrl: body.sourceUrl || undefined,
-    sourceName: body.sourceName,
-    path: body.path || undefined,
+    body: body.body,
+    slug: body.slug || undefined,
+    status: body.status,
+    featured: body.featured,
+    pinned: body.pinned,
+    url: body.url || undefined,
+    quoteText: body.quoteText,
+    rating: body.rating || undefined,
+    collectionId: body.collectionId || undefined,
     replyToId: body.replyToId
       ? (sqid.decode(body.replyToId) ?? undefined)
       : undefined,
@@ -201,17 +205,9 @@ postsApiRoutes.put("/:id", requireAuthApi(), async (c) => {
 
   const body = parseResult.data;
 
-  // Validate media for post type if mediaIds is provided
+  // Validate media count if mediaIds is provided
   if (body.mediaIds !== undefined) {
-    // Need the post type — use the new type if provided, else fetch existing
-    let postType = body.type;
-    if (!postType) {
-      const existing = await c.var.services.posts.getById(id);
-      if (!existing) return c.json({ error: "Not found" }, 404);
-      postType = existing.type;
-    }
-
-    const mediaError = validateMediaForPostType(postType, body.mediaIds);
+    const mediaError = validateMediaCount(body.mediaIds);
     if (mediaError) {
       return c.json({ error: mediaError }, 400);
     }
@@ -226,13 +222,17 @@ postsApiRoutes.put("/:id", requireAuthApi(), async (c) => {
   }
 
   const post = await c.var.services.posts.update(id, {
-    type: body.type,
+    format: body.format,
     title: body.title,
-    content: body.content,
-    visibility: body.visibility,
-    sourceUrl: body.sourceUrl,
-    sourceName: body.sourceName,
-    path: body.path,
+    body: body.body,
+    slug: body.slug,
+    status: body.status,
+    featured: body.featured,
+    pinned: body.pinned,
+    url: body.url,
+    quoteText: body.quoteText,
+    rating: body.rating || undefined,
+    collectionId: body.collectionId || undefined,
     publishedAt: body.publishedAt,
   });
 

package/src/routes/api/search.ts

@@ -29,19 +29,19 @@ searchApiRoutes.get("/", async (c) => {
   try {
     const results = await c.var.services.search.search(query, {
       limit,
-      visibility: ["featured", "quiet"],
+      status: ["published"],
     });
 
     return c.json({
       query,
       results: results.map((r) => ({
         id: sqid.encode(r.post.id),
-        type: r.post.type,
+        format: r.post.format,
         title: r.post.title,
-        path: r.post.path,
+        slug: r.post.slug,
         snippet: r.snippet,
         publishedAt: r.post.publishedAt,
-        url: `/p/${sqid.encode(r.post.id)}`,
+        url: r.post.slug ? `/${r.post.slug}` : `/p/${sqid.encode(r.post.id)}`,
       })),
       count: results.length,
     });

package/src/routes/api/upload.ts

@@ -5,7 +5,7 @@
  * Supports both JSON and SSE (Datastar) responses.
  */
 
-import { Hono } from "hono";
+import { Hono, type Context } from "hono";
 import { html } from "hono/html";
 import { uuidv7 } from "uuidv7";
 import type { Bindings } from "../../types.js";
@@ -16,7 +16,7 @@ import {
   getImageUrl,
   getPublicUrlForProvider,
 } from "../../lib/image.js";
-import { sse, dsSignals } from "../../lib/sse.js";
+import { sse } from "../../lib/sse.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
@@ -118,12 +118,22 @@ function wantsSSE(c: {
   return accept.includes("text/event-stream");
 }
 
+/**
+ * Return an SSE error response that removes the upload placeholder and shows a toast
+ */
+function sseUploadError(c: Context<Env>, message: string): Response {
+  return sse(c, async (stream) => {
+    await stream.remove("#upload-placeholder");
+    await stream.toast(message, "error");
+  });
+}
+
 // Upload a file
 uploadApiRoutes.post("/", async (c) => {
   const storage = c.var.storage;
   if (!storage) {
     if (wantsSSE(c)) {
-      return dsSignals({ _uploadError: "Storage not configured" });
+      return sseUploadError(c, "Storage not configured");
     }
     return c.json({ error: "Storage not configured" }, 500);
   }
@@ -133,7 +143,7 @@ uploadApiRoutes.post("/", async (c) => {
 
   if (!file) {
     if (wantsSSE(c)) {
-      return dsSignals({ _uploadError: "No file provided" });
+      return sseUploadError(c, "No file provided");
     }
     return c.json({ error: "No file provided" }, 400);
   }
@@ -148,7 +158,7 @@ uploadApiRoutes.post("/", async (c) => {
   ];
   if (!allowedTypes.includes(file.type)) {
     if (wantsSSE(c)) {
-      return dsSignals({ _uploadError: "File type not allowed" });
+      return sseUploadError(c, "File type not allowed");
     }
     return c.json({ error: "File type not allowed" }, 400);
   }
@@ -157,7 +167,7 @@ uploadApiRoutes.post("/", async (c) => {
   const maxSize = 10 * 1024 * 1024;
   if (file.size > maxSize) {
     if (wantsSSE(c)) {
-      return dsSignals({ _uploadError: "File too large (max 10MB)" });
+      return sseUploadError(c, "File too large (max 10MB)");
     }
     return c.json({ error: "File too large (max 10MB)" }, 400);
   }