@ampless/plugin-youtube 1.0.0-alpha.6 → 1.0.0-alpha.8

package/dist/editor.d.ts

@@ -1,5 +1,5 @@
 import { Node } from '@tiptap/core';
-import { TiptapNodeMarkdownAdapters } from 'ampless';
+import { TiptapNodeHtmlAdapters, TiptapNodeMarkdownAdapters } from 'ampless';
 
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {
@@ -48,4 +48,22 @@ declare const editorExtension: Node<any, any>;
  */
 declare const tiptapNodeToMarkdown: TiptapNodeMarkdownAdapters;
 
-export { AmplessYoutubeNode, editorExtension, tiptapNodeToMarkdown, youtubeEditor };
+/**
+ * tiptap → html adapter map. Serialises `amplessYoutube` nodes to the
+ * canonical placeholder div `<div data-ampless-youtube data-video-id="..."
+ * class="ampless-youtube-placeholder">…</div>` so the admin's
+ * "format: tiptap → html" body switch is lossless. The div is what
+ * `Node.parseHTML`'s `tag: 'div[data-ampless-youtube]'` rule restores
+ * from. It is an admin format-switch interchange form; public rendering
+ * expands YouTube embeds from the `tiptap` / `markdown` walkers, while
+ * `format: 'html'` preserves the div literally.
+ *
+ * `markdown → html` is a 2-hop via `generateJSON` (in admin format-switch);
+ * this adapter is reused by that path — no duplicate logic needed.
+ *
+ * `update-ampless` reads this export (via namespace import `* as`) and
+ * wires it into `installAdminTiptapNodeHtml`.
+ */
+declare const tiptapNodeToHtml: TiptapNodeHtmlAdapters;
+
+export { AmplessYoutubeNode, editorExtension, tiptapNodeToHtml, tiptapNodeToMarkdown, youtubeEditor };

package/dist/editor.js

@@ -6,6 +6,40 @@ import {
 
 // src/editor.tsx
 import { Node, mergeAttributes } from "@tiptap/core";
+function getBareUrlLinkHref(el) {
+  if (el.tagName.toLowerCase() === "a") {
+    return el.getAttribute("href");
+  }
+  if (el.tagName.toLowerCase() !== "p") return null;
+  const children = Array.from(el.children);
+  if (children.length !== 1) return null;
+  const link = children[0];
+  if (!(link instanceof HTMLElement)) return null;
+  if (link.tagName.toLowerCase() !== "a") return null;
+  const href = link.getAttribute("href")?.trim();
+  if (!href) return null;
+  const linkText = link.textContent?.trim();
+  if (linkText !== href) return null;
+  if (el.textContent?.trim() !== linkText) return null;
+  return href;
+}
+function placeholderAttrs(attrs) {
+  const out = {
+    "data-ampless-youtube": "",
+    "data-video-id": String(attrs.videoId ?? ""),
+    class: "ampless-youtube-placeholder"
+  };
+  if (attrs.start != null && Number.isFinite(Number(attrs.start))) {
+    out["data-start"] = String(attrs.start);
+  }
+  return out;
+}
+function escapeAttr(v) {
+  return v.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
+function attrsToHtmlString(attrs) {
+  return Object.entries(attrs).map(([k, v]) => v === "" ? k : `${k}="${escapeAttr(v)}"`).join(" ");
+}
 var AmplessYoutubeNode = Node.create({
   name: "amplessYoutube",
   group: "block",
@@ -16,7 +50,12 @@ var AmplessYoutubeNode = Node.create({
     return {
       videoId: {
         default: "",
-        parseHTML: (el) => el.getAttribute("data-video-id") ?? "",
+        parseHTML: (el) => {
+          const dataVideoId = el.getAttribute("data-video-id");
+          if (dataVideoId != null) return dataVideoId;
+          const href = getBareUrlLinkHref(el);
+          return href ? parseYoutubeUrl(href) ?? "" : "";
+        },
         renderHTML: (attrs) => ({
           "data-video-id": String(attrs.videoId ?? "")
         })
@@ -37,16 +76,59 @@ var AmplessYoutubeNode = Node.create({
     return [
       {
         tag: "div[data-ampless-youtube]"
+      },
+      {
+        tag: "p",
+        priority: 100,
+        getAttrs: (el) => {
+          const href = getBareUrlLinkHref(el) ?? "";
+          const videoId = parseYoutubeUrl(href);
+          if (!videoId) return false;
+          return { videoId, start: null };
+        }
+      },
+      {
+        // Defensive fallback for genuinely top-level bare-URL `<a>` tags
+        // (no parent block, or directly under `<body>` — = HTML fragments
+        // without a paragraph wrapper at all). The primary case is the
+        // markdown bare URL line `<p><a href=URL>URL</a></p>`, which is
+        // already handled by the `tag: 'p'` rule above (priority 100,
+        // `getBareUrlLinkHref`). This rule covers the rare standalone-link
+        // shape that bypasses that rule entirely.
+        //
+        // Scope is deliberately narrow:
+        //   1. Link text equals href — `<a href="URL">caption</a>` stays
+        //      a captioned Link, not silently swallowed into an embed.
+        //   2. Parent is null or `<body>` only. Inside any content block
+        //      (`<p>`, `<li>`, `<blockquote>`, `<div>`, …) the autolink
+        //      stays an inline Link mark to preserve the surrounding
+        //      structure. Promoting it would split `<li>` into an empty
+        //      paragraph item plus a list-external embed, break
+        //      blockquotes, etc.
+        tag: "a[href]",
+        priority: 100,
+        getAttrs: (el) => {
+          const link = el;
+          const parent = link.parentElement;
+          if (parent && parent.tagName.toLowerCase() !== "body") return false;
+          const href = link.getAttribute("href")?.trim() ?? "";
+          if (!href) return false;
+          const linkText = link.textContent?.trim() ?? "";
+          if (linkText !== href) return false;
+          const videoId = parseYoutubeUrl(href);
+          if (!videoId) return false;
+          return { videoId, start: null };
+        }
       }
     ];
   },
   renderHTML({ HTMLAttributes }) {
     return [
       "div",
-      mergeAttributes(HTMLAttributes, {
-        "data-ampless-youtube": "",
-        class: "ampless-youtube-placeholder"
-      }),
+      mergeAttributes(HTMLAttributes, placeholderAttrs({
+        videoId: HTMLAttributes["data-video-id"],
+        start: HTMLAttributes["data-start"]
+      })),
       ["span", {}, `YouTube: ${HTMLAttributes["data-video-id"] ?? ""}`]
     ];
   },
@@ -103,9 +185,18 @@ var tiptapNodeToMarkdown = {
     return `https://youtu.be/${videoId}`;
   }
 };
+var tiptapNodeToHtml = {
+  amplessYoutube: (node) => {
+    const videoId = String(node.attrs?.videoId ?? "").trim();
+    if (!videoId) return null;
+    const attrs = placeholderAttrs(node.attrs ?? {});
+    return `<div ${attrsToHtmlString(attrs)}><span>YouTube: ${escapeAttr(videoId)}</span></div>`;
+  }
+};
 export {
   AmplessYoutubeNode,
   editorExtension,
+  tiptapNodeToHtml,
   tiptapNodeToMarkdown,
   youtubeEditor
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ampless/plugin-youtube",
-  "version": "1.0.0-alpha.6",
+  "version": "1.0.0-alpha.8",
   "description": "YouTube embed plugin for ampless — renders youtube.com / youtu.be URLs inline as iframes in tiptap + markdown posts",
   "license": "MIT",
   "type": "module",
@@ -32,7 +32,7 @@
   "peerDependencies": {
     "@tiptap/core": "^3",
     "react": "^18 || ^19",
-    "ampless": "1.0.0-alpha.45"
+    "ampless": "1.0.0-alpha.47"
   },
   "devDependencies": {
     "@tiptap/core": "^3.23.6",