@uniformdev/canvas-next-rsc 19.58.2-alpha.0 → 19.59.0

package/dist/components/__tests__/evaluateComposition.spec.js

@@ -11,7 +11,7 @@ jest.mock('../getUniformContext', () => ({
     },
 }));
 describe('evaluateComposition', () => {
-    it('should localize a compoisition when dynmaic inputs include locale token', async () => {
+    it('should localize a composition when dynmaic inputs include locale token', async () => {
         var _a, _b;
         const root = {
             _id: 'root',

package/dist/components/evaluateComposition.js

@@ -1,4 +1,4 @@
-import { CANVAS_PERSONALIZATION_PARAM, CANVAS_PERSONALIZE_TYPE, CANVAS_TEST_TYPE, localize, mapSlotToPersonalizedVariations, mapSlotToTestVariations, walkComponentTree, } from '@uniformdev/canvas';
+import { CANVAS_PERSONALIZATION_PARAM, CANVAS_PERSONALIZE_TYPE, CANVAS_TEST_TYPE, localize, mapSlotToPersonalizedVariations, mapSlotToTestVariations, walkNodeTree, } from '@uniformdev/canvas';
 import { UNIFORM_DEFAULT_COOKIE_NAME } from '@uniformdev/context';
 import { getServerConfig } from '../config/helpers';
 import { serializeCookie } from '../score';
@@ -56,8 +56,13 @@ export const evaluateComposition = async ({ root, params, searchParams, dynamicI
     }
     const enrichmentTags = [];
     const seenComponents = [];
-    walkComponentTree(composition, (component, _ancestors, actions) => {
+    walkNodeTree(composition, ({ type, node: component, actions }) => {
         var _a, _b, _c, _d, _e, _f;
+        if (type !== 'component') {
+            // we ignore blocks for now
+            actions.stopProcessingDescendants();
+            return;
+        }
         let replacementComponents;
         // evaluate personalization components
         if (component.type === CANVAS_PERSONALIZE_TYPE) {
@@ -119,12 +124,12 @@ export const evaluateComposition = async ({ root, params, searchParams, dynamicI
         if (typeof replacementComponents !== 'undefined') {
             // if no variants were selected, just remove the current component. no matches.
             if (replacementComponents.length === 0) {
-                actions.removeComponent();
+                actions.remove();
             }
             else {
                 const [first, ...rest] = replacementComponents;
                 // replace the first component
-                actions.replaceComponent(first);
+                actions.replace(first);
                 // if there are other components, insert them after the first
                 if (rest.length) {
                     actions.insertAfter(rest);
@@ -145,7 +150,11 @@ export const evaluateComposition = async ({ root, params, searchParams, dynamicI
     // to pass API validation. walk the composition and add them back in, assume
     // everything is editable.
     if (isIncontextEditingEnabled({ searchParams })) {
-        walkComponentTree(composition, (component) => {
+        walkNodeTree(composition, ({ node: component, actions, type }) => {
+            if (type !== 'component') {
+                actions.stopProcessingDescendants();
+                return;
+            }
             if (component.parameters) {
                 const params = Object.keys(component.parameters);
                 params.forEach((key) => {

package/dist/utils/comp.js

@@ -1,14 +1,25 @@
-import { walkComponentTree } from '@uniformdev/canvas';
+import { walkNodeTree } from '@uniformdev/canvas';
 export const getAllComponents = (composition) => {
     const ids = {};
-    walkComponentTree(composition, (component, ancestors) => {
-        if (component._id) {
-            const [self, parent] = ancestors;
-            ids[component._id] = {
-                parentId: parent === null || parent === void 0 ? void 0 : parent.component._id,
-                slot: self === null || self === void 0 ? void 0 : self.parentSlot,
-                slotIndex: self === null || self === void 0 ? void 0 : self.parentSlotIndex,
-                component,
+    walkNodeTree(composition, ({ type, actions, node, ancestorsAndSelf }) => {
+        if (type !== 'component') {
+            // don't want blocks here
+            actions.stopProcessingDescendants();
+            return;
+        }
+        if (node._id) {
+            const [self, parent] = ancestorsAndSelf;
+            if (self.type === 'block') {
+                // just to make TS happy, we already know this is true due to the preceding type-prop check
+                return;
+            }
+            const slotIndex = self.type === 'root' ? undefined : self.parentSlotIndex;
+            const slot = self.type === 'root' ? undefined : self.parentSlot;
+            ids[node._id] = {
+                parentId: parent === null || parent === void 0 ? void 0 : parent.node._id,
+                slot,
+                slotIndex,
+                component: node,
             };
         }
     });
@@ -16,9 +27,16 @@ export const getAllComponents = (composition) => {
 };
 export const getComponent = (composition, id) => {
     let result;
-    walkComponentTree(composition, (component) => {
-        if (component._id === id) {
-            result = component;
+    walkNodeTree(composition, ({ type, node, actions }) => {
+        // note: does not work on blocks because it didn't before - so leaving that for back compat
+        // no technical reason I know of why we can't let it find blocks by ID
+        if (type !== 'component') {
+            actions.stopProcessingDescendants();
+            return;
+        }
+        if (node._id === id) {
+            result = node;
+            actions.stopProcessingDescendants();
         }
     });
     return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next-rsc",
-  "version": "19.58.2-alpha.0+68d890cf9",
+  "version": "19.59.0",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "dev": "tsc --watch",
@@ -55,13 +55,13 @@
     "react-dom": "18.2.0"
   },
   "dependencies": {
-    "@uniformdev/canvas": "19.58.2-alpha.0+68d890cf9",
-    "@uniformdev/canvas-react": "19.58.2-alpha.0+68d890cf9",
-    "@uniformdev/context": "19.58.2-alpha.0+68d890cf9",
-    "@uniformdev/project-map": "19.58.2-alpha.0+68d890cf9",
-    "@uniformdev/redirect": "19.58.2-alpha.0+68d890cf9",
-    "@uniformdev/richtext": "19.58.2-alpha.0+68d890cf9",
-    "@uniformdev/webhooks": "19.58.2-alpha.0+68d890cf9",
+    "@uniformdev/canvas": "19.59.0",
+    "@uniformdev/canvas-react": "19.59.0",
+    "@uniformdev/context": "19.59.0",
+    "@uniformdev/project-map": "19.59.0",
+    "@uniformdev/redirect": "19.59.0",
+    "@uniformdev/richtext": "19.59.0",
+    "@uniformdev/webhooks": "19.59.0",
     "@vercel/edge-config": "^0.2.0",
     "dequal": "^2.0.3",
     "js-cookie": "^3.0.5",
@@ -78,5 +78,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "68d890cf94dc44136dd88bcc2d703248bae10bea"
+  "gitHead": "912b2badf364d2959cb0b664ba16d9741f16add5"
 }