@jant/core 0.3.39 → 0.3.42

package/src/db/migrations/pg/meta/_journal.json

@@ -22,6 +22,97 @@
       "when": 1774449718468,
       "tag": "0002_breezy_lockjaw",
       "breakpoints": true
+    },
+    {
+      "idx": 3,
+      "version": "7",
+      "when": 1774681447549,
+      "tag": "0003_motionless_norrin_radd",
+      "breakpoints": true
+    },
+    {
+      "idx": 4,
+      "version": "7",
+      "when": 1774869651950,
+      "tag": "0004_nervous_captain_midlands",
+      "breakpoints": true
+    },
+    {
+      "idx": 5,
+      "version": "7",
+      "when": 1775027563589,
+      "tag": "0005_romantic_mesmero",
+      "breakpoints": true
+    },
+    {
+      "idx": 6,
+      "version": "7",
+      "when": 1775108281543,
+      "tag": "0006_perpetual_bruce_banner",
+      "breakpoints": true
+    },
+    {
+      "idx": 7,
+      "version": "7",
+      "when": 1775368800000,
+      "tag": "0007_nav_item_placement",
+      "breakpoints": true
+    },
+    {
+      "idx": 8,
+      "version": "7",
+      "when": 1775369700000,
+      "tag": "0008_yielding_frightful_four",
+      "breakpoints": true
+    },
+    {
+      "idx": 9,
+      "version": "7",
+      "when": 1775369800000,
+      "tag": "0009_outstanding_ogun",
+      "breakpoints": true
+    },
+    {
+      "idx": 10,
+      "version": "7",
+      "when": 1775369900000,
+      "tag": "0010_overjoyed_gertrude_yorkes",
+      "breakpoints": true
+    },
+    {
+      "idx": 11,
+      "version": "7",
+      "when": 1775538682750,
+      "tag": "0011_fixed_hulk",
+      "breakpoints": true
+    },
+    {
+      "idx": 12,
+      "version": "7",
+      "when": 1775749590270,
+      "tag": "0012_cute_shockwave",
+      "breakpoints": true
+    },
+    {
+      "idx": 13,
+      "version": "7",
+      "when": 1775756694875,
+      "tag": "0013_bizarre_obadiah_stane",
+      "breakpoints": true
+    },
+    {
+      "idx": 14,
+      "version": "7",
+      "when": 1776147972118,
+      "tag": "0014_tearful_grim_reaper",
+      "breakpoints": true
+    },
+    {
+      "idx": 15,
+      "version": "7",
+      "when": 1776405301273,
+      "tag": "0015_daffy_mikhail_rasputin",
+      "breakpoints": true
     }
   ]
-}
+}

package/src/db/pg/__tests__/node.test.ts

@@ -1,6 +1,9 @@
 import { describe, expect, it } from "vitest";
 import {
   describePostgresTarget,
+  formatNavItemConstraintSummary,
+  formatPgMigrationJournalSummary,
+  isMigrationDebugEnabled,
   wrapPostgresConnectionError,
 } from "../node.js";
 
@@ -14,6 +17,41 @@ describe("describePostgresTarget", () => {
   });
 });
 
+describe("isMigrationDebugEnabled", () => {
+  it("only enables migration debug logging when the flag is set", () => {
+    expect(isMigrationDebugEnabled({ JANT_DEBUG_MIGRATE: "1" })).toBe(true);
+    expect(isMigrationDebugEnabled({ JANT_DEBUG_MIGRATE: "true" })).toBe(false);
+    expect(isMigrationDebugEnabled({})).toBe(false);
+  });
+});
+
+describe("formatPgMigrationJournalSummary", () => {
+  it("includes the applied and expected migration counts", () => {
+    expect(
+      formatPgMigrationJournalSummary(
+        [{ id: 8, hash: "hash-8", created_at: 1775349118 }],
+        10,
+      ),
+    ).toBe("count=1/10 latest_id=8 latest_created_at=1775349118");
+  });
+
+  it("handles an empty migration journal", () => {
+    expect(formatPgMigrationJournalSummary([], 8)).toBe("count=0/8");
+  });
+});
+
+describe("formatNavItemConstraintSummary", () => {
+  it("shows both nav_item check constraints and marks missing ones", () => {
+    expect(
+      formatNavItemConstraintSummary({
+        chk_nav_item_system_key: "CHECK ((system_key IS NULL))",
+      }),
+    ).toBe(
+      "chk_nav_item_placement=<missing>; chk_nav_item_system_key=CHECK ((system_key IS NULL))",
+    );
+  });
+});
+
 describe("wrapPostgresConnectionError", () => {
   it("turns authentication failures into a clear configuration error", () => {
     const cause = Object.assign(new Error("password authentication failed"), {

package/src/db/pg/node.ts

@@ -1,3 +1,4 @@
+import { readdirSync } from "node:fs";
 import { drizzle } from "drizzle-orm/node-postgres";
 import { migrate as drizzleMigrate } from "drizzle-orm/node-postgres/migrator";
 import { Pool } from "pg";
@@ -9,6 +10,132 @@ interface PostgresErrorLike extends Error {
   code?: string;
 }
 
+interface PgMigrationJournalRow {
+  created_at: number;
+  hash: string;
+  id: number;
+}
+
+interface PgConstraintRow {
+  conname: string;
+  definition: string;
+}
+
+export function isMigrationDebugEnabled(
+  env: Record<string, string | undefined> = process.env,
+): boolean {
+  return env.JANT_DEBUG_MIGRATE === "1";
+}
+
+export function listPgMigrationFiles(migrationsFolder: string): string[] {
+  return readdirSync(migrationsFolder)
+    .filter((entry) => entry.endsWith(".sql"))
+    .sort();
+}
+
+export function formatPgMigrationJournalSummary(
+  entries: PgMigrationJournalRow[],
+  expectedCount?: number,
+): string {
+  const expectedSuffix =
+    typeof expectedCount === "number" ? `/${expectedCount}` : "";
+
+  if (entries.length === 0) {
+    return `count=0${expectedSuffix}`;
+  }
+
+  const latest = entries.at(-1);
+  return `count=${entries.length}${expectedSuffix} latest_id=${latest?.id ?? "?"} latest_created_at=${latest?.created_at ?? "?"}`;
+}
+
+export async function readPgMigrationJournal(
+  pool: Pool,
+): Promise<PgMigrationJournalRow[]> {
+  try {
+    const result = await pool.query<PgMigrationJournalRow>(`
+      SELECT id, hash, created_at
+      FROM drizzle.__drizzle_migrations
+      ORDER BY created_at ASC, id ASC
+    `);
+    return result.rows;
+  } catch (error) {
+    const pgError = error as PostgresErrorLike | undefined;
+    if (pgError?.code === "3F000" || pgError?.code === "42P01") {
+      return [];
+    }
+    throw error;
+  }
+}
+
+export async function readNavItemCheckConstraints(
+  pool: Pool,
+): Promise<Record<string, string>> {
+  const result = await pool.query<PgConstraintRow>(
+    `
+      SELECT
+        c.conname,
+        pg_get_constraintdef(c.oid) AS definition
+      FROM pg_constraint c
+      JOIN pg_class t ON t.oid = c.conrelid
+      JOIN pg_namespace n ON n.oid = t.relnamespace
+      WHERE n.nspname = 'public'
+        AND t.relname = 'nav_item'
+        AND c.conname = ANY($1::text[])
+      ORDER BY c.conname ASC
+    `,
+    [["chk_nav_item_placement", "chk_nav_item_system_key"]],
+  );
+
+  return Object.fromEntries(
+    result.rows.map((row) => [row.conname, row.definition]),
+  );
+}
+
+export function formatNavItemConstraintSummary(
+  constraints: Record<string, string>,
+): string {
+  const placement = constraints.chk_nav_item_placement ?? "<missing>";
+  const systemKey = constraints.chk_nav_item_system_key ?? "<missing>";
+  return `chk_nav_item_placement=${placement}; chk_nav_item_system_key=${systemKey}`;
+}
+
+function logMigrationDebug(message: string): void {
+  process.stdout.write(`[jant:migrate] ${message}\n`);
+}
+
+export async function logPgMigrationDebugState(
+  pool: Pool,
+  databaseUrl: string,
+  migrationsFolder: string,
+  phase: "before" | "after" | "failed",
+): Promise<void> {
+  if (!isMigrationDebugEnabled()) {
+    return;
+  }
+
+  const target = describePostgresTarget(databaseUrl);
+  const migrationFiles = listPgMigrationFiles(migrationsFolder);
+  const journal = await readPgMigrationJournal(pool);
+  const constraints = await readNavItemCheckConstraints(pool);
+
+  logMigrationDebug(`pg.${phase}.target=${target}`);
+  logMigrationDebug(`pg.${phase}.migrations_folder=${migrationsFolder}`);
+  logMigrationDebug(
+    `pg.${phase}.migrations_files=${migrationFiles.join(", ") || "<none>"}`,
+  );
+  logMigrationDebug(
+    `pg.${phase}.journal=${formatPgMigrationJournalSummary(
+      journal,
+      migrationFiles.length,
+    )}`,
+  );
+  logMigrationDebug(
+    `pg.${phase}.nav_item_constraints=${formatNavItemConstraintSummary(
+      constraints,
+    )}`,
+  );
+}
+
 export function describePostgresTarget(databaseUrl: string): string {
   try {
     const parsed = new URL(databaseUrl);
@@ -142,8 +269,30 @@ export async function migrateNodePgDatabase(
 
   try {
     const db = drizzle(pool, { schema: pgSchemaBundle });
+    await logPgMigrationDebugState(
+      pool,
+      databaseUrl,
+      migrationsFolder,
+      "before",
+    );
     await drizzleMigrate(db, { migrationsFolder });
+    await logPgMigrationDebugState(
+      pool,
+      databaseUrl,
+      migrationsFolder,
+      "after",
+    );
   } catch (error) {
+    try {
+      await logPgMigrationDebugState(
+        pool,
+        databaseUrl,
+        migrationsFolder,
+        "failed",
+      );
+    } catch {
+      // Best-effort debug logging should never hide the original migration error.
+    }
     throw wrapPostgresConnectionError(error, databaseUrl, "migrate");
   } finally {
     await pool.end();

package/src/db/pg/schema.ts

@@ -27,8 +27,16 @@ const FORMATS = ["note", "link", "quote"] as const;
 const STATUSES = ["draft", "published"] as const;
 const VISIBILITIES = ["public", "latest_hidden", "private"] as const;
 const COLLECTION_SORT_ORDERS = ["newest", "oldest", "rating_desc"] as const;
-const NAV_ITEM_TYPES = ["link", "system"] as const;
-const SYSTEM_NAV_KEYS = ["rss", "settings", "collections", "archive"] as const;
+const NAV_ITEM_TYPES = ["link", "system", "collection"] as const;
+const NAV_ITEM_PLACEMENTS = ["header", "more"] as const;
+const SYSTEM_NAV_KEYS = [
+  "latest",
+  "featured",
+  "collections",
+  "archive",
+  "rss",
+  "settings",
+] as const;
 const UPLOAD_SESSION_STATES = [
   "pending",
   "uploaded",
@@ -168,6 +176,9 @@ export const posts = pgTable(
           setweight(to_tsvector('simple', coalesce("body_text", '')), 'C')`,
     ),
     rating: integer("rating"),
+    previewImageKey: text("preview_image_key"),
+    previewKind: text("preview_kind"),
+    previewProvider: text("preview_provider"),
     replyToId: text("reply_to_id"),
     threadId: text("thread_id").notNull(),
     deletedAt: integer("deleted_at"),
@@ -267,6 +278,7 @@ export const media = pgTable(
     provider: text("provider").notNull().default("r2"),
     width: integer("width"),
     height: integer("height"),
+    durationSeconds: integer("duration_seconds"),
     alt: text("alt"),
     position: text("position").notNull().default("a0"),
     blurhash: text("blurhash"),
@@ -413,7 +425,7 @@ export const pathRegistry = pgTable(
       .references(() => sites.id, { onDelete: "cascade" }),
     path: text("path").notNull(),
     kind: text("kind", {
-      enum: ["slug", "alias", "redirect"],
+      enum: ["slug", "alias", "redirect", "archive"],
     }).notNull(),
     postId: text("post_id").references(() => posts.id, {
       onDelete: "cascade",
@@ -423,13 +435,14 @@ export const pathRegistry = pgTable(
     }),
     redirectToPath: text("redirect_to_path"),
     redirectType: integer("redirect_type"),
+    archiveQuery: text("archive_query"),
     createdAt: integer("created_at").notNull(),
     updatedAt: integer("updated_at").notNull(),
   },
   (table) => [
     check(
       "chk_path_registry_kind",
-      sql`${table.kind} IN ('slug', 'alias', 'redirect')`,
+      sql`${table.kind} IN ('slug', 'alias', 'redirect', 'archive')`,
     ),
     uniqueIndex("uq_path_registry_site_path").on(table.siteId, table.path),
     uniqueIndex("uq_path_registry_site_post_slug")
@@ -453,19 +466,28 @@ export const pathRegistry = pgTable(
         )
         AND ${table.redirectToPath} IS NULL
         AND ${table.redirectType} IS NULL
+        AND ${table.archiveQuery} IS NULL
       ) OR (
         ${table.kind} = 'redirect'
         AND ${table.postId} IS NULL
         AND ${table.collectionId} IS NULL
         AND ${table.redirectToPath} IS NOT NULL
         AND ${table.redirectType} IN (301, 302)
+        AND ${table.archiveQuery} IS NULL
+      ) OR (
+        ${table.kind} = 'archive'
+        AND ${table.postId} IS NULL
+        AND ${table.collectionId} IS NULL
+        AND ${table.redirectToPath} IS NULL
+        AND ${table.redirectType} IS NULL
+        AND ${table.archiveQuery} IS NOT NULL
       )`,
     ),
   ],
 );
 
 // =============================================================================
-// Collection Directory Items (unified ordering for collections + dividers)
+// Collection Directory Items (unified ordering for collections, links, and dividers)
 // =============================================================================
 
 export const collectionDirectoryItems = pgTable(
@@ -475,11 +497,13 @@ export const collectionDirectoryItems = pgTable(
     siteId: text("site_id")
       .notNull()
       .references(() => sites.id, { onDelete: "cascade" }),
-    type: text("type", { enum: ["collection", "divider"] }).notNull(),
+    type: text("type", { enum: ["collection", "divider", "link"] }).notNull(),
     collectionId: text("collection_id").references(() => collections.id, {
       onDelete: "cascade",
     }),
     label: text("label"),
+    url: text("url"),
+    description: text("description"),
     position: text("position").notNull().default("a0"),
     createdAt: integer("created_at").notNull(),
     updatedAt: integer("updated_at").notNull(),
@@ -487,7 +511,7 @@ export const collectionDirectoryItems = pgTable(
   (table) => [
     check(
       "chk_collection_directory_item_type",
-      sql`${table.type} IN ('collection', 'divider')`,
+      sql`${table.type} IN ('collection', 'divider', 'link')`,
     ),
     index("idx_collection_directory_item_site_collection_id").on(
       table.siteId,
@@ -505,14 +529,28 @@ export const collectionDirectoryItems = pgTable(
     check(
       "chk_collection_directory_item_shape",
       sql`(
-        ${table.type} = 'collection' AND ${table.collectionId} IS NOT NULL
+        ${table.type} = 'collection'
+        AND ${table.collectionId} IS NOT NULL
+        AND ${table.label} IS NULL
+        AND ${table.url} IS NULL
+      ) OR (
+        ${table.type} = 'divider'
+        AND ${table.collectionId} IS NULL
+        AND ${table.url} IS NULL
       ) OR (
-        ${table.type} = 'divider' AND ${table.collectionId} IS NULL
+        ${table.type} = 'link'
+        AND ${table.collectionId} IS NULL
+        AND ${table.label} IS NOT NULL
+        AND ${table.url} IS NOT NULL
       )`,
     ),
     check(
       "chk_collection_directory_item_label",
-      sql`${table.type} = 'divider' OR ${table.label} IS NULL`,
+      sql`${table.type} <> 'collection' OR ${table.label} IS NULL`,
+    ),
+    check(
+      "chk_collection_directory_item_description",
+      sql`${table.type} = 'link' OR ${table.description} IS NULL`,
     ),
   ],
 );
@@ -534,6 +572,8 @@ export const postCollections = pgTable(
       .notNull()
       .references(() => collections.id, { onDelete: "cascade" }),
     createdAt: integer("created_at").notNull(),
+    position: integer("position").notNull().default(0),
+    pinnedAt: integer("pinned_at"),
   },
   (table) => [
     primaryKey({ columns: [table.siteId, table.postId, table.collectionId] }),
@@ -569,8 +609,16 @@ export const navItems = pgTable(
     systemKey: text("system_key", {
       enum: SYSTEM_NAV_KEYS,
     }),
+    collectionId: text("collection_id").references(() => collections.id, {
+      onDelete: "cascade",
+    }),
     label: text("label").notNull(),
     url: text("url").notNull(),
+    placement: text("placement", {
+      enum: NAV_ITEM_PLACEMENTS,
+    })
+      .notNull()
+      .default("header"),
     position: text("position").notNull().default("a0"),
     createdAt: integer("created_at").notNull(),
     updatedAt: integer("updated_at").notNull(),
@@ -581,23 +629,32 @@ export const navItems = pgTable(
       sql`${table.type} IN (${sqlTextEnum(NAV_ITEM_TYPES)})`,
     ),
     check(
-      "chk_nav_item_system_key",
-      sql`${table.systemKey} IS NULL OR ${table.systemKey} IN (${sqlTextEnum(SYSTEM_NAV_KEYS)})`,
+      "chk_nav_item_placement",
+      sql`${table.placement} IN (${sqlTextEnum(NAV_ITEM_PLACEMENTS)})`,
     ),
     check(
       "chk_nav_item_shape",
       sql`(
         ${table.type} = 'link'
         AND ${table.systemKey} IS NULL
+        AND ${table.collectionId} IS NULL
       ) OR (
         ${table.type} = 'system'
         AND ${table.systemKey} IS NOT NULL
+        AND ${table.collectionId} IS NULL
+      ) OR (
+        ${table.type} = 'collection'
+        AND ${table.systemKey} IS NULL
+        AND ${table.collectionId} IS NOT NULL
       )`,
     ),
     uniqueIndex("uq_nav_item_site_position").on(table.siteId, table.position),
     uniqueIndex("uq_nav_item_site_system_key")
       .on(table.siteId, table.systemKey)
       .where(sql`${table.systemKey} IS NOT NULL`),
+    uniqueIndex("uq_nav_item_site_collection_id")
+      .on(table.siteId, table.collectionId)
+      .where(sql`${table.collectionId} IS NOT NULL`),
   ],
 );
 
@@ -720,6 +777,36 @@ export const account = pgTable("account", {
   }).notNull(),
 });
 
+// ---------------------------------------------------------------------------
+// Sync Jobs (GitHub Sync queue fallback)
+// ---------------------------------------------------------------------------
+
+export const syncJobs = pgTable(
+  "sync_job",
+  {
+    id: text("id").primaryKey(),
+    siteId: text("site_id")
+      .notNull()
+      .references(() => sites.id, { onDelete: "cascade" }),
+    kind: text("kind").notNull(),
+    payload: text("payload").notNull(),
+    status: text("status", {
+      enum: ["pending", "processing", "completed", "failed"],
+    })
+      .notNull()
+      .default("pending"),
+    attempts: integer("attempts").notNull().default(0),
+    maxAttempts: integer("max_attempts").notNull().default(3),
+    createdAt: integer("created_at").notNull(),
+    updatedAt: integer("updated_at").notNull(),
+    lockedUntil: integer("locked_until"),
+  },
+  (table) => [
+    index("idx_sync_job_status_created").on(table.status, table.createdAt),
+    index("idx_sync_job_site_id").on(table.siteId),
+  ],
+);
+
 export const verification = pgTable("verification", {
   id: text("id").primaryKey(),
   identifier: text("identifier").notNull(),
@@ -737,3 +824,34 @@ export const verification = pgTable("verification", {
     mode: "date",
   }),
 });
+
+// ---------------------------------------------------------------------------
+// GitHub App Installations (junction table: installation ↔ site, many-to-many)
+// ---------------------------------------------------------------------------
+
+const GITHUB_APP_ACCOUNT_TYPES = ["User", "Organization"] as const;
+
+export const githubAppInstallation = pgTable(
+  "github_app_installation",
+  {
+    installationId: text("installation_id").notNull(),
+    siteId: text("site_id")
+      .notNull()
+      .references(() => sites.id, { onDelete: "cascade" }),
+    accountLogin: text("account_login").notNull(),
+    accountType: text("account_type", {
+      enum: GITHUB_APP_ACCOUNT_TYPES,
+    }).notNull(),
+    accountAvatarUrl: text("account_avatar_url").notNull().default(""),
+    addedAt: integer("added_at").notNull(),
+  },
+  (table) => [
+    primaryKey({ columns: [table.installationId, table.siteId] }),
+    index("github_app_installation_by_installation").on(table.installationId),
+    index("github_app_installation_by_site").on(table.siteId),
+    check(
+      "chk_github_app_installation_account_type",
+      sql`${table.accountType} IN (${sqlTextEnum(GITHUB_APP_ACCOUNT_TYPES)})`,
+    ),
+  ],
+);

package/src/db/rehearsal-fixtures/demo-current.sql

@@ -31,6 +31,50 @@ INSERT INTO "collection" (
   1774200010
 );
 
+INSERT INTO "nav_item" (
+  "id",
+  "site_id",
+  "type",
+  "system_key",
+  "label",
+  "url",
+  "position",
+  "created_at",
+  "updated_at"
+) VALUES (
+  'nav_01kme7j8xfe4m7s2k8r5c9t0qa',
+  'sit_01kme7j7j1f4m7s2k8r5c9t0qb',
+  'system',
+  'rss',
+  '',
+  '/rss',
+  'a0',
+  1774200011,
+  1774200011
+);
+
+INSERT INTO "nav_item" (
+  "id",
+  "site_id",
+  "type",
+  "system_key",
+  "label",
+  "url",
+  "position",
+  "created_at",
+  "updated_at"
+) VALUES (
+  'nav_01kme7j8xfe4m7s2k8r5c9t0qb',
+  'sit_01kme7j7j1f4m7s2k8r5c9t0qb',
+  'system',
+  'settings',
+  '',
+  '/settings',
+  'a1',
+  1774200011,
+  1774200011
+);
+
 INSERT INTO "nav_item" (
   "id",
   "site_id",
@@ -46,9 +90,9 @@ INSERT INTO "nav_item" (
   'sit_01kme7j7j1f4m7s2k8r5c9t0qb',
   'system',
   'collections',
-  'Collections',
-  '/c',
-  'a0',
+  '',
+  '/collections',
+  'a2',
   1774200011,
   1774200011
 );