npm - @plank-cms/plank - Versions diffs - 0.21.0 → 0.21.1 - Mend

@plank-cms/plank 0.21.0 → 0.21.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 (5) hide show

package/dist/admin/assets/{index-EnjVcK3R.js → index-Cyv_3rmL.js} +2 -2
package/dist/admin/index.html +1 -1
package/dist/index.js +2 -2
package/dist/{server-5CCETV6P.js → server-CW3GRBTB.js} +67 -38
package/package.json +4 -4

package/dist/admin/index.html CHANGED Viewed

@@ -12,7 +12,7 @@
       href="https://fonts.googleapis.com/css2?family=Google+Sans:ital,opsz,wght@0,17..18,400..700;1,17..18,400..700&display=swap"
       rel="stylesheet"
     />
-    <script type="module" crossorigin src="/admin/assets/index-EnjVcK3R.js"></script>
+    <script type="module" crossorigin src="/admin/assets/index-Cyv_3rmL.js"></script>
     <link rel="stylesheet" crossorigin href="/admin/assets/index-Dlj9367E.css">
   </head>
   <body>

package/dist/index.js CHANGED Viewed

@@ -7,7 +7,7 @@ import { randomBytes } from "crypto";
 import { resolve, join } from "path";
 import fs from "fs-extra";
 import { execa } from "execa";
-var PACKAGE_VERSION = "0.21.0";
+var PACKAGE_VERSION = "0.21.1";
 function generateSecret() {
   return randomBytes(32).toString("hex");
 }
@@ -101,7 +101,7 @@ import { dirname, join as join2, resolve as resolve2 } from "path";
 async function start() {
   config({ path: resolve2(process.cwd(), ".env") });
   process.env.PLANK_ADMIN_DIST = join2(dirname(fileURLToPath(import.meta.url)), "admin");
-  const { start: startServer } = await import("./server-5CCETV6P.js");
+  const { start: startServer } = await import("./server-CW3GRBTB.js");
   await startServer();
 }

package/dist/{server-5CCETV6P.js → server-CW3GRBTB.js} RENAMED Viewed

@@ -613,7 +613,7 @@ function validate(contentType, payload) {
                 }
               } else if (subField.type === "media") {
                 if (typeof subValue !== "string" || !subValue.trim()) {
-                  errors.push(`Field "${field.name}[${i2}].${subField.name}" must be a non-empty string URL`);
+                  errors.push(`Field "${field.name}[${i2}].${subField.name}" must be a non-empty media reference string`);
                 }
               } else if (subField.type === "mixed") {
                 if (!isMixedArrayValue(subValue)) {
@@ -4933,26 +4933,73 @@ function normalizeArrayItemsBySchema(value, field) {
     return normalized;
   });
 }
-async function resolveMediaFields(entries, ct) {
-  const singleFields = ct.fields.filter((f2) => f2.type === "media").map((f2) => f2.name);
-  const galleryFields = ct.fields.filter((f2) => f2.type === "media-gallery").map((f2) => f2.name);
-  if (singleFields.length === 0 && galleryFields.length === 0)
+function collectMediaIdsFromValue(field, value, idSet) {
+  if (field.type === "media") {
+    if (typeof value === "string" && value && !value.startsWith("http"))
+      idSet.add(value);
+    return;
+  }
+  if (field.type === "media-gallery") {
+    if (!Array.isArray(value))
+      return;
+    for (const item of value) {
+      if (typeof item === "string" && item && !item.startsWith("http"))
+        idSet.add(item);
+    }
     return;
+  }
+  if (field.type !== "array" || !Array.isArray(value))
+    return;
+  const subFields = field.arrayFields ?? [];
+  for (const item of value) {
+    if (typeof item !== "object" || item === null || Array.isArray(item))
+      continue;
+    const raw = item;
+    for (const subField of subFields) {
+      collectMediaIdsFromValue(subField, raw[subField.name], idSet);
+    }
+  }
+}
+function resolveMediaValue(field, value, mediaMap) {
+  if (field.type === "media") {
+    if (typeof value === "string" && value.startsWith("http"))
+      return createMediaValue(value);
+    if (typeof value === "string" && mediaMap.has(value))
+      return mediaMap.get(value);
+    return value;
+  }
+  if (field.type === "media-gallery") {
+    if (!Array.isArray(value))
+      return value;
+    return value.map((item) => {
+      if (typeof item === "string" && item.startsWith("http"))
+        return createMediaValue(item);
+      if (typeof item === "string" && mediaMap.has(item))
+        return mediaMap.get(item);
+      return item;
+    });
+  }
+  if (field.type !== "array" || !Array.isArray(value))
+    return value;
+  const subFields = field.arrayFields ?? [];
+  return value.map((item) => {
+    if (typeof item !== "object" || item === null || Array.isArray(item))
+      return item;
+    const raw = item;
+    const next = { ...raw };
+    for (const subField of subFields) {
+      if (!(subField.name in raw))
+        continue;
+      next[subField.name] = resolveMediaValue(subField, raw[subField.name], mediaMap);
+    }
+    return next;
+  });
+}
+async function resolveMediaFields(entries, ct) {
   const idSet = /* @__PURE__ */ new Set();
   for (const entry of entries) {
-    for (const name of singleFields) {
-      const val = entry[name];
-      if (typeof val === "string" && val && !val.startsWith("http"))
-        idSet.add(val);
-    }
-    for (const name of galleryFields) {
-      const val = entry[name];
-      if (Array.isArray(val)) {
-        for (const id of val) {
-          if (typeof id === "string" && id && !id.startsWith("http"))
-            idSet.add(id);
-        }
-      }
+    for (const field of ct.fields) {
+      collectMediaIdsFromValue(field, entry[field.name], idSet);
     }
   }
   const mediaMap = /* @__PURE__ */ new Map();
@@ -4972,26 +5019,8 @@ async function resolveMediaFields(entries, ct) {
     }));
   }
   for (const entry of entries) {
-    for (const name of singleFields) {
-      const val = entry[name];
-      if (typeof val === "string" && val.startsWith("http")) {
-        entry[name] = createMediaValue(val);
-        continue;
-      }
-      if (typeof val === "string" && mediaMap.has(val))
-        entry[name] = mediaMap.get(val);
-    }
-    for (const name of galleryFields) {
-      const val = entry[name];
-      if (Array.isArray(val)) {
-        entry[name] = val.map((item) => {
-          if (typeof item === "string" && item.startsWith("http"))
-            return createMediaValue(item);
-          if (typeof item === "string" && mediaMap.has(item))
-            return mediaMap.get(item);
-          return item;
-        });
-      }
+    for (const field of ct.fields) {
+      entry[field.name] = resolveMediaValue(field, entry[field.name], mediaMap);
     }
   }
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@plank-cms/plank",
-  "version": "0.21.0",
+  "version": "0.21.1",
   "description": "Self-hosted headless CMS. Deploy in minutes on your own infrastructure.",
   "type": "module",
   "files": [
@@ -55,9 +55,9 @@
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "tsup": "^8.5.0",
-    "@plank-cms/core": "0.21.0",
-    "@plank-cms/schema": "0.21.0",
-    "@plank-cms/db": "0.21.0"
+    "@plank-cms/core": "0.21.1",
+    "@plank-cms/schema": "0.21.1",
+    "@plank-cms/db": "0.21.1"
   },
   "scripts": {
     "build": "tsup",