npm - @momentumcms/server-analog - Versions diffs - 0.5.0 → 0.5.1 - Mend

@momentumcms/server-analog 0.5.0 → 0.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/index.cjs +62 -20
package/index.js +62 -20
package/package.json +3 -2
package/src/lib/server-analog.d.ts +2 -2

package/index.cjs CHANGED Viewed

@@ -317,7 +317,7 @@ function detectMimeType(buffer) {
     if (match) {
       if (sig.bytes[0] === 82 && sig.bytes[1] === 73) {
         if (buffer.length >= 12) {
-          const formatId = buffer.slice(8, 12).toString("ascii");
+          const formatId = String.fromCharCode(...buffer.subarray(8, 12));
           if (formatId === "WEBP") {
             return "image/webp";
           }
@@ -330,7 +330,7 @@ function detectMimeType(buffer) {
         }
       }
       if (sig.mimeType === "video/mp4" && buffer.length >= 8) {
-        const boxType = buffer.slice(4, 8).toString("ascii");
+        const boxType = String.fromCharCode(...buffer.subarray(4, 8));
         if (boxType === "ftyp") {
           return "video/mp4";
         }
@@ -339,7 +339,7 @@ function detectMimeType(buffer) {
     }
   }
   if (isTextContent(buffer)) {
-    const text2 = buffer.toString("utf8", 0, Math.min(buffer.length, 1e3));
+    const text2 = new TextDecoder().decode(buffer.subarray(0, Math.min(buffer.length, 1e3)));
     if (text2.trim().startsWith("{") || text2.trim().startsWith("[")) {
       return "application/json";
     }
@@ -4335,11 +4335,11 @@ SwaggerUIBundle({
 // libs/server-core/src/lib/preview-renderer.ts
 function renderPreviewHTML(options) {
-  const { doc, collection } = options;
+  const { doc, collection, customFieldRenderers } = options;
   const titleField = collection.admin?.useAsTitle ?? "id";
   const title = escapeHtml(String(doc[titleField] ?? doc["id"] ?? "Untitled"));
   const fields = collection.fields ?? [];
-  const fieldHtml = fields.filter((f) => !isHiddenField(f) && !isLayoutField(f) && f.name !== titleField).map((f) => renderField(f, doc)).filter(Boolean).join("\n");
+  const fieldHtml = fields.filter((f) => !isHiddenField(f) && !isLayoutField(f) && f.name !== titleField).map((f) => renderField(f, doc, customFieldRenderers)).filter(Boolean).join("\n");
   const richTextFields = fields.filter((f) => f.type === "richText").map((f) => f.name);
   return `<!DOCTYPE html>
 <html lang="en">
@@ -4373,6 +4373,7 @@ ${fieldHtml}
 (function(){
 var richTextFields=${JSON.stringify(richTextFields)};
 window.addEventListener('message',function(e){
+if(e.origin!==window.location.origin)return;
 if(!e.data||e.data.type!=='momentum-preview-update')return;
 var d=e.data.data;if(!d)return;
 document.querySelectorAll('[data-field]').forEach(function(el){
@@ -4393,16 +4394,20 @@ if(titleEl){var tf=titleEl.getAttribute('data-field');if(d[tf]!==undefined)title
 </body>
 </html>`;
 }
-function renderField(field, doc) {
+function renderField(field, doc, customRenderers) {
   const value = doc[field.name];
   if (value === void 0 || value === null) {
     return renderFieldWrapper(field, "");
   }
+  const editorKey = field.admin?.editor;
+  if (editorKey && customRenderers?.[editorKey]) {
+    return renderFieldWrapper(field, customRenderers[editorKey](value, field));
+  }
   switch (field.type) {
     case "richText":
       return renderFieldWrapper(
         field,
-        `<div class="field-value rich-text" data-field="${escapeHtml(field.name)}">${String(value)}</div>`
+        `<div class="field-value rich-text" data-field="${escapeHtml(field.name)}">${escapeHtml(String(value))}</div>`
       );
     case "checkbox":
       return renderFieldWrapper(
@@ -4733,6 +4738,21 @@ function coerceCsvValue(value, fieldType) {
 }
 // libs/server-analog/src/lib/server-analog.ts
+function getEmailBuilderFieldName(collection) {
+  const field = collection.fields.find(
+    (f) => f.type === "json" && f.admin?.editor === "email-builder"
+  );
+  return field?.name;
+}
+async function renderEmailPreviewHTML(doc, blocksFieldName) {
+  const emailPkg = "@momentumcms/email";
+  const { renderEmailFromBlocks } = await import(emailPkg);
+  const blocks2 = doc[blocksFieldName];
+  if (!Array.isArray(blocks2) || blocks2.length === 0) {
+    return '<html><body style="display:flex;align-items:center;justify-content:center;min-height:100vh;color:#666;font-family:sans-serif"><p>No email blocks yet.</p></body></html>';
+  }
+  return renderEmailFromBlocks({ blocks: blocks2 });
+}
 function nestBracketParams(flat) {
   const result = {};
   for (const [key, value] of Object.entries(flat)) {
@@ -5417,26 +5437,47 @@ function createComprehensiveMomentumHandler(config) {
         };
       }
     }
-    if (seg2 === "preview" && seg1 && method === "GET") {
+    if (seg2 === "preview" && seg1 && (method === "GET" || method === "POST")) {
+      if (!user) {
+        utils.setResponseStatus(event, 401);
+        return { error: "Authentication required to access preview" };
+      }
       try {
         const collectionSlug2 = seg0;
         const docId = seg1;
-        const contextApi = getContextualAPI(user);
-        const doc = await contextApi.collection(collectionSlug2).findById(docId);
-        if (!doc) {
-          utils.setResponseStatus(event, 404);
-          return { error: "Document not found" };
-        }
         const collectionConfig = config.collections.find((c) => c.slug === collectionSlug2);
         if (!collectionConfig) {
           utils.setResponseStatus(event, 404);
           return { error: "Collection not found" };
         }
-        const html = renderPreviewHTML({
-          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions -- doc type from API
-          doc,
-          collection: collectionConfig
-        });
+        const accessFn = collectionConfig.access?.read;
+        if (accessFn) {
+          const allowed = await Promise.resolve(accessFn({ req: { user } }));
+          if (!allowed) {
+            utils.setResponseStatus(event, 403);
+            return { error: "Access denied" };
+          }
+        }
+        let docRecord;
+        if (method === "POST") {
+          const body2 = await safeReadBody(event, utils, method);
+          if (body2["data"] && typeof body2["data"] === "object") {
+            docRecord = body2["data"];
+          } else {
+            utils.setResponseStatus(event, 400);
+            return { error: "POST preview requires { data: ... } body" };
+          }
+        } else {
+          const contextApi = getContextualAPI(user);
+          const doc = await contextApi.collection(collectionSlug2).findById(docId);
+          if (!doc) {
+            utils.setResponseStatus(event, 404);
+            return { error: "Document not found" };
+          }
+          docRecord = doc;
+        }
+        const emailField = getEmailBuilderFieldName(collectionConfig);
+        const html = emailField ? await renderEmailPreviewHTML(docRecord, emailField) : renderPreviewHTML({ doc: docRecord, collection: collectionConfig });
         utils.setResponseHeader(event, "Content-Type", "text/html; charset=utf-8");
         return utils.send(event, html);
       } catch (error) {
@@ -5705,12 +5746,13 @@ function createComprehensiveMomentumHandler(config) {
           fields[field.name] = field.data.toString("utf-8");
         }
       }
+      const collectionUpload = postUploadCol.upload ?? {};
       const uploadRequest = {
         file,
         user,
         fields,
         collectionSlug: seg0,
-        collectionUpload: postUploadCol.upload
+        collectionUpload
       };
       const response2 = await handleCollectionUpload(uploadConfig, uploadRequest);
       utils.setResponseStatus(event, response2.status);

package/index.js CHANGED Viewed

@@ -294,7 +294,7 @@ function detectMimeType(buffer) {
     if (match) {
       if (sig.bytes[0] === 82 && sig.bytes[1] === 73) {
         if (buffer.length >= 12) {
-          const formatId = buffer.slice(8, 12).toString("ascii");
+          const formatId = String.fromCharCode(...buffer.subarray(8, 12));
           if (formatId === "WEBP") {
             return "image/webp";
           }
@@ -307,7 +307,7 @@ function detectMimeType(buffer) {
         }
       }
       if (sig.mimeType === "video/mp4" && buffer.length >= 8) {
-        const boxType = buffer.slice(4, 8).toString("ascii");
+        const boxType = String.fromCharCode(...buffer.subarray(4, 8));
         if (boxType === "ftyp") {
           return "video/mp4";
         }
@@ -316,7 +316,7 @@ function detectMimeType(buffer) {
     }
   }
   if (isTextContent(buffer)) {
-    const text2 = buffer.toString("utf8", 0, Math.min(buffer.length, 1e3));
+    const text2 = new TextDecoder().decode(buffer.subarray(0, Math.min(buffer.length, 1e3)));
     if (text2.trim().startsWith("{") || text2.trim().startsWith("[")) {
       return "application/json";
     }
@@ -4316,11 +4316,11 @@ SwaggerUIBundle({
 // libs/server-core/src/lib/preview-renderer.ts
 function renderPreviewHTML(options) {
-  const { doc, collection } = options;
+  const { doc, collection, customFieldRenderers } = options;
   const titleField = collection.admin?.useAsTitle ?? "id";
   const title = escapeHtml(String(doc[titleField] ?? doc["id"] ?? "Untitled"));
   const fields = collection.fields ?? [];
-  const fieldHtml = fields.filter((f) => !isHiddenField(f) && !isLayoutField(f) && f.name !== titleField).map((f) => renderField(f, doc)).filter(Boolean).join("\n");
+  const fieldHtml = fields.filter((f) => !isHiddenField(f) && !isLayoutField(f) && f.name !== titleField).map((f) => renderField(f, doc, customFieldRenderers)).filter(Boolean).join("\n");
   const richTextFields = fields.filter((f) => f.type === "richText").map((f) => f.name);
   return `<!DOCTYPE html>
 <html lang="en">
@@ -4354,6 +4354,7 @@ ${fieldHtml}
 (function(){
 var richTextFields=${JSON.stringify(richTextFields)};
 window.addEventListener('message',function(e){
+if(e.origin!==window.location.origin)return;
 if(!e.data||e.data.type!=='momentum-preview-update')return;
 var d=e.data.data;if(!d)return;
 document.querySelectorAll('[data-field]').forEach(function(el){
@@ -4374,16 +4375,20 @@ if(titleEl){var tf=titleEl.getAttribute('data-field');if(d[tf]!==undefined)title
 </body>
 </html>`;
 }
-function renderField(field, doc) {
+function renderField(field, doc, customRenderers) {
   const value = doc[field.name];
   if (value === void 0 || value === null) {
     return renderFieldWrapper(field, "");
   }
+  const editorKey = field.admin?.editor;
+  if (editorKey && customRenderers?.[editorKey]) {
+    return renderFieldWrapper(field, customRenderers[editorKey](value, field));
+  }
   switch (field.type) {
     case "richText":
       return renderFieldWrapper(
         field,
-        `<div class="field-value rich-text" data-field="${escapeHtml(field.name)}">${String(value)}</div>`
+        `<div class="field-value rich-text" data-field="${escapeHtml(field.name)}">${escapeHtml(String(value))}</div>`
       );
     case "checkbox":
       return renderFieldWrapper(
@@ -4714,6 +4719,21 @@ function coerceCsvValue(value, fieldType) {
 }
 // libs/server-analog/src/lib/server-analog.ts
+function getEmailBuilderFieldName(collection) {
+  const field = collection.fields.find(
+    (f) => f.type === "json" && f.admin?.editor === "email-builder"
+  );
+  return field?.name;
+}
+async function renderEmailPreviewHTML(doc, blocksFieldName) {
+  const emailPkg = "@momentumcms/email";
+  const { renderEmailFromBlocks } = await import(emailPkg);
+  const blocks2 = doc[blocksFieldName];
+  if (!Array.isArray(blocks2) || blocks2.length === 0) {
+    return '<html><body style="display:flex;align-items:center;justify-content:center;min-height:100vh;color:#666;font-family:sans-serif"><p>No email blocks yet.</p></body></html>';
+  }
+  return renderEmailFromBlocks({ blocks: blocks2 });
+}
 function nestBracketParams(flat) {
   const result = {};
   for (const [key, value] of Object.entries(flat)) {
@@ -5398,26 +5418,47 @@ function createComprehensiveMomentumHandler(config) {
         };
       }
     }
-    if (seg2 === "preview" && seg1 && method === "GET") {
+    if (seg2 === "preview" && seg1 && (method === "GET" || method === "POST")) {
+      if (!user) {
+        utils.setResponseStatus(event, 401);
+        return { error: "Authentication required to access preview" };
+      }
       try {
         const collectionSlug2 = seg0;
         const docId = seg1;
-        const contextApi = getContextualAPI(user);
-        const doc = await contextApi.collection(collectionSlug2).findById(docId);
-        if (!doc) {
-          utils.setResponseStatus(event, 404);
-          return { error: "Document not found" };
-        }
         const collectionConfig = config.collections.find((c) => c.slug === collectionSlug2);
         if (!collectionConfig) {
           utils.setResponseStatus(event, 404);
           return { error: "Collection not found" };
         }
-        const html = renderPreviewHTML({
-          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions -- doc type from API
-          doc,
-          collection: collectionConfig
-        });
+        const accessFn = collectionConfig.access?.read;
+        if (accessFn) {
+          const allowed = await Promise.resolve(accessFn({ req: { user } }));
+          if (!allowed) {
+            utils.setResponseStatus(event, 403);
+            return { error: "Access denied" };
+          }
+        }
+        let docRecord;
+        if (method === "POST") {
+          const body2 = await safeReadBody(event, utils, method);
+          if (body2["data"] && typeof body2["data"] === "object") {
+            docRecord = body2["data"];
+          } else {
+            utils.setResponseStatus(event, 400);
+            return { error: "POST preview requires { data: ... } body" };
+          }
+        } else {
+          const contextApi = getContextualAPI(user);
+          const doc = await contextApi.collection(collectionSlug2).findById(docId);
+          if (!doc) {
+            utils.setResponseStatus(event, 404);
+            return { error: "Document not found" };
+          }
+          docRecord = doc;
+        }
+        const emailField = getEmailBuilderFieldName(collectionConfig);
+        const html = emailField ? await renderEmailPreviewHTML(docRecord, emailField) : renderPreviewHTML({ doc: docRecord, collection: collectionConfig });
         utils.setResponseHeader(event, "Content-Type", "text/html; charset=utf-8");
         return utils.send(event, html);
       } catch (error) {
@@ -5686,12 +5727,13 @@ function createComprehensiveMomentumHandler(config) {
           fields[field.name] = field.data.toString("utf-8");
         }
       }
+      const collectionUpload = postUploadCol.upload ?? {};
       const uploadRequest = {
         file,
         user,
         fields,
         collectionSlug: seg0,
-        collectionUpload: postUploadCol.upload
+        collectionUpload
       };
       const response2 = await handleCollectionUpload(uploadConfig, uploadRequest);
       utils.setResponseStatus(event, response2.status);

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@momentumcms/server-analog",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Nitro/h3 adapter for Momentum CMS with Analog.js support",
   "license": "MIT",
   "author": "Momentum CMS Contributors",
@@ -28,7 +28,8 @@
   "types": "./src/index.d.ts",
   "peerDependencies": {
     "@momentumcms/core": ">=0.0.1",
-    "@momentumcms/server-core": ">=0.0.1"
+    "@momentumcms/server-core": ">=0.0.1",
+    "@momentumcms/storage": ">=0.0.1"
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.983.0",

package/src/lib/server-analog.d.ts CHANGED Viewed

@@ -43,7 +43,7 @@ export type ReadMultipartFormDataFn = (event: H3Event) => Promise<Array<{
 /**
  * Type for send function from h3.
  */
-export type SendFn = (event: H3Event, data: Buffer | string, type?: string) => unknown;
+export type SendFn = (event: H3Event, data: Buffer | Uint8Array | string, type?: string) => unknown;
 /**
  * Extended h3 utilities for comprehensive API handling.
  */
@@ -59,7 +59,7 @@ export interface MomentumH3Utils {
         type?: string;
         data: Buffer;
     }> | undefined>;
-    send(event: H3Event, data: Buffer | string, type?: string): unknown;
+    send(event: H3Event, data: Buffer | Uint8Array | string, type?: string): unknown;
 }
 /**
  * Creates an h3 event handler for Momentum CMS API.