@goplasmatic/datalogic-ui 4.0.9 → 4.0.11

package/dist/index.cjs

@@ -2654,11 +2654,21 @@ function createIfElseNodeFromTrace(nodeId, expression, children, context, parent
         argIndex: idx
       });
     } else {
-      conditionBranchId = `${nodeId}-cond-${idx}`;
-      createFallbackNode(conditionBranchId, condition, context, {
-        parentId: nodeId,
-        argIndex: idx
-      });
+      const condNodeType = determineNodeType(condition, context.preserveStructure);
+      const nextUnused = condNodeType !== "literal" ? getNextUnusedChild(children, usedChildIndices) : null;
+      if (nextUnused) {
+        usedChildIndices.add(nextUnused.index);
+        conditionBranchId = processExpressionNode(nextUnused.child, context, {
+          parentId: nodeId,
+          argIndex: idx
+        }, condition);
+      } else {
+        conditionBranchId = `${nodeId}-cond-${idx}`;
+        createFallbackNode(conditionBranchId, condition, context, {
+          parentId: nodeId,
+          argIndex: idx
+        });
+      }
     }
     context.edges.push(createBranchEdge(nodeId, conditionBranchId, branchIndex));
     const conditionText = generateExpressionText(condition, 40);
@@ -2682,12 +2692,23 @@ function createIfElseNodeFromTrace(nodeId, expression, children, context, parent
         branchType: "yes"
       });
     } else {
-      thenBranchId = `${nodeId}-then-${idx}`;
-      createFallbackNode(thenBranchId, thenValue, context, {
-        parentId: nodeId,
-        argIndex: idx + 1,
-        branchType: "yes"
-      });
+      const thenNodeType = determineNodeType(thenValue, context.preserveStructure);
+      const nextUnused = thenNodeType !== "literal" ? getNextUnusedChild(children, usedChildIndices) : null;
+      if (nextUnused) {
+        usedChildIndices.add(nextUnused.index);
+        thenBranchId = processExpressionNode(nextUnused.child, context, {
+          parentId: nodeId,
+          argIndex: idx + 1,
+          branchType: "yes"
+        }, thenValue);
+      } else {
+        thenBranchId = `${nodeId}-then-${idx}`;
+        createFallbackNode(thenBranchId, thenValue, context, {
+          parentId: nodeId,
+          argIndex: idx + 1,
+          branchType: "yes"
+        });
+      }
     }
     context.edges.push(createBranchEdge(nodeId, thenBranchId, branchIndex));
     const thenText = generateExpressionText(thenValue, 40);
@@ -2716,12 +2737,23 @@ function createIfElseNodeFromTrace(nodeId, expression, children, context, parent
         branchType: "no"
       });
     } else {
-      elseBranchId = `${nodeId}-else`;
-      createFallbackNode(elseBranchId, elseValue, context, {
-        parentId: nodeId,
-        argIndex: ifArgs.length - 1,
-        branchType: "no"
-      });
+      const elseNodeType = determineNodeType(elseValue, context.preserveStructure);
+      const nextUnused = elseNodeType !== "literal" ? getNextUnusedChild(children, usedChildIndices) : null;
+      if (nextUnused) {
+        usedChildIndices.add(nextUnused.index);
+        elseBranchId = processExpressionNode(nextUnused.child, context, {
+          parentId: nodeId,
+          argIndex: ifArgs.length - 1,
+          branchType: "no"
+        }, elseValue);
+      } else {
+        elseBranchId = `${nodeId}-else`;
+        createFallbackNode(elseBranchId, elseValue, context, {
+          parentId: nodeId,
+          argIndex: ifArgs.length - 1,
+          branchType: "no"
+        });
+      }
     }
     context.edges.push(createBranchEdge(nodeId, elseBranchId, branchIndex));
     const elseText = generateExpressionText(elseValue, 40);
@@ -2777,6 +2809,14 @@ function findMatchingChild(operand, children, usedIndices) {
   }
   return null;
 }
+function getNextUnusedChild(children, usedIndices) {
+  for (let i = 0; i < children.length; i++) {
+    if (!usedIndices.has(i)) {
+      return { child: children[i], index: i };
+    }
+  }
+  return null;
+}
 function createVerticalCellNodeFromTrace(nodeId, expression, children, context, parentInfo) {
   const obj = expression;
   const operator = Object.keys(obj)[0];
@@ -2994,7 +3034,9 @@ function createStructureNodeFromTrace(nodeId, expression, children, context, par
         return EXPR_PLACEHOLDER;
       }
       return item;
-    });
+    },
+    context
+  );
   const formattedJson = JSON.stringify(structureWithPlaceholders, null, 2);
   let searchPos = 0;
   for (const element of elements) {
@@ -3037,14 +3079,19 @@ function createStructureNodeFromTrace(nodeId, expression, children, context, par
     }
   }
 }
+function isExpressionBranch(item, preserveStructure) {
+  if (isJsonLogicExpression(item)) return true;
+  if (preserveStructure && isDataStructure(item)) return true;
+  return false;
+}
 function walkAndCollectFromTrace(value, path, onValue, context) {
   if (Array.isArray(value)) {
     return value.map((item, index) => {
       const itemPath = [...path, String(index)];
-      if (isJsonLogicExpression(item)) {
+      if (isExpressionBranch(item, context.preserveStructure)) {
         return onValue(itemPath, item);
       } else if (typeof item === "object" && item !== null) {
-        return walkAndCollectFromTrace(item, itemPath, onValue);
+        return walkAndCollectFromTrace(item, itemPath, onValue, context);
       }
       return item;
     });
@@ -3053,10 +3100,10 @@ function walkAndCollectFromTrace(value, path, onValue, context) {
     const result = {};
     for (const [key, item] of Object.entries(value)) {
       const itemPath = [...path, key];
-      if (isJsonLogicExpression(item)) {
+      if (isExpressionBranch(item, context.preserveStructure)) {
         result[key] = onValue(itemPath, item, key);
       } else if (typeof item === "object" && item !== null) {
-        result[key] = walkAndCollectFromTrace(item, itemPath, onValue);
+        result[key] = walkAndCollectFromTrace(item, itemPath, onValue, context);
       } else {
         result[key] = item;
       }
@@ -9238,6 +9285,11 @@ function collectCellBranchIds(cell, target) {
   if (cell.conditionBranchId) target.add(cell.conditionBranchId);
   if (cell.thenBranchId) target.add(cell.thenBranchId);
 }
+function collectStructureBranchIds(elements, target) {
+  elements.forEach((element) => {
+    if (element.branchId) target.add(element.branchId);
+  });
+}
 function buildParentChildMap(nodes) {
   const parentChildMap = /* @__PURE__ */ new Map();
   nodes.forEach((node) => {
@@ -9274,6 +9326,10 @@ function getHiddenNodeIds(nodes) {
           }
         });
       }
+    } else if (isStructureNode(node)) {
+      if (node.data.collapsed && node.data.elements) {
+        collectStructureBranchIds(node.data.elements, collapsedBranchIds);
+      }
     }
   });
   function markDescendantsHidden(parentId) {

package/dist/index.js

@@ -3286,11 +3286,21 @@ let __tla = (async () => {
           argIndex: idx
         });
       } else {
-        conditionBranchId = `${nodeId}-cond-${idx}`;
-        createFallbackNode(conditionBranchId, condition, context, {
-          parentId: nodeId,
-          argIndex: idx
-        });
+        const condNodeType = determineNodeType(condition, context.preserveStructure);
+        const nextUnused = condNodeType !== "literal" ? getNextUnusedChild(children, usedChildIndices) : null;
+        if (nextUnused) {
+          usedChildIndices.add(nextUnused.index);
+          conditionBranchId = processExpressionNode(nextUnused.child, context, {
+            parentId: nodeId,
+            argIndex: idx
+          }, condition);
+        } else {
+          conditionBranchId = `${nodeId}-cond-${idx}`;
+          createFallbackNode(conditionBranchId, condition, context, {
+            parentId: nodeId,
+            argIndex: idx
+          });
+        }
       }
       context.edges.push(createBranchEdge(nodeId, conditionBranchId, branchIndex));
       const conditionText = generateExpressionText(condition, 40);
@@ -3314,12 +3324,23 @@ let __tla = (async () => {
           branchType: "yes"
         });
       } else {
-        thenBranchId = `${nodeId}-then-${idx}`;
-        createFallbackNode(thenBranchId, thenValue, context, {
-          parentId: nodeId,
-          argIndex: idx + 1,
-          branchType: "yes"
-        });
+        const thenNodeType = determineNodeType(thenValue, context.preserveStructure);
+        const nextUnused = thenNodeType !== "literal" ? getNextUnusedChild(children, usedChildIndices) : null;
+        if (nextUnused) {
+          usedChildIndices.add(nextUnused.index);
+          thenBranchId = processExpressionNode(nextUnused.child, context, {
+            parentId: nodeId,
+            argIndex: idx + 1,
+            branchType: "yes"
+          }, thenValue);
+        } else {
+          thenBranchId = `${nodeId}-then-${idx}`;
+          createFallbackNode(thenBranchId, thenValue, context, {
+            parentId: nodeId,
+            argIndex: idx + 1,
+            branchType: "yes"
+          });
+        }
       }
       context.edges.push(createBranchEdge(nodeId, thenBranchId, branchIndex));
       const thenText = generateExpressionText(thenValue, 40);
@@ -3348,12 +3369,23 @@ let __tla = (async () => {
           branchType: "no"
         });
       } else {
-        elseBranchId = `${nodeId}-else`;
-        createFallbackNode(elseBranchId, elseValue, context, {
-          parentId: nodeId,
-          argIndex: ifArgs.length - 1,
-          branchType: "no"
-        });
+        const elseNodeType = determineNodeType(elseValue, context.preserveStructure);
+        const nextUnused = elseNodeType !== "literal" ? getNextUnusedChild(children, usedChildIndices) : null;
+        if (nextUnused) {
+          usedChildIndices.add(nextUnused.index);
+          elseBranchId = processExpressionNode(nextUnused.child, context, {
+            parentId: nodeId,
+            argIndex: ifArgs.length - 1,
+            branchType: "no"
+          }, elseValue);
+        } else {
+          elseBranchId = `${nodeId}-else`;
+          createFallbackNode(elseBranchId, elseValue, context, {
+            parentId: nodeId,
+            argIndex: ifArgs.length - 1,
+            branchType: "no"
+          });
+        }
       }
       context.edges.push(createBranchEdge(nodeId, elseBranchId, branchIndex));
       const elseText = generateExpressionText(elseValue, 40);
@@ -3418,6 +3450,17 @@ let __tla = (async () => {
     }
     return null;
   }
+  function getNextUnusedChild(children, usedIndices) {
+    for (let i = 0; i < children.length; i++) {
+      if (!usedIndices.has(i)) {
+        return {
+          child: children[i],
+          index: i
+        };
+      }
+    }
+    return null;
+  }
   function createVerticalCellNodeFromTrace(nodeId, expression, children, context, parentInfo) {
     const obj = expression;
     const operator = Object.keys(obj)[0];
@@ -3644,7 +3687,7 @@ let __tla = (async () => {
         return EXPR_PLACEHOLDER;
       }
       return item;
-    });
+    }, context);
     const formattedJson = JSON.stringify(structureWithPlaceholders, null, 2);
     let searchPos = 0;
     for (const element of elements) {
@@ -3690,6 +3733,11 @@ let __tla = (async () => {
       }
     }
   }
+  function isExpressionBranch(item, preserveStructure) {
+    if (isJsonLogicExpression(item)) return true;
+    if (preserveStructure && isDataStructure(item)) return true;
+    return false;
+  }
   function walkAndCollectFromTrace(value, path, onValue, context) {
     if (Array.isArray(value)) {
       return value.map((item, index) => {
@@ -3697,10 +3745,10 @@ let __tla = (async () => {
           ...path,
           String(index)
         ];
-        if (isJsonLogicExpression(item)) {
+        if (isExpressionBranch(item, context.preserveStructure)) {
           return onValue(itemPath, item);
         } else if (typeof item === "object" && item !== null) {
-          return walkAndCollectFromTrace(item, itemPath, onValue);
+          return walkAndCollectFromTrace(item, itemPath, onValue, context);
         }
         return item;
       });
@@ -3712,10 +3760,10 @@ let __tla = (async () => {
           ...path,
           key
         ];
-        if (isJsonLogicExpression(item)) {
+        if (isExpressionBranch(item, context.preserveStructure)) {
           result[key] = onValue(itemPath, item, key);
         } else if (typeof item === "object" && item !== null) {
-          result[key] = walkAndCollectFromTrace(item, itemPath, onValue);
+          result[key] = walkAndCollectFromTrace(item, itemPath, onValue, context);
         } else {
           result[key] = item;
         }
@@ -8988,6 +9036,11 @@ let __tla = (async () => {
     if (cell.conditionBranchId) target.add(cell.conditionBranchId);
     if (cell.thenBranchId) target.add(cell.thenBranchId);
   }
+  function collectStructureBranchIds(elements, target) {
+    elements.forEach((element) => {
+      if (element.branchId) target.add(element.branchId);
+    });
+  }
   function buildParentChildMap(nodes) {
     const parentChildMap = /* @__PURE__ */ new Map();
     nodes.forEach((node) => {
@@ -9024,6 +9077,10 @@ let __tla = (async () => {
             }
           });
         }
+      } else if (isStructureNode(node)) {
+        if (node.data.collapsed && node.data.elements) {
+          collectStructureBranchIds(node.data.elements, collapsedBranchIds);
+        }
       }
     });
     function markDescendantsHidden(parentId) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@goplasmatic/datalogic-ui",
   "private": false,
-  "version": "4.0.9",
+  "version": "4.0.11",
   "type": "module",
   "description": "DataLogic Debugger - Visual JSONLogic Debugger & Editor for debugging and visualizing JSONLogic expressions",
   "keywords": [
@@ -51,23 +51,11 @@
   "sideEffects": [
     "**/*.css"
   ],
-  "scripts": {
-    "dev": "vite",
-    "build": "tsc -b && vite build",
-    "build:lib": "vite build --config vite.lib.config.ts",
-    "build:embed": "vite build --config vite.embed.config.ts",
-    "lint": "eslint .",
-    "preview": "vite preview",
-    "prepublishOnly": "npm run build:lib",
-    "release:patch": "npm version patch && npm publish --access public",
-    "release:minor": "npm version minor && npm publish --access public",
-    "release:major": "npm version major && npm publish --access public"
-  },
   "dependencies": {
     "@dagrejs/dagre": "^1.1.8",
-    "@goplasmatic/datalogic": "workspace:*",
     "lucide-react": "^0.562.0",
-    "uuid": "^13.0.0"
+    "uuid": "^13.0.0",
+    "@goplasmatic/datalogic": "4.0.9"
   },
   "peerDependencies": {
     "@xyflow/react": "^12.0.0",
@@ -94,5 +82,16 @@
     "vite-plugin-dts": "^4.5.4",
     "vite-plugin-top-level-await": "^1.6.0",
     "vite-plugin-wasm": "^3.5.0"
+  },
+  "scripts": {
+    "dev": "vite",
+    "build": "tsc -b && vite build",
+    "build:lib": "vite build --config vite.lib.config.ts",
+    "build:embed": "vite build --config vite.embed.config.ts",
+    "lint": "eslint .",
+    "preview": "vite preview",
+    "release:patch": "npm version patch && pnpm publish --access public --no-git-checks",
+    "release:minor": "npm version minor && pnpm publish --access public --no-git-checks",
+    "release:major": "npm version major && pnpm publish --access public --no-git-checks"
   }
-}
+}