npm - @uniformdev/canvas - Versions diffs - 19.203.0 → 19.204.1-alpha.2 - Mend

@uniformdev/canvas 19.203.0 → 19.204.1-alpha.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/dist/index.d.mts CHANGED Viewed

@@ -11704,14 +11704,18 @@ type ComponentLocationReferenceV2 = {
     type: 'slot';
     node: ComponentInstance;
     parentSlot: string;
+    /** @deprecated invoke parentSlotIndexFn instead, this property may be unreliable with some bundlers. This will be removed in the next major. */
     parentSlotIndex: number;
+    parentSlotIndexFn: () => number;
 };
 /** Ancestor location that is in a block on a parameter or field */
 type BlockLocationReference = {
     type: 'block';
     node: EntryData;
     fieldName: string;
+    /** @deprecated invoke blockIndexFn instead, this property may be unreliable with some bundlers. This will be removed in the next major. */
     blockIndex: number;
+    blockIndexFn: () => number;
 };
 /** Ancestor location that is the root of a composition or entry */
 type RootLocationReference = {

package/dist/index.d.ts CHANGED Viewed

@@ -11704,14 +11704,18 @@ type ComponentLocationReferenceV2 = {
     type: 'slot';
     node: ComponentInstance;
     parentSlot: string;
+    /** @deprecated invoke parentSlotIndexFn instead, this property may be unreliable with some bundlers. This will be removed in the next major. */
     parentSlotIndex: number;
+    parentSlotIndexFn: () => number;
 };
 /** Ancestor location that is in a block on a parameter or field */
 type BlockLocationReference = {
     type: 'block';
     node: EntryData;
     fieldName: string;
+    /** @deprecated invoke blockIndexFn instead, this property may be unreliable with some bundlers. This will be removed in the next major. */
     blockIndex: number;
+    blockIndexFn: () => number;
 };
 /** Ancestor location that is the root of a composition or entry */
 type RootLocationReference = {

package/dist/index.esm.js CHANGED Viewed

@@ -910,7 +910,8 @@ function getComponentPath(ancestorsAndSelf) {
     const parentLocation = ancestorsAndSelf[i + 1];
     if ("type" in currentLocation && currentLocation.type !== "slot") {
       if (currentLocation.type === "block") {
-        const { fieldName, blockIndex } = currentLocation;
+        const { fieldName, blockIndexFn } = currentLocation;
+        const blockIndex = blockIndexFn();
         if (fieldName && blockIndex !== void 0) {
           const noun = parentLocation && "type" in parentLocation && parentLocation.type === "block" ? "fields" : "parameters";
           path.push(`${noun}.${fieldName}.value[${blockIndex}]`);
@@ -919,7 +920,8 @@ function getComponentPath(ancestorsAndSelf) {
       }
       continue;
     }
-    const { parentSlot, parentSlotIndex } = currentLocation;
+    const parentSlotIndex = "parentSlotIndexFn" in currentLocation ? currentLocation.parentSlotIndexFn() : currentLocation.parentSlotIndex;
+    const { parentSlot } = currentLocation;
     if (parentSlot && parentSlotIndex !== void 0) {
       path.push(`${parentSlot}[${parentSlotIndex}]`);
     }
@@ -1156,7 +1158,8 @@ function walkNodeTree(node, visitor, options) {
             const currentComponentLocation = currentQueueEntry.ancestorsAndSelf[0];
             const parentComponent = currentQueueEntry.ancestorsAndSelf[1];
             if (currentComponentLocation.type === "block") {
-              const { fieldName, blockIndex } = currentComponentLocation;
+              const { fieldName, blockIndexFn } = currentComponentLocation;
+              const blockIndex = blockIndexFn();
               const blockValue = getBlockValue(parentComponent.node, fieldName);
               blockValue.splice(blockIndex, 1);
               if (blockValue.length === 0) {
@@ -1173,7 +1176,8 @@ function walkNodeTree(node, visitor, options) {
             if (currentNodeInfo.type !== "block") {
               throw new Error("Unknown type");
             }
-            const { fieldName, blockIndex } = currentNodeInfo;
+            const { fieldName, blockIndexFn } = currentNodeInfo;
+            const blockIndex = blockIndexFn();
             const parentComponent = currentQueueEntry.ancestorsAndSelf[1];
             const nodesToInsert = Array.isArray(nodes) ? nodes : [nodes];
             if (fieldName && typeof blockIndex !== "undefined") {
@@ -1183,22 +1187,28 @@ function walkNodeTree(node, visitor, options) {
                 ...nodesToInsert
               );
               componentQueue.unshift(
-                ...nodesToInsert.map((enqueueingComponent) => ({
-                  ancestorsAndSelf: [
-                    {
-                      type: "block",
-                      node: enqueueingComponent,
-                      fieldName,
-                      get blockIndex() {
-                        const parentArray = getPropertiesValue(parentComponent.node)[fieldName].value;
-                        return parentArray.findIndex((x) => x === enqueueingComponent);
-                      }
-                    },
-                    // slice removes 'self' since we are inserting a peer of self
-                    ...currentQueueEntry.ancestorsAndSelf.slice(1)
-                  ],
-                  context: descendantContext
-                }))
+                ...nodesToInsert.map((enqueueingComponent) => {
+                  const blockIndexFn2 = () => {
+                    const parentArray = getPropertiesValue(parentComponent.node)[fieldName].value;
+                    return parentArray.findIndex((x) => x === enqueueingComponent);
+                  };
+                  return {
+                    ancestorsAndSelf: [
+                      {
+                        type: "block",
+                        node: enqueueingComponent,
+                        fieldName,
+                        get blockIndex() {
+                          return blockIndexFn2();
+                        },
+                        blockIndexFn: blockIndexFn2
+                      },
+                      // slice removes 'self' since we are inserting a peer of self
+                      ...currentQueueEntry.ancestorsAndSelf.slice(1)
+                    ],
+                    context: descendantContext
+                  };
+                })
               );
             }
           },
@@ -1247,7 +1257,8 @@ function walkNodeTree(node, visitor, options) {
               throw new Error("Unable to delete root node.");
             }
             if (currentComponentLocation.type === "slot") {
-              const { parentSlot, parentSlotIndex } = currentComponentLocation;
+              const { parentSlot, parentSlotIndexFn } = currentComponentLocation;
+              const parentSlotIndex = parentSlotIndexFn();
               parentComponent.node.slots[parentSlot].splice(parentSlotIndex, 1);
             } else {
               throw new Error("Unknown node type");
@@ -1261,7 +1272,8 @@ function walkNodeTree(node, visitor, options) {
               throw new Error("Unable to insert after root node.");
             }
             if (currentNodeInfo.type === "slot") {
-              const { parentSlot, parentSlotIndex } = currentNodeInfo;
+              const { parentSlot, parentSlotIndexFn } = currentNodeInfo;
+              const parentSlotIndex = parentSlotIndexFn();
               const parentComponent = currentQueueEntry.ancestorsAndSelf[1];
               if (parentSlot && typeof parentSlotIndex !== "undefined") {
                 parentComponent.node.slots[parentSlot].splice(
@@ -1270,24 +1282,30 @@ function walkNodeTree(node, visitor, options) {
                   ...nodesToInsert
                 );
                 componentQueue.unshift(
-                  ...nodesToInsert.map((enqueueingComponent) => ({
-                    type: "slot",
-                    ancestorsAndSelf: [
-                      {
-                        type: "slot",
-                        node: enqueueingComponent,
-                        parentSlot,
-                        get parentSlotIndex() {
-                          return parentComponent.node.slots[parentSlot].findIndex(
-                            (x) => x === enqueueingComponent
-                          );
-                        }
-                      },
-                      // slice removes 'self' since we are inserting a peer of self
-                      ...currentQueueEntry.ancestorsAndSelf.slice(1)
-                    ],
-                    context: descendantContext
-                  }))
+                  ...nodesToInsert.map((enqueueingComponent) => {
+                    const parentSlotIndexFn2 = () => {
+                      return parentComponent.node.slots[parentSlot].findIndex(
+                        (x) => x === enqueueingComponent
+                      );
+                    };
+                    return {
+                      type: "slot",
+                      ancestorsAndSelf: [
+                        {
+                          type: "slot",
+                          node: enqueueingComponent,
+                          parentSlot,
+                          get parentSlotIndex() {
+                            return parentSlotIndexFn2();
+                          },
+                          parentSlotIndexFn: parentSlotIndexFn2
+                        },
+                        // slice removes 'self' since we are inserting a peer of self
+                        ...currentQueueEntry.ancestorsAndSelf.slice(1)
+                      ],
+                      context: descendantContext
+                    };
+                  })
                 );
               }
             } else {
@@ -1319,6 +1337,12 @@ function walkNodeTree(node, visitor, options) {
         const components = slots[slotKey];
         for (let componentIndex = components.length - 1; componentIndex >= 0; componentIndex--) {
           const enqueueingComponent = components[componentIndex];
+          const parentSlotIndexFn = () => {
+            const result = currentComponent.node.slots[slotKey].findIndex(
+              (x) => x === enqueueingComponent
+            );
+            return result;
+          };
           componentQueue.push({
             ancestorsAndSelf: [
               {
@@ -1326,10 +1350,9 @@ function walkNodeTree(node, visitor, options) {
                 node: enqueueingComponent,
                 parentSlot: slotKey,
                 get parentSlotIndex() {
-                  return currentComponent.node.slots[slotKey].findIndex(
-                    (x) => x === enqueueingComponent
-                  );
-                }
+                  return parentSlotIndexFn();
+                },
+                parentSlotIndexFn
               },
               ...currentQueueEntry.ancestorsAndSelf
             ],
@@ -1365,6 +1388,9 @@ function walkNodeTree(node, visitor, options) {
         const blocks = (_b = propObject.value) != null ? _b : [];
         for (let blockIndex = blocks.length - 1; blockIndex >= 0; blockIndex--) {
           const enqueueingBlock = blocks[blockIndex];
+          const blockIndexFn = () => {
+            return getBlockValue(currentComponent.node, propKey).findIndex((x) => x === enqueueingBlock);
+          };
           componentQueue.push({
             ancestorsAndSelf: [
               {
@@ -1372,10 +1398,9 @@ function walkNodeTree(node, visitor, options) {
                 node: enqueueingBlock,
                 fieldName: propKey,
                 get blockIndex() {
-                  return getBlockValue(currentComponent.node, propKey).findIndex(
-                    (x) => x === enqueueingBlock
-                  );
-                }
+                  return blockIndexFn();
+                },
+                blockIndexFn
               },
               ...currentQueueEntry.ancestorsAndSelf
             ],
@@ -1666,7 +1691,8 @@ function getComponentJsonPointer(ancestorsAndSelf) {
     const parentLocation = ancestorsAndSelf[i + 1];
     if ("type" in currentLocation && currentLocation.type !== "slot") {
       if (currentLocation.type === "block") {
-        const { fieldName: parameterName, blockIndex } = currentLocation;
+        const { fieldName: parameterName, blockIndexFn } = currentLocation;
+        const blockIndex = blockIndexFn();
         if (parameterName && blockIndex !== void 0) {
           const noun = getNounForLocation(parentLocation);
           path.push(`${noun}/${parameterName}/value/${blockIndex}`);
@@ -1675,7 +1701,8 @@ function getComponentJsonPointer(ancestorsAndSelf) {
       }
       continue;
     }
-    const { parentSlot, parentSlotIndex } = currentLocation;
+    const parentSlotIndex = "parentSlotIndexFn" in currentLocation ? currentLocation.parentSlotIndexFn() : currentLocation.parentSlotIndex;
+    const { parentSlot } = currentLocation;
     if (parentSlot && parentSlotIndex !== void 0) {
       path.push(`slots/${parentSlot}/${parentSlotIndex}`);
     }

package/dist/index.js CHANGED Viewed

@@ -1068,7 +1068,8 @@ function getComponentPath(ancestorsAndSelf) {
     const parentLocation = ancestorsAndSelf[i + 1];
     if ("type" in currentLocation && currentLocation.type !== "slot") {
       if (currentLocation.type === "block") {
-        const { fieldName, blockIndex } = currentLocation;
+        const { fieldName, blockIndexFn } = currentLocation;
+        const blockIndex = blockIndexFn();
         if (fieldName && blockIndex !== void 0) {
           const noun = parentLocation && "type" in parentLocation && parentLocation.type === "block" ? "fields" : "parameters";
           path.push(`${noun}.${fieldName}.value[${blockIndex}]`);
@@ -1077,7 +1078,8 @@ function getComponentPath(ancestorsAndSelf) {
       }
       continue;
     }
-    const { parentSlot, parentSlotIndex } = currentLocation;
+    const parentSlotIndex = "parentSlotIndexFn" in currentLocation ? currentLocation.parentSlotIndexFn() : currentLocation.parentSlotIndex;
+    const { parentSlot } = currentLocation;
     if (parentSlot && parentSlotIndex !== void 0) {
       path.push(`${parentSlot}[${parentSlotIndex}]`);
     }
@@ -1314,7 +1316,8 @@ function walkNodeTree(node, visitor, options) {
             const currentComponentLocation = currentQueueEntry.ancestorsAndSelf[0];
             const parentComponent = currentQueueEntry.ancestorsAndSelf[1];
             if (currentComponentLocation.type === "block") {
-              const { fieldName, blockIndex } = currentComponentLocation;
+              const { fieldName, blockIndexFn } = currentComponentLocation;
+              const blockIndex = blockIndexFn();
               const blockValue = getBlockValue(parentComponent.node, fieldName);
               blockValue.splice(blockIndex, 1);
               if (blockValue.length === 0) {
@@ -1331,7 +1334,8 @@ function walkNodeTree(node, visitor, options) {
             if (currentNodeInfo.type !== "block") {
               throw new Error("Unknown type");
             }
-            const { fieldName, blockIndex } = currentNodeInfo;
+            const { fieldName, blockIndexFn } = currentNodeInfo;
+            const blockIndex = blockIndexFn();
             const parentComponent = currentQueueEntry.ancestorsAndSelf[1];
             const nodesToInsert = Array.isArray(nodes) ? nodes : [nodes];
             if (fieldName && typeof blockIndex !== "undefined") {
@@ -1341,22 +1345,28 @@ function walkNodeTree(node, visitor, options) {
                 ...nodesToInsert
               );
               componentQueue.unshift(
-                ...nodesToInsert.map((enqueueingComponent) => ({
-                  ancestorsAndSelf: [
-                    {
-                      type: "block",
-                      node: enqueueingComponent,
-                      fieldName,
-                      get blockIndex() {
-                        const parentArray = getPropertiesValue(parentComponent.node)[fieldName].value;
-                        return parentArray.findIndex((x) => x === enqueueingComponent);
-                      }
-                    },
-                    // slice removes 'self' since we are inserting a peer of self
-                    ...currentQueueEntry.ancestorsAndSelf.slice(1)
-                  ],
-                  context: descendantContext
-                }))
+                ...nodesToInsert.map((enqueueingComponent) => {
+                  const blockIndexFn2 = () => {
+                    const parentArray = getPropertiesValue(parentComponent.node)[fieldName].value;
+                    return parentArray.findIndex((x) => x === enqueueingComponent);
+                  };
+                  return {
+                    ancestorsAndSelf: [
+                      {
+                        type: "block",
+                        node: enqueueingComponent,
+                        fieldName,
+                        get blockIndex() {
+                          return blockIndexFn2();
+                        },
+                        blockIndexFn: blockIndexFn2
+                      },
+                      // slice removes 'self' since we are inserting a peer of self
+                      ...currentQueueEntry.ancestorsAndSelf.slice(1)
+                    ],
+                    context: descendantContext
+                  };
+                })
               );
             }
           },
@@ -1405,7 +1415,8 @@ function walkNodeTree(node, visitor, options) {
               throw new Error("Unable to delete root node.");
             }
             if (currentComponentLocation.type === "slot") {
-              const { parentSlot, parentSlotIndex } = currentComponentLocation;
+              const { parentSlot, parentSlotIndexFn } = currentComponentLocation;
+              const parentSlotIndex = parentSlotIndexFn();
               parentComponent.node.slots[parentSlot].splice(parentSlotIndex, 1);
             } else {
               throw new Error("Unknown node type");
@@ -1419,7 +1430,8 @@ function walkNodeTree(node, visitor, options) {
               throw new Error("Unable to insert after root node.");
             }
             if (currentNodeInfo.type === "slot") {
-              const { parentSlot, parentSlotIndex } = currentNodeInfo;
+              const { parentSlot, parentSlotIndexFn } = currentNodeInfo;
+              const parentSlotIndex = parentSlotIndexFn();
               const parentComponent = currentQueueEntry.ancestorsAndSelf[1];
               if (parentSlot && typeof parentSlotIndex !== "undefined") {
                 parentComponent.node.slots[parentSlot].splice(
@@ -1428,24 +1440,30 @@ function walkNodeTree(node, visitor, options) {
                   ...nodesToInsert
                 );
                 componentQueue.unshift(
-                  ...nodesToInsert.map((enqueueingComponent) => ({
-                    type: "slot",
-                    ancestorsAndSelf: [
-                      {
-                        type: "slot",
-                        node: enqueueingComponent,
-                        parentSlot,
-                        get parentSlotIndex() {
-                          return parentComponent.node.slots[parentSlot].findIndex(
-                            (x) => x === enqueueingComponent
-                          );
-                        }
-                      },
-                      // slice removes 'self' since we are inserting a peer of self
-                      ...currentQueueEntry.ancestorsAndSelf.slice(1)
-                    ],
-                    context: descendantContext
-                  }))
+                  ...nodesToInsert.map((enqueueingComponent) => {
+                    const parentSlotIndexFn2 = () => {
+                      return parentComponent.node.slots[parentSlot].findIndex(
+                        (x) => x === enqueueingComponent
+                      );
+                    };
+                    return {
+                      type: "slot",
+                      ancestorsAndSelf: [
+                        {
+                          type: "slot",
+                          node: enqueueingComponent,
+                          parentSlot,
+                          get parentSlotIndex() {
+                            return parentSlotIndexFn2();
+                          },
+                          parentSlotIndexFn: parentSlotIndexFn2
+                        },
+                        // slice removes 'self' since we are inserting a peer of self
+                        ...currentQueueEntry.ancestorsAndSelf.slice(1)
+                      ],
+                      context: descendantContext
+                    };
+                  })
                 );
               }
             } else {
@@ -1477,6 +1495,12 @@ function walkNodeTree(node, visitor, options) {
         const components = slots[slotKey];
         for (let componentIndex = components.length - 1; componentIndex >= 0; componentIndex--) {
           const enqueueingComponent = components[componentIndex];
+          const parentSlotIndexFn = () => {
+            const result = currentComponent.node.slots[slotKey].findIndex(
+              (x) => x === enqueueingComponent
+            );
+            return result;
+          };
           componentQueue.push({
             ancestorsAndSelf: [
               {
@@ -1484,10 +1508,9 @@ function walkNodeTree(node, visitor, options) {
                 node: enqueueingComponent,
                 parentSlot: slotKey,
                 get parentSlotIndex() {
-                  return currentComponent.node.slots[slotKey].findIndex(
-                    (x) => x === enqueueingComponent
-                  );
-                }
+                  return parentSlotIndexFn();
+                },
+                parentSlotIndexFn
               },
               ...currentQueueEntry.ancestorsAndSelf
             ],
@@ -1523,6 +1546,9 @@ function walkNodeTree(node, visitor, options) {
         const blocks = (_b = propObject.value) != null ? _b : [];
         for (let blockIndex = blocks.length - 1; blockIndex >= 0; blockIndex--) {
           const enqueueingBlock = blocks[blockIndex];
+          const blockIndexFn = () => {
+            return getBlockValue(currentComponent.node, propKey).findIndex((x) => x === enqueueingBlock);
+          };
           componentQueue.push({
             ancestorsAndSelf: [
               {
@@ -1530,10 +1556,9 @@ function walkNodeTree(node, visitor, options) {
                 node: enqueueingBlock,
                 fieldName: propKey,
                 get blockIndex() {
-                  return getBlockValue(currentComponent.node, propKey).findIndex(
-                    (x) => x === enqueueingBlock
-                  );
-                }
+                  return blockIndexFn();
+                },
+                blockIndexFn
               },
               ...currentQueueEntry.ancestorsAndSelf
             ],
@@ -1824,7 +1849,8 @@ function getComponentJsonPointer(ancestorsAndSelf) {
     const parentLocation = ancestorsAndSelf[i + 1];
     if ("type" in currentLocation && currentLocation.type !== "slot") {
       if (currentLocation.type === "block") {
-        const { fieldName: parameterName, blockIndex } = currentLocation;
+        const { fieldName: parameterName, blockIndexFn } = currentLocation;
+        const blockIndex = blockIndexFn();
         if (parameterName && blockIndex !== void 0) {
           const noun = getNounForLocation(parentLocation);
           path.push(`${noun}/${parameterName}/value/${blockIndex}`);
@@ -1833,7 +1859,8 @@ function getComponentJsonPointer(ancestorsAndSelf) {
       }
       continue;
     }
-    const { parentSlot, parentSlotIndex } = currentLocation;
+    const parentSlotIndex = "parentSlotIndexFn" in currentLocation ? currentLocation.parentSlotIndexFn() : currentLocation.parentSlotIndex;
+    const { parentSlot } = currentLocation;
     if (parentSlot && parentSlotIndex !== void 0) {
       path.push(`slots/${parentSlot}/${parentSlotIndex}`);
     }

package/dist/index.mjs CHANGED Viewed

@@ -910,7 +910,8 @@ function getComponentPath(ancestorsAndSelf) {
     const parentLocation = ancestorsAndSelf[i + 1];
     if ("type" in currentLocation && currentLocation.type !== "slot") {
       if (currentLocation.type === "block") {
-        const { fieldName, blockIndex } = currentLocation;
+        const { fieldName, blockIndexFn } = currentLocation;
+        const blockIndex = blockIndexFn();
         if (fieldName && blockIndex !== void 0) {
           const noun = parentLocation && "type" in parentLocation && parentLocation.type === "block" ? "fields" : "parameters";
           path.push(`${noun}.${fieldName}.value[${blockIndex}]`);
@@ -919,7 +920,8 @@ function getComponentPath(ancestorsAndSelf) {
       }
       continue;
     }
-    const { parentSlot, parentSlotIndex } = currentLocation;
+    const parentSlotIndex = "parentSlotIndexFn" in currentLocation ? currentLocation.parentSlotIndexFn() : currentLocation.parentSlotIndex;
+    const { parentSlot } = currentLocation;
     if (parentSlot && parentSlotIndex !== void 0) {
       path.push(`${parentSlot}[${parentSlotIndex}]`);
     }
@@ -1156,7 +1158,8 @@ function walkNodeTree(node, visitor, options) {
             const currentComponentLocation = currentQueueEntry.ancestorsAndSelf[0];
             const parentComponent = currentQueueEntry.ancestorsAndSelf[1];
             if (currentComponentLocation.type === "block") {
-              const { fieldName, blockIndex } = currentComponentLocation;
+              const { fieldName, blockIndexFn } = currentComponentLocation;
+              const blockIndex = blockIndexFn();
               const blockValue = getBlockValue(parentComponent.node, fieldName);
               blockValue.splice(blockIndex, 1);
               if (blockValue.length === 0) {
@@ -1173,7 +1176,8 @@ function walkNodeTree(node, visitor, options) {
             if (currentNodeInfo.type !== "block") {
               throw new Error("Unknown type");
             }
-            const { fieldName, blockIndex } = currentNodeInfo;
+            const { fieldName, blockIndexFn } = currentNodeInfo;
+            const blockIndex = blockIndexFn();
             const parentComponent = currentQueueEntry.ancestorsAndSelf[1];
             const nodesToInsert = Array.isArray(nodes) ? nodes : [nodes];
             if (fieldName && typeof blockIndex !== "undefined") {
@@ -1183,22 +1187,28 @@ function walkNodeTree(node, visitor, options) {
                 ...nodesToInsert
               );
               componentQueue.unshift(
-                ...nodesToInsert.map((enqueueingComponent) => ({
-                  ancestorsAndSelf: [
-                    {
-                      type: "block",
-                      node: enqueueingComponent,
-                      fieldName,
-                      get blockIndex() {
-                        const parentArray = getPropertiesValue(parentComponent.node)[fieldName].value;
-                        return parentArray.findIndex((x) => x === enqueueingComponent);
-                      }
-                    },
-                    // slice removes 'self' since we are inserting a peer of self
-                    ...currentQueueEntry.ancestorsAndSelf.slice(1)
-                  ],
-                  context: descendantContext
-                }))
+                ...nodesToInsert.map((enqueueingComponent) => {
+                  const blockIndexFn2 = () => {
+                    const parentArray = getPropertiesValue(parentComponent.node)[fieldName].value;
+                    return parentArray.findIndex((x) => x === enqueueingComponent);
+                  };
+                  return {
+                    ancestorsAndSelf: [
+                      {
+                        type: "block",
+                        node: enqueueingComponent,
+                        fieldName,
+                        get blockIndex() {
+                          return blockIndexFn2();
+                        },
+                        blockIndexFn: blockIndexFn2
+                      },
+                      // slice removes 'self' since we are inserting a peer of self
+                      ...currentQueueEntry.ancestorsAndSelf.slice(1)
+                    ],
+                    context: descendantContext
+                  };
+                })
               );
             }
           },
@@ -1247,7 +1257,8 @@ function walkNodeTree(node, visitor, options) {
               throw new Error("Unable to delete root node.");
             }
             if (currentComponentLocation.type === "slot") {
-              const { parentSlot, parentSlotIndex } = currentComponentLocation;
+              const { parentSlot, parentSlotIndexFn } = currentComponentLocation;
+              const parentSlotIndex = parentSlotIndexFn();
               parentComponent.node.slots[parentSlot].splice(parentSlotIndex, 1);
             } else {
               throw new Error("Unknown node type");
@@ -1261,7 +1272,8 @@ function walkNodeTree(node, visitor, options) {
               throw new Error("Unable to insert after root node.");
             }
             if (currentNodeInfo.type === "slot") {
-              const { parentSlot, parentSlotIndex } = currentNodeInfo;
+              const { parentSlot, parentSlotIndexFn } = currentNodeInfo;
+              const parentSlotIndex = parentSlotIndexFn();
               const parentComponent = currentQueueEntry.ancestorsAndSelf[1];
               if (parentSlot && typeof parentSlotIndex !== "undefined") {
                 parentComponent.node.slots[parentSlot].splice(
@@ -1270,24 +1282,30 @@ function walkNodeTree(node, visitor, options) {
                   ...nodesToInsert
                 );
                 componentQueue.unshift(
-                  ...nodesToInsert.map((enqueueingComponent) => ({
-                    type: "slot",
-                    ancestorsAndSelf: [
-                      {
-                        type: "slot",
-                        node: enqueueingComponent,
-                        parentSlot,
-                        get parentSlotIndex() {
-                          return parentComponent.node.slots[parentSlot].findIndex(
-                            (x) => x === enqueueingComponent
-                          );
-                        }
-                      },
-                      // slice removes 'self' since we are inserting a peer of self
-                      ...currentQueueEntry.ancestorsAndSelf.slice(1)
-                    ],
-                    context: descendantContext
-                  }))
+                  ...nodesToInsert.map((enqueueingComponent) => {
+                    const parentSlotIndexFn2 = () => {
+                      return parentComponent.node.slots[parentSlot].findIndex(
+                        (x) => x === enqueueingComponent
+                      );
+                    };
+                    return {
+                      type: "slot",
+                      ancestorsAndSelf: [
+                        {
+                          type: "slot",
+                          node: enqueueingComponent,
+                          parentSlot,
+                          get parentSlotIndex() {
+                            return parentSlotIndexFn2();
+                          },
+                          parentSlotIndexFn: parentSlotIndexFn2
+                        },
+                        // slice removes 'self' since we are inserting a peer of self
+                        ...currentQueueEntry.ancestorsAndSelf.slice(1)
+                      ],
+                      context: descendantContext
+                    };
+                  })
                 );
               }
             } else {
@@ -1319,6 +1337,12 @@ function walkNodeTree(node, visitor, options) {
         const components = slots[slotKey];
         for (let componentIndex = components.length - 1; componentIndex >= 0; componentIndex--) {
           const enqueueingComponent = components[componentIndex];
+          const parentSlotIndexFn = () => {
+            const result = currentComponent.node.slots[slotKey].findIndex(
+              (x) => x === enqueueingComponent
+            );
+            return result;
+          };
           componentQueue.push({
             ancestorsAndSelf: [
               {
@@ -1326,10 +1350,9 @@ function walkNodeTree(node, visitor, options) {
                 node: enqueueingComponent,
                 parentSlot: slotKey,
                 get parentSlotIndex() {
-                  return currentComponent.node.slots[slotKey].findIndex(
-                    (x) => x === enqueueingComponent
-                  );
-                }
+                  return parentSlotIndexFn();
+                },
+                parentSlotIndexFn
               },
               ...currentQueueEntry.ancestorsAndSelf
             ],
@@ -1365,6 +1388,9 @@ function walkNodeTree(node, visitor, options) {
         const blocks = (_b = propObject.value) != null ? _b : [];
         for (let blockIndex = blocks.length - 1; blockIndex >= 0; blockIndex--) {
           const enqueueingBlock = blocks[blockIndex];
+          const blockIndexFn = () => {
+            return getBlockValue(currentComponent.node, propKey).findIndex((x) => x === enqueueingBlock);
+          };
           componentQueue.push({
             ancestorsAndSelf: [
               {
@@ -1372,10 +1398,9 @@ function walkNodeTree(node, visitor, options) {
                 node: enqueueingBlock,
                 fieldName: propKey,
                 get blockIndex() {
-                  return getBlockValue(currentComponent.node, propKey).findIndex(
-                    (x) => x === enqueueingBlock
-                  );
-                }
+                  return blockIndexFn();
+                },
+                blockIndexFn
               },
               ...currentQueueEntry.ancestorsAndSelf
             ],
@@ -1666,7 +1691,8 @@ function getComponentJsonPointer(ancestorsAndSelf) {
     const parentLocation = ancestorsAndSelf[i + 1];
     if ("type" in currentLocation && currentLocation.type !== "slot") {
       if (currentLocation.type === "block") {
-        const { fieldName: parameterName, blockIndex } = currentLocation;
+        const { fieldName: parameterName, blockIndexFn } = currentLocation;
+        const blockIndex = blockIndexFn();
         if (parameterName && blockIndex !== void 0) {
           const noun = getNounForLocation(parentLocation);
           path.push(`${noun}/${parameterName}/value/${blockIndex}`);
@@ -1675,7 +1701,8 @@ function getComponentJsonPointer(ancestorsAndSelf) {
       }
       continue;
     }
-    const { parentSlot, parentSlotIndex } = currentLocation;
+    const parentSlotIndex = "parentSlotIndexFn" in currentLocation ? currentLocation.parentSlotIndexFn() : currentLocation.parentSlotIndex;
+    const { parentSlot } = currentLocation;
     if (parentSlot && parentSlotIndex !== void 0) {
       path.push(`slots/${parentSlot}/${parentSlotIndex}`);
     }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas",
-  "version": "19.203.0",
+  "version": "19.204.1-alpha.2+0262cf78a6",
   "description": "Common functionality and types for Uniform Canvas",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -38,9 +38,9 @@
     "pusher-js": "8.2.0"
   },
   "dependencies": {
-    "@uniformdev/assets": "19.203.0",
-    "@uniformdev/context": "19.203.0",
-    "@uniformdev/richtext": "19.203.0",
+    "@uniformdev/assets": "19.204.1-alpha.2+0262cf78a6",
+    "@uniformdev/context": "19.204.1-alpha.2+0262cf78a6",
+    "@uniformdev/richtext": "19.204.1-alpha.2+0262cf78a6",
     "immer": "10.1.1"
   },
   "files": [
@@ -49,5 +49,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fd2dc597c7909df1e00d9a0eb307ffac2ff72991"
+  "gitHead": "0262cf78a6bd7179419e2e1505c1a985fd1103de"
 }