@jant/core 0.3.40 → 0.3.42

package/src/lib/tiptap-to-markdown.ts

@@ -1,26 +1,12 @@
 /**
  * Tiptap JSON → Markdown Converter
  *
- * Server-side converter that transforms Tiptap JSON documents to Markdown strings.
- * Pure string concatenation — no DOM required. Mirrors the node types
- * supported by `tiptap-render.ts`.
+ * Converts Tiptap JSON documents to Markdown using the official
+ * Tiptap MarkdownManager and Jant's shared markdown schema.
  */
 
-import { escapeHtml } from "./html.js";
-import { sanitizeUrl } from "./url.js";
-
-interface TiptapMark {
-  type: string;
-  attrs?: Record<string, unknown>;
-}
-
-interface TiptapNode {
-  type: string;
-  content?: TiptapNode[];
-  text?: string;
-  marks?: TiptapMark[];
-  attrs?: Record<string, unknown>;
-}
+import type { JSONContent } from "@tiptap/core";
+import { serializeMarkdownDocument } from "./markdown-manager.js";
 
 /**
  * Converts a Tiptap JSON document to a Markdown string.
@@ -36,319 +22,10 @@ interface TiptapNode {
  */
 export function tiptapJsonToMarkdown(json: string): string {
   try {
-    const doc = JSON.parse(json) as TiptapNode;
+    const doc = JSON.parse(json) as JSONContent;
     if (doc.type !== "doc") return "";
-    return renderBlocks(doc.content ?? []).trimEnd();
+    return serializeMarkdownDocument(doc).trimEnd();
   } catch {
     return "";
   }
 }
-
-function renderBlocks(nodes: TiptapNode[], indent = ""): string {
-  const parts: string[] = [];
-
-  for (const node of nodes) {
-    const rendered = renderBlockNode(node, indent);
-    if (rendered !== null) {
-      parts.push(rendered);
-    }
-  }
-
-  return parts.join("\n\n");
-}
-
-function renderBlockNode(node: TiptapNode, indent: string): string | null {
-  switch (node.type) {
-    case "paragraph": {
-      const text = renderInline(node.content ?? []);
-      return indent + text;
-    }
-
-    case "heading": {
-      const level = Math.min(Math.max(Number(node.attrs?.level ?? 1), 1), 6);
-      const prefix = "#".repeat(level);
-      const text = renderInline(node.content ?? []);
-      return `${indent}${prefix} ${text}`;
-    }
-
-    case "bulletList":
-      return renderList(node.content ?? [], indent, "bullet");
-
-    case "orderedList": {
-      const start = Number(node.attrs?.start ?? 1);
-      return renderList(node.content ?? [], indent, "ordered", start);
-    }
-
-    case "blockquote": {
-      const inner = renderBlocks(node.content ?? []);
-      return inner
-        .split("\n")
-        .map((line) => indent + (line ? `> ${line}` : ">"))
-        .join("\n");
-    }
-
-    case "codeBlock": {
-      const lang = node.attrs?.language ? String(node.attrs.language) : "";
-      const content = getPlainText(node.content ?? []);
-      const fence = chooseFence(content);
-      return `${indent}${fence}${lang}\n${content}\n${indent}${fence}`;
-    }
-
-    case "table":
-      return renderTable(node.content ?? [], indent);
-
-    case "horizontalRule":
-      return `${indent}---`;
-
-    case "hardBreak":
-      return null;
-
-    case "image": {
-      const src = String(node.attrs?.src ?? "");
-      const alt = node.attrs?.alt ? String(node.attrs.alt) : "";
-      const title = node.attrs?.title ? String(node.attrs.title) : "";
-      const caption = node.attrs?.caption ? String(node.attrs.caption) : "";
-      const layout =
-        node.attrs?.layout && String(node.attrs.layout) !== "regular"
-          ? String(node.attrs.layout)
-          : "";
-      const href = node.attrs?.href ? sanitizeUrl(String(node.attrs.href)) : "";
-
-      if (caption || layout || href) {
-        return `${indent}${renderRichImageHtml({
-          src,
-          alt,
-          title,
-          caption,
-          href,
-          layout,
-        })}`;
-      }
-
-      const titlePart = title ? ` "${title}"` : "";
-      return `${indent}![${alt}](${src}${titlePart})`;
-    }
-
-    case "moreBreak":
-      return `${indent}<!--more-->`;
-
-    default:
-      if (node.content) {
-        return renderBlocks(node.content, indent);
-      }
-      return null;
-  }
-}
-
-function renderRichImageHtml(image: {
-  src: string;
-  alt: string;
-  title: string;
-  caption: string;
-  href: string;
-  layout: string;
-}): string {
-  const attrs = ['data-jant-node="image"'];
-  if (image.layout) {
-    attrs.push(`data-jant-layout="${escapeHtml(image.layout)}"`);
-  }
-
-  const imgAttrs = [`src="${escapeHtml(image.src)}"`];
-  if (image.alt) imgAttrs.push(`alt="${escapeHtml(image.alt)}"`);
-  if (image.title) imgAttrs.push(`title="${escapeHtml(image.title)}"`);
-
-  const imgTag = `<img ${imgAttrs.join(" ")}>`;
-  const content = image.href
-    ? `<a href="${escapeHtml(image.href)}">${imgTag}</a>`
-    : imgTag;
-  const figcaption = image.caption
-    ? `<figcaption>${escapeHtml(image.caption)}</figcaption>`
-    : "";
-
-  return `<figure ${attrs.join(" ")}>${content}${figcaption}</figure>`;
-}
-
-function renderList(
-  items: TiptapNode[],
-  indent: string,
-  type: "bullet" | "ordered",
-  start = 1,
-): string {
-  const lines: string[] = [];
-
-  for (let i = 0; i < items.length; i++) {
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- index-bounded loop
-    const item = items[i]!;
-    const marker = type === "bullet" ? "-" : `${(start + i).toString()}.`;
-    const children = item.content ?? [];
-
-    for (let j = 0; j < children.length; j++) {
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- index-bounded loop
-      const child = children[j]!;
-      if (j === 0) {
-        // First child gets the list marker
-        if (child.type === "bulletList" || child.type === "orderedList") {
-          // Nested list as first child — render with increased indent
-          const nested = renderBlockNode(child, indent + "  ");
-          if (nested !== null) {
-            lines.push(`${indent}${marker} \n${nested}`);
-          }
-        } else {
-          const text = renderInline(child.content ?? []);
-          lines.push(`${indent}${marker} ${text}`);
-        }
-      } else {
-        // Subsequent children: indent to align with first line content
-        const childIndent = indent + " ".repeat(marker.length + 1);
-        if (child.type === "bulletList" || child.type === "orderedList") {
-          const nested = renderBlockNode(child, childIndent);
-          if (nested !== null) lines.push(nested);
-        } else if (child.type === "paragraph") {
-          const text = renderInline(child.content ?? []);
-          lines.push("");
-          lines.push(`${childIndent}${text}`);
-        } else {
-          const rendered = renderBlockNode(child, childIndent);
-          if (rendered !== null) {
-            lines.push("");
-            lines.push(rendered);
-          }
-        }
-      }
-    }
-  }
-
-  return lines.join("\n");
-}
-
-function renderTable(rows: TiptapNode[], indent: string): string {
-  if (rows.length === 0) return "";
-
-  const matrix: string[][] = [];
-
-  for (const row of rows) {
-    const cells: string[] = [];
-    for (const cell of row.content ?? []) {
-      // Each cell may contain paragraphs — render inline content
-      const parts: string[] = [];
-      for (const child of cell.content ?? []) {
-        parts.push(renderInline(child.content ?? []));
-      }
-      cells.push(parts.join(" "));
-    }
-    matrix.push(cells);
-  }
-
-  // Calculate column widths
-  const colCount = Math.max(...matrix.map((r) => r.length));
-  const widths: number[] = [];
-  for (let c = 0; c < colCount; c++) {
-    widths.push(Math.max(3, ...matrix.map((r) => (r[c] ?? "").length)));
-  }
-
-  const lines: string[] = [];
-
-  // Header row
-  const headerRow = matrix[0] ?? [];
-  lines.push(
-    indent +
-      "| " +
-      widths.map((w, i) => (headerRow[i] ?? "").padEnd(w)).join(" | ") +
-      " |",
-  );
-
-  // Separator row (first row is always the header)
-  lines.push(
-    indent + "| " + widths.map((w) => "-".repeat(w)).join(" | ") + " |",
-  );
-
-  // Body rows
-  for (let r = 1; r < matrix.length; r++) {
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- index-bounded loop
-    const row = matrix[r]!;
-    lines.push(
-      indent +
-        "| " +
-        widths.map((w, i) => (row[i] ?? "").padEnd(w)).join(" | ") +
-        " |",
-    );
-  }
-
-  return lines.join("\n");
-}
-
-function renderInline(nodes: TiptapNode[]): string {
-  return nodes.map(renderInlineNode).join("");
-}
-
-function renderInlineNode(node: TiptapNode): string {
-  switch (node.type) {
-    case "text": {
-      let text = node.text ?? "";
-      if (node.marks && node.marks.length > 0) {
-        text = applyMarks(text, node.marks);
-      }
-      return text;
-    }
-
-    case "hardBreak":
-      return "  \n";
-
-    case "image": {
-      const src = String(node.attrs?.src ?? "");
-      const alt = node.attrs?.alt ? String(node.attrs.alt) : "";
-      const title = node.attrs?.title ? String(node.attrs.title) : "";
-      const titlePart = title ? ` "${title}"` : "";
-      return `![${alt}](${src}${titlePart})`;
-    }
-
-    default:
-      if (node.content) return renderInline(node.content);
-      return "";
-  }
-}
-
-function applyMarks(text: string, marks: TiptapMark[]): string {
-  let result = text;
-
-  for (const mark of marks) {
-    switch (mark.type) {
-      case "bold":
-        result = `**${result}**`;
-        break;
-      case "italic":
-        result = `*${result}*`;
-        break;
-      case "strike":
-        result = `~~${result}~~`;
-        break;
-      case "code":
-        result = `\`${result}\``;
-        break;
-      case "link": {
-        const href = String(mark.attrs?.href ?? "");
-        result = `[${result}](${href})`;
-        break;
-      }
-    }
-  }
-
-  return result;
-}
-
-function getPlainText(nodes: TiptapNode[]): string {
-  return nodes.map((n) => n.text ?? "").join("");
-}
-
-function chooseFence(content: string): string {
-  let count = 3;
-  const regex = /(`{3,})/g;
-  let match;
-  while ((match = regex.exec(content)) !== null) {
-    const backticks = match[1] ?? "";
-    if (backticks.length >= count) {
-      count = backticks.length + 1;
-    }
-  }
-  return "`".repeat(count);
-}

package/src/lib/upload.ts

@@ -11,6 +11,7 @@ const MEDIA_ROOT_PREFIX = "media";
 const MEDIA_FILES_STORAGE_PREFIX = "files";
 const MEDIA_POSTERS_STORAGE_PREFIX = "posters";
 const MEDIA_ASSET_STORAGE_PREFIX = "assets";
+const MEDIA_PREVIEWS_STORAGE_PREFIX = "previews";
 
 /** MIME types — images */
 const IMAGE_MIME_TYPES = [
@@ -82,7 +83,6 @@ const TEXT_MIME_TYPES = [
   "text/plain",
   "text/markdown",
   "text/csv",
-  "text/x-tiptap+json",
   "text/html",
   "text/css",
   "text/javascript",
@@ -185,6 +185,8 @@ const ATTACHMENT_ONLY_MIME_TYPES = new Set([
 
 const INLINE_SIGNATURE_MIME_TYPES = new Set([
   "image/webp",
+  "image/png",
+  "image/jpeg",
   "video/mp4",
   "audio/mp4",
   "application/pdf",
@@ -331,7 +333,12 @@ export function getStoredUploadPolicy(
   contentType: string,
 ): StoredUploadPolicy | null {
   if (contentType.startsWith("image/")) {
-    if (contentType !== "image/webp") return null;
+    if (
+      contentType !== "image/webp" &&
+      contentType !== "image/png" &&
+      contentType !== "image/jpeg"
+    )
+      return null;
     return {
       contentDisposition: "inline",
       mediaKind: "image",
@@ -413,7 +420,17 @@ export function validateStoredUploadSignature(
         readAscii(bytes, 0, 4) === "RIFF" &&
         readAscii(bytes, 8, 4) === "WEBP"
         ? null
-        : "Only WebP images are supported.";
+        : "File does not match the expected WebP format.";
+    case "image/jpeg":
+      return bytes.length >= 2 && bytes[0] === 0xff && bytes[1] === 0xd8
+        ? null
+        : "File does not match the expected JPEG format.";
+    case "image/png":
+      return bytes.length >= 8 &&
+        bytes[0] === 0x89 &&
+        readAscii(bytes, 1, 3) === "PNG"
+        ? null
+        : "File does not match the expected PNG format.";
     case "video/mp4":
     case "audio/mp4":
       return bytes.length >= 12 && readAscii(bytes, 4, 4) === "ftyp"
@@ -428,6 +445,49 @@ export function validateStoredUploadSignature(
   }
 }
 
+/** Allowed poster MIME types and their file extensions. */
+const POSTER_FORMATS = {
+  "image/webp": "webp",
+  "image/png": "png",
+} as const;
+
+export type PosterMimeType = keyof typeof POSTER_FORMATS;
+
+/**
+ * Returns the file extension for a poster MIME type, or null if unsupported.
+ *
+ * @param contentType - The poster MIME type to check
+ * @returns File extension string
+ */
+export function getPosterExtension(contentType: PosterMimeType): string {
+  return POSTER_FORMATS[contentType];
+}
+
+/**
+ * Detects the poster image format from the first bytes of the file.
+ * Returns the MIME type if recognized, null otherwise.
+ *
+ * @param bytes - First few bytes of the file
+ * @returns MIME type string or null
+ */
+export function detectPosterMimeType(bytes: Uint8Array): PosterMimeType | null {
+  if (
+    bytes.length >= 12 &&
+    readAscii(bytes, 0, 4) === "RIFF" &&
+    readAscii(bytes, 8, 4) === "WEBP"
+  ) {
+    return "image/webp";
+  }
+  if (
+    bytes.length >= 8 &&
+    bytes[0] === 0x89 &&
+    readAscii(bytes, 1, 3) === "PNG"
+  ) {
+    return "image/png";
+  }
+  return null;
+}
+
 function readAscii(bytes: Uint8Array, start: number, length: number): string {
   return new TextDecoder("ascii").decode(bytes.slice(start, start + length));
 }
@@ -496,8 +556,12 @@ export function generateSiteAssetStorageKey(
   return { id, filename, storageKey };
 }
 
-export function getPosterStorageKey(siteId: string, mediaId: string): string {
-  return `${MEDIA_ROOT_PREFIX}/${siteId}/${MEDIA_POSTERS_STORAGE_PREFIX}/${mediaId}.webp`;
+export function getPosterStorageKey(
+  siteId: string,
+  mediaId: string,
+  ext = "webp",
+): string {
+  return `${MEDIA_ROOT_PREFIX}/${siteId}/${MEDIA_POSTERS_STORAGE_PREFIX}/${mediaId}.${ext}`;
 }
 
 export function getTemporaryUploadStorageKey(
@@ -512,8 +576,9 @@ export function getTemporaryUploadStorageKey(
 export function getTemporaryPosterStorageKey(
   siteId: string,
   uploadSessionId: string,
+  ext = "webp",
 ): string {
-  return `${MEDIA_ROOT_PREFIX}/${siteId}/tmp/${uploadSessionId}/poster.webp`;
+  return `${MEDIA_ROOT_PREFIX}/${siteId}/tmp/${uploadSessionId}/poster.${ext}`;
 }
 
 export function getSiteStorageKey(
@@ -523,3 +588,29 @@ export function getSiteStorageKey(
 ): string {
   return `${MEDIA_ROOT_PREFIX}/${siteId}/${MEDIA_ASSET_STORAGE_PREFIX}/${assetKind}/${filename}`;
 }
+
+/**
+ * Generates a storage key for a link preview image.
+ *
+ * Uses a unique suffix to avoid cache staleness when the preview is replaced.
+ *
+ * @param siteId - The site ID
+ * @param postId - The post ID
+ * @param suffix - A short random string to make the key unique across updates
+ * @param ext - File extension (default: "jpg")
+ * @returns Storage key like `media/{siteId}/previews/{postId}-{suffix}.jpg`
+ *
+ * @example
+ * ```ts
+ * getPreviewStorageKey("sit_123", "pst_456", "a3k9m");
+ * // "media/sit_123/previews/pst_456-a3k9m.jpg"
+ * ```
+ */
+export function getPreviewStorageKey(
+  siteId: string,
+  postId: string,
+  suffix: string,
+  ext = "jpg",
+): string {
+  return `${MEDIA_ROOT_PREFIX}/${siteId}/${MEDIA_PREVIEWS_STORAGE_PREFIX}/${postId}-${suffix}.${ext}`;
+}

package/src/lib/version.ts

@@ -5,12 +5,30 @@
  * In production (wrangler/esbuild), the typeof check evaluates to false safely.
  *
  * `__JANT_VERSION__` is replaced by Vite's `define` during both dev and lib build.
+ *
+ * `__CLIENT_JS_FILE__` and `__CLIENT_AUTH_JS_FILE__` are content-addressed
+ * internal paths (e.g. `/_assets/client-HASH.js`) embedded by the Worker build
+ * from the Vite client manifest. Used only in production (IS_VITE_DEV=false).
  */
 
 declare const __JANT_DEV__: boolean | undefined;
 declare const __JANT_VERSION__: string;
+declare const __CLIENT_JS_FILE__: string;
+declare const __CLIENT_AUTH_JS_FILE__: string;
+declare const __CLIENT_CSS_FILE__: string;
+declare const __CLIENT_CJK_CSS_FILE__: string;
+declare const __CLIENT_CJK_TC_CSS_FILE__: string;
+declare const __CLIENT_CJK_JP_CSS_FILE__: string;
+declare const __CLIENT_CJK_KR_CSS_FILE__: string;
 
 export const IS_VITE_DEV =
   typeof __JANT_DEV__ !== "undefined" && __JANT_DEV__ === true;
 
 export const CORE_VERSION = __JANT_VERSION__;
+export const CLIENT_JS_FILE = __CLIENT_JS_FILE__;
+export const CLIENT_AUTH_JS_FILE = __CLIENT_AUTH_JS_FILE__;
+export const CLIENT_CSS_FILE = __CLIENT_CSS_FILE__;
+export const CLIENT_CJK_CSS_FILE = __CLIENT_CJK_CSS_FILE__;
+export const CLIENT_CJK_TC_CSS_FILE = __CLIENT_CJK_TC_CSS_FILE__;
+export const CLIENT_CJK_JP_CSS_FILE = __CLIENT_CJK_JP_CSS_FILE__;
+export const CLIENT_CJK_KR_CSS_FILE = __CLIENT_CJK_KR_CSS_FILE__;

package/src/lib/video-playback.ts

@@ -0,0 +1,73 @@
+/**
+ * Shared video playback heuristics for feed autoplay and lightbox controls.
+ */
+
+export const SHORT_VIDEO_MAX_DURATION_SECONDS = 15;
+export const SHORT_VIDEO_MAX_AUTOPLAY_SIZE_BYTES = 12 * 1024 * 1024;
+
+/**
+ * Normalize a media duration into a whole-second value suitable for storage
+ * and heuristic checks.
+ *
+ * @param value - Duration in seconds, usually from video metadata
+ * @returns Ceiled whole-second duration, or `undefined` when invalid
+ *
+ * @example
+ * ```ts
+ * normalizeDurationSeconds(14.2); // 15
+ * ```
+ */
+export function normalizeDurationSeconds(
+  value: number | null | undefined,
+): number | undefined {
+  if (!Number.isFinite(value) || !value || value <= 0) {
+    return undefined;
+  }
+
+  return Math.ceil(value);
+}
+
+/**
+ * Decide whether a video should use the short-video autoplay/custom-player
+ * treatment.
+ *
+ * @param media - Minimal media fields needed for the heuristic
+ * @returns `true` when the media should use the short-video experience
+ *
+ * @example
+ * ```ts
+ * shouldUseShortVideoExperience({
+ *   mimeType: "video/mp4",
+ *   durationSeconds: 12,
+ *   size: 3_000_000,
+ * });
+ * ```
+ */
+export function shouldUseShortVideoExperience(media: {
+  mimeType?: string | null;
+  durationSeconds?: number | null;
+  size?: number | null;
+}): boolean {
+  if (!media.mimeType?.startsWith("video/")) {
+    return false;
+  }
+
+  if (
+    !Number.isFinite(media.durationSeconds) ||
+    !media.durationSeconds ||
+    media.durationSeconds <= 0
+  ) {
+    return false;
+  }
+
+  if (media.durationSeconds > SHORT_VIDEO_MAX_DURATION_SECONDS) {
+    return false;
+  }
+
+  const size = media.size;
+  if (typeof size === "number" && size > SHORT_VIDEO_MAX_AUTOPLAY_SIZE_BYTES) {
+    return false;
+  }
+
+  return true;
+}