@octaviaflow/core 3.1.0-beta.110 → 3.1.0-beta.111

package/dist/index.js

@@ -11637,7 +11637,9 @@ function splitArguments(argsText) {
     }
     current += ch;
   }
-  if (current.trim()) args.push(current.trim());
+  const tail = current.trim();
+  if (tail) args.push(tail);
+  else if (args.length) args.push("");
   return args;
 }
 function parseCall(raw) {
@@ -11650,7 +11652,7 @@ function parseCall(raw) {
   return { name: head[1], args: splitArguments(inner.slice(open + 1, close)) };
 }
 function formatCall(name, args) {
-  return `{{${name}(${args.filter((a) => a.trim() !== "").join(", ")})}}`;
+  return `{{${name}(${args.join(", ")})}}`;
 }
 function parseExpression(value, pillEveryToken = false) {
   const segments = [];
@@ -11692,7 +11694,15 @@ function callAt(raw, path) {
   return current;
 }
 function formatNestedCall(name, args) {
-  return `${name}(${args.filter((a) => a.trim() !== "").join(", ")})`;
+  return `${name}(${args.join(", ")})`;
+}
+function normalizeCall(raw) {
+  const call = parseCall(raw);
+  if (!call) return raw;
+  const args = call.args.map((arg) => parseCall(arg) ? normalizeCall(arg) : arg);
+  while (args.length > 0 && args[args.length - 1].trim() === "") args.pop();
+  const held = args.map((arg) => arg.trim() === "" ? '""' : arg);
+  return raw.trim().startsWith("{{") ? formatCall(call.name, held) : formatNestedCall(call.name, held);
 }
 function replaceArgument(raw, path, next) {
   if (path.length === 0) return next;
@@ -12160,7 +12170,9 @@ function CallEditor({
       const target = e.target;
       if (panelRef.current?.contains(target)) return;
       if (anchor.contains(target)) return;
-      onApplyRef.current(draftRef.current);
+      const el = target instanceof Element ? target : target.parentElement;
+      if (el?.closest('[draggable="true"]')) return;
+      onApplyRef.current(normalizeCall(draftRef.current));
     };
     document.addEventListener("keydown", onKey);
     document.addEventListener("mousedown", onPointerDown, true);
@@ -12357,7 +12369,7 @@ function CallEditor({
           ] }),
           /* @__PURE__ */ jsxs49("div", { className: "ods-expression-field__editor-foot", children: [
             /* @__PURE__ */ jsx49(Button, { variant: "secondary", size: "sm", onClick: onCancel, children: "Cancel" }),
-            /* @__PURE__ */ jsx49(Button, { variant: "primary", size: "sm", onClick: () => onApply(draft), children: "Apply" })
+            /* @__PURE__ */ jsx49(Button, { variant: "primary", size: "sm", onClick: () => onApply(normalizeCall(draft)), children: "Apply" })
           ] })
         ]
       }