@jant/core 0.3.35 → 0.3.37

package/src/routes/__tests__/compose.test.ts

@@ -11,7 +11,7 @@ describe("Compose Routes", () => {
       const res = await app.request("/compose", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ format: "note", body: "Hello" }),
+        body: JSON.stringify({ format: "note", bodyMarkdown: "Hello" }),
       });
 
       expect(res.status).toBe(302);
@@ -25,23 +25,22 @@ describe("Compose Routes", () => {
       const res = await app.request("/compose", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ format: "note", body: "Hello world" }),
+        body: JSON.stringify({ format: "note", bodyMarkdown: "Hello world" }),
       });
 
       expect(res.status).toBe(200);
       expect(res.headers.get("Content-Type")).toBe("text/event-stream");
 
       const text = await res.text();
-      // SSE prepends the card to the timeline
+      // SSE closes the compose dialog and resets signals
       expect(text).toContain("datastar-patch-elements");
-      expect(text).toContain('data-format="note"');
-      expect(text).toContain("selector #timeline-items");
+      expect(text).toContain("compose-dialog");
 
       // Verify post was created
       const posts = await services.posts.list();
       expect(posts).toHaveLength(1);
       expect(posts[0].format).toBe("note");
-      expect(posts[0].body).toBe("Hello world");
+      expect(posts[0].bodyText).toBe("Hello world");
       expect(posts[0].status).toBe("published");
     });
 
@@ -54,7 +53,7 @@ describe("Compose Routes", () => {
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
           format: "link",
-          body: "Check this out",
+          bodyMarkdown: "Check this out",
           url: "https://example.com",
         }),
       });
@@ -62,9 +61,6 @@ describe("Compose Routes", () => {
       expect(res.status).toBe(200);
       expect(res.headers.get("Content-Type")).toBe("text/event-stream");
 
-      const text = await res.text();
-      expect(text).toContain('data-format="link"');
-
       const posts = await services.posts.list();
       expect(posts).toHaveLength(1);
       expect(posts[0].format).toBe("link");
@@ -80,7 +76,7 @@ describe("Compose Routes", () => {
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
           format: "quote",
-          body: "Great insight",
+          bodyMarkdown: "Great insight",
           quoteText: "The original quote",
           url: "https://example.com/source",
         }),
@@ -89,9 +85,6 @@ describe("Compose Routes", () => {
       expect(res.status).toBe(200);
       expect(res.headers.get("Content-Type")).toBe("text/event-stream");
 
-      const text = await res.text();
-      expect(text).toContain('data-format="quote"');
-
       const posts = await services.posts.list();
       expect(posts).toHaveLength(1);
       expect(posts[0].format).toBe("quote");
@@ -107,7 +100,7 @@ describe("Compose Routes", () => {
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
           format: "note",
-          body: "Draft content",
+          bodyMarkdown: "Draft content",
           status: "draft",
         }),
       });
@@ -133,7 +126,7 @@ describe("Compose Routes", () => {
       const res = await app.request("/compose", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ format: "invalid", body: "Hello" }),
+        body: JSON.stringify({ format: "invalid", bodyMarkdown: "Hello" }),
       });
 
       expect(res.status).toBe(200);
@@ -163,7 +156,7 @@ describe("Compose Routes", () => {
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
           format: "note",
-          body: "Post with media",
+          bodyMarkdown: "Post with media",
           mediaIds: [media.id],
         }),
       });
@@ -186,7 +179,7 @@ describe("Compose Routes", () => {
       const res = await app.request("/compose", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ format: "note", body: "Hello" }),
+        body: JSON.stringify({ format: "note", bodyMarkdown: "Hello" }),
       });
 
       const text = await res.text();
@@ -202,7 +195,7 @@ describe("Compose Routes", () => {
       const res = await app.request("/compose", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ body: "No format" }),
+        body: JSON.stringify({ bodyMarkdown: "No format" }),
       });
 
       expect(res.status).toBe(200);
@@ -222,7 +215,7 @@ describe("Compose Routes", () => {
           "Content-Type": "application/json",
           Accept: "application/json",
         },
-        body: JSON.stringify({ format: "note", body: "Hello JSON" }),
+        body: JSON.stringify({ format: "note", bodyMarkdown: "Hello JSON" }),
       });
 
       expect(res.status).toBe(200);
@@ -230,11 +223,11 @@ describe("Compose Routes", () => {
 
       const data = await res.json();
       expect(data.status).toBe("published");
-      expect(data.cardHtml).toContain('data-format="note"');
+      expect(data.permalink).toBeDefined();
 
       const posts = await services.posts.list();
       expect(posts).toHaveLength(1);
-      expect(posts[0].body).toBe("Hello JSON");
+      expect(posts[0].bodyText).toBe("Hello JSON");
     });
 
     it("returns JSON for draft", async () => {
@@ -249,7 +242,7 @@ describe("Compose Routes", () => {
         },
         body: JSON.stringify({
           format: "note",
-          body: "Draft JSON",
+          bodyMarkdown: "Draft JSON",
           status: "draft",
         }),
       });
@@ -274,7 +267,7 @@ describe("Compose Routes", () => {
           "Content-Type": "application/json",
           Accept: "application/json",
         },
-        body: JSON.stringify({ format: "invalid", body: "Hello" }),
+        body: JSON.stringify({ format: "invalid", bodyMarkdown: "Hello" }),
       });
 
       expect(res.status).toBe(422);

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

@@ -13,9 +13,10 @@ describe("Collections API Routes", () => {
 
       const body = await res.json();
       expect(body.collections).toEqual([]);
+      expect(body.sidebarItems).toEqual([]);
     });
 
-    it("returns collections with post counts", async () => {
+    it("returns collections with post counts and sidebar items", async () => {
       const { app, services } = createTestApp();
       app.route("/api/collections", collectionsApiRoutes);
 
@@ -25,7 +26,7 @@ describe("Collections API Routes", () => {
       });
       const post = await services.posts.create({
         format: "note",
-        body: "tech post",
+        bodyMarkdown: "tech post",
       });
       await services.collections.addPost(col.id, post.id);
 
@@ -35,6 +36,10 @@ describe("Collections API Routes", () => {
       expect(body.collections).toHaveLength(1);
       expect(body.collections[0].slug).toBe("tech");
       expect(body.collections[0].postCount).toBe(1);
+
+      expect(body.sidebarItems).toHaveLength(1);
+      expect(body.sidebarItems[0].type).toBe("collection");
+      expect(body.sidebarItems[0].collectionId).toBe(col.id);
     });
   });
 
@@ -60,7 +65,7 @@ describe("Collections API Routes", () => {
       const { app } = createTestApp();
       app.route("/api/collections", collectionsApiRoutes);
 
-      const res = await app.request("/api/collections/abc");
+      const res = await app.request("/api/collections/!!invalid!!");
       expect(res.status).toBe(400);
     });
 
@@ -68,7 +73,9 @@ describe("Collections API Routes", () => {
       const { app } = createTestApp();
       app.route("/api/collections", collectionsApiRoutes);
 
-      const res = await app.request("/api/collections/9999");
+      const res = await app.request(
+        `/api/collections/${"00000000-0000-0000-0000-000000009999"}`,
+      );
       expect(res.status).toBe(404);
     });
   });
@@ -122,46 +129,6 @@ describe("Collections API Routes", () => {
     });
   });
 
-  describe("PUT /api/collections/reorder", () => {
-    it("returns 401 when not authenticated", async () => {
-      const { app } = createTestApp({ authenticated: false });
-      app.route("/api/collections", collectionsApiRoutes);
-
-      const res = await app.request("/api/collections/reorder", {
-        method: "PUT",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ ids: [1, 2] }),
-      });
-
-      expect(res.status).toBe(401);
-    });
-
-    it("reorders collections when authenticated", async () => {
-      const { app, services } = createTestApp({ authenticated: true });
-      app.route("/api/collections", collectionsApiRoutes);
-
-      const col1 = await services.collections.create({
-        slug: "first",
-        title: "First",
-      });
-      const col2 = await services.collections.create({
-        slug: "second",
-        title: "Second",
-      });
-
-      const res = await app.request("/api/collections/reorder", {
-        method: "PUT",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ ids: [col2.id, col1.id] }),
-      });
-
-      expect(res.status).toBe(200);
-      const body = await res.json();
-      expect(body.collections[0].slug).toBe("second");
-      expect(body.collections[1].slug).toBe("first");
-    });
-  });
-
   describe("PUT /api/collections/:id", () => {
     it("updates a collection when authenticated", async () => {
       const { app, services } = createTestApp({ authenticated: true });
@@ -187,11 +154,14 @@ describe("Collections API Routes", () => {
       const { app } = createTestApp({ authenticated: true });
       app.route("/api/collections", collectionsApiRoutes);
 
-      const res = await app.request("/api/collections/9999", {
-        method: "PUT",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ title: "test" }),
-      });
+      const res = await app.request(
+        `/api/collections/${"00000000-0000-0000-0000-000000009999"}`,
+        {
+          method: "PUT",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ title: "test" }),
+        },
+      );
 
       expect(res.status).toBe(404);
     });
@@ -239,14 +209,87 @@ describe("Collections API Routes", () => {
       const { app } = createTestApp({ authenticated: true });
       app.route("/api/collections", collectionsApiRoutes);
 
-      const res = await app.request("/api/collections/9999", {
-        method: "DELETE",
-      });
+      const res = await app.request(
+        `/api/collections/${"00000000-0000-0000-0000-000000009999"}`,
+        { method: "DELETE" },
+      );
 
       expect(res.status).toBe(404);
     });
   });
 
+  describe("POST /api/collections/sidebar-items", () => {
+    it("creates a divider sidebar item", async () => {
+      const { app } = createTestApp({ authenticated: true });
+      app.route("/api/collections", collectionsApiRoutes);
+
+      const res = await app.request("/api/collections/sidebar-items", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+      });
+
+      expect(res.status).toBe(201);
+      const body = await res.json();
+      expect(body.type).toBe("divider");
+      expect(body.collectionId).toBeNull();
+    });
+  });
+
+  describe("DELETE /api/collections/sidebar-items/:id", () => {
+    it("deletes a sidebar item", async () => {
+      const { app, services } = createTestApp({ authenticated: true });
+      app.route("/api/collections", collectionsApiRoutes);
+
+      const item = await services.collections.createSidebarItem("divider");
+
+      const res = await app.request(
+        `/api/collections/sidebar-items/${item.id}`,
+        { method: "DELETE" },
+      );
+
+      expect(res.status).toBe(200);
+      const body = await res.json();
+      expect(body.success).toBe(true);
+    });
+  });
+
+  describe("PUT /api/collections/sidebar-items/:id/move", () => {
+    it("moves a sidebar item", async () => {
+      const { app, services } = createTestApp({ authenticated: true });
+      app.route("/api/collections", collectionsApiRoutes);
+
+      await services.collections.create({ slug: "a", title: "A" });
+      await services.collections.create({ slug: "b", title: "B" });
+      await services.collections.create({ slug: "c", title: "C" });
+
+      const items = await services.collections.listSidebarItems();
+      expect(items).toHaveLength(3);
+      const itemA = items[0];
+      const itemB = items[1];
+      const itemC = items[2];
+
+      // Move C between A and B
+      const res = await app.request(
+        `/api/collections/sidebar-items/${itemC?.id ?? ""}/move`,
+        {
+          method: "PUT",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({
+            after: itemA?.id ?? "",
+            before: itemB?.id ?? "",
+          }),
+        },
+      );
+
+      expect(res.status).toBe(200);
+
+      const reordered = await services.collections.listSidebarItems();
+      expect(reordered[0]?.id).toBe(itemA?.id);
+      expect(reordered[1]?.id).toBe(itemC?.id);
+      expect(reordered[2]?.id).toBe(itemB?.id);
+    });
+  });
+
   describe("POST /api/collections/:id/posts", () => {
     it("adds a post to a collection", async () => {
       const { app, services } = createTestApp({ authenticated: true });
@@ -258,7 +301,7 @@ describe("Collections API Routes", () => {
       });
       const post = await services.posts.create({
         format: "note",
-        body: "test",
+        bodyMarkdown: "test",
       });
 
       const res = await app.request(`/api/collections/${col.id}/posts`, {
@@ -279,14 +322,17 @@ describe("Collections API Routes", () => {
 
       const post = await services.posts.create({
         format: "note",
-        body: "test",
+        bodyMarkdown: "test",
       });
 
-      const res = await app.request("/api/collections/9999/posts", {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ postId: post.id }),
-      });
+      const res = await app.request(
+        `/api/collections/${"00000000-0000-0000-0000-000000009999"}/posts`,
+        {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ postId: post.id }),
+        },
+      );
 
       expect(res.status).toBe(404);
     });
@@ -303,7 +349,9 @@ describe("Collections API Routes", () => {
       const res = await app.request(`/api/collections/${col.id}/posts`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ postId: 1 }),
+        body: JSON.stringify({
+          postId: "00000000-0000-0000-0000-000000000001",
+        }),
       });
 
       expect(res.status).toBe(401);
@@ -321,7 +369,7 @@ describe("Collections API Routes", () => {
       });
       const post = await services.posts.create({
         format: "note",
-        body: "test",
+        bodyMarkdown: "test",
       });
 
       await services.collections.addPost(col.id, post.id);

package/src/routes/api/__tests__/nav-items.test.ts

@@ -92,21 +92,8 @@ describe("Nav Items API Routes", () => {
     });
   });
 
-  describe("PUT /api/nav-items/reorder", () => {
-    it("returns 401 when not authenticated", async () => {
-      const { app } = createTestApp({ authenticated: false });
-      app.route("/api/nav-items", navItemsApiRoutes);
-
-      const res = await app.request("/api/nav-items/reorder", {
-        method: "PUT",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ ids: [1, 2] }),
-      });
-
-      expect(res.status).toBe(401);
-    });
-
-    it("reorders nav items when authenticated", async () => {
+  describe("PUT /api/nav-items/:id/move", () => {
+    it("moves a nav item between two others", async () => {
       const { app, services } = createTestApp({ authenticated: true });
       app.route("/api/nav-items", navItemsApiRoutes);
 
@@ -120,18 +107,44 @@ describe("Nav Items API Routes", () => {
         label: "Second",
         url: "/second",
       });
+      const item3 = await services.navItems.create({
+        type: "link",
+        label: "Third",
+        url: "/third",
+      });
 
-      // Reverse order
-      const res = await app.request("/api/nav-items/reorder", {
+      // Move Third between First and Second
+      const res = await app.request(`/api/nav-items/${item3.id}/move`, {
         method: "PUT",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ ids: [item2.id, item1.id] }),
+        body: JSON.stringify({
+          after: item1.id,
+          before: item2.id,
+        }),
       });
 
       expect(res.status).toBe(200);
-      const body = await res.json();
-      expect(body.navItems[0].label).toBe("Second");
-      expect(body.navItems[1].label).toBe("First");
+
+      const items = await services.navItems.list();
+      expect(items[0]?.label).toBe("First");
+      expect(items[1]?.label).toBe("Third");
+      expect(items[2]?.label).toBe("Second");
+    });
+
+    it("returns 404 for non-existent item", async () => {
+      const { app } = createTestApp({ authenticated: true });
+      app.route("/api/nav-items", navItemsApiRoutes);
+
+      const res = await app.request(
+        `/api/nav-items/${"00000000-0000-0000-0000-000000009999"}/move`,
+        {
+          method: "PUT",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ after: null, before: null }),
+        },
+      );
+
+      expect(res.status).toBe(404);
     });
   });
 
@@ -161,11 +174,14 @@ describe("Nav Items API Routes", () => {
       const { app } = createTestApp({ authenticated: true });
       app.route("/api/nav-items", navItemsApiRoutes);
 
-      const res = await app.request("/api/nav-items/9999", {
-        method: "PUT",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ label: "test" }),
-      });
+      const res = await app.request(
+        `/api/nav-items/${"00000000-0000-0000-0000-000000009999"}`,
+        {
+          method: "PUT",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ label: "test" }),
+        },
+      );
 
       expect(res.status).toBe(404);
     });
@@ -212,9 +228,10 @@ describe("Nav Items API Routes", () => {
       const { app } = createTestApp({ authenticated: true });
       app.route("/api/nav-items", navItemsApiRoutes);
 
-      const res = await app.request("/api/nav-items/9999", {
-        method: "DELETE",
-      });
+      const res = await app.request(
+        `/api/nav-items/${"00000000-0000-0000-0000-000000009999"}`,
+        { method: "DELETE" },
+      );
 
       expect(res.status).toBe(404);
     });