arky-sdk 0.4.27 → 0.4.29

package/README.md

@@ -291,10 +291,8 @@ The SDK includes helpful utilities accessible via `arky.utils`:
 // Get image URL from block
 const url = arky.utils.getImageUrl(imageBlock)
 
-// Get block values
+// Get block value
 const value = arky.utils.getBlockValue(entry, 'title')
-const values = arky.utils.getBlockValues(entry, 'gallery')
-const text = arky.utils.getBlockTextValue(block, 'en')
 
 // Format blocks
 const formatted = arky.utils.formatBlockValue(block)

package/dist/index.cjs

@@ -570,90 +570,65 @@ var createPromoCodeApi = (apiConfig) => {
 // src/utils/blocks.ts
 function getBlockLabel(block, locale = "en") {
   if (!block) return "";
-  if (block.properties?.label) {
-    if (typeof block.properties.label === "object") {
-      return block.properties.label[locale] || block.properties.label.en || Object.values(block.properties.label)[0] || "";
-    }
-    if (typeof block.properties.label === "string") {
-      return block.properties.label;
-    }
-  }
-  return block.key?.replace(/_/g, " ").replace(/\b\w/g, (l) => l.toUpperCase()) || "";
+  if (typeof block.properties?.label === "string") return block.properties.label;
+  if (typeof block.properties?.label === "object") return block.properties.label[locale];
+  return block.key?.replace(/_/g, " ").replace(/\b\w/g, (l) => l.toUpperCase());
 }
 function formatBlockValue(block) {
-  if (!block || block.value === null || block.value === void 0) {
-    return "";
-  }
+  if (!block || block.value === null || block.value === void 0) return "";
+  const value = block.value;
   switch (block.type) {
     case "BOOLEAN":
-      return block.value ? "Yes" : "No";
+      return value ? "Yes" : "No";
     case "NUMBER":
       if (block.properties?.variant === "DATE" || block.properties?.variant === "DATE_TIME") {
-        try {
-          return new Date(block.value).toLocaleDateString();
-        } catch (e) {
-          return String(block.value);
-        }
+        return new Date(value).toLocaleDateString();
       }
-      return String(block.value);
-    case "RELATIONSHIP":
-      if (Array.isArray(block.value) && block.value.length > 0) {
-        const firstValue = block.value[0];
-        if (firstValue && firstValue.mimeType) {
-          return firstValue.name || firstValue.id || "Media";
-        }
-        return firstValue.title || firstValue.name || firstValue.id || "Entry";
+      return String(value);
+    case "RELATIONSHIP_ENTRY":
+    case "RELATIONSHIP_MEDIA":
+      if (value && typeof value === "object") {
+        return value.mimeType ? value.name || value.id : value.title || value.name || value.id;
       }
-      return String(block.value);
+      return String(value);
     default:
-      return String(block.value);
+      return String(value);
   }
 }
-function prepareBlocksForSubmission(formData) {
-  const preparedBlocks = [];
-  Object.keys(formData).forEach((key) => {
-    if (formData[key] !== null && formData[key] !== void 0) {
-      preparedBlocks.push({
-        key,
-        value: [formData[key]]
-      });
-    }
-  });
-  return preparedBlocks;
+function prepareBlocksForSubmission(formData, blockTypes) {
+  return Object.keys(formData).filter((key) => formData[key] !== null && formData[key] !== void 0).map((key) => ({
+    key,
+    value: blockTypes?.[key] === "BLOCK" && !Array.isArray(formData[key]) ? [formData[key]] : formData[key]
+  }));
 }
 function extractBlockValues(blocks) {
   const values = {};
   blocks.forEach((block) => {
-    if (block.value && block.value.length > 0) {
-      values[block.key] = block.value[0];
-    } else {
-      values[block.key] = null;
-    }
+    values[block.key] = block.value ?? null;
   });
   return values;
 }
-function getBlockTextValue(block, locale = "en") {
-  if (!block || !block.value || block.value.length === 0) return "";
-  const firstValue = block.value[0];
-  if (typeof firstValue === "object" && firstValue !== null) {
-    if (firstValue[locale]) return firstValue[locale];
-    if (firstValue.en) return firstValue.en;
-    const values = Object.values(firstValue);
-    return String(values[0] || "");
-  }
-  return String(firstValue);
-}
 var getBlockValue = (entry, blockKey) => {
-  if (!entry || !entry.blocks) return null;
-  const block = entry.blocks.find((f) => f.key === blockKey);
-  if (!block || !block.value || block.value.length === 0) return null;
-  return block.value[0];
+  const block = entry?.blocks?.find((f) => f.key === blockKey);
+  return block?.value ?? null;
+};
+var getBlockTextValue = (block, locale = "en") => {
+  if (!block || block.value === null || block.value === void 0) return "";
+  if (block.type === "LOCALIZED_TEXT" || block.type === "MARKDOWN") {
+    if (typeof block.value === "object" && block.value !== null) {
+      return block.value[locale] ?? block.value["en"] ?? "";
+    }
+  }
+  if (typeof block.value === "string") return block.value;
+  return String(block.value ?? "");
 };
 var getBlockValues = (entry, blockKey) => {
-  if (!entry || !entry.blocks) return null;
-  const block = entry.blocks.find((f) => f.key === blockKey);
-  if (!block || !block.value || block.value.length === 0) return null;
-  return block.value;
+  const block = entry?.blocks?.find((f) => f.key === blockKey);
+  if (!block) return [];
+  if (block.type === "BLOCK" && Array.isArray(block.value)) {
+    return block.value;
+  }
+  return [];
 };
 function unwrapBlock(block, locale) {
   if (!block?.type || block.value === void 0) return block;
@@ -666,72 +641,47 @@ function unwrapBlock(block, locale) {
       return parsed;
     });
   }
-  const isLocalized = block.type === "LOCALIZED_TEXT" || block.type === "MARKDOWN";
-  const isList = block.properties?.ui === "list" || (block.properties?.maxValues ?? 1) > 1 || block.value.length > 1;
-  if (isList) {
-    return isLocalized ? block.value.map((v) => v[locale] || v["en"]) : [...block.value];
+  if (block.type === "TEXT_FILTER" || block.type === "NUMBER_FILTER") {
+    return block.value;
   }
-  return isLocalized ? block.value[0][locale] || block.value[0]["en"] : block.value[0];
+  if (block.type === "LOCALIZED_TEXT" || block.type === "MARKDOWN") {
+    return block.value?.[locale];
+  }
+  return block.value;
 }
 var getBlockObjectValues = (entry, blockKey, locale = "en") => {
-  if (!entry) {
-    return [];
-  }
-  const values = getBlockValues(entry, blockKey);
-  if (!values || !Array.isArray(values)) {
-    return [];
-  }
-  const parsed = values.map((obj) => {
-    if (!obj || !obj.value || !Array.isArray(obj.value)) {
-      return {};
-    }
-    const res = obj.value.reduce((acc, current) => {
+  const block = entry?.blocks?.find((f) => f.key === blockKey);
+  if (!block || block.type !== "BLOCK" || !Array.isArray(block.value)) return [];
+  return block.value.map((obj) => {
+    if (!obj?.value || !Array.isArray(obj.value)) return {};
+    return obj.value.reduce((acc, current) => {
       acc[current.key] = unwrapBlock(current, locale);
       return acc;
     }, {});
-    return res;
   });
-  return parsed;
 };
 var getBlockFromArray = (entry, blockKey, locale = "en") => {
-  if (!entry) {
-    return {};
-  }
-  const values = getBlockValues(entry, blockKey);
-  if (!values || !Array.isArray(values)) {
-    return {};
+  const block = entry?.blocks?.find((f) => f.key === blockKey);
+  if (!block) return {};
+  if (block.type === "BLOCK" && Array.isArray(block.value)) {
+    return block.value.reduce((acc, current) => {
+      acc[current.key] = unwrapBlock(current, locale);
+      return acc;
+    }, {});
   }
-  return values.reduce((acc, current) => {
-    acc[current.key] = unwrapBlock(current, locale);
-    return acc;
-  }, {});
+  return { [block.key]: unwrapBlock(block, locale) };
 };
 var getImageUrl = (imageBlock, isBlock = true) => {
   if (!imageBlock) return null;
-  if (imageBlock.type === "RELATIONSHIP_MEDIA" && Array.isArray(imageBlock.value)) {
-    const mediaValue = imageBlock.value[0];
-    if (mediaValue && mediaValue.mimeType) {
-      if (mediaValue.resolutions && mediaValue.resolutions.original && mediaValue.resolutions.original.url) {
-        return mediaValue.resolutions.original.url;
-      }
-      if (mediaValue.url) {
-        return mediaValue.url;
-      }
-    }
-    return null;
+  if (imageBlock.type === "RELATIONSHIP_MEDIA") {
+    const mediaValue = imageBlock.value;
+    return mediaValue?.resolutions?.original?.url || mediaValue?.url || null;
   }
   if (isBlock) {
-    if (typeof imageBlock === "string") {
-      return imageBlock;
-    }
-    if (imageBlock.url) {
-      return imageBlock.url;
-    }
-  }
-  if (imageBlock.resolutions && imageBlock.resolutions.original && imageBlock.resolutions.original.url) {
-    return imageBlock.resolutions.original.url;
+    if (typeof imageBlock === "string") return imageBlock;
+    if (imageBlock.url) return imageBlock.url;
   }
-  return null;
+  return imageBlock.resolutions?.original?.url || null;
 };
 
 // src/api/cms.ts
@@ -1745,9 +1695,9 @@ async function createArkySDK(config) {
     utils: {
       getImageUrl: (imageBlock, isBlock = true) => getImageUrl(imageBlock, isBlock),
       getBlockValue,
+      getBlockTextValue,
       getBlockValues,
       getBlockLabel,
-      getBlockTextValue,
       getBlockObjectValues,
       getBlockFromArray,
       formatBlockValue,