@redneckz/wildless-cms-uni-blocks 0.9.1 → 0.9.3

package/bin/migration-scripts/0.5.14.js

@@ -15,6 +15,12 @@ export default (unitPath, content) => {
 };
 
 function adjustGalleryBlock(block) {
+  if (block.blocks) {
+    for (const childBlock of block.blocks) {
+      adjustGalleryBlock(childBlock);
+    }
+  }
+
   if (block.type !== 'Gallery' || !block.content || !block.content.cards) {
     return;
   }

package/bin/migration-scripts/0.8.17.js

@@ -15,6 +15,12 @@ export default (uniPath, content) => {
 };
 
 function adjustBonusBenefitsBlock(block) {
+  if (block.blocks) {
+    for (const childBlock of block.blocks) {
+      adjustBonusBenefitsBlock(childBlock);
+    }
+  }
+
   if (block.type === 'BonusBenefitsBlock') {
     const bonusBenefits = block?.content?.bonusBenefits;
     if (bonusBenefits) {

package/bin/migration-scripts/0.8.24.js

@@ -15,9 +15,15 @@ export default (uniPath, content) => {
 };
 
 function adjustCarouselRecommendationCardBlock(block) {
+  if (block.blocks) {
+    for (const childBlock of block.blocks) {
+      adjustCarouselRecommendationCardBlock(childBlock);
+    }
+  }
+
   if (block.type === 'CarouselRecommendationCard') {
-    const carouselRecommendationCard = block?.content?.carouselRecommendationCard;
-    if (carouselRecommendationCard.image) {
+    const carouselRecommendationCard = block?.content;
+    if (carouselRecommendationCard?.image) {
       renameProp(carouselRecommendationCard, 'image', 'icon');
     }
   }

package/bin/migration-scripts/0.8.8.js

@@ -17,6 +17,12 @@ export default (unitPath, content) => {
 };
 
 const adjustCarouselBlock = (block) => {
+  if (block.blocks) {
+    for (const childBlock of block.blocks) {
+      adjustCarouselBlock(childBlock);
+    }
+  }
+
   if (block.type === 'Catalog') {
     adjustCarousel(block, 'CarouselCatalogCard');
   }

package/bin/migration-scripts/{0.8.31.js → 0.9.3.js}

@@ -1,7 +1,7 @@
 import crypto from 'crypto';
 import { createReadStream, promises as fs } from 'fs';
 import glob from 'glob';
-import { basename } from 'path';
+import { join, parse, relative } from 'path';
 import { promisify } from 'util';
 
 const findFiles = promisify(glob);
@@ -10,15 +10,16 @@ const CONTENT_DIR = './content';
 const IMAGE_EXT_LIST = ['png', 'jpg', 'svg'];
 const IMAGE_FIELD_KEYS = ['image', 'icon'];
 
-export const description = 'v0.8.31';
+export const description = 'v0.9.3';
 
 export default async (unitPath, content) => {
-  replaceImgSrcRecursive(content);
+  const unitPathDir = parse(unitPath).dir;
+  replaceImgSrcRecursive(content, unitPathDir);
 
   return { ...content };
 };
 
-const getFileHash = async (filePath, algorithm = 'sha1') => {
+const getFileHash = async (filePath, algorithm = 'sha256') => {
   return new Promise((resolve, reject) => {
     const hash = crypto.createHash(algorithm);
     const stream = createReadStream(filePath);
@@ -35,7 +36,7 @@ const getFilesHashMap = async (paths) => {
     if (!fileStat.isFile()) {
       continue;
     }
-    fileHashMap[basename(filePath)] = await getFileHash(filePath);
+    fileHashMap[filePath] = await getFileHash(filePath);
   }
 
   return fileHashMap;
@@ -60,7 +61,7 @@ const isObject = (value) => {
   return !!(value && typeof value === 'object' && !Array.isArray(value));
 };
 
-const replaceImgSrcRecursive = (node) => {
+const replaceImgSrcRecursive = (node, unitPathDir) => {
   if (isObject(node)) {
     const entries = Object.entries(node);
 
@@ -68,19 +69,20 @@ const replaceImgSrcRecursive = (node) => {
       const [key, childNode] = entries[i];
 
       if (IMAGE_FIELD_KEYS.includes(key) && childNode.src) {
-        const fileHash = filesHashMap[childNode.src];
+        const srcPath = join(unitPathDir, childNode.src);
+        const fileHash = filesHashMap[`./${srcPath}`];
         const filesGroup = filesGroupByHash.get(fileHash);
-        const baseFileSrc = filesGroup ? filesGroup[0] : null;
-        if (baseFileSrc) {
-          childNode.src = baseFileSrc;
+        const baseFilePath = filesGroup ? filesGroup[0] : null;
+        if (baseFilePath) {
+          childNode.src = relative(unitPathDir, baseFilePath);
         }
       } else {
-        replaceImgSrcRecursive(childNode);
+        replaceImgSrcRecursive(childNode, unitPathDir);
       }
     }
   } else if (Array.isArray(node)) {
     node.forEach((childNode) => {
-      replaceImgSrcRecursive(childNode);
+      replaceImgSrcRecursive(childNode, unitPathDir);
     });
   }
 };