@uniformdev/tms-sdk 19.154.1-alpha.22 → 19.154.1-alpha.24

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { ComponentInstance, RootComponentInstance, EntryData, CanvasClient, CompositionGetResponse, ContentClient, Entry } from '@uniformdev/canvas';
 
-type ComponentTranslationPayload = Pick<ComponentInstance, 'type' | 'parameters' | '_overrides'>;
+type ComponentTranslationPayload = Pick<ComponentInstance, '_id' | 'type' | 'parameters' | 'slots' | '_overrides'>;
 type TranslationPayload = {
     schemaVersion: number;
     metadata: {

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { ComponentInstance, RootComponentInstance, EntryData, CanvasClient, CompositionGetResponse, ContentClient, Entry } from '@uniformdev/canvas';
 
-type ComponentTranslationPayload = Pick<ComponentInstance, 'type' | 'parameters' | '_overrides'>;
+type ComponentTranslationPayload = Pick<ComponentInstance, '_id' | 'type' | 'parameters' | 'slots' | '_overrides'>;
 type TranslationPayload = {
     schemaVersion: number;
     metadata: {

package/dist/index.esm.js

@@ -1,7 +1,7 @@
 // src/collectTranslationPayload.ts
 import {
   bindVariables,
-  walkNodeTree
+  walkNodeTree as walkNodeTree2
 } from "@uniformdev/canvas";
 import { isRichTextValue, isRichTextValueConsideredEmpty as isRichTextValueConsideredEmpty2 } from "@uniformdev/richtext";
 
@@ -15,6 +15,9 @@ var SUPPORTED_PARAM_TYPES = {
 };
 
 // src/translationHelpers.ts
+import {
+  walkNodeTree
+} from "@uniformdev/canvas";
 import { isRichTextValueConsideredEmpty } from "@uniformdev/richtext";
 import { dequal } from "dequal/lite";
 var MERGE_TRANSLATION_ERRORS = {
@@ -156,22 +159,33 @@ var processOverrideTranslation = ({
       if (!slotComponent.type || !slotComponent._id) {
         return;
       }
-      const originalComponent = originalSlotComponents.find(
+      const originalSlotComponent = originalSlotComponents.find(
         (x) => x._id === slotComponent._id && x.type === slotComponent.type
       );
-      if (!originalComponent) {
+      if (!originalSlotComponent) {
         return;
       }
-      const { updated: isComponentUpdated } = processComponentTranslation({
-        uniformSourceLocale,
-        uniformTargetLocale,
-        overrideModifiedTargetLocale,
-        originalNode: originalComponent,
-        translatedComponent: slotComponent
+      walkNodeTree(slotComponent, ({ node: component, type, actions }) => {
+        if (type !== "component" || !component._id || !component.type) {
+          actions.stopProcessingDescendants();
+          return;
+        }
+        const originalComponent = findComponentInNodeTree(originalSlotComponent, component._id);
+        if (!originalComponent || originalComponent.type !== component.type) {
+          actions.stopProcessingDescendants();
+          return;
+        }
+        const { updated: isComponentUpdated } = processComponentTranslation({
+          uniformSourceLocale,
+          uniformTargetLocale,
+          overrideModifiedTargetLocale,
+          originalNode: originalComponent,
+          translatedComponent: component
+        });
+        if (isComponentUpdated) {
+          updated = true;
+        }
       });
-      if (isComponentUpdated) {
-        updated = true;
-      }
     });
   });
   return { updated };
@@ -195,6 +209,16 @@ var isSameParameterValue = ({
       return left === right;
   }
 };
+var findComponentInNodeTree = (root, id) => {
+  let result;
+  walkNodeTree(root, ({ node, actions }) => {
+    if (node._id === id) {
+      result = node;
+      actions.stopProcessingDescendants();
+    }
+  });
+  return result;
+};
 
 // src/collectTranslationPayload.ts
 var MERGE_TRANSLATION_ERRORS2 = {
@@ -238,20 +262,22 @@ var collectTranslationPayload = ({
     },
     components: {}
   };
-  walkNodeTree(entity, ({ node, actions }) => {
+  walkNodeTree2(entity, ({ node, actions }) => {
     if (!node.type || !node._id) {
       actions.stopProcessingDescendants();
       return;
     }
-    const { parameters, _overrides } = collectFromNode({
+    const { _id, type, parameters, _overrides } = collectFromNode({
       uniformSourceLocale,
       uniformTargetLocale,
       overrideModifiedTargetLocale,
-      node
+      node,
+      deep: false
     });
     if (parameters || _overrides) {
       payload.components[node._id] = {
-        type: node.type,
+        _id,
+        type,
         parameters,
         _overrides
       };
@@ -260,14 +286,16 @@ var collectTranslationPayload = ({
   return { payload };
 };
 var collectFromNode = ({
-  node,
   uniformSourceLocale,
   uniformTargetLocale,
-  overrideModifiedTargetLocale
+  overrideModifiedTargetLocale,
+  node,
+  deep
 }) => {
-  var _a, _b;
-  const parameters = {};
-  const overrides = {};
+  var _a, _b, _c;
+  const collectedParameters = {};
+  const collectedSlots = {};
+  const collectedOverrides = {};
   const componentParameters = "parameters" in node ? node.parameters : void 0;
   const entryFields = "fields" in node ? node.fields : void 0;
   Object.entries((_a = componentParameters != null ? componentParameters : entryFields) != null ? _a : {}).forEach(([paramKey, param]) => {
@@ -280,7 +308,7 @@ var collectFromNode = ({
     if (!overrideModifiedTargetLocale && !isTargetLocaleUntouched(param.type, sourceLocaleValue, targetLocaleValue)) {
       return;
     }
-    parameters[paramKey] = {
+    collectedParameters[paramKey] = {
       type: param.type,
       locales: {
         [TRANSLATION_PAYLOAD_SOURCE_KEY]: sourceLocaleValue,
@@ -289,10 +317,32 @@ var collectFromNode = ({
       }
     };
   });
-  Object.entries((_b = node._overrides) != null ? _b : {}).forEach(([overrideKey, override]) => {
+  if (deep) {
+    Object.entries((_b = "slots" in node ? node.slots : null) != null ? _b : {}).forEach(([slotKey, slotComponents]) => {
+      slotComponents.map((slotComponent) => {
+        var _a2;
+        if (!slotComponent.type || !slotComponent._id) {
+          return;
+        }
+        const collectedNode = collectFromNode({
+          uniformSourceLocale,
+          uniformTargetLocale,
+          overrideModifiedTargetLocale,
+          node: slotComponent,
+          deep: true
+        });
+        const hasContent = collectedNode.parameters || collectedNode._overrides || collectedNode.slots;
+        if (hasContent) {
+          (_a2 = collectedSlots[slotKey]) != null ? _a2 : collectedSlots[slotKey] = [];
+          collectedSlots[slotKey].push(collectedNode);
+        }
+      });
+    });
+  }
+  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, _c, _d, _e;
+      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];
       if (!canTranslateParameterValue(param, sourceLocaleValue)) {
@@ -301,9 +351,9 @@ var collectFromNode = ({
       if (!overrideModifiedTargetLocale && !isTargetLocaleUntouched(param.type, sourceLocaleValue, targetLocaleValue)) {
         return;
       }
-      (_c = overrides[overrideKey]) != null ? _c : overrides[overrideKey] = {};
-      (_e = (_d = overrides[overrideKey]).parameters) != null ? _e : _d.parameters = {};
-      overrides[overrideKey].parameters[paramKey] = {
+      (_c2 = collectedOverrides[overrideKey]) != null ? _c2 : collectedOverrides[overrideKey] = {};
+      (_e = (_d = collectedOverrides[overrideKey]).parameters) != null ? _e : _d.parameters = {};
+      collectedOverrides[overrideKey].parameters[paramKey] = {
         type: param.type,
         locales: {
           [TRANSLATION_PAYLOAD_SOURCE_KEY]: sourceLocaleValue,
@@ -314,38 +364,38 @@ var collectFromNode = ({
     });
     Object.entries((_b2 = override.slots) != null ? _b2 : {}).forEach(([slotKey, slotComponents]) => {
       slotComponents.map((slotComponent) => {
-        walkNodeTree(slotComponent, ({ node: node2, actions }) => {
-          var _a3, _b3, _c, _d, _e;
-          if (!node2.type || !node2._id) {
-            actions.stopProcessingDescendants();
-            return;
-          }
-          const { parameters: parameters2, _overrides } = collectFromNode({
-            uniformSourceLocale,
-            uniformTargetLocale,
-            overrideModifiedTargetLocale,
-            node: node2
-          });
-          if (parameters2 || _overrides) {
-            (_a3 = overrides[overrideKey]) != null ? _a3 : overrides[overrideKey] = {};
-            (_c = (_b3 = overrides[overrideKey]).slots) != null ? _c : _b3.slots = {};
-            (_e = (_d = overrides[overrideKey].slots)[slotKey]) != null ? _e : _d[slotKey] = [];
-            overrides[overrideKey].slots[slotKey].push({
-              _id: node2._id,
-              type: node2.type,
-              parameters: parameters2,
-              _overrides
-            });
-          }
+        var _a3, _b3, _c2, _d, _e;
+        if (!slotComponent.type || !slotComponent._id) {
+          return;
+        }
+        const collectedNode = collectFromNode({
+          uniformSourceLocale,
+          uniformTargetLocale,
+          overrideModifiedTargetLocale,
+          node: slotComponent,
+          // keep tree structure for `Slot Sections`
+          // to store whole `override` content in scope of current component
+          deep: true
         });
+        const hasContent = collectedNode.parameters || collectedNode._overrides || collectedNode.slots;
+        if (hasContent) {
+          (_a3 = collectedOverrides[overrideKey]) != null ? _a3 : collectedOverrides[overrideKey] = {};
+          (_c2 = (_b3 = collectedOverrides[overrideKey]).slots) != null ? _c2 : _b3.slots = {};
+          (_e = (_d = collectedOverrides[overrideKey].slots)[slotKey]) != null ? _e : _d[slotKey] = [];
+          collectedOverrides[overrideKey].slots[slotKey].push(collectedNode);
+        }
       });
     });
   });
-  const hasParameters = Object.keys(parameters).length > 0;
-  const hasOverrides = Object.keys(overrides).length > 0;
+  const hasParameters = Object.keys(collectedParameters).length > 0;
+  const hasSlots = Object.keys(collectedSlots).length > 0;
+  const hasOverrides = Object.keys(collectedOverrides).length > 0;
   return {
-    parameters: hasParameters ? parameters : void 0,
-    _overrides: hasOverrides ? overrides : void 0
+    _id: node._id,
+    type: node.type,
+    parameters: hasParameters ? collectedParameters : void 0,
+    slots: hasSlots ? collectedSlots : void 0,
+    _overrides: hasOverrides ? collectedOverrides : void 0
   };
 };
 var canTranslateParameterValue = (parameter, value) => {
@@ -442,7 +492,7 @@ var getEntryForTranslation = async ({
 import { CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE4 } from "@uniformdev/canvas";
 
 // src/translateComposition.ts
-import { CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE3, walkNodeTree as walkNodeTree2 } from "@uniformdev/canvas";
+import { CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE3, walkNodeTree as walkNodeTree3 } from "@uniformdev/canvas";
 import { produce } from "immer";
 var translateComposition = ({
   composition,
@@ -473,7 +523,7 @@ var translateComposition = ({
       (_b = (_a2 = draft.composition)._locales) != null ? _b : _a2._locales = [];
       draft.composition._locales.push(uniformTargetLocale);
     }
-    walkNodeTree2(draft.composition, ({ node: component, type, actions }) => {
+    walkNodeTree3(draft.composition, ({ node: component, type, actions }) => {
       if (type !== "component") {
         actions.stopProcessingDescendants();
         return;
@@ -572,7 +622,7 @@ var defaultUpdateComposition = async ({
 import { CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE6 } from "@uniformdev/canvas";
 
 // src/translateEntry.ts
-import { CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE5, walkNodeTree as walkNodeTree3 } from "@uniformdev/canvas";
+import { CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE5, walkNodeTree as walkNodeTree4 } from "@uniformdev/canvas";
 import { produce as produce2 } from "immer";
 var translateEntry = ({
   entry,
@@ -603,7 +653,7 @@ var translateEntry = ({
       (_b = (_a2 = draft.entry)._locales) != null ? _b : _a2._locales = [];
       draft.entry._locales.push(uniformTargetLocale);
     }
-    walkNodeTree3(draft.entry, ({ node: component, type, actions }) => {
+    walkNodeTree4(draft.entry, ({ node: component, type, actions }) => {
       if (type !== "entry") {
         actions.stopProcessingDescendants();
         return;

package/dist/index.js

@@ -32,7 +32,7 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/collectTranslationPayload.ts
-var import_canvas = require("@uniformdev/canvas");
+var import_canvas2 = require("@uniformdev/canvas");
 var import_richtext2 = require("@uniformdev/richtext");
 
 // src/constants.ts
@@ -45,6 +45,7 @@ var SUPPORTED_PARAM_TYPES = {
 };
 
 // src/translationHelpers.ts
+var import_canvas = require("@uniformdev/canvas");
 var import_richtext = require("@uniformdev/richtext");
 var import_lite = require("dequal/lite");
 var MERGE_TRANSLATION_ERRORS = {
@@ -186,22 +187,33 @@ var processOverrideTranslation = ({
       if (!slotComponent.type || !slotComponent._id) {
         return;
       }
-      const originalComponent = originalSlotComponents.find(
+      const originalSlotComponent = originalSlotComponents.find(
         (x) => x._id === slotComponent._id && x.type === slotComponent.type
       );
-      if (!originalComponent) {
+      if (!originalSlotComponent) {
         return;
       }
-      const { updated: isComponentUpdated } = processComponentTranslation({
-        uniformSourceLocale,
-        uniformTargetLocale,
-        overrideModifiedTargetLocale,
-        originalNode: originalComponent,
-        translatedComponent: slotComponent
+      (0, import_canvas.walkNodeTree)(slotComponent, ({ node: component, type, actions }) => {
+        if (type !== "component" || !component._id || !component.type) {
+          actions.stopProcessingDescendants();
+          return;
+        }
+        const originalComponent = findComponentInNodeTree(originalSlotComponent, component._id);
+        if (!originalComponent || originalComponent.type !== component.type) {
+          actions.stopProcessingDescendants();
+          return;
+        }
+        const { updated: isComponentUpdated } = processComponentTranslation({
+          uniformSourceLocale,
+          uniformTargetLocale,
+          overrideModifiedTargetLocale,
+          originalNode: originalComponent,
+          translatedComponent: component
+        });
+        if (isComponentUpdated) {
+          updated = true;
+        }
       });
-      if (isComponentUpdated) {
-        updated = true;
-      }
     });
   });
   return { updated };
@@ -225,6 +237,16 @@ var isSameParameterValue = ({
       return left === right;
   }
 };
+var findComponentInNodeTree = (root, id) => {
+  let result;
+  (0, import_canvas.walkNodeTree)(root, ({ node, actions }) => {
+    if (node._id === id) {
+      result = node;
+      actions.stopProcessingDescendants();
+    }
+  });
+  return result;
+};
 
 // src/collectTranslationPayload.ts
 var MERGE_TRANSLATION_ERRORS2 = {
@@ -268,20 +290,22 @@ var collectTranslationPayload = ({
     },
     components: {}
   };
-  (0, import_canvas.walkNodeTree)(entity, ({ node, actions }) => {
+  (0, import_canvas2.walkNodeTree)(entity, ({ node, actions }) => {
     if (!node.type || !node._id) {
       actions.stopProcessingDescendants();
       return;
     }
-    const { parameters, _overrides } = collectFromNode({
+    const { _id, type, parameters, _overrides } = collectFromNode({
       uniformSourceLocale,
       uniformTargetLocale,
       overrideModifiedTargetLocale,
-      node
+      node,
+      deep: false
     });
     if (parameters || _overrides) {
       payload.components[node._id] = {
-        type: node.type,
+        _id,
+        type,
         parameters,
         _overrides
       };
@@ -290,14 +314,16 @@ var collectTranslationPayload = ({
   return { payload };
 };
 var collectFromNode = ({
-  node,
   uniformSourceLocale,
   uniformTargetLocale,
-  overrideModifiedTargetLocale
+  overrideModifiedTargetLocale,
+  node,
+  deep
 }) => {
-  var _a, _b;
-  const parameters = {};
-  const overrides = {};
+  var _a, _b, _c;
+  const collectedParameters = {};
+  const collectedSlots = {};
+  const collectedOverrides = {};
   const componentParameters = "parameters" in node ? node.parameters : void 0;
   const entryFields = "fields" in node ? node.fields : void 0;
   Object.entries((_a = componentParameters != null ? componentParameters : entryFields) != null ? _a : {}).forEach(([paramKey, param]) => {
@@ -310,7 +336,7 @@ var collectFromNode = ({
     if (!overrideModifiedTargetLocale && !isTargetLocaleUntouched(param.type, sourceLocaleValue, targetLocaleValue)) {
       return;
     }
-    parameters[paramKey] = {
+    collectedParameters[paramKey] = {
       type: param.type,
       locales: {
         [TRANSLATION_PAYLOAD_SOURCE_KEY]: sourceLocaleValue,
@@ -319,10 +345,32 @@ var collectFromNode = ({
       }
     };
   });
-  Object.entries((_b = node._overrides) != null ? _b : {}).forEach(([overrideKey, override]) => {
+  if (deep) {
+    Object.entries((_b = "slots" in node ? node.slots : null) != null ? _b : {}).forEach(([slotKey, slotComponents]) => {
+      slotComponents.map((slotComponent) => {
+        var _a2;
+        if (!slotComponent.type || !slotComponent._id) {
+          return;
+        }
+        const collectedNode = collectFromNode({
+          uniformSourceLocale,
+          uniformTargetLocale,
+          overrideModifiedTargetLocale,
+          node: slotComponent,
+          deep: true
+        });
+        const hasContent = collectedNode.parameters || collectedNode._overrides || collectedNode.slots;
+        if (hasContent) {
+          (_a2 = collectedSlots[slotKey]) != null ? _a2 : collectedSlots[slotKey] = [];
+          collectedSlots[slotKey].push(collectedNode);
+        }
+      });
+    });
+  }
+  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, _c, _d, _e;
+      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];
       if (!canTranslateParameterValue(param, sourceLocaleValue)) {
@@ -331,9 +379,9 @@ var collectFromNode = ({
       if (!overrideModifiedTargetLocale && !isTargetLocaleUntouched(param.type, sourceLocaleValue, targetLocaleValue)) {
         return;
       }
-      (_c = overrides[overrideKey]) != null ? _c : overrides[overrideKey] = {};
-      (_e = (_d = overrides[overrideKey]).parameters) != null ? _e : _d.parameters = {};
-      overrides[overrideKey].parameters[paramKey] = {
+      (_c2 = collectedOverrides[overrideKey]) != null ? _c2 : collectedOverrides[overrideKey] = {};
+      (_e = (_d = collectedOverrides[overrideKey]).parameters) != null ? _e : _d.parameters = {};
+      collectedOverrides[overrideKey].parameters[paramKey] = {
         type: param.type,
         locales: {
           [TRANSLATION_PAYLOAD_SOURCE_KEY]: sourceLocaleValue,
@@ -344,38 +392,38 @@ var collectFromNode = ({
     });
     Object.entries((_b2 = override.slots) != null ? _b2 : {}).forEach(([slotKey, slotComponents]) => {
       slotComponents.map((slotComponent) => {
-        (0, import_canvas.walkNodeTree)(slotComponent, ({ node: node2, actions }) => {
-          var _a3, _b3, _c, _d, _e;
-          if (!node2.type || !node2._id) {
-            actions.stopProcessingDescendants();
-            return;
-          }
-          const { parameters: parameters2, _overrides } = collectFromNode({
-            uniformSourceLocale,
-            uniformTargetLocale,
-            overrideModifiedTargetLocale,
-            node: node2
-          });
-          if (parameters2 || _overrides) {
-            (_a3 = overrides[overrideKey]) != null ? _a3 : overrides[overrideKey] = {};
-            (_c = (_b3 = overrides[overrideKey]).slots) != null ? _c : _b3.slots = {};
-            (_e = (_d = overrides[overrideKey].slots)[slotKey]) != null ? _e : _d[slotKey] = [];
-            overrides[overrideKey].slots[slotKey].push({
-              _id: node2._id,
-              type: node2.type,
-              parameters: parameters2,
-              _overrides
-            });
-          }
+        var _a3, _b3, _c2, _d, _e;
+        if (!slotComponent.type || !slotComponent._id) {
+          return;
+        }
+        const collectedNode = collectFromNode({
+          uniformSourceLocale,
+          uniformTargetLocale,
+          overrideModifiedTargetLocale,
+          node: slotComponent,
+          // keep tree structure for `Slot Sections`
+          // to store whole `override` content in scope of current component
+          deep: true
         });
+        const hasContent = collectedNode.parameters || collectedNode._overrides || collectedNode.slots;
+        if (hasContent) {
+          (_a3 = collectedOverrides[overrideKey]) != null ? _a3 : collectedOverrides[overrideKey] = {};
+          (_c2 = (_b3 = collectedOverrides[overrideKey]).slots) != null ? _c2 : _b3.slots = {};
+          (_e = (_d = collectedOverrides[overrideKey].slots)[slotKey]) != null ? _e : _d[slotKey] = [];
+          collectedOverrides[overrideKey].slots[slotKey].push(collectedNode);
+        }
       });
     });
   });
-  const hasParameters = Object.keys(parameters).length > 0;
-  const hasOverrides = Object.keys(overrides).length > 0;
+  const hasParameters = Object.keys(collectedParameters).length > 0;
+  const hasSlots = Object.keys(collectedSlots).length > 0;
+  const hasOverrides = Object.keys(collectedOverrides).length > 0;
   return {
-    parameters: hasParameters ? parameters : void 0,
-    _overrides: hasOverrides ? overrides : void 0
+    _id: node._id,
+    type: node.type,
+    parameters: hasParameters ? collectedParameters : void 0,
+    slots: hasSlots ? collectedSlots : void 0,
+    _overrides: hasOverrides ? collectedOverrides : void 0
   };
 };
 var canTranslateParameterValue = (parameter, value) => {
@@ -386,7 +434,7 @@ var canTranslateParameterValue = (parameter, value) => {
     if (value.trim().length === 0) {
       return false;
     }
-    const bindResult = (0, import_canvas.bindVariables)({
+    const bindResult = (0, import_canvas2.bindVariables)({
       variables: {},
       value,
       handleBinding: () => ""
@@ -419,12 +467,12 @@ var isTargetLocaleUntouched = (parameterType, sourceLocaleValue, targetLocaleVal
 };
 
 // src/getCompositionForTranslation.ts
-var import_canvas2 = require("@uniformdev/canvas");
+var import_canvas3 = require("@uniformdev/canvas");
 var getCompositionForTranslation = async ({
   canvasClient,
   compositionId,
   releaseId,
-  state = import_canvas2.CANVAS_DRAFT_STATE
+  state = import_canvas3.CANVAS_DRAFT_STATE
 }) => {
   if (!compositionId) {
     return void 0;
@@ -442,13 +490,13 @@ var getCompositionForTranslation = async ({
 };
 
 // src/getEntryForTranslation.ts
-var import_canvas3 = require("@uniformdev/canvas");
+var import_canvas4 = require("@uniformdev/canvas");
 var getEntryForTranslation = async ({
   contentClient,
   entryId,
   releaseId,
   pattern,
-  state = import_canvas3.CANVAS_DRAFT_STATE
+  state = import_canvas4.CANVAS_DRAFT_STATE
 }) => {
   if (!entryId) {
     return void 0;
@@ -469,10 +517,10 @@ var getEntryForTranslation = async ({
 };
 
 // src/mergeCompositionTranslationToUniform.ts
-var import_canvas5 = require("@uniformdev/canvas");
+var import_canvas6 = require("@uniformdev/canvas");
 
 // src/translateComposition.ts
-var import_canvas4 = require("@uniformdev/canvas");
+var import_canvas5 = require("@uniformdev/canvas");
 var import_immer = require("immer");
 var translateComposition = ({
   composition,
@@ -498,12 +546,12 @@ var translateComposition = ({
   let updated = false;
   const translatedComposition = (0, import_immer.produce)(composition, (draft) => {
     var _a2, _b;
-    draft.state = import_canvas4.CANVAS_DRAFT_STATE;
+    draft.state = import_canvas5.CANVAS_DRAFT_STATE;
     if (!compositionLocales.includes(uniformTargetLocale)) {
       (_b = (_a2 = draft.composition)._locales) != null ? _b : _a2._locales = [];
       draft.composition._locales.push(uniformTargetLocale);
     }
-    (0, import_canvas4.walkNodeTree)(draft.composition, ({ node: component, type, actions }) => {
+    (0, import_canvas5.walkNodeTree)(draft.composition, ({ node: component, type, actions }) => {
       if (type !== "component") {
         actions.stopProcessingDescendants();
         return;
@@ -586,7 +634,7 @@ var getCurrentCompositionFromPayload = async ({
     canvasClient,
     compositionId,
     releaseId,
-    state: import_canvas5.CANVAS_DRAFT_STATE
+    state: import_canvas6.CANVAS_DRAFT_STATE
   });
   return currentComposition;
 };
@@ -599,10 +647,10 @@ var defaultUpdateComposition = async ({
 };
 
 // src/mergeEntryTranslationToUniform.ts
-var import_canvas7 = require("@uniformdev/canvas");
+var import_canvas8 = require("@uniformdev/canvas");
 
 // src/translateEntry.ts
-var import_canvas6 = require("@uniformdev/canvas");
+var import_canvas7 = require("@uniformdev/canvas");
 var import_immer2 = require("immer");
 var translateEntry = ({
   entry,
@@ -628,12 +676,12 @@ var translateEntry = ({
   let updated = false;
   const translatedEntry = (0, import_immer2.produce)(entry, (draft) => {
     var _a2, _b;
-    draft.state = import_canvas6.CANVAS_DRAFT_STATE;
+    draft.state = import_canvas7.CANVAS_DRAFT_STATE;
     if (!entryLocales.includes(uniformTargetLocale)) {
       (_b = (_a2 = draft.entry)._locales) != null ? _b : _a2._locales = [];
       draft.entry._locales.push(uniformTargetLocale);
     }
-    (0, import_canvas6.walkNodeTree)(draft.entry, ({ node: component, type, actions }) => {
+    (0, import_canvas7.walkNodeTree)(draft.entry, ({ node: component, type, actions }) => {
       if (type !== "entry") {
         actions.stopProcessingDescendants();
         return;
@@ -718,7 +766,7 @@ var getCurrentEntryFromPayload = async ({
     entryId,
     releaseId,
     pattern: entityType === "entryPattern",
-    state: import_canvas7.CANVAS_DRAFT_STATE
+    state: import_canvas8.CANVAS_DRAFT_STATE
   });
   return currentEntry;
 };

package/dist/index.mjs

@@ -1,7 +1,7 @@
 // src/collectTranslationPayload.ts
 import {
   bindVariables,
-  walkNodeTree
+  walkNodeTree as walkNodeTree2
 } from "@uniformdev/canvas";
 import { isRichTextValue, isRichTextValueConsideredEmpty as isRichTextValueConsideredEmpty2 } from "@uniformdev/richtext";
 
@@ -15,6 +15,9 @@ var SUPPORTED_PARAM_TYPES = {
 };
 
 // src/translationHelpers.ts
+import {
+  walkNodeTree
+} from "@uniformdev/canvas";
 import { isRichTextValueConsideredEmpty } from "@uniformdev/richtext";
 import { dequal } from "dequal/lite";
 var MERGE_TRANSLATION_ERRORS = {
@@ -156,22 +159,33 @@ var processOverrideTranslation = ({
       if (!slotComponent.type || !slotComponent._id) {
         return;
       }
-      const originalComponent = originalSlotComponents.find(
+      const originalSlotComponent = originalSlotComponents.find(
         (x) => x._id === slotComponent._id && x.type === slotComponent.type
       );
-      if (!originalComponent) {
+      if (!originalSlotComponent) {
         return;
       }
-      const { updated: isComponentUpdated } = processComponentTranslation({
-        uniformSourceLocale,
-        uniformTargetLocale,
-        overrideModifiedTargetLocale,
-        originalNode: originalComponent,
-        translatedComponent: slotComponent
+      walkNodeTree(slotComponent, ({ node: component, type, actions }) => {
+        if (type !== "component" || !component._id || !component.type) {
+          actions.stopProcessingDescendants();
+          return;
+        }
+        const originalComponent = findComponentInNodeTree(originalSlotComponent, component._id);
+        if (!originalComponent || originalComponent.type !== component.type) {
+          actions.stopProcessingDescendants();
+          return;
+        }
+        const { updated: isComponentUpdated } = processComponentTranslation({
+          uniformSourceLocale,
+          uniformTargetLocale,
+          overrideModifiedTargetLocale,
+          originalNode: originalComponent,
+          translatedComponent: component
+        });
+        if (isComponentUpdated) {
+          updated = true;
+        }
       });
-      if (isComponentUpdated) {
-        updated = true;
-      }
     });
   });
   return { updated };
@@ -195,6 +209,16 @@ var isSameParameterValue = ({
       return left === right;
   }
 };
+var findComponentInNodeTree = (root, id) => {
+  let result;
+  walkNodeTree(root, ({ node, actions }) => {
+    if (node._id === id) {
+      result = node;
+      actions.stopProcessingDescendants();
+    }
+  });
+  return result;
+};
 
 // src/collectTranslationPayload.ts
 var MERGE_TRANSLATION_ERRORS2 = {
@@ -238,20 +262,22 @@ var collectTranslationPayload = ({
     },
     components: {}
   };
-  walkNodeTree(entity, ({ node, actions }) => {
+  walkNodeTree2(entity, ({ node, actions }) => {
     if (!node.type || !node._id) {
       actions.stopProcessingDescendants();
       return;
     }
-    const { parameters, _overrides } = collectFromNode({
+    const { _id, type, parameters, _overrides } = collectFromNode({
       uniformSourceLocale,
       uniformTargetLocale,
       overrideModifiedTargetLocale,
-      node
+      node,
+      deep: false
     });
     if (parameters || _overrides) {
       payload.components[node._id] = {
-        type: node.type,
+        _id,
+        type,
         parameters,
         _overrides
       };
@@ -260,14 +286,16 @@ var collectTranslationPayload = ({
   return { payload };
 };
 var collectFromNode = ({
-  node,
   uniformSourceLocale,
   uniformTargetLocale,
-  overrideModifiedTargetLocale
+  overrideModifiedTargetLocale,
+  node,
+  deep
 }) => {
-  var _a, _b;
-  const parameters = {};
-  const overrides = {};
+  var _a, _b, _c;
+  const collectedParameters = {};
+  const collectedSlots = {};
+  const collectedOverrides = {};
   const componentParameters = "parameters" in node ? node.parameters : void 0;
   const entryFields = "fields" in node ? node.fields : void 0;
   Object.entries((_a = componentParameters != null ? componentParameters : entryFields) != null ? _a : {}).forEach(([paramKey, param]) => {
@@ -280,7 +308,7 @@ var collectFromNode = ({
     if (!overrideModifiedTargetLocale && !isTargetLocaleUntouched(param.type, sourceLocaleValue, targetLocaleValue)) {
       return;
     }
-    parameters[paramKey] = {
+    collectedParameters[paramKey] = {
       type: param.type,
       locales: {
         [TRANSLATION_PAYLOAD_SOURCE_KEY]: sourceLocaleValue,
@@ -289,10 +317,32 @@ var collectFromNode = ({
       }
     };
   });
-  Object.entries((_b = node._overrides) != null ? _b : {}).forEach(([overrideKey, override]) => {
+  if (deep) {
+    Object.entries((_b = "slots" in node ? node.slots : null) != null ? _b : {}).forEach(([slotKey, slotComponents]) => {
+      slotComponents.map((slotComponent) => {
+        var _a2;
+        if (!slotComponent.type || !slotComponent._id) {
+          return;
+        }
+        const collectedNode = collectFromNode({
+          uniformSourceLocale,
+          uniformTargetLocale,
+          overrideModifiedTargetLocale,
+          node: slotComponent,
+          deep: true
+        });
+        const hasContent = collectedNode.parameters || collectedNode._overrides || collectedNode.slots;
+        if (hasContent) {
+          (_a2 = collectedSlots[slotKey]) != null ? _a2 : collectedSlots[slotKey] = [];
+          collectedSlots[slotKey].push(collectedNode);
+        }
+      });
+    });
+  }
+  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, _c, _d, _e;
+      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];
       if (!canTranslateParameterValue(param, sourceLocaleValue)) {
@@ -301,9 +351,9 @@ var collectFromNode = ({
       if (!overrideModifiedTargetLocale && !isTargetLocaleUntouched(param.type, sourceLocaleValue, targetLocaleValue)) {
         return;
       }
-      (_c = overrides[overrideKey]) != null ? _c : overrides[overrideKey] = {};
-      (_e = (_d = overrides[overrideKey]).parameters) != null ? _e : _d.parameters = {};
-      overrides[overrideKey].parameters[paramKey] = {
+      (_c2 = collectedOverrides[overrideKey]) != null ? _c2 : collectedOverrides[overrideKey] = {};
+      (_e = (_d = collectedOverrides[overrideKey]).parameters) != null ? _e : _d.parameters = {};
+      collectedOverrides[overrideKey].parameters[paramKey] = {
         type: param.type,
         locales: {
           [TRANSLATION_PAYLOAD_SOURCE_KEY]: sourceLocaleValue,
@@ -314,38 +364,38 @@ var collectFromNode = ({
     });
     Object.entries((_b2 = override.slots) != null ? _b2 : {}).forEach(([slotKey, slotComponents]) => {
       slotComponents.map((slotComponent) => {
-        walkNodeTree(slotComponent, ({ node: node2, actions }) => {
-          var _a3, _b3, _c, _d, _e;
-          if (!node2.type || !node2._id) {
-            actions.stopProcessingDescendants();
-            return;
-          }
-          const { parameters: parameters2, _overrides } = collectFromNode({
-            uniformSourceLocale,
-            uniformTargetLocale,
-            overrideModifiedTargetLocale,
-            node: node2
-          });
-          if (parameters2 || _overrides) {
-            (_a3 = overrides[overrideKey]) != null ? _a3 : overrides[overrideKey] = {};
-            (_c = (_b3 = overrides[overrideKey]).slots) != null ? _c : _b3.slots = {};
-            (_e = (_d = overrides[overrideKey].slots)[slotKey]) != null ? _e : _d[slotKey] = [];
-            overrides[overrideKey].slots[slotKey].push({
-              _id: node2._id,
-              type: node2.type,
-              parameters: parameters2,
-              _overrides
-            });
-          }
+        var _a3, _b3, _c2, _d, _e;
+        if (!slotComponent.type || !slotComponent._id) {
+          return;
+        }
+        const collectedNode = collectFromNode({
+          uniformSourceLocale,
+          uniformTargetLocale,
+          overrideModifiedTargetLocale,
+          node: slotComponent,
+          // keep tree structure for `Slot Sections`
+          // to store whole `override` content in scope of current component
+          deep: true
         });
+        const hasContent = collectedNode.parameters || collectedNode._overrides || collectedNode.slots;
+        if (hasContent) {
+          (_a3 = collectedOverrides[overrideKey]) != null ? _a3 : collectedOverrides[overrideKey] = {};
+          (_c2 = (_b3 = collectedOverrides[overrideKey]).slots) != null ? _c2 : _b3.slots = {};
+          (_e = (_d = collectedOverrides[overrideKey].slots)[slotKey]) != null ? _e : _d[slotKey] = [];
+          collectedOverrides[overrideKey].slots[slotKey].push(collectedNode);
+        }
       });
     });
   });
-  const hasParameters = Object.keys(parameters).length > 0;
-  const hasOverrides = Object.keys(overrides).length > 0;
+  const hasParameters = Object.keys(collectedParameters).length > 0;
+  const hasSlots = Object.keys(collectedSlots).length > 0;
+  const hasOverrides = Object.keys(collectedOverrides).length > 0;
   return {
-    parameters: hasParameters ? parameters : void 0,
-    _overrides: hasOverrides ? overrides : void 0
+    _id: node._id,
+    type: node.type,
+    parameters: hasParameters ? collectedParameters : void 0,
+    slots: hasSlots ? collectedSlots : void 0,
+    _overrides: hasOverrides ? collectedOverrides : void 0
   };
 };
 var canTranslateParameterValue = (parameter, value) => {
@@ -442,7 +492,7 @@ var getEntryForTranslation = async ({
 import { CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE4 } from "@uniformdev/canvas";
 
 // src/translateComposition.ts
-import { CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE3, walkNodeTree as walkNodeTree2 } from "@uniformdev/canvas";
+import { CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE3, walkNodeTree as walkNodeTree3 } from "@uniformdev/canvas";
 import { produce } from "immer";
 var translateComposition = ({
   composition,
@@ -473,7 +523,7 @@ var translateComposition = ({
       (_b = (_a2 = draft.composition)._locales) != null ? _b : _a2._locales = [];
       draft.composition._locales.push(uniformTargetLocale);
     }
-    walkNodeTree2(draft.composition, ({ node: component, type, actions }) => {
+    walkNodeTree3(draft.composition, ({ node: component, type, actions }) => {
       if (type !== "component") {
         actions.stopProcessingDescendants();
         return;
@@ -572,7 +622,7 @@ var defaultUpdateComposition = async ({
 import { CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE6 } from "@uniformdev/canvas";
 
 // src/translateEntry.ts
-import { CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE5, walkNodeTree as walkNodeTree3 } from "@uniformdev/canvas";
+import { CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE5, walkNodeTree as walkNodeTree4 } from "@uniformdev/canvas";
 import { produce as produce2 } from "immer";
 var translateEntry = ({
   entry,
@@ -603,7 +653,7 @@ var translateEntry = ({
       (_b = (_a2 = draft.entry)._locales) != null ? _b : _a2._locales = [];
       draft.entry._locales.push(uniformTargetLocale);
     }
-    walkNodeTree3(draft.entry, ({ node: component, type, actions }) => {
+    walkNodeTree4(draft.entry, ({ node: component, type, actions }) => {
       if (type !== "entry") {
         actions.stopProcessingDescendants();
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/tms-sdk",
-  "version": "19.154.1-alpha.22+47eb3efd47",
+  "version": "19.154.1-alpha.24+6b5f73fb09",
   "description": "Uniform Translation Management System SDK",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -33,10 +33,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@uniformdev/canvas": "19.154.1-alpha.22+47eb3efd47",
-    "@uniformdev/richtext": "19.154.1-alpha.22+47eb3efd47",
+    "@uniformdev/canvas": "19.154.1-alpha.24+6b5f73fb09",
+    "@uniformdev/richtext": "19.154.1-alpha.24+6b5f73fb09",
     "dequal": "2.0.3",
     "immer": "10.0.4"
   },
-  "gitHead": "47eb3efd47e7582cd4b509a6f5a943dcbb12b0ee"
+  "gitHead": "6b5f73fb09a0f75fb549cdc6ed754da016b7b345"
 }