@jant/core 0.3.36 → 0.3.38

package/src/services/page.ts

@@ -1,216 +0,0 @@
-/**
- * Page Service
- *
- * CRUD operations for standalone pages (about, now, etc.)
- */
-
-import { eq, desc, sql, and } from "drizzle-orm";
-import type { Database } from "../db/index.js";
-import { pages, navItems } from "../db/schema.js";
-import { now } from "../lib/time.js";
-import { render as renderMarkdown } from "../lib/markdown.js";
-import type { Page, Status, CreatePage, UpdatePage } from "../types.js";
-import type { PathRegistryService } from "./path-registry.js";
-import { ConflictError } from "../lib/errors.js";
-
-export interface PageFilters {
-  status?: Status;
-}
-
-export interface PageService {
-  getById(id: number): Promise<Page | null>;
-  getBySlug(slug: string): Promise<Page | null>;
-  list(filters?: PageFilters): Promise<Page[]>;
-  listNotInNav(): Promise<Page[]>;
-  create(data: CreatePage): Promise<Page>;
-  update(id: number, data: UpdatePage): Promise<Page | null>;
-  delete(id: number): Promise<boolean>;
-}
-
-/** Check if an error (or any of its causes) is a SQLite UNIQUE constraint violation */
-function isUniqueConstraintError(err: unknown): boolean {
-  let current: unknown = err;
-  while (current) {
-    const msg = String(current);
-    if (
-      msg.includes("UNIQUE constraint") ||
-      msg.includes("SQLITE_CONSTRAINT")
-    ) {
-      return true;
-    }
-    current =
-      current instanceof Error && current.cause !== current
-        ? current.cause
-        : undefined;
-  }
-  return false;
-}
-
-export function createPageService(
-  db: Database,
-  pathRegistry: PathRegistryService,
-): PageService {
-  function toPage(row: typeof pages.$inferSelect): Page {
-    return {
-      id: row.id,
-      slug: row.slug,
-      title: row.title,
-      body: row.body,
-      bodyHtml: row.bodyHtml,
-      status: row.status as Status,
-      createdAt: row.createdAt,
-      updatedAt: row.updatedAt,
-    };
-  }
-
-  return {
-    async getById(id) {
-      const result = await db
-        .select()
-        .from(pages)
-        .where(eq(pages.id, id))
-        .limit(1);
-      return result[0] ? toPage(result[0]) : null;
-    },
-
-    async getBySlug(slug) {
-      const result = await db
-        .select()
-        .from(pages)
-        .where(eq(pages.slug, slug))
-        .limit(1);
-      return result[0] ? toPage(result[0]) : null;
-    },
-
-    async list(filters?: PageFilters) {
-      const conditions = [];
-      if (filters?.status) {
-        conditions.push(eq(pages.status, filters.status));
-      }
-      const rows = await db
-        .select()
-        .from(pages)
-        .where(conditions.length > 0 ? and(...conditions) : undefined)
-        .orderBy(desc(pages.createdAt));
-      return rows.map(toPage);
-    },
-
-    async listNotInNav() {
-      const rows = await db
-        .select()
-        .from(pages)
-        .where(
-          sql`${pages.id} NOT IN (SELECT ${navItems.pageId} FROM ${navItems} WHERE ${navItems.pageId} IS NOT NULL)`,
-        )
-        .orderBy(desc(pages.createdAt));
-      return rows.map(toPage);
-    },
-
-    async create(data) {
-      // Validate and reserve path before DB insert — throws friendly
-      // ConflictError/ValidationError instead of a raw UNIQUE constraint error.
-      // Uses placeholder owner ID; corrected to real ID after insert.
-      await pathRegistry.claim(data.slug, "page", 0);
-
-      const timestamp = now();
-      const bodyHtml = data.body ? renderMarkdown(data.body) : null;
-
-      let page: Page;
-      try {
-        const result = await db
-          .insert(pages)
-          .values({
-            slug: data.slug,
-            title: data.title ?? null,
-            body: data.body ?? null,
-            bodyHtml,
-            status: data.status ?? "published",
-            createdAt: timestamp,
-            updatedAt: timestamp,
-          })
-          .returning();
-
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- DB insert with .returning() always returns inserted row
-        page = toPage(result[0]!);
-      } catch (err) {
-        await pathRegistry.release(data.slug);
-        // Surface DB unique constraint failures as a friendly error
-        if (isUniqueConstraintError(err)) {
-          throw new ConflictError(`Slug "${data.slug}" is already in use`);
-        }
-        throw err;
-      }
-
-      // Update registry with actual page ID
-      await pathRegistry.release(data.slug);
-      await pathRegistry.claim(data.slug, "page", page.id);
-
-      return page;
-    },
-
-    async update(id, data) {
-      const existing = await this.getById(id);
-      if (!existing) return null;
-
-      const slugChanging =
-        data.slug !== undefined && data.slug !== existing.slug;
-
-      // If slug is changing, claim the new path first (validates before modifying)
-      if (slugChanging) {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- guarded by slugChanging check
-        await pathRegistry.claim(data.slug!, "page", id);
-      }
-
-      const timestamp = now();
-      const updates: Partial<typeof pages.$inferInsert> = {
-        updatedAt: timestamp,
-      };
-
-      if (data.slug !== undefined) updates.slug = data.slug;
-      if (data.title !== undefined) updates.title = data.title;
-      if (data.status !== undefined) updates.status = data.status;
-
-      if (data.body !== undefined) {
-        updates.body = data.body;
-        updates.bodyHtml = data.body ? renderMarkdown(data.body) : null;
-      }
-
-      // If slug changed, update related nav_items
-      if (slugChanging) {
-        await db
-          .update(navItems)
-          .set({ url: `/${data.slug}`, updatedAt: timestamp })
-          .where(eq(navItems.pageId, id));
-      }
-
-      // If title changed, update related nav_items label
-      if (data.title !== undefined && data.title !== existing.title) {
-        await db
-          .update(navItems)
-          .set({ label: data.title ?? existing.slug, updatedAt: timestamp })
-          .where(eq(navItems.pageId, id));
-      }
-
-      const result = await db
-        .update(pages)
-        .set(updates)
-        .where(eq(pages.id, id))
-        .returning();
-
-      // Release old slug from registry after successful update
-      if (slugChanging) {
-        await pathRegistry.release(existing.slug);
-      }
-
-      return result[0] ? toPage(result[0]) : null;
-    },
-
-    async delete(id) {
-      // Release path registry entries for this page
-      await pathRegistry.releaseByOwner("page", id);
-      // nav_items with page_id FK have ON DELETE CASCADE, so they auto-delete
-      const result = await db.delete(pages).where(eq(pages.id, id)).returning();
-      return result.length > 0;
-    },
-  };
-}

package/src/services/path-registry.ts

@@ -1,160 +0,0 @@
-/**
- * Path Registry Service
- *
- * Central registry for URL path ownership. Every entity (page, post, redirect)
- * that claims a URL path registers it here. The table's PRIMARY KEY on path
- * provides DB-level uniqueness. Reserved system paths are rejected at the
- * service layer.
- */
-
-import { eq, and } from "drizzle-orm";
-import type { Database } from "../db/index.js";
-import { pathRegistry } from "../db/schema.js";
-import { now } from "../lib/time.js";
-import { normalizePath } from "../lib/url.js";
-import { isReservedPath } from "../lib/constants.js";
-import { ValidationError, ConflictError } from "../lib/errors.js";
-
-export type OwnerType = "page" | "post" | "redirect";
-
-export interface PathRegistryEntry {
-  path: string;
-  ownerType: OwnerType;
-  ownerId: number;
-  createdAt: number;
-}
-
-export interface PathRegistryService {
-  /**
-   * Claim a path for an entity. Rejects reserved paths and conflicts.
-   * Idempotent: re-claiming the same path for the same owner is a no-op.
-   *
-   * @param path - The URL path to claim
-   * @param ownerType - The type of entity claiming the path
-   * @param ownerId - The ID of the entity claiming the path
-   * @returns The registry entry
-   */
-  claim(
-    path: string,
-    ownerType: OwnerType,
-    ownerId: number,
-  ): Promise<PathRegistryEntry>;
-
-  /**
-   * Release a claimed path.
-   *
-   * @param path - The URL path to release
-   */
-  release(path: string): Promise<void>;
-
-  /**
-   * Release all paths owned by a specific entity.
-   *
-   * @param ownerType - The type of entity
-   * @param ownerId - The ID of the entity
-   */
-  releaseByOwner(ownerType: OwnerType, ownerId: number): Promise<void>;
-
-  /**
-   * Look up a path in the registry.
-   *
-   * @param path - The URL path to look up
-   * @returns The registry entry, or null if not claimed
-   */
-  getByPath(path: string): Promise<PathRegistryEntry | null>;
-
-  /**
-   * Check if a path is available (not reserved and not claimed).
-   *
-   * @param path - The URL path to check
-   * @returns true if the path is available
-   */
-  isAvailable(path: string): Promise<boolean>;
-}
-
-export function createPathRegistryService(db: Database): PathRegistryService {
-  function toEntry(row: typeof pathRegistry.$inferSelect): PathRegistryEntry {
-    return {
-      path: row.path,
-      ownerType: row.ownerType as OwnerType,
-      ownerId: row.ownerId,
-      createdAt: row.createdAt,
-    };
-  }
-
-  return {
-    async claim(path, ownerType, ownerId) {
-      const normalized = normalizePath(path);
-
-      if (isReservedPath(normalized)) {
-        throw new ValidationError(
-          `Path "${normalized}" is reserved and cannot be used`,
-        );
-      }
-
-      // Check existing claim
-      const existing = await db
-        .select()
-        .from(pathRegistry)
-        .where(eq(pathRegistry.path, normalized))
-        .limit(1);
-
-      if (existing[0]) {
-        const entry = toEntry(existing[0]);
-        // Idempotent: same owner re-claiming is a no-op
-        if (entry.ownerType === ownerType && entry.ownerId === ownerId) {
-          return entry;
-        }
-        throw new ConflictError(`Path "${normalized}" is already in use`);
-      }
-
-      const timestamp = now();
-      await db.insert(pathRegistry).values({
-        path: normalized,
-        ownerType,
-        ownerId,
-        createdAt: timestamp,
-      });
-
-      return { path: normalized, ownerType, ownerId, createdAt: timestamp };
-    },
-
-    async release(path) {
-      const normalized = normalizePath(path);
-      await db.delete(pathRegistry).where(eq(pathRegistry.path, normalized));
-    },
-
-    async releaseByOwner(ownerType, ownerId) {
-      await db
-        .delete(pathRegistry)
-        .where(
-          and(
-            eq(pathRegistry.ownerType, ownerType),
-            eq(pathRegistry.ownerId, ownerId),
-          ),
-        );
-    },
-
-    async getByPath(path) {
-      const normalized = normalizePath(path);
-      const result = await db
-        .select()
-        .from(pathRegistry)
-        .where(eq(pathRegistry.path, normalized))
-        .limit(1);
-      return result[0] ? toEntry(result[0]) : null;
-    },
-
-    async isAvailable(path) {
-      const normalized = normalizePath(path);
-      if (isReservedPath(normalized)) return false;
-
-      const existing = await db
-        .select()
-        .from(pathRegistry)
-        .where(eq(pathRegistry.path, normalized))
-        .limit(1);
-      return existing.length === 0;
-    },
-  };
-}

package/src/services/redirect.ts

@@ -1,97 +0,0 @@
-/**
- * Redirect Service
- *
- * URL redirect management for path changes
- */
-
-import { eq } from "drizzle-orm";
-import type { Database } from "../db/index.js";
-import { redirects } from "../db/schema.js";
-import { now } from "../lib/time.js";
-import { normalizePath } from "../lib/url.js";
-import type { Redirect } from "../types.js";
-import type { PathRegistryService } from "./path-registry.js";
-import { ConflictError } from "../lib/errors.js";
-
-export interface RedirectService {
-  getByPath(fromPath: string): Promise<Redirect | null>;
-  create(fromPath: string, toPath: string, type?: 301 | 302): Promise<Redirect>;
-  delete(id: number): Promise<boolean>;
-  list(): Promise<Redirect[]>;
-}
-
-export function createRedirectService(
-  db: Database,
-  pathRegistry: PathRegistryService,
-): RedirectService {
-  function toRedirect(row: typeof redirects.$inferSelect): Redirect {
-    return {
-      id: row.id,
-      fromPath: row.fromPath,
-      toPath: row.toPath,
-      type: row.type as 301 | 302,
-      createdAt: row.createdAt,
-    };
-  }
-
-  return {
-    async getByPath(fromPath) {
-      const normalized = normalizePath(fromPath);
-      const result = await db
-        .select()
-        .from(redirects)
-        .where(eq(redirects.fromPath, normalized))
-        .limit(1);
-      return result[0] ? toRedirect(result[0]) : null;
-    },
-
-    async create(fromPath, toPath, type = 301) {
-      const timestamp = now();
-      const normalizedFrom = normalizePath(fromPath);
-
-      // Check if path is claimed by a non-redirect entity
-      const existingClaim = await pathRegistry.getByPath(normalizedFrom);
-      if (existingClaim && existingClaim.ownerType !== "redirect") {
-        throw new ConflictError(`Path "${normalizedFrom}" is already in use`);
-      }
-
-      // Delete existing redirect from this path if any (upsert behavior)
-      if (existingClaim?.ownerType === "redirect") {
-        await pathRegistry.release(normalizedFrom);
-      }
-      await db.delete(redirects).where(eq(redirects.fromPath, normalizedFrom));
-
-      const result = await db
-        .insert(redirects)
-        .values({
-          fromPath: normalizedFrom,
-          toPath,
-          type,
-          createdAt: timestamp,
-        })
-        .returning();
-
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- DB insert with .returning() always returns inserted row
-      const redirect = toRedirect(result[0]!);
-
-      await pathRegistry.claim(normalizedFrom, "redirect", redirect.id);
-
-      return redirect;
-    },
-
-    async delete(id) {
-      // Release path registry entries for this redirect
-      await pathRegistry.releaseByOwner("redirect", id);
-      const result = await db
-        .delete(redirects)
-        .where(eq(redirects.id, id))
-        .returning();
-      return result.length > 0;
-    },
-
-    async list() {
-      const rows = await db.select().from(redirects);
-      return rows.map(toRedirect);
-    },
-  };
-}

package/src/ui/dash/PageForm.tsx

@@ -1,187 +0,0 @@
-/**
- * Page Creation/Edit Form
- *
- * For managing standalone pages (about, now, etc.)
- */
-
-import type { FC } from "hono/jsx";
-import type { Page } from "../../types.js";
-import { useLingui } from "@lingui/react/macro";
-
-export interface PageFormProps {
-  page?: Page;
-  action: string;
-  cancelUrl?: string;
-}
-
-export const PageForm: FC<PageFormProps> = ({
-  page,
-  action,
-  cancelUrl = "/dash/pages",
-}) => {
-  const { t } = useLingui();
-  const isEdit = !!page;
-
-  const signals = JSON.stringify({
-    title: page?.title ?? "",
-    slug: page?.slug ?? "",
-    body: page?.body ?? "",
-    status: page?.status ?? "published",
-  }).replace(/</g, "\\u003c");
-
-  return (
-    <form
-      data-page-form
-      {...(isEdit ? { "data-page-edit": "" } : {})}
-      data-signals={signals}
-      data-on:submit__prevent={`@post('${action}')`}
-      data-indicator="_loading"
-      class="flex flex-col gap-4"
-    >
-      <div id="page-form-message"></div>
-
-      {/* Title */}
-      <div class="field">
-        <label class="label">
-          {t({
-            message: "Title",
-            comment: "@context: Page form field label - title",
-          })}
-        </label>
-        <input
-          type="text"
-          data-bind="title"
-          class="input"
-          placeholder={t({
-            message: "Page title...",
-            comment: "@context: Page title placeholder",
-          })}
-          required
-        />
-      </div>
-
-      {/* Slug */}
-      <div class="field">
-        <label class="label">
-          {t({
-            message: "Slug",
-            comment: "@context: Page form field label - URL slug",
-          })}
-        </label>
-        <div class="flex items-center gap-2">
-          <span class="text-muted-foreground">/</span>
-          <input
-            type="text"
-            data-bind="slug"
-            class="input flex-1"
-            placeholder="about"
-            pattern="[a-z0-9\-]+"
-            title={t({
-              message: "Lowercase letters, numbers, and hyphens only",
-              comment: "@context: Page slug validation message",
-            })}
-            required
-          />
-        </div>
-        <p class="text-xs text-muted-foreground mt-1">
-          {t({
-            message:
-              "The URL path for this page. Use lowercase letters, numbers, and hyphens.",
-            comment: "@context: Page slug helper text",
-          })}
-        </p>
-      </div>
-
-      {/* Body */}
-      <div class="field">
-        <label class="label">
-          {t({
-            message: "Content",
-            comment: "@context: Page form field label - content",
-          })}
-        </label>
-        <textarea
-          data-bind="body"
-          class="textarea min-h-48"
-          placeholder={t({
-            message: "Page content (Markdown supported)...",
-            comment: "@context: Page content placeholder",
-          })}
-          required
-        >
-          {page?.body ?? ""}
-        </textarea>
-      </div>
-
-      {/* Status */}
-      <div class="field">
-        <label class="label">
-          {t({
-            message: "Status",
-            comment: "@context: Page form field label - publish status",
-          })}
-        </label>
-        <select data-bind="status" class="select">
-          <option
-            value="published"
-            selected={page?.status === "published" || !page}
-          >
-            {t({
-              message: "Published",
-              comment: "@context: Page status option - published",
-            })}
-          </option>
-          <option value="draft" selected={page?.status === "draft"}>
-            {t({
-              message: "Draft",
-              comment: "@context: Page status option - draft",
-            })}
-          </option>
-        </select>
-        <p class="text-xs text-muted-foreground mt-1">
-          {t({
-            message:
-              "Published pages are accessible via their slug. Drafts are not visible.",
-            comment: "@context: Page status helper text",
-          })}
-        </p>
-      </div>
-
-      {/* Submit */}
-      <div class="flex gap-2">
-        <button type="submit" class="btn" data-attr:disabled="$_loading">
-          <svg
-            data-show="$_loading"
-            style="display:none"
-            class="animate-spin size-4"
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 24 24"
-            fill="none"
-            stroke="currentColor"
-            stroke-width="2"
-            stroke-linecap="round"
-            stroke-linejoin="round"
-            role="status"
-          >
-            <path d="M21 12a9 9 0 1 1-6.219-8.56" />
-          </svg>
-          {isEdit
-            ? t({
-                message: "Update Page",
-                comment: "@context: Button to update existing page",
-              })
-            : t({
-                message: "Create Page",
-                comment: "@context: Button to create new page",
-              })}
-        </button>
-        <a href={cancelUrl} class="btn-outline">
-          {t({
-            message: "Cancel",
-            comment: "@context: Button to cancel and go back",
-          })}
-        </a>
-      </div>
-    </form>
-  );
-};