@k34a/blog 0.0.20 → 0.0.21

package/dist/services/articles.d.ts

@@ -41,6 +41,7 @@ export declare class ArticleService {
      * Get all available tag names.
      */
     getTagNames(): Promise<string[]>;
+    private getUniqueIdsInOrder;
     /**
      * Paginated list of articles with filters and sorting.
      */

package/dist/services/articles.js

@@ -1,7 +1,7 @@
-import { articleSortByVsQuery as h } from "./search-params.js";
+import { articleSortByVsQuery as m } from "./search-params.js";
 import "zod";
-import { PAGE_SIZE as p } from "../cfg.js";
-class q {
+import { PAGE_SIZE as f } from "../cfg.js";
+class I {
   db;
   constructor(e) {
     this.db = e;
@@ -14,22 +14,22 @@ class q {
     const { data: t, error: r } = await this.db.from("articles").select("*").eq("slug", e).eq("status", "Published").single();
     if (r)
       return console.error("Error fetching article details:", r.message), null;
-    const { data: g, error: s } = await this.db.from("tag_articles").select("tag_id").eq("article_id", t.id);
-    if (s)
+    const { data: a, error: o } = await this.db.from("tag_articles").select("tag_id").eq("article_id", t.id);
+    if (o)
       return console.error(
         "Error fetching article tag links:",
-        s.message
+        o.message
       ), { ...t, tags: [] };
-    const n = g?.map((c) => c.tag_id) || [];
-    let o = [];
-    if (n.length > 0) {
-      const { data: c, error: l } = await this.db.from("tags").select("name").in("id", n);
-      l ? console.error(
+    const i = a?.map((c) => c.tag_id) || [];
+    let n = [];
+    if (i.length > 0) {
+      const { data: c, error: s } = await this.db.from("tags").select("name").in("id", i);
+      s ? console.error(
         "Error fetching article tag names:",
-        l.message
-      ) : o = c.map((d) => d.name);
+        s.message
+      ) : n = c.map((l) => l.name);
     }
-    return { ...t, tags: o };
+    return { ...t, tags: n };
   }
   /**
    * Get total number of articles.
@@ -48,37 +48,28 @@ class q {
     const { data: e, error: t } = await this.db.from("tags").select("name");
     return t ? (console.error("Error fetching tags:", t.message), []) : e?.map((r) => r.name) ?? [];
   }
+  getUniqueIdsInOrder(e) {
+    const t = /* @__PURE__ */ new Set(), r = [];
+    for (const a of e)
+      t.has(a.id) || (t.add(a.id), r.push(a.id));
+    return r;
+  }
   /**
    * Paginated list of articles with filters and sorting.
    */
   async list(e) {
-    const { page: t, search: r, sortBy: g, tags: s } = e, n = h[g] ?? h.latest;
-    let o = this.db.from("article_with_tags").select("id").eq("status", "Published");
-    r && (o = o.ilike("title", `%${r}%`)), s && s.length > 0 && (o = o.in("tag", s));
-    const { data: c, error: l } = await o;
-    if (l)
-      return console.error("Count failed:", l), { items: [], total: 0 };
-    const d = new Set(c?.map((a) => a.id)).size;
-    let i = this.db.from("article_with_tags").select("*").eq("status", "Published");
-    r && (i = i.ilike("title", `%${r}%`)), s && s.length > 0 && (i = i.in("tag", s)), i = i.order(n.column, { ascending: n.ascending });
-    const u = t * p, _ = u + p - 1;
-    i = i.range(u, _);
-    const { data: b, error: f } = await i;
-    if (f)
-      return console.error("Error fetching paginated articles:", f), { items: [], total: 0 };
-    const m = /* @__PURE__ */ new Map();
-    for (const a of b ?? [])
-      m.has(a.id) || m.set(a.id, {
-        id: a.id,
-        title: a.title,
-        description: a.description,
-        slug: a.slug,
-        created_at: a.created_at,
-        banner_image: a.banner_image
-      });
-    return {
-      items: [...m.values()],
-      total: d
+    const { page: t, search: r, sortBy: a, tags: o } = e, i = m[a] ?? m.latest, n = t * f, c = n + f - 1;
+    let s = this.db.from("article_with_tags").select("id", { count: "exact" }).eq("status", "Published");
+    r && (s = s.ilike("title", `%${r}%`)), o && o.length > 0 && (s = s.in("tag", o)), s = s.order(i.column, { ascending: i.ascending });
+    const { data: l, error: d } = await s;
+    if (d)
+      return console.error("Count failed:", d), { items: [], total: 0 };
+    const g = new Set(l?.map((p) => p.id)).size, h = this.getUniqueIdsInOrder(l).slice(n, c + 1), { data: b, error: u } = await this.db.from("articles").select(
+      "id,title,description,slug,created_at,banner_image"
+    ).in("id", h).eq("status", "Published").order(i.column, { ascending: i.ascending });
+    return u ? (console.error("Error fetching articles:", u), { items: [], total: g }) : {
+      items: b ?? [],
+      total: g
     };
   }
   async getDescription(e) {
@@ -92,5 +83,5 @@ class q {
   }
 }
 export {
-  q as ArticleService
+  I as ArticleService
 };

package/package.json

@@ -2,7 +2,7 @@
   "name": "@k34a/blog",
   "description": "Create and share articles with your audience.",
   "private": false,
-  "version": "0.0.20",
+  "version": "0.0.21",
   "type": "module",
   "exports": {
     ".": {