strapi-plugin-bulk-updater 1.3.8 → 1.3.9

package/dist/server/index.mjs

@@ -3617,15 +3617,18 @@ function extractHeadingsFromRichText(content) {
   }
   return counts;
 }
+function cleanKey(str2) {
+  return (str2 || "").replace(/[-_]/g, "").toLowerCase().trim();
+}
 function matchesPath(normalizedPath, leafKey, targetField) {
   if (!targetField) return false;
-  const pLower = (normalizedPath || "").toLowerCase().trim();
-  const kLower = (leafKey || "").toLowerCase().trim();
-  const tLower = targetField.toLowerCase().trim();
-  if (!tLower.includes(".")) {
-    return kLower === tLower || pLower === tLower || pLower.endsWith(`.${tLower}`);
+  const pClean = cleanKey(normalizedPath);
+  const kClean = cleanKey(leafKey);
+  const tClean = cleanKey(targetField);
+  if (!tClean.includes(".")) {
+    return kClean === tClean || pClean === tClean || pClean.endsWith(`.${tClean}`);
   }
-  return pLower === tLower || pLower.endsWith(`.${tLower}`) || pLower.endsWith(tLower);
+  return pClean === tClean || pClean.endsWith(`.${tClean}`) || pClean.endsWith(tClean) || pClean.includes(`.${tClean}`);
 }
 const validationRulesService = ({ strapi: strapi2 }) => ({
   async getStore() {
@@ -3739,8 +3742,9 @@ const validationRulesService = ({ strapi: strapi2 }) => ({
     function componentHasField(compUid, targetField2) {
       const comp = allComponents[compUid];
       if (!comp?.attributes) return false;
+      if (matchesPath(compUid, compUid, targetField2)) return true;
       for (const [attrName, attrDef] of Object.entries(comp.attributes)) {
-        if (matchesPath(attrName, attrName, targetField2)) return true;
+        if (matchesPath(attrName, attrName, targetField2) || matchesPath(`${compUid}.${attrName}`, attrName, targetField2)) return true;
         if (attrDef.type === "component" && attrDef.component) {
           if (componentHasField(attrDef.component, targetField2)) return true;
         }
@@ -3763,7 +3767,7 @@ const validationRulesService = ({ strapi: strapi2 }) => ({
           }
         } else if (attrDef.type === "dynamiczone" && Array.isArray(attrDef.components)) {
           const matchingComp = attrDef.components.some(
-            (compUid) => componentHasField(compUid, targetField)
+            (compUid) => componentHasField(compUid, targetField) || matchesPath(`${attrKey}.${compUid}`, compUid, targetField)
           );
           if (matchingComp) {
             hasField = true;
@@ -3808,11 +3812,15 @@ const validationRulesService = ({ strapi: strapi2 }) => ({
             for (const entry of entries) {
               let traverse = function(obj, currentPath = "") {
                 if (!obj || typeof obj !== "object") return;
+                const compName = typeof obj.__component === "string" ? obj.__component : "";
                 for (const key of Object.keys(obj)) {
+                  if (key === "__component") continue;
                   const val = obj[key];
                   const newPath = currentPath ? `${currentPath}.${key}` : key;
                   const normalizedPath = newPath.replace(/\.\d+/g, "");
-                  if (matchesPath(normalizedPath, key, targetField) && typeof val === "string" && val.trim()) {
+                  const compPath = compName ? (currentPath ? `${currentPath}.${compName}.${key}` : `${compName}.${key}`).replace(/\.\d+/g, "") : "";
+                  const isMatch = matchesPath(normalizedPath, key, targetField) || (compPath ? matchesPath(compPath, key, targetField) : false);
+                  if (isMatch && typeof val === "string" && val.trim()) {
                     const lower = val.toLowerCase().trim();
                     structuredCounts[lower] = (structuredCounts[lower] || 0) + 1;
                   }
@@ -34145,12 +34153,16 @@ const index = {
         if (data && typeof data === "object") {
           let scanDataTree = function(obj, currentPath = "") {
             if (!obj || typeof obj !== "object") return;
+            const compName = typeof obj.__component === "string" ? obj.__component : "";
             for (const key of Object.keys(obj)) {
+              if (key === "__component") continue;
               const val = obj[key];
               const newPath = currentPath ? `${currentPath}.${key}` : key;
               const normalizedPath = newPath.replace(/\.\d+/g, "");
+              const compPath = compName ? (currentPath ? `${currentPath}.${compName}.${key}` : `${compName}.${key}`).replace(/\.\d+/g, "") : "";
               for (const rule of effectiveRules) {
-                if (matchesPath(normalizedPath, key, rule.targetField) && typeof val === "string" && val.trim()) {
+                const isMatch = matchesPath(normalizedPath, key, rule.targetField) || (compPath ? matchesPath(compPath, key, rule.targetField) : false);
+                if (isMatch && typeof val === "string" && val.trim()) {
                   const lowerVal = val.toLowerCase().trim();
                   structuredCounts[rule.id] = structuredCounts[rule.id] || {};
                   structuredCounts[rule.id][lowerVal] = (structuredCounts[rule.id][lowerVal] || 0) + 1;