@uniformdev/canvas 19.214.0 → 19.214.1-alpha.17

package/dist/index.mjs

@@ -1045,7 +1045,7 @@ function getComponentPath(ancestorsAndSelf) {
       }
       continue;
     }
-    const parentSlotIndex = "parentSlotIndexFn" in currentLocation ? currentLocation.parentSlotIndexFn() : currentLocation.parentSlotIndex;
+    const parentSlotIndex = currentLocation.parentSlotIndexFn();
     const { parentSlot } = currentLocation;
     if (parentSlot && parentSlotIndex !== void 0) {
       path.push(`${parentSlot}[${parentSlotIndex}]`);
@@ -1119,9 +1119,6 @@ function isLinkParamValue(value) {
 function getPropertiesValue(entity) {
   return "parameters" in entity && entity.parameters ? entity.parameters : "fields" in entity && entity.fields ? entity.fields : void 0;
 }
-function getPropertyValue(parameter) {
-  return parameter ? parameter.value : parameter;
-}
 function getLocalizedPropertyValues(parameter) {
   if (!parameter) {
     return parameter;
@@ -1153,7 +1150,7 @@ function flattenSingleNodeValues(data, options = {}) {
   const properties = getPropertiesValue(data);
   return properties ? Object.fromEntries(
     Object.entries(properties).map(([id, parameter]) => {
-      const value = getPropertyValue(parameter);
+      const value = parameter ? parameter.value : parameter;
       if (levels > 0 && Array.isArray(value) && // In the future ASSET_PARAMETER_TYPE will be a nested data type
       (isNestedNodeType(parameter.type) || parameter.type === ASSET_PARAMETER_TYPE)) {
         const nestedOptions = { ...options, levels: levels - 1 };
@@ -1324,9 +1321,6 @@ function walkNodeTree(node, visitor, options) {
                         type: "block",
                         node: enqueueingComponent,
                         fieldName,
-                        get blockIndex() {
-                          return blockIndexFn2();
-                        },
                         blockIndexFn: blockIndexFn2
                       },
                       // slice removes 'self' since we are inserting a peer of self
@@ -1421,9 +1415,6 @@ function walkNodeTree(node, visitor, options) {
                           type: "slot",
                           node: enqueueingComponent,
                           parentSlot,
-                          get parentSlotIndex() {
-                            return parentSlotIndexFn2();
-                          },
                           parentSlotIndexFn: parentSlotIndexFn2
                         },
                         // slice removes 'self' since we are inserting a peer of self
@@ -1475,9 +1466,6 @@ function walkNodeTree(node, visitor, options) {
                 type: "slot",
                 node: enqueueingComponent,
                 parentSlot: slotKey,
-                get parentSlotIndex() {
-                  return parentSlotIndexFn();
-                },
                 parentSlotIndexFn
               },
               ...currentQueueEntry.ancestorsAndSelf
@@ -1523,9 +1511,6 @@ function walkNodeTree(node, visitor, options) {
                 type: "block",
                 node: enqueueingBlock,
                 fieldName: propKey,
-                get blockIndex() {
-                  return blockIndexFn();
-                },
                 blockIndexFn
               },
               ...currentQueueEntry.ancestorsAndSelf
@@ -1827,7 +1812,7 @@ function getComponentJsonPointer(ancestorsAndSelf) {
       }
       continue;
     }
-    const parentSlotIndex = "parentSlotIndexFn" in currentLocation ? currentLocation.parentSlotIndexFn() : currentLocation.parentSlotIndex;
+    const parentSlotIndex = currentLocation.parentSlotIndexFn();
     const { parentSlot } = currentLocation;
     if (parentSlot && parentSlotIndex !== void 0) {
       path.push(`slots/${parentSlot}/${parentSlotIndex}`);
@@ -2246,7 +2231,7 @@ function extractLocales({ component }) {
   return variations;
 }
 function localize(options) {
-  const nodes = "nodes" in options ? options.nodes : options.composition;
+  const nodes = options.nodes;
   const locale = options.locale;
   const isUsingModernOptions = typeof locale === "string";
   const vizControlLocaleRule = isUsingModernOptions ? createLocaleVisibilityRule(locale) : {};
@@ -2270,10 +2255,9 @@ function localize(options) {
     }
     if (node.type === CANVAS_LOCALIZATION_TYPE) {
       const locales = extractLocales({ component: node });
-      const resolvedLocale = isUsingModernOptions ? locale : locale == null ? void 0 : locale({ component: node, locales });
       let replaceComponent;
-      if (resolvedLocale) {
-        replaceComponent = locales[resolvedLocale];
+      if (locale) {
+        replaceComponent = locales[locale];
       }
       if (replaceComponent == null ? void 0 : replaceComponent.length) {
         replaceComponent.forEach((component) => {
@@ -2372,123 +2356,6 @@ var UniqueBatchEntries = class {
   }
 };
 
-// src/enhancement/walkComponentTree.ts
-function walkComponentTree(component, visitor, initialContext) {
-  var _a;
-  const componentQueue = [
-    {
-      ancestorsAndSelf: [{ component, parentSlot: void 0, parentSlotIndex: void 0 }],
-      context: initialContext
-    }
-  ];
-  const childContexts = /* @__PURE__ */ new Map();
-  do {
-    const currentQueueEntry = componentQueue.pop();
-    if (!currentQueueEntry) continue;
-    const currentComponent = currentQueueEntry.ancestorsAndSelf[0];
-    let visitDescendants = true;
-    let descendantContext = (_a = childContexts.get(currentComponent.component)) != null ? _a : currentQueueEntry.context;
-    visitor(
-      currentComponent.component,
-      currentQueueEntry.ancestorsAndSelf,
-      {
-        replaceComponent: (replacementComponent) => {
-          Object.assign(currentComponent.component, replacementComponent);
-          const propertiesToCheck = [
-            "parameters",
-            "variant",
-            "slots",
-            "data",
-            "_pattern",
-            "_patternError"
-          ];
-          propertiesToCheck.forEach((property) => {
-            if (!replacementComponent[property]) {
-              delete currentComponent.component[property];
-            }
-          });
-        },
-        removeComponent: () => {
-          const { parentSlot, parentSlotIndex } = currentQueueEntry.ancestorsAndSelf[0];
-          const parentComponent = currentQueueEntry.ancestorsAndSelf[1];
-          if (parentSlot && typeof parentSlotIndex !== "undefined") {
-            parentComponent.component.slots[parentSlot].splice(parentSlotIndex, 1);
-          } else {
-            throw new Error("Unable to delete composition.");
-          }
-        },
-        insertAfter: (components) => {
-          const componentsToInsert = Array.isArray(components) ? components : [components];
-          const { parentSlot, parentSlotIndex } = currentQueueEntry.ancestorsAndSelf[0];
-          const parentComponent = currentQueueEntry.ancestorsAndSelf[1];
-          if (parentSlot && typeof parentSlotIndex !== "undefined") {
-            parentComponent.component.slots[parentSlot].splice(
-              parentSlotIndex + 1,
-              0,
-              ...componentsToInsert
-            );
-            componentQueue.unshift(
-              ...componentsToInsert.map((enqueueingComponent) => ({
-                ancestorsAndSelf: [
-                  {
-                    component: enqueueingComponent,
-                    parentSlot,
-                    get parentSlotIndex() {
-                      return parentComponent.component.slots[parentSlot].findIndex(
-                        (x) => x === enqueueingComponent
-                      );
-                    }
-                  },
-                  ...currentQueueEntry.ancestorsAndSelf
-                ],
-                context: descendantContext
-              }))
-            );
-          } else {
-            throw new Error("Unable to insert after a component not in a slot.");
-          }
-        },
-        stopProcessingDescendants() {
-          visitDescendants = false;
-        },
-        setDescendantsContext(context) {
-          descendantContext = context;
-        },
-        setChildContext(child, context) {
-          childContexts.set(child, context);
-        }
-      },
-      descendantContext
-    );
-    const slots = currentComponent.component.slots;
-    if (visitDescendants && slots) {
-      const slotKeys = Object.keys(slots);
-      for (let slotIndex = slotKeys.length - 1; slotIndex >= 0; slotIndex--) {
-        const slotKey = slotKeys[slotIndex];
-        const components = slots[slotKey];
-        for (let componentIndex = components.length - 1; componentIndex >= 0; componentIndex--) {
-          const enqueueingComponent = components[componentIndex];
-          componentQueue.push({
-            ancestorsAndSelf: [
-              {
-                component: enqueueingComponent,
-                parentSlot: slotKey,
-                get parentSlotIndex() {
-                  return currentComponent.component.slots[slotKey].findIndex(
-                    (x) => x === enqueueingComponent
-                  );
-                }
-              },
-              ...currentQueueEntry.ancestorsAndSelf
-            ],
-            context: descendantContext
-          });
-        }
-      }
-    }
-  } while (componentQueue.length > 0);
-}
-
 // src/EntityReleasesClient.ts
 import { ApiClient as ApiClient6 } from "@uniformdev/context/api";
 var releaseContentsUrl = "/api/v1/entity-releases";
@@ -2857,84 +2724,6 @@ var createCanvasChannel = ({
   };
 };
 
-// src/preview/createEventBus.ts
-var PUSHER_SRC = "https://js.pusher.com/7.0.3/pusher.min.js";
-async function loadPusher() {
-  if (typeof document === "undefined" || typeof window === "undefined") {
-    return;
-  }
-  if (window.Pusher) {
-    return window.Pusher;
-  }
-  return new Promise((resolve, reject) => {
-    const timeout = setTimeout(() => {
-      if (window.Pusher) {
-        resolve(window.Pusher);
-      }
-      reject(
-        `Unable to load pusher.js; Uniform Canvas live preview disabled. Consider adding <script src="${PUSHER_SRC}"></script> manually.`
-      );
-    }, 5e3);
-    const pusher = document.createElement("script");
-    pusher.src = PUSHER_SRC;
-    pusher.addEventListener("load", () => {
-      clearTimeout(timeout);
-      resolve(window.Pusher);
-    });
-    document.head.appendChild(pusher);
-  });
-}
-async function createEventBus() {
-  const WindowPusher = await loadPusher();
-  if (!WindowPusher) {
-    return;
-  }
-  let bus = window.__UNIFORM_EVENT_BUS__;
-  if (!bus) {
-    const pusher = new WindowPusher("7b5f5abd160fea549ffe", {
-      cluster: "mt1"
-    });
-    pusher.connect();
-    console.log("[canvas] \u{1F525} preview connected");
-    bus = window.__UNIFORM_EVENT_BUS__ = {
-      subscribe: (channel) => {
-        const channelObj = pusher.subscribe(channel);
-        return {
-          unsubscribe: () => pusher.unsubscribe(channel),
-          addEventHandler: (eventName, handler) => {
-            channelObj.bind(eventName, handler);
-            return () => channelObj.unbind(eventName, handler);
-          }
-        };
-      }
-    };
-  }
-  return bus;
-}
-
-// src/preview/getChannelName.ts
-function getChannelName(projectId, compositionId, state) {
-  return `${projectId}.${compositionId}@${state}`;
-}
-
-// src/preview/subscribeToComposition.ts
-function subscribeToComposition({
-  projectId,
-  compositionId,
-  compositionState = 0,
-  eventBus: { subscribe },
-  callback,
-  event = "updated"
-}) {
-  const channelName = getChannelName(projectId, compositionId, compositionState);
-  const channel = subscribe(channelName);
-  const off = channel.addEventHandler(event, callback);
-  return () => {
-    off();
-    channel.unsubscribe();
-  };
-}
-
 // src/PreviewClient.ts
 import { ApiClient as ApiClient8 } from "@uniformdev/context/api";
 var previewUrlsUrl = "/api/v1/preview-urls";
@@ -3556,7 +3345,6 @@ export {
   createCanvasChannel,
   createDynamicInputVisibilityRule,
   createDynamicTokenVisibilityRule,
-  createEventBus,
   createLimitPolicy,
   createLocaleVisibilityRule,
   createQuirksVisibilityRule,
@@ -3574,7 +3362,6 @@ export {
   generateComponentPlaceholderId,
   generateHash,
   getBlockValue,
-  getChannelName,
   getComponentJsonPointer,
   getComponentPath,
   getDataSourceVariantFromRouteGetParams,
@@ -3583,7 +3370,6 @@ export {
   getNounForNode,
   getParameterAttributes,
   getPropertiesValue,
-  getPropertyValue,
   hasReferencedVariables,
   isAddComponentMessage,
   isAllowedReferrer,
@@ -3620,7 +3406,5 @@ export {
   nullLimitPolicy,
   parseComponentPlaceholderId,
   parseVariableExpression,
-  subscribeToComposition,
-  walkComponentTree,
   walkNodeTree
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas",
-  "version": "19.214.0",
+  "version": "19.214.1-alpha.17+15e689c12c",
   "description": "Common functionality and types for Uniform Canvas",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -35,13 +35,12 @@
     "lexical": "0.17.1",
     "p-limit": "3.1.0",
     "p-retry": "5.1.2",
-    "p-throttle": "5.0.0",
-    "pusher-js": "8.2.0"
+    "p-throttle": "5.0.0"
   },
   "dependencies": {
-    "@uniformdev/assets": "19.214.0",
-    "@uniformdev/context": "19.214.0",
-    "@uniformdev/richtext": "19.214.0",
+    "@uniformdev/assets": "19.214.1-alpha.17+15e689c12c",
+    "@uniformdev/context": "19.214.1-alpha.17+15e689c12c",
+    "@uniformdev/richtext": "19.214.1-alpha.17+15e689c12c",
     "immer": "10.1.1"
   },
   "files": [
@@ -50,5 +49,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "057019805f3d07ac560a53b0a621268a9c3c3518"
+  "gitHead": "15e689c12ce848ce17d170f9be8c6f3d2c29ffe1"
 }