@nitrogenbuilder/connector-payload 1.2.0 → 1.2.1

package/dist/endpoints/ctrlLinkResolver.js

@@ -106,6 +106,35 @@ function resolveMediaUrl(url, settings) {
     const relativeUrl = url.startsWith('/') ? url : `/${url}`;
     return baseUrl ? `${baseUrl}${relativeUrl}` : relativeUrl;
 }
+const MEDIA_PATH_MARKER = 'api/media/file/';
+// The editor's wysiwyg (TinyMCE) rewrites same-origin media URLs to relative
+// paths on save (e.g. `../../api/media/file/x.pdf`), which 404 on the frontend
+// host. Re-anchor anything that is only `./`/`../` hops away from the media
+// path back to the Payload origin; other relative URLs are left untouched.
+function resolveInlineMediaUrl(url, settings) {
+    if (/^https?:\/\//i.test(url))
+        return url;
+    const index = url.indexOf(MEDIA_PATH_MARKER);
+    if (index === -1)
+        return url;
+    const prefix = url.slice(0, index);
+    if (!/^[./]*$/.test(prefix))
+        return url;
+    return resolveMediaUrl(`/${url.slice(index)}`, settings);
+}
+function resolveInlineMediaUrls(value, settings) {
+    if (!value.includes(MEDIA_PATH_MARKER))
+        return value;
+    if (!value.includes('<')) {
+        const trimmed = value.trim();
+        const resolved = resolveInlineMediaUrl(trimmed, settings);
+        return resolved === trimmed ? value : resolved;
+    }
+    return value.replace(/((?:href|src)=)(["'])([^"']*)\2/gi, (match, attr, quote, url) => {
+        const resolved = resolveInlineMediaUrl(url, settings);
+        return resolved === url ? match : `${attr}${quote}${resolved}${quote}`;
+    });
+}
 async function findInternalTarget(context, link, internalRef) {
     const entryId = getId(internalRef.entryId);
     if (entryId === null)
@@ -205,13 +234,25 @@ async function resolveLinkRecord(context, link) {
 }
 async function walk(context, value) {
     if (Array.isArray(value)) {
-        await Promise.all(value.map((item) => walk(context, item)));
+        await Promise.all(value.map(async (item, index) => {
+            if (typeof item === 'string') {
+                value[index] = resolveInlineMediaUrls(item, context.settings);
+                return;
+            }
+            await walk(context, item);
+        }));
         return;
     }
     if (!isRecord(value))
         return;
     await resolveLinkRecord(context, value);
-    await Promise.all(Object.values(value).map((item) => walk(context, item)));
+    await Promise.all(Object.entries(value).map(async ([key, item]) => {
+        if (typeof item === 'string') {
+            value[key] = resolveInlineMediaUrls(item, context.settings);
+            return;
+        }
+        await walk(context, item);
+    }));
 }
 export async function resolveCtrlLinksInNitrogenData(payload, value, settings) {
     if (!value)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nitrogenbuilder/connector-payload",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Nitrogen page builder connector plugin for Payload CMS 3.x",
   "author": "Leonardo Dentzien <leo@torchmedia.ca>",
   "type": "module",