@uniformdev/tms-sdk 20.64.1-alpha.3 → 20.66.0

package/dist/index.esm.js

@@ -1,6 +1,7 @@
 // src/collectTranslationPayload.ts
 import {
   bindVariables,
+  CANVAS_BLOCK_PARAM_TYPE as CANVAS_BLOCK_PARAM_TYPE2,
   walkNodeTree as walkNodeTree2
 } from "@uniformdev/canvas";
 import { isRichTextValue as isRichTextValue2, isRichTextValueConsideredEmpty as isRichTextValueConsideredEmpty2 } from "@uniformdev/richtext";
@@ -109,6 +110,7 @@ var getNodeMetaAttributesString = (node) => {
 
 // src/translationHelpers.ts
 import {
+  CANVAS_BLOCK_PARAM_TYPE,
   walkNodeTree
 } from "@uniformdev/canvas";
 import { isRichTextValueConsideredEmpty } from "@uniformdev/richtext";
@@ -287,6 +289,9 @@ var processComponentTranslation = ({
   });
   return { updated };
 };
+var isNestedParameterType = (type) => {
+  return type === CANVAS_BLOCK_PARAM_TYPE;
+};
 var processParameterTranslation = ({
   uniformSourceLocale,
   uniformTargetLocale,
@@ -297,6 +302,14 @@ var processParameterTranslation = ({
   if (originalParameter.type !== parameter.type) {
     return { updated: false };
   }
+  if (isNestedParameterType(originalParameter.type)) {
+    return processNestedParameterTranslation({
+      uniformSourceLocale,
+      uniformTargetLocale,
+      originalParameter,
+      parameter
+    });
+  }
   if (!originalParameter.locales && originalParameter.value === void 0) {
     return { updated: false };
   }
@@ -341,6 +354,39 @@ var processParameterTranslation = ({
   }
   return { updated: false };
 };
+var processNestedParameterTranslation = ({
+  uniformSourceLocale,
+  uniformTargetLocale,
+  originalParameter,
+  parameter
+}) => {
+  let updated = false;
+  if (originalParameter.type == CANVAS_BLOCK_PARAM_TYPE && Array.isArray(originalParameter.value) && Array.isArray(parameter.value)) {
+    const originalValue = originalParameter.value;
+    const translatedValue = parameter.value;
+    for (const translatedBlock of translatedValue) {
+      if (!translatedBlock._id || !translatedBlock.type) {
+        continue;
+      }
+      const originalBlock = originalValue.find(
+        (b) => b._id === translatedBlock._id && b.type === translatedBlock.type
+      );
+      if (!originalBlock) {
+        continue;
+      }
+      const { updated: blockUpdated } = processComponentTranslation({
+        uniformSourceLocale,
+        uniformTargetLocale,
+        originalNode: originalBlock,
+        translatedComponent: translatedBlock
+      });
+      if (blockUpdated) {
+        updated = true;
+      }
+    }
+  }
+  return { updated };
+};
 var processOverrideTranslation = ({
   uniformSourceLocale,
   uniformTargetLocale,
@@ -478,11 +524,16 @@ var collectTranslationPayload = ({
     },
     components: {}
   };
-  walkNodeTree2(entity, ({ node, actions }) => {
+  walkNodeTree2(entity, ({ node, actions, ancestorsAndSelf }) => {
+    var _a;
     if (!node.type || !node._id) {
       actions.stopProcessingDescendants();
       return;
     }
+    if (((_a = ancestorsAndSelf.at(0)) == null ? void 0 : _a.type) === "block") {
+      actions.stopProcessingDescendants();
+      return;
+    }
     const { _id, type, parameters, _overrides } = collectFromNode({
       uniformSourceLocale,
       uniformTargetLocale,
@@ -516,6 +567,18 @@ var collectFromNode = ({
   const entryFields = "fields" in node ? node.fields : void 0;
   Object.entries((_a = componentParameters != null ? componentParameters : entryFields) != null ? _a : {}).forEach(([paramKey, param]) => {
     var _a2, _b2;
+    if (isNestedParameterType(param.type)) {
+      const nestedParam = collectNestedParameter({
+        param,
+        uniformSourceLocale,
+        uniformTargetLocale,
+        config
+      });
+      if (nestedParam) {
+        collectedParameters[paramKey] = nestedParam;
+      }
+      return;
+    }
     const sourceLocaleValue = (_a2 = param.locales) == null ? void 0 : _a2[uniformSourceLocale];
     const targetLocaleValue = (_b2 = param.locales) == null ? void 0 : _b2[uniformTargetLocale];
     if (!canTranslateParameterValue(param, sourceLocaleValue)) {
@@ -558,17 +621,31 @@ var collectFromNode = ({
   Object.entries((_c = node._overrides) != null ? _c : {}).forEach(([overrideKey, override]) => {
     var _a2, _b2;
     Object.entries((_a2 = override.parameters) != null ? _a2 : {}).forEach(([paramKey, param]) => {
-      var _a3, _b3, _c2, _d, _e;
-      const sourceLocaleValue = (_a3 = param.locales) == null ? void 0 : _a3[uniformSourceLocale];
-      const targetLocaleValue = (_b3 = param.locales) == null ? void 0 : _b3[uniformTargetLocale];
+      var _a3, _b3, _c2, _d, _e, _f, _g, _h;
+      if (isNestedParameterType(param.type)) {
+        const nestedParam = collectNestedParameter({
+          param,
+          uniformSourceLocale,
+          uniformTargetLocale,
+          config
+        });
+        if (nestedParam) {
+          (_a3 = collectedOverrides[overrideKey]) != null ? _a3 : collectedOverrides[overrideKey] = {};
+          (_c2 = (_b3 = collectedOverrides[overrideKey]).parameters) != null ? _c2 : _b3.parameters = {};
+          collectedOverrides[overrideKey].parameters[paramKey] = nestedParam;
+        }
+        return;
+      }
+      const sourceLocaleValue = (_d = param.locales) == null ? void 0 : _d[uniformSourceLocale];
+      const targetLocaleValue = (_e = param.locales) == null ? void 0 : _e[uniformTargetLocale];
       if (!canTranslateParameterValue(param, sourceLocaleValue)) {
         return;
       }
       if (!config.ignoreTargetLocaleValueMismatch && !isTargetLocaleUntouched(param.type, sourceLocaleValue, targetLocaleValue)) {
         return;
       }
-      (_c2 = collectedOverrides[overrideKey]) != null ? _c2 : collectedOverrides[overrideKey] = {};
-      (_e = (_d = collectedOverrides[overrideKey]).parameters) != null ? _e : _d.parameters = {};
+      (_f = collectedOverrides[overrideKey]) != null ? _f : collectedOverrides[overrideKey] = {};
+      (_h = (_g = collectedOverrides[overrideKey]).parameters) != null ? _h : _g.parameters = {};
       collectedOverrides[overrideKey].parameters[paramKey] = {
         type: param.type,
         locales: {
@@ -614,6 +691,42 @@ var collectFromNode = ({
     _overrides: hasOverrides ? collectedOverrides : void 0
   };
 };
+var collectNestedParameter = ({
+  param,
+  uniformSourceLocale,
+  uniformTargetLocale,
+  config
+}) => {
+  if (param.type === CANVAS_BLOCK_PARAM_TYPE2 && Array.isArray(param.value)) {
+    const blockValue = param.value;
+    const collectedBlocks = [];
+    for (const blockEntry of blockValue) {
+      if (!blockEntry._id || !blockEntry.type) {
+        continue;
+      }
+      const collectedNode = collectFromNode({
+        uniformSourceLocale,
+        uniformTargetLocale,
+        node: blockEntry,
+        deep: false,
+        config
+      });
+      const hasContent = collectedNode.parameters || collectedNode._overrides;
+      if (hasContent) {
+        collectedNode.slots = void 0;
+        collectedBlocks.push(collectedNode);
+      }
+    }
+    if (collectedBlocks.length === 0) {
+      return void 0;
+    }
+    return {
+      type: CANVAS_BLOCK_PARAM_TYPE2,
+      value: collectedBlocks
+    };
+  }
+  return void 0;
+};
 var canTranslateParameterValue = (parameter, value) => {
   if (parameter.type === SUPPORTED_PARAM_TYPES.text) {
     if (typeof value !== "string" || !value) {

package/dist/index.js

@@ -315,6 +315,9 @@ var processComponentTranslation = ({
   });
   return { updated };
 };
+var isNestedParameterType = (type) => {
+  return type === import_canvas.CANVAS_BLOCK_PARAM_TYPE;
+};
 var processParameterTranslation = ({
   uniformSourceLocale,
   uniformTargetLocale,
@@ -325,6 +328,14 @@ var processParameterTranslation = ({
   if (originalParameter.type !== parameter.type) {
     return { updated: false };
   }
+  if (isNestedParameterType(originalParameter.type)) {
+    return processNestedParameterTranslation({
+      uniformSourceLocale,
+      uniformTargetLocale,
+      originalParameter,
+      parameter
+    });
+  }
   if (!originalParameter.locales && originalParameter.value === void 0) {
     return { updated: false };
   }
@@ -369,6 +380,39 @@ var processParameterTranslation = ({
   }
   return { updated: false };
 };
+var processNestedParameterTranslation = ({
+  uniformSourceLocale,
+  uniformTargetLocale,
+  originalParameter,
+  parameter
+}) => {
+  let updated = false;
+  if (originalParameter.type == import_canvas.CANVAS_BLOCK_PARAM_TYPE && Array.isArray(originalParameter.value) && Array.isArray(parameter.value)) {
+    const originalValue = originalParameter.value;
+    const translatedValue = parameter.value;
+    for (const translatedBlock of translatedValue) {
+      if (!translatedBlock._id || !translatedBlock.type) {
+        continue;
+      }
+      const originalBlock = originalValue.find(
+        (b) => b._id === translatedBlock._id && b.type === translatedBlock.type
+      );
+      if (!originalBlock) {
+        continue;
+      }
+      const { updated: blockUpdated } = processComponentTranslation({
+        uniformSourceLocale,
+        uniformTargetLocale,
+        originalNode: originalBlock,
+        translatedComponent: translatedBlock
+      });
+      if (blockUpdated) {
+        updated = true;
+      }
+    }
+  }
+  return { updated };
+};
 var processOverrideTranslation = ({
   uniformSourceLocale,
   uniformTargetLocale,
@@ -506,11 +550,16 @@ var collectTranslationPayload = ({
     },
     components: {}
   };
-  (0, import_canvas2.walkNodeTree)(entity, ({ node, actions }) => {
+  (0, import_canvas2.walkNodeTree)(entity, ({ node, actions, ancestorsAndSelf }) => {
+    var _a;
     if (!node.type || !node._id) {
       actions.stopProcessingDescendants();
       return;
     }
+    if (((_a = ancestorsAndSelf.at(0)) == null ? void 0 : _a.type) === "block") {
+      actions.stopProcessingDescendants();
+      return;
+    }
     const { _id, type, parameters, _overrides } = collectFromNode({
       uniformSourceLocale,
       uniformTargetLocale,
@@ -544,6 +593,18 @@ var collectFromNode = ({
   const entryFields = "fields" in node ? node.fields : void 0;
   Object.entries((_a = componentParameters != null ? componentParameters : entryFields) != null ? _a : {}).forEach(([paramKey, param]) => {
     var _a2, _b2;
+    if (isNestedParameterType(param.type)) {
+      const nestedParam = collectNestedParameter({
+        param,
+        uniformSourceLocale,
+        uniformTargetLocale,
+        config
+      });
+      if (nestedParam) {
+        collectedParameters[paramKey] = nestedParam;
+      }
+      return;
+    }
     const sourceLocaleValue = (_a2 = param.locales) == null ? void 0 : _a2[uniformSourceLocale];
     const targetLocaleValue = (_b2 = param.locales) == null ? void 0 : _b2[uniformTargetLocale];
     if (!canTranslateParameterValue(param, sourceLocaleValue)) {
@@ -586,17 +647,31 @@ var collectFromNode = ({
   Object.entries((_c = node._overrides) != null ? _c : {}).forEach(([overrideKey, override]) => {
     var _a2, _b2;
     Object.entries((_a2 = override.parameters) != null ? _a2 : {}).forEach(([paramKey, param]) => {
-      var _a3, _b3, _c2, _d, _e;
-      const sourceLocaleValue = (_a3 = param.locales) == null ? void 0 : _a3[uniformSourceLocale];
-      const targetLocaleValue = (_b3 = param.locales) == null ? void 0 : _b3[uniformTargetLocale];
+      var _a3, _b3, _c2, _d, _e, _f, _g, _h;
+      if (isNestedParameterType(param.type)) {
+        const nestedParam = collectNestedParameter({
+          param,
+          uniformSourceLocale,
+          uniformTargetLocale,
+          config
+        });
+        if (nestedParam) {
+          (_a3 = collectedOverrides[overrideKey]) != null ? _a3 : collectedOverrides[overrideKey] = {};
+          (_c2 = (_b3 = collectedOverrides[overrideKey]).parameters) != null ? _c2 : _b3.parameters = {};
+          collectedOverrides[overrideKey].parameters[paramKey] = nestedParam;
+        }
+        return;
+      }
+      const sourceLocaleValue = (_d = param.locales) == null ? void 0 : _d[uniformSourceLocale];
+      const targetLocaleValue = (_e = param.locales) == null ? void 0 : _e[uniformTargetLocale];
       if (!canTranslateParameterValue(param, sourceLocaleValue)) {
         return;
       }
       if (!config.ignoreTargetLocaleValueMismatch && !isTargetLocaleUntouched(param.type, sourceLocaleValue, targetLocaleValue)) {
         return;
       }
-      (_c2 = collectedOverrides[overrideKey]) != null ? _c2 : collectedOverrides[overrideKey] = {};
-      (_e = (_d = collectedOverrides[overrideKey]).parameters) != null ? _e : _d.parameters = {};
+      (_f = collectedOverrides[overrideKey]) != null ? _f : collectedOverrides[overrideKey] = {};
+      (_h = (_g = collectedOverrides[overrideKey]).parameters) != null ? _h : _g.parameters = {};
       collectedOverrides[overrideKey].parameters[paramKey] = {
         type: param.type,
         locales: {
@@ -642,6 +717,42 @@ var collectFromNode = ({
     _overrides: hasOverrides ? collectedOverrides : void 0
   };
 };
+var collectNestedParameter = ({
+  param,
+  uniformSourceLocale,
+  uniformTargetLocale,
+  config
+}) => {
+  if (param.type === import_canvas2.CANVAS_BLOCK_PARAM_TYPE && Array.isArray(param.value)) {
+    const blockValue = param.value;
+    const collectedBlocks = [];
+    for (const blockEntry of blockValue) {
+      if (!blockEntry._id || !blockEntry.type) {
+        continue;
+      }
+      const collectedNode = collectFromNode({
+        uniformSourceLocale,
+        uniformTargetLocale,
+        node: blockEntry,
+        deep: false,
+        config
+      });
+      const hasContent = collectedNode.parameters || collectedNode._overrides;
+      if (hasContent) {
+        collectedNode.slots = void 0;
+        collectedBlocks.push(collectedNode);
+      }
+    }
+    if (collectedBlocks.length === 0) {
+      return void 0;
+    }
+    return {
+      type: import_canvas2.CANVAS_BLOCK_PARAM_TYPE,
+      value: collectedBlocks
+    };
+  }
+  return void 0;
+};
 var canTranslateParameterValue = (parameter, value) => {
   if (parameter.type === SUPPORTED_PARAM_TYPES.text) {
     if (typeof value !== "string" || !value) {

package/dist/index.mjs

@@ -1,6 +1,7 @@
 // src/collectTranslationPayload.ts
 import {
   bindVariables,
+  CANVAS_BLOCK_PARAM_TYPE as CANVAS_BLOCK_PARAM_TYPE2,
   walkNodeTree as walkNodeTree2
 } from "@uniformdev/canvas";
 import { isRichTextValue as isRichTextValue2, isRichTextValueConsideredEmpty as isRichTextValueConsideredEmpty2 } from "@uniformdev/richtext";
@@ -109,6 +110,7 @@ var getNodeMetaAttributesString = (node) => {
 
 // src/translationHelpers.ts
 import {
+  CANVAS_BLOCK_PARAM_TYPE,
   walkNodeTree
 } from "@uniformdev/canvas";
 import { isRichTextValueConsideredEmpty } from "@uniformdev/richtext";
@@ -287,6 +289,9 @@ var processComponentTranslation = ({
   });
   return { updated };
 };
+var isNestedParameterType = (type) => {
+  return type === CANVAS_BLOCK_PARAM_TYPE;
+};
 var processParameterTranslation = ({
   uniformSourceLocale,
   uniformTargetLocale,
@@ -297,6 +302,14 @@ var processParameterTranslation = ({
   if (originalParameter.type !== parameter.type) {
     return { updated: false };
   }
+  if (isNestedParameterType(originalParameter.type)) {
+    return processNestedParameterTranslation({
+      uniformSourceLocale,
+      uniformTargetLocale,
+      originalParameter,
+      parameter
+    });
+  }
   if (!originalParameter.locales && originalParameter.value === void 0) {
     return { updated: false };
   }
@@ -341,6 +354,39 @@ var processParameterTranslation = ({
   }
   return { updated: false };
 };
+var processNestedParameterTranslation = ({
+  uniformSourceLocale,
+  uniformTargetLocale,
+  originalParameter,
+  parameter
+}) => {
+  let updated = false;
+  if (originalParameter.type == CANVAS_BLOCK_PARAM_TYPE && Array.isArray(originalParameter.value) && Array.isArray(parameter.value)) {
+    const originalValue = originalParameter.value;
+    const translatedValue = parameter.value;
+    for (const translatedBlock of translatedValue) {
+      if (!translatedBlock._id || !translatedBlock.type) {
+        continue;
+      }
+      const originalBlock = originalValue.find(
+        (b) => b._id === translatedBlock._id && b.type === translatedBlock.type
+      );
+      if (!originalBlock) {
+        continue;
+      }
+      const { updated: blockUpdated } = processComponentTranslation({
+        uniformSourceLocale,
+        uniformTargetLocale,
+        originalNode: originalBlock,
+        translatedComponent: translatedBlock
+      });
+      if (blockUpdated) {
+        updated = true;
+      }
+    }
+  }
+  return { updated };
+};
 var processOverrideTranslation = ({
   uniformSourceLocale,
   uniformTargetLocale,
@@ -478,11 +524,16 @@ var collectTranslationPayload = ({
     },
     components: {}
   };
-  walkNodeTree2(entity, ({ node, actions }) => {
+  walkNodeTree2(entity, ({ node, actions, ancestorsAndSelf }) => {
+    var _a;
     if (!node.type || !node._id) {
       actions.stopProcessingDescendants();
       return;
     }
+    if (((_a = ancestorsAndSelf.at(0)) == null ? void 0 : _a.type) === "block") {
+      actions.stopProcessingDescendants();
+      return;
+    }
     const { _id, type, parameters, _overrides } = collectFromNode({
       uniformSourceLocale,
       uniformTargetLocale,
@@ -516,6 +567,18 @@ var collectFromNode = ({
   const entryFields = "fields" in node ? node.fields : void 0;
   Object.entries((_a = componentParameters != null ? componentParameters : entryFields) != null ? _a : {}).forEach(([paramKey, param]) => {
     var _a2, _b2;
+    if (isNestedParameterType(param.type)) {
+      const nestedParam = collectNestedParameter({
+        param,
+        uniformSourceLocale,
+        uniformTargetLocale,
+        config
+      });
+      if (nestedParam) {
+        collectedParameters[paramKey] = nestedParam;
+      }
+      return;
+    }
     const sourceLocaleValue = (_a2 = param.locales) == null ? void 0 : _a2[uniformSourceLocale];
     const targetLocaleValue = (_b2 = param.locales) == null ? void 0 : _b2[uniformTargetLocale];
     if (!canTranslateParameterValue(param, sourceLocaleValue)) {
@@ -558,17 +621,31 @@ var collectFromNode = ({
   Object.entries((_c = node._overrides) != null ? _c : {}).forEach(([overrideKey, override]) => {
     var _a2, _b2;
     Object.entries((_a2 = override.parameters) != null ? _a2 : {}).forEach(([paramKey, param]) => {
-      var _a3, _b3, _c2, _d, _e;
-      const sourceLocaleValue = (_a3 = param.locales) == null ? void 0 : _a3[uniformSourceLocale];
-      const targetLocaleValue = (_b3 = param.locales) == null ? void 0 : _b3[uniformTargetLocale];
+      var _a3, _b3, _c2, _d, _e, _f, _g, _h;
+      if (isNestedParameterType(param.type)) {
+        const nestedParam = collectNestedParameter({
+          param,
+          uniformSourceLocale,
+          uniformTargetLocale,
+          config
+        });
+        if (nestedParam) {
+          (_a3 = collectedOverrides[overrideKey]) != null ? _a3 : collectedOverrides[overrideKey] = {};
+          (_c2 = (_b3 = collectedOverrides[overrideKey]).parameters) != null ? _c2 : _b3.parameters = {};
+          collectedOverrides[overrideKey].parameters[paramKey] = nestedParam;
+        }
+        return;
+      }
+      const sourceLocaleValue = (_d = param.locales) == null ? void 0 : _d[uniformSourceLocale];
+      const targetLocaleValue = (_e = param.locales) == null ? void 0 : _e[uniformTargetLocale];
       if (!canTranslateParameterValue(param, sourceLocaleValue)) {
         return;
       }
       if (!config.ignoreTargetLocaleValueMismatch && !isTargetLocaleUntouched(param.type, sourceLocaleValue, targetLocaleValue)) {
         return;
       }
-      (_c2 = collectedOverrides[overrideKey]) != null ? _c2 : collectedOverrides[overrideKey] = {};
-      (_e = (_d = collectedOverrides[overrideKey]).parameters) != null ? _e : _d.parameters = {};
+      (_f = collectedOverrides[overrideKey]) != null ? _f : collectedOverrides[overrideKey] = {};
+      (_h = (_g = collectedOverrides[overrideKey]).parameters) != null ? _h : _g.parameters = {};
       collectedOverrides[overrideKey].parameters[paramKey] = {
         type: param.type,
         locales: {
@@ -614,6 +691,42 @@ var collectFromNode = ({
     _overrides: hasOverrides ? collectedOverrides : void 0
   };
 };
+var collectNestedParameter = ({
+  param,
+  uniformSourceLocale,
+  uniformTargetLocale,
+  config
+}) => {
+  if (param.type === CANVAS_BLOCK_PARAM_TYPE2 && Array.isArray(param.value)) {
+    const blockValue = param.value;
+    const collectedBlocks = [];
+    for (const blockEntry of blockValue) {
+      if (!blockEntry._id || !blockEntry.type) {
+        continue;
+      }
+      const collectedNode = collectFromNode({
+        uniformSourceLocale,
+        uniformTargetLocale,
+        node: blockEntry,
+        deep: false,
+        config
+      });
+      const hasContent = collectedNode.parameters || collectedNode._overrides;
+      if (hasContent) {
+        collectedNode.slots = void 0;
+        collectedBlocks.push(collectedNode);
+      }
+    }
+    if (collectedBlocks.length === 0) {
+      return void 0;
+    }
+    return {
+      type: CANVAS_BLOCK_PARAM_TYPE2,
+      value: collectedBlocks
+    };
+  }
+  return void 0;
+};
 var canTranslateParameterValue = (parameter, value) => {
   if (parameter.type === SUPPORTED_PARAM_TYPES.text) {
     if (typeof value !== "string" || !value) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/tms-sdk",
-  "version": "20.64.1-alpha.3+4d67fefad7",
+  "version": "20.66.0",
   "description": "Uniform Translation Management System SDK",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -32,12 +32,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@uniformdev/canvas": "20.64.1-alpha.3+4d67fefad7",
-    "@uniformdev/mesh-sdk": "20.64.1-alpha.3+4d67fefad7",
-    "@uniformdev/richtext": "20.64.1-alpha.3+4d67fefad7",
+    "@uniformdev/canvas": "20.66.0",
+    "@uniformdev/mesh-sdk": "20.66.0",
+    "@uniformdev/richtext": "20.66.0",
     "dequal": "2.0.3",
     "fast-xml-parser": "4.5.5",
     "immer": "10.1.3"
   },
-  "gitHead": "4d67fefad751baac0fa2a703d72cfd391f6fdb7f"
+  "gitHead": "13647d6ac2860218bede840b73d214888637811c"
 }