@jant/core 0.3.40 → 0.3.42

package/src/node/__tests__/cli-migrate.test.ts

@@ -0,0 +1,111 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+describe("jant migrate", () => {
+  const originalDatabaseUrl = process.env.DATABASE_URL;
+  const originalDataDir = process.env.DATA_DIR;
+  const originalDebugFlag = process.env.JANT_DEBUG_MIGRATE;
+
+  afterEach(() => {
+    if (originalDatabaseUrl === undefined) {
+      delete process.env.DATABASE_URL;
+    } else {
+      process.env.DATABASE_URL = originalDatabaseUrl;
+    }
+
+    if (originalDataDir === undefined) {
+      delete process.env.DATA_DIR;
+    } else {
+      process.env.DATA_DIR = originalDataDir;
+    }
+
+    if (originalDebugFlag === undefined) {
+      delete process.env.JANT_DEBUG_MIGRATE;
+    } else {
+      process.env.JANT_DEBUG_MIGRATE = originalDebugFlag;
+    }
+
+    vi.restoreAllMocks();
+    vi.resetModules();
+  });
+
+  it("keeps the existing DATABASE_URL when --node loads .env.node", async () => {
+    process.env.DATABASE_URL =
+      "postgres://shell_user:super-secret@db.example.com:5432/shell_db";
+    delete process.env.DATA_DIR;
+    process.env.JANT_DEBUG_MIGRATE = "1";
+
+    const migrate = vi.fn(async () => {});
+    const poolQuery = vi
+      .fn()
+      .mockResolvedValueOnce({
+        rows: [{ id: 7, hash: "hash-before", created_at: 1775349000 }],
+      })
+      .mockResolvedValueOnce({
+        rows: [
+          {
+            conname: "chk_nav_item_system_key",
+            definition:
+              "CHECK (((system_key IS NULL) OR (system_key = ANY (ARRAY['latest'::text]))))",
+          },
+        ],
+      })
+      .mockResolvedValueOnce({
+        rows: [{ id: 8, hash: "hash-after", created_at: 1775349118 }],
+      })
+      .mockResolvedValueOnce({
+        rows: [
+          {
+            conname: "chk_nav_item_system_key",
+            definition:
+              "CHECK (((system_key IS NULL) OR (system_key = ANY (ARRAY['latest'::text,'featured'::text]))))",
+          },
+        ],
+      });
+    const poolEnd = vi.fn(async () => undefined);
+    const Pool = vi.fn(function MockPool() {
+      return {
+        end: poolEnd,
+        query: poolQuery,
+      };
+    });
+
+    vi.doMock("node:fs", () => ({
+      existsSync: vi.fn((path) =>
+        String(path).endsWith("/packages/core/src/db/migrations/pg"),
+      ),
+      readFileSync: vi.fn(
+        () =>
+          "DATABASE_URL=postgres://file_user:file-secret@db.example.com:5432/file_db\n",
+      ),
+      readdirSync: vi.fn(() => ["0008_yielding.sql", "0007_nav_item.sql"]),
+    }));
+    vi.doMock("pg", () => ({ Pool }));
+    vi.doMock("../../../bin/lib/load-node-runtime.js", () => ({
+      loadNodeRuntime: vi.fn(async () => ({ migrate })),
+    }));
+
+    const logSpy = vi.spyOn(console, "log").mockImplementation(() => {});
+
+    const { run } = await import("../../../bin/commands/migrate.js");
+    await run(["--node"]);
+
+    expect(migrate).toHaveBeenCalledTimes(1);
+    expect(process.env.DATABASE_URL).toBe(
+      "postgres://shell_user:super-secret@db.example.com:5432/shell_db",
+    );
+
+    const output = logSpy.mock.calls
+      .map((args) => args.map((value) => String(value)).join(" "))
+      .join("\n");
+
+    expect(output).toContain("cli.node_env.database_url_source=process.env");
+    expect(output).toContain("cli.node_env.skipped_keys=DATABASE_URL");
+    expect(output).toContain(
+      "cli.node.target=postgres://shell_user@db.example.com:5432/shell_db",
+    );
+    expect(output).not.toContain("super-secret");
+    expect(output).not.toContain("file-secret");
+    expect(output).toContain("cli.pg.before.journal=count=1/2");
+    expect(output).toContain("cli.pg.after.journal=count=1/2");
+  });
+});

package/src/node/__tests__/cli-runtime-target.test.ts

@@ -31,7 +31,7 @@ describe("resolveCliRuntime", () => {
 
   it("rejects conflicting runtime flags", () => {
     expect(() => resolveCliRuntime({ local: true, remote: true }, {})).toThrow(
-      /either --local or --remote/,
+      /Choose only one of --local, --remote/,
     );
   });
 });

package/src/node/__tests__/cli-site-token-env.test.ts

@@ -69,11 +69,11 @@ describe("site CLI token env", () => {
       "https://example.com",
       "--output",
       outputPath,
-      "--no-localize-media",
+      "--no-pull-media",
     ]);
 
     expect(fetchMock).toHaveBeenCalledWith(
-      "https://example.com/api/export/zola",
+      "https://example.com/api/export/hugo",
       expect.objectContaining({
         headers: { Authorization: "Bearer jnt_prefixed_token" },
         method: "POST",

package/src/preset.css

@@ -13,6 +13,7 @@
 @import "./styles/components.css";
 @import "./styles/tokens.css";
 @import "./styles/ui.css";
+@import "./styles/site-media.css" layer(components);
 
 /*
  * Override BaseCoat's class-based dark mode with media-query-based.
@@ -23,14 +24,63 @@
 @theme {
   --radius-default: 0.5rem;
   --color-success: var(--success);
-  --default-font-family: var(--font-body);
+  --default-font-family: var(--font-ui);
   --default-mono-font-family: var(--font-mono);
+  --max-width-form: var(--form-max-width);
+
+  /* Bridge Tailwind text-* utilities to the unified type scale.
+     Any `text-sm`, `text-base`, etc. in templates uses these values. */
+  --text-2xs: var(--type-2xs);
+  --text-xs: var(--type-xs);
+  --text-sm: var(--type-sm);
+  --text-base: var(--type-base);
+  --text-lg: var(--type-secondary);
+  --text-xl: var(--type-body);
+  --text-2xl: var(--type-subtitle);
+  --text-3xl: var(--type-title);
+  --text-4xl: var(--type-display);
+}
+
+html {
+  font-size: 15px;
 }
 
 :root {
   --success: oklch(0.518 0.16 145.071);
 }
 
+/*
+ * UI voice — BaseCoat interactive components always use the theme-invariant
+ * sans-serif `--font-ui` token, keeping them visually distinct from content
+ * text when a serif font theme is active (Tufte, Bookish, etc.).
+ */
+@layer components {
+  .btn,
+  .btn-primary,
+  .btn-secondary,
+  .btn-outline,
+  .btn-ghost,
+  .btn-link,
+  .btn-destructive,
+  .badge,
+  .badge-primary,
+  .badge-secondary,
+  .badge-destructive,
+  .badge-outline,
+  .alert,
+  .alert-destructive,
+  .input,
+  .select,
+  .textarea,
+  .toggle,
+  .breadcrumb,
+  .pagination,
+  .tabs,
+  .field {
+    font-family: var(--font-ui);
+  }
+}
+
 /*
  * BaseCoat dark mode fallback — mirrors BaseCoat's `.dark { }` variables
  * via media query so dark mode works without JS class toggling.
@@ -111,7 +161,7 @@
  * We override them to use BaseCoat's CSS variables so that:
  *   - Light/dark mode switches automatically
  *   - Prose text matches the rest of the theme
- *   - Links use the theme accent without reading like UI chrome
+ *   - Links read like editorial text instead of UI chrome
  *
  * Design reference: editorial reading surfaces where links feel
  * integrated into the text, not like product controls.
@@ -120,7 +170,10 @@
   --tw-prose-body: inherit;
   --tw-prose-headings: var(--color-foreground);
   --tw-prose-lead: var(--color-muted-foreground);
-  --tw-prose-links: var(--site-accent);
+  --tw-prose-links: var(--site-content-link);
+  --site-prose-link-color: var(--site-content-link);
+  --site-prose-link-hover: var(--site-content-link-hover);
+  --site-prose-link-underline: var(--site-content-link-underline);
   --tw-prose-bold: inherit;
   --tw-prose-counters: var(--color-muted-foreground);
   --tw-prose-bullets: var(--color-muted-foreground);
@@ -134,6 +187,7 @@
   --tw-prose-pre-bg: var(--color-muted);
   --tw-prose-th-borders: var(--color-border);
   --tw-prose-td-borders: var(--color-border);
+  font-family: var(--font-body);
   font-size: var(--type-body-size);
   line-height: var(--type-body-leading);
   letter-spacing: var(--type-body-tracking);
@@ -145,6 +199,82 @@
     line-height: var(--type-heading-leading);
   }
 
+  /* Tufte typographic scale — sizes, margins, and rhythm */
+  :where(p) {
+    margin-top: 1.4rem;
+    margin-bottom: 1.4rem;
+  }
+
+  :where(h1) {
+    font-size: var(--type-content-display);
+    margin-top: 4rem;
+    margin-bottom: 1.5rem;
+  }
+
+  :where(h2) {
+    font-size: var(--type-content-title);
+    font-style: italic;
+    margin-top: 2.1rem;
+    margin-bottom: 1.4rem;
+  }
+
+  :where(h3) {
+    font-size: var(--type-content-subtitle);
+    font-style: italic;
+    margin-top: 2rem;
+    margin-bottom: 1.4rem;
+  }
+
+  :where(h4, h5, h6) {
+    font-size: var(--type-content-body);
+    font-weight: var(--fw-medium);
+  }
+
+  :where(h5, h6) {
+    color: var(--site-reading-meta);
+  }
+
+  :where(ul, ol) {
+    margin: 1.25em 0;
+    padding-left: 1.625em;
+  }
+
+  :where(li, dt) {
+    margin-top: 1.2em;
+    margin-bottom: 1.2em;
+  }
+
+  /* Normalize li > p so list spacing is controlled by li alone,
+     regardless of whether the markdown renderer wraps li contents in <p>. */
+  :where(li) > :where(p:first-child) {
+    margin-top: 0;
+  }
+
+  :where(li) > :where(p:last-child) {
+    margin-bottom: 0;
+  }
+
+  :where(code, pre code) {
+    font-size: var(--type-code);
+    line-height: 1.42;
+    overflow-wrap: break-word;
+  }
+
+  :where(:not(pre) > code) {
+    padding: 0.1em 0.35em;
+    background-color: var(--site-feed-card-bg);
+    border: 1px solid var(--site-feed-card-border);
+    border-radius: 0.25rem;
+  }
+
+  :where(pre code) {
+    font-size: var(--type-code-block);
+  }
+
+  :where(h1, h2, h3) :where(code) {
+    font-size: 0.8em;
+  }
+
   /* Image figures */
   figure {
     margin: 1.5em 0;
@@ -160,7 +290,7 @@
 
   figcaption {
     text-align: center;
-    font-size: 0.875rem;
+    font-size: var(--type-sm);
     color: var(--tw-prose-captions);
     margin-top: 0.5em;
   }
@@ -182,6 +312,75 @@
   figure[data-layout="full"] img {
     border-radius: 0;
   }
+
+  /* Blockquotes — tinted background card with quote icon */
+  blockquote {
+    position: relative;
+    margin: 1.4rem 0;
+    padding: 1.4rem 1rem 0.75rem;
+    border: none;
+    background: var(--site-blockquote-bg);
+    border-radius: 6px;
+    color: var(--site-blockquote-text);
+    font-family: var(--font-blockquote);
+    font-style: italic;
+    font-weight: inherit;
+    quotes: none;
+    text-wrap: pretty;
+  }
+
+  blockquote::before {
+    content: "";
+    display: block;
+    width: 1.3rem;
+    height: 1.3rem;
+    margin-bottom: 0.35rem;
+    background: var(--site-blockquote-rail);
+    opacity: 0.6;
+    mask-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 96 96' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M24.4 10.5C16.9 17.7 11.5 26.8 8.2 37.7C4.9 48.7 4.8 58.9 7.8 68.2C10.3 75.7 15.4 79.5 22.9 79.5C28 79.5 32.2 77.8 35.4 74.2C38.6 70.7 40.2 66.5 40.2 61.4C40.2 56.5 38.8 52.6 36 49.6C33.3 46.6 29.7 45.1 25.2 45.1C23.4 45.1 21.8 45.3 20.2 45.8C22.2 37.3 26.7 29.2 33.6 21.4L24.4 10.5Z'/%3E%3Cpath d='M60.8 10.5C53.3 17.7 47.9 26.8 44.6 37.7C41.3 48.7 41.2 58.9 44.2 68.2C46.7 75.7 51.8 79.5 59.3 79.5C64.4 79.5 68.6 77.8 71.8 74.2C75 70.7 76.6 66.5 76.6 61.4C76.6 56.5 75.2 52.6 72.4 49.6C69.7 46.6 66.1 45.1 61.6 45.1C59.8 45.1 58.2 45.3 56.6 45.8C58.6 37.3 63.1 29.2 70 21.4L60.8 10.5Z'/%3E%3C/svg%3E");
+    mask-size: contain;
+    mask-repeat: no-repeat;
+    -webkit-mask-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 96 96' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M24.4 10.5C16.9 17.7 11.5 26.8 8.2 37.7C4.9 48.7 4.8 58.9 7.8 68.2C10.3 75.7 15.4 79.5 22.9 79.5C28 79.5 32.2 77.8 35.4 74.2C38.6 70.7 40.2 66.5 40.2 61.4C40.2 56.5 38.8 52.6 36 49.6C33.3 46.6 29.7 45.1 25.2 45.1C23.4 45.1 21.8 45.3 20.2 45.8C22.2 37.3 26.7 29.2 33.6 21.4L24.4 10.5Z'/%3E%3Cpath d='M60.8 10.5C53.3 17.7 47.9 26.8 44.6 37.7C41.3 48.7 41.2 58.9 44.2 68.2C46.7 75.7 51.8 79.5 59.3 79.5C64.4 79.5 68.6 77.8 71.8 74.2C75 70.7 76.6 66.5 76.6 61.4C76.6 56.5 75.2 52.6 72.4 49.6C69.7 46.6 66.1 45.1 61.6 45.1C59.8 45.1 58.2 45.3 56.6 45.8C58.6 37.3 63.1 29.2 70 21.4L60.8 10.5Z'/%3E%3C/svg%3E");
+    -webkit-mask-size: contain;
+    -webkit-mask-repeat: no-repeat;
+  }
+
+  blockquote :where(p:first-of-type)::before,
+  blockquote :where(p:last-of-type)::after {
+    content: none;
+  }
+
+  blockquote > :first-child {
+    margin-top: 0;
+  }
+
+  blockquote > :last-child {
+    margin-bottom: 0;
+  }
+
+  blockquote p {
+    margin: 0;
+  }
+
+  blockquote p + p,
+  blockquote ul,
+  blockquote ol,
+  blockquote pre {
+    margin-top: 0.6em;
+  }
+
+  blockquote cite {
+    font-style: normal;
+    color: var(--site-reading-meta);
+    font-size: var(--type-sm);
+  }
+}
+
+/* CJK: no italic for blockquotes (no true italic glyph) */
+:lang(zh) .prose blockquote,
+:lang(ja) .prose blockquote,
+:lang(ko) .prose blockquote {
+  font-style: normal;
 }
 
 /*
@@ -192,16 +391,15 @@
  */
 .content-link,
 .prose a {
-  color: var(--site-accent);
+  color: var(--site-prose-link-color, var(--site-content-link));
   font-weight: inherit;
   text-decoration: underline;
-  text-decoration-color: color-mix(
-    in srgb,
-    var(--site-accent) 58%,
-    transparent
+  text-decoration-color: var(
+    --site-prose-link-underline,
+    var(--site-content-link-underline)
   );
-  text-decoration-thickness: 1px;
-  text-underline-offset: 0.14em;
+  text-decoration-thickness: 0.05em;
+  text-underline-offset: 0.1em;
   transition:
     color 0.18s ease,
     text-decoration-color 0.18s ease;
@@ -209,6 +407,112 @@
 
 .content-link:hover,
 .prose a:hover {
-  color: color-mix(in srgb, var(--site-accent) 84%, var(--color-foreground));
+  color: var(--site-prose-link-hover, var(--site-content-link-hover));
   text-decoration-color: currentColor;
 }
+
+.prose > :first-child {
+  margin-top: 0;
+}
+
+.prose > :last-child {
+  margin-bottom: 0;
+}
+
+/*
+ * Detail-page reading prose
+ *
+ * Keep these overrides outside cascade layers so they can outrank the base
+ * `.prose` variable defaults defined above.
+ */
+[data-page="post"] .post-detail-body.prose {
+  --tw-prose-body: var(--site-reading-body);
+  --tw-prose-headings: var(--site-reading-heading);
+  --tw-prose-lead: color-mix(
+    in srgb,
+    var(--site-reading-body) 88%,
+    var(--site-reading-meta)
+  );
+  --tw-prose-links: var(--site-reading-link);
+  --site-prose-link-color: var(--site-reading-link);
+  --site-prose-link-hover: var(--site-reading-link-hover);
+  --site-prose-link-underline: var(--site-reading-link-underline);
+  --tw-prose-bold: var(--site-reading-heading);
+  --tw-prose-counters: var(--site-reading-meta);
+  --tw-prose-bullets: var(--site-reading-meta);
+  --tw-prose-hr: color-mix(in srgb, var(--site-divider) 82%, transparent);
+  --tw-prose-quotes: var(--site-reading-quote);
+  --tw-prose-quote-borders: color-mix(
+    in srgb,
+    var(--site-reading-meta) 28%,
+    var(--site-divider)
+  );
+  --tw-prose-captions: var(--site-reading-caption);
+  --tw-prose-kbd: var(--site-reading-heading);
+  --tw-prose-code: var(--site-reading-heading);
+  --tw-prose-pre-code: color-mix(
+    in srgb,
+    var(--site-reading-caption) 86%,
+    var(--site-reading-body)
+  );
+  --tw-prose-th-borders: color-mix(
+    in srgb,
+    var(--site-divider) 88%,
+    transparent
+  );
+  --tw-prose-td-borders: color-mix(
+    in srgb,
+    var(--site-divider) 82%,
+    transparent
+  );
+}
+
+/*
+ * Tufte content-width constraint.
+ *
+ * ALL content follows the 55% rule — text blocks occupy 55% of the page
+ * section width, leaving 45% right margin for sidenotes.
+ * This applies globally, not just to detail pages.
+ */
+.prose {
+  max-width: none;
+}
+
+[data-page="search"],
+.site-home-header,
+.post-detail-body,
+.post-body-summary,
+.feed-note-title,
+.feed-link-title,
+.feed-quote,
+.feed-quote-attribution,
+.feed-quote-commentary,
+.feed-link-domain,
+.feed-continue-link,
+[data-post-body].prose,
+[data-post-meta] {
+  width: var(--layout-content-width);
+}
+
+.post-detail-title {
+  width: min(80%, 45rem);
+}
+
+@media (max-width: 1024px) {
+  [data-page="search"],
+  .site-home-header,
+  .post-detail-title,
+  .post-detail-body,
+  .post-body-summary,
+  .feed-note-title,
+  .feed-link-title,
+  .feed-quote,
+  .feed-quote-attribution,
+  .feed-quote-commentary,
+  .feed-link-domain,
+  .feed-continue-link,
+  [data-post-body].prose,
+  [data-post-meta] {
+    width: min(100%, 35rem);
+  }
+}

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

@@ -235,13 +235,15 @@ describe("Compose Routes", () => {
 
       const attachments = await services.media.getByPostId(posts[0].id);
       expect(attachments).toHaveLength(1);
-      expect(attachments[0].mimeType).toBe("text/x-tiptap+json");
+      expect(attachments[0].mimeType).toBe("text/markdown; charset=utf-8");
+      expect(attachments[0].mediaKind).toBe("text");
 
       const content = await services.media.getTextAttachmentContent(
         attachments[0].id,
         storage,
       );
       expect(content?.content).toBe("Attached body");
+      // Markdown-only storage: a single .md object per text attachment.
       expect(storage.files.size).toBe(1);
     });