next-workflow-builder 0.4.7 → 0.5.0

package/dist/{chunk-MIBRBQIJ.js → chunk-EMCA7GLF.js}

@@ -1038,6 +1038,142 @@ ${code}
 `;
 }
 
+// src/plugins/condition/operators.ts
+var DATA_TYPE_OPTIONS = [
+  { value: "string", label: "String" },
+  { value: "number", label: "Number" },
+  { value: "boolean", label: "Boolean" },
+  { value: "datetime", label: "Date & Time" }
+];
+var OPERATORS = {
+  string: [
+    { value: "exists", label: "exists", unary: true },
+    { value: "doesNotExist", label: "does not exist", unary: true },
+    { value: "isEmpty", label: "is empty", unary: true },
+    { value: "isNotEmpty", label: "is not empty", unary: true },
+    { value: "equals", label: "equals", unary: false },
+    { value: "notEquals", label: "does not equal", unary: false },
+    { value: "contains", label: "contains", unary: false },
+    { value: "doesNotContain", label: "does not contain", unary: false },
+    { value: "startsWith", label: "starts with", unary: false },
+    { value: "doesNotStartWith", label: "does not start with", unary: false },
+    { value: "endsWith", label: "ends with", unary: false },
+    { value: "doesNotEndWith", label: "does not end with", unary: false },
+    { value: "matchesRegex", label: "matches regex", unary: false },
+    { value: "doesNotMatchRegex", label: "does not match regex", unary: false }
+  ],
+  number: [
+    { value: "equals", label: "equals", unary: false },
+    { value: "notEquals", label: "does not equal", unary: false },
+    { value: "greaterThan", label: "greater than", unary: false },
+    { value: "lessThan", label: "less than", unary: false },
+    { value: "greaterThanOrEqual", label: "greater than or equal", unary: false },
+    { value: "lessThanOrEqual", label: "less than or equal", unary: false }
+  ],
+  boolean: [
+    { value: "isTrue", label: "is true", unary: true },
+    { value: "isFalse", label: "is false", unary: true },
+    { value: "exists", label: "exists", unary: true },
+    { value: "doesNotExist", label: "does not exist", unary: true }
+  ],
+  datetime: [
+    { value: "isBefore", label: "is before", unary: false },
+    { value: "isAfter", label: "is after", unary: false },
+    { value: "equals", label: "equals", unary: false }
+  ]
+};
+function evaluateOperator(dataType, operator, leftValue, rightValue) {
+  switch (operator) {
+    case "exists":
+      return leftValue !== null && leftValue !== void 0;
+    case "doesNotExist":
+      return leftValue === null || leftValue === void 0;
+    case "isEmpty":
+      return leftValue === null || leftValue === void 0 || String(leftValue) === "";
+    case "isNotEmpty":
+      return leftValue !== null && leftValue !== void 0 && String(leftValue) !== "";
+    case "isTrue":
+      return Boolean(leftValue) === true;
+    case "isFalse":
+      return Boolean(leftValue) === false;
+  }
+  switch (dataType) {
+    case "string": {
+      const left = String(leftValue ?? "");
+      const right = String(rightValue ?? "");
+      switch (operator) {
+        case "equals":
+          return left === right;
+        case "notEquals":
+          return left !== right;
+        case "contains":
+          return left.includes(right);
+        case "doesNotContain":
+          return !left.includes(right);
+        case "startsWith":
+          return left.startsWith(right);
+        case "doesNotStartWith":
+          return !left.startsWith(right);
+        case "endsWith":
+          return left.endsWith(right);
+        case "doesNotEndWith":
+          return !left.endsWith(right);
+        case "matchesRegex":
+          try {
+            return new RegExp(right).test(left);
+          } catch {
+            return false;
+          }
+        case "doesNotMatchRegex":
+          try {
+            return !new RegExp(right).test(left);
+          } catch {
+            return false;
+          }
+      }
+      break;
+    }
+    case "number": {
+      const left = Number(leftValue);
+      const right = Number(rightValue);
+      if (Number.isNaN(left) || Number.isNaN(right)) return false;
+      switch (operator) {
+        case "equals":
+          return left === right;
+        case "notEquals":
+          return left !== right;
+        case "greaterThan":
+          return left > right;
+        case "lessThan":
+          return left < right;
+        case "greaterThanOrEqual":
+          return left >= right;
+        case "lessThanOrEqual":
+          return left <= right;
+      }
+      break;
+    }
+    case "boolean":
+      break;
+    case "datetime": {
+      const left = new Date(leftValue).getTime();
+      const right = new Date(rightValue).getTime();
+      if (Number.isNaN(left) || Number.isNaN(right)) return false;
+      switch (operator) {
+        case "isBefore":
+          return left < right;
+        case "isAfter":
+          return left > right;
+        case "equals":
+          return left === right;
+      }
+      break;
+    }
+  }
+  console.warn(`[Condition] Unknown operator "${operator}" for data type "${dataType}"`);
+  return false;
+}
+
 // src/plugins/condition/index.tsx
 import { GitBranch } from "lucide-react";
 import { jsx } from "react/jsx-runtime";
@@ -1049,10 +1185,14 @@ var conditionAction = {
   icon: /* @__PURE__ */ jsx(GitBranch, { className: "size-12 text-pink-300", strokeWidth: 1.5 }),
   codeGenerator: `export async function conditionStep(input: {
   condition: boolean;
+  dataType?: string;
+  operator?: string;
+  leftValue?: unknown;
+  rightValue?: unknown;
 }) {
   "use step";
-  
-  // Evaluate condition
+
+  // Evaluate structured condition
   return { condition: input.condition };
 }`
 };
@@ -1156,6 +1296,9 @@ export {
   sanitizeVarName,
   generateWorkflowCode,
   generateWorkflowModule,
+  DATA_TYPE_OPTIONS,
+  OPERATORS,
+  evaluateOperator,
   conditionAction,
   databaseQueryAction,
   httpRequestAction

package/dist/client/index.js

@@ -1,10 +1,12 @@
 "use client";
 import {
+  DATA_TYPE_OPTIONS,
+  OPERATORS,
   conditionAction,
   databaseQueryAction,
   generateWorkflowCode,
   httpRequestAction
-} from "../chunk-MIBRBQIJ.js";
+} from "../chunk-EMCA7GLF.js";
 import {
   cn
 } from "../chunk-5YYA34YV.js";
@@ -1176,6 +1178,166 @@ import { useAtomValue as useAtomValue5, useSetAtom as useSetAtom5 } from "jotai"
 import { HelpCircle as HelpCircle2, Plus as Plus3, Settings as Settings2 } from "lucide-react";
 import { useEffect as useEffect8, useMemo as useMemo4, useState as useState11 } from "react";
 
+// src/client/components/ui/select.tsx
+import { Select as SelectPrimitive } from "radix-ui";
+import { CheckIcon, ChevronDownIcon, ChevronUpIcon } from "lucide-react";
+import { jsx as jsx7, jsxs as jsxs2 } from "react/jsx-runtime";
+function Select({
+  ...props
+}) {
+  return /* @__PURE__ */ jsx7(SelectPrimitive.Root, { "data-slot": "select", ...props });
+}
+function SelectGroup({
+  ...props
+}) {
+  return /* @__PURE__ */ jsx7(SelectPrimitive.Group, { "data-slot": "select-group", ...props });
+}
+function SelectValue({
+  ...props
+}) {
+  return /* @__PURE__ */ jsx7(SelectPrimitive.Value, { "data-slot": "select-value", ...props });
+}
+function SelectTrigger({
+  className,
+  size = "default",
+  children,
+  ...props
+}) {
+  return /* @__PURE__ */ jsxs2(
+    SelectPrimitive.Trigger,
+    {
+      "data-slot": "select-trigger",
+      "data-size": size,
+      className: cn(
+        "border-input data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive bg-transparent hover:bg-accent/50 flex w-fit items-center justify-between gap-2 rounded-md border px-3 py-2 text-sm whitespace-nowrap shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-9 data-[size=sm]:h-8 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className
+      ),
+      ...props,
+      children: [
+        children,
+        /* @__PURE__ */ jsx7(SelectPrimitive.Icon, { asChild: true, children: /* @__PURE__ */ jsx7(ChevronDownIcon, { className: "size-4 opacity-50" }) })
+      ]
+    }
+  );
+}
+function SelectContent({
+  className,
+  children,
+  position = "popper",
+  align = "center",
+  ...props
+}) {
+  return /* @__PURE__ */ jsx7(SelectPrimitive.Portal, { children: /* @__PURE__ */ jsxs2(
+    SelectPrimitive.Content,
+    {
+      "data-slot": "select-content",
+      className: cn(
+        "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-(--radix-select-content-available-height) min-w-[8rem] origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border shadow-md",
+        position === "popper" && "data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
+        className
+      ),
+      position,
+      align,
+      ...props,
+      children: [
+        /* @__PURE__ */ jsx7(SelectScrollUpButton, {}),
+        /* @__PURE__ */ jsx7(
+          SelectPrimitive.Viewport,
+          {
+            className: cn(
+              "p-1",
+              position === "popper" && "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)] scroll-my-1"
+            ),
+            children
+          }
+        ),
+        /* @__PURE__ */ jsx7(SelectScrollDownButton, {})
+      ]
+    }
+  ) });
+}
+function SelectLabel({
+  className,
+  ...props
+}) {
+  return /* @__PURE__ */ jsx7(
+    SelectPrimitive.Label,
+    {
+      "data-slot": "select-label",
+      className: cn("text-muted-foreground px-2 py-1.5 text-xs", className),
+      ...props
+    }
+  );
+}
+function SelectItem({
+  className,
+  children,
+  ...props
+}) {
+  return /* @__PURE__ */ jsxs2(
+    SelectPrimitive.Item,
+    {
+      "data-slot": "select-item",
+      className: cn(
+        "focus:bg-accent focus:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
+        className
+      ),
+      ...props,
+      children: [
+        /* @__PURE__ */ jsx7("span", { className: "absolute right-2 flex size-3.5 items-center justify-center", children: /* @__PURE__ */ jsx7(SelectPrimitive.ItemIndicator, { children: /* @__PURE__ */ jsx7(CheckIcon, { className: "size-4" }) }) }),
+        /* @__PURE__ */ jsx7(SelectPrimitive.ItemText, { children })
+      ]
+    }
+  );
+}
+function SelectSeparator({
+  className,
+  ...props
+}) {
+  return /* @__PURE__ */ jsx7(
+    SelectPrimitive.Separator,
+    {
+      "data-slot": "select-separator",
+      className: cn("bg-border pointer-events-none -mx-1 my-1 h-px", className),
+      ...props
+    }
+  );
+}
+function SelectScrollUpButton({
+  className,
+  ...props
+}) {
+  return /* @__PURE__ */ jsx7(
+    SelectPrimitive.ScrollUpButton,
+    {
+      "data-slot": "select-scroll-up-button",
+      className: cn(
+        "flex cursor-default items-center justify-center py-1",
+        className
+      ),
+      ...props,
+      children: /* @__PURE__ */ jsx7(ChevronUpIcon, { className: "size-4" })
+    }
+  );
+}
+function SelectScrollDownButton({
+  className,
+  ...props
+}) {
+  return /* @__PURE__ */ jsx7(
+    SelectPrimitive.ScrollDownButton,
+    {
+      "data-slot": "select-scroll-down-button",
+      className: cn(
+        "flex cursor-default items-center justify-center py-1",
+        className
+      ),
+      ...props,
+      children: /* @__PURE__ */ jsx7(ChevronDownIcon, { className: "size-4" })
+    }
+  );
+}
+
 // src/client/components/ui/template-badge-input.tsx
 import { useAtom as useAtom2 } from "jotai";
 import { useEffect as useEffect3, useRef as useRef2, useState as useState3 } from "react";
@@ -1185,7 +1347,7 @@ import { useAtom } from "jotai";
 import { Check } from "lucide-react";
 import { useEffect as useEffect2, useRef, useState as useState2 } from "react";
 import { createPortal } from "react-dom";
-import { Fragment, jsx as jsx7, jsxs as jsxs2 } from "react/jsx-runtime";
+import { Fragment, jsx as jsx8, jsxs as jsxs3 } from "react/jsx-runtime";
 var getNodeDisplayName = (node) => {
   if (node.data.label) {
     return node.data.label;
@@ -1404,7 +1566,7 @@ function TemplateAutocomplete({
     left: Math.min(position.left, window.innerWidth - 320)
     // Keep menu (320px wide) within viewport
   };
-  const menuContent = /* @__PURE__ */ jsx7(
+  const menuContent = /* @__PURE__ */ jsx8(
     "div",
     {
       className: "fixed z-[9999] w-80 rounded-lg border bg-popover p-1 text-popover-foreground shadow-md",
@@ -1413,7 +1575,7 @@ function TemplateAutocomplete({
         top: `${adjustedPosition.top}px`,
         left: `${adjustedPosition.left}px`
       },
-      children: /* @__PURE__ */ jsx7("div", { className: "max-h-60 overflow-y-auto", children: filteredOptions.map((option, index) => /* @__PURE__ */ jsxs2(
+      children: /* @__PURE__ */ jsx8("div", { className: "max-h-60 overflow-y-auto", children: filteredOptions.map((option, index) => /* @__PURE__ */ jsxs3(
         "div",
         {
           className: cn(
@@ -1423,17 +1585,17 @@ function TemplateAutocomplete({
           onClick: () => onSelect(option.template),
           onMouseEnter: () => setSelectedIndex(index),
           children: [
-            /* @__PURE__ */ jsxs2("div", { className: "flex-1", children: [
-              /* @__PURE__ */ jsx7("div", { className: "font-medium", children: option.type === "node" ? option.nodeName : /* @__PURE__ */ jsxs2(Fragment, { children: [
-                /* @__PURE__ */ jsxs2("span", { className: "text-muted-foreground", children: [
+            /* @__PURE__ */ jsxs3("div", { className: "flex-1", children: [
+              /* @__PURE__ */ jsx8("div", { className: "font-medium", children: option.type === "node" ? option.nodeName : /* @__PURE__ */ jsxs3(Fragment, { children: [
+                /* @__PURE__ */ jsxs3("span", { className: "text-muted-foreground", children: [
                   option.nodeName,
                   "."
                 ] }),
                 option.field
               ] }) }),
-              option.description && /* @__PURE__ */ jsx7("div", { className: "text-muted-foreground text-xs", children: option.description })
+              option.description && /* @__PURE__ */ jsx8("div", { className: "text-muted-foreground text-xs", children: option.description })
             ] }),
-            index === selectedIndex && /* @__PURE__ */ jsx7(Check, { className: "h-4 w-4" })
+            index === selectedIndex && /* @__PURE__ */ jsx8(Check, { className: "h-4 w-4" })
           ]
         },
         `${option.nodeId}-${option.field || "root"}`
@@ -1444,7 +1606,7 @@ function TemplateAutocomplete({
 }
 
 // src/client/components/ui/template-badge-input.tsx
-import { Fragment as Fragment2, jsx as jsx8, jsxs as jsxs3 } from "react/jsx-runtime";
+import { Fragment as Fragment2, jsx as jsx9, jsxs as jsxs4 } from "react/jsx-runtime";
 function doesNodeExist(template, nodes) {
   const match = template.match(/\{\{@([^:]+):([^}]+)\}\}/);
   if (!match) return false;
@@ -1795,8 +1957,8 @@ function TemplateBadgeInput({
       updateDisplay();
     }
   }, [internalValue, isFocused]);
-  return /* @__PURE__ */ jsxs3(Fragment2, { children: [
-    /* @__PURE__ */ jsx8(
+  return /* @__PURE__ */ jsxs4(Fragment2, { children: [
+    /* @__PURE__ */ jsx9(
       "div",
       {
         className: cn(
@@ -1804,7 +1966,7 @@ function TemplateBadgeInput({
           disabled && "cursor-not-allowed opacity-50",
           className
         ),
-        children: /* @__PURE__ */ jsx8(
+        children: /* @__PURE__ */ jsx9(
           "div",
           {
             className: "w-full outline-none",
@@ -1821,7 +1983,7 @@ function TemplateBadgeInput({
         )
       }
     ),
-    /* @__PURE__ */ jsx8(
+    /* @__PURE__ */ jsx9(
       TemplateAutocomplete,
       {
         currentNodeId: selectedNodeId || void 0,
@@ -1836,193 +1998,88 @@ function TemplateBadgeInput({
 }
 
 // src/plugins/condition/fields.tsx
-import { jsx as jsx9, jsxs as jsxs4 } from "react/jsx-runtime";
+import { jsx as jsx10, jsxs as jsxs5 } from "react/jsx-runtime";
 function ConditionFields({
   config,
   onUpdateConfig,
   disabled
 }) {
-  return /* @__PURE__ */ jsxs4("div", { className: "space-y-2", children: [
-    /* @__PURE__ */ jsx9(Label, { htmlFor: "condition", children: "Condition Expression" }),
-    /* @__PURE__ */ jsx9(
-      TemplateBadgeInput,
-      {
-        disabled,
-        id: "condition",
-        onChange: (value) => onUpdateConfig("condition", value),
-        placeholder: "e.g., 5 > 3, status === 200, {{PreviousNode.value}} > 100",
-        value: config?.condition || ""
-      }
-    ),
-    /* @__PURE__ */ jsx9("p", { className: "text-muted-foreground text-xs", children: "Enter a JavaScript expression that evaluates to true or false. You can use @ to reference previous node outputs." })
+  const dataType = config?.dataType || "string";
+  const operator = config?.operator || OPERATORS[dataType][0].value;
+  const operatorDefs = OPERATORS[dataType];
+  const selectedOp = operatorDefs.find((op) => op.value === operator);
+  const isUnary = selectedOp?.unary ?? false;
+  function handleDataTypeChange(value) {
+    onUpdateConfig("dataType", value);
+    const newOps = OPERATORS[value];
+    if (newOps?.[0]) {
+      onUpdateConfig("operator", newOps[0].value);
+    }
+  }
+  return /* @__PURE__ */ jsxs5("div", { className: "space-y-4", children: [
+    /* @__PURE__ */ jsxs5("div", { className: "space-y-2", children: [
+      /* @__PURE__ */ jsx10(Label, { htmlFor: "leftValue", children: "Value to Test" }),
+      /* @__PURE__ */ jsx10(
+        TemplateBadgeInput,
+        {
+          disabled,
+          id: "leftValue",
+          onChange: (value) => onUpdateConfig("leftValue", value),
+          placeholder: "e.g., {{PreviousNode.status}}",
+          value: config?.leftValue || ""
+        }
+      ),
+      /* @__PURE__ */ jsx10("p", { className: "text-muted-foreground text-xs", children: "Use @ to reference previous node outputs." })
+    ] }),
+    /* @__PURE__ */ jsxs5("div", { className: "space-y-2", children: [
+      /* @__PURE__ */ jsx10(Label, { htmlFor: "dataType", children: "Data Type" }),
+      /* @__PURE__ */ jsxs5(
+        Select,
+        {
+          disabled,
+          onValueChange: handleDataTypeChange,
+          value: dataType,
+          children: [
+            /* @__PURE__ */ jsx10(SelectTrigger, { id: "dataType", children: /* @__PURE__ */ jsx10(SelectValue, { placeholder: "Select data type" }) }),
+            /* @__PURE__ */ jsx10(SelectContent, { children: DATA_TYPE_OPTIONS.map((opt) => /* @__PURE__ */ jsx10(SelectItem, { value: opt.value, children: opt.label }, opt.value)) })
+          ]
+        }
+      )
+    ] }),
+    /* @__PURE__ */ jsxs5("div", { className: "space-y-2", children: [
+      /* @__PURE__ */ jsx10(Label, { htmlFor: "operator", children: "Operator" }),
+      /* @__PURE__ */ jsxs5(
+        Select,
+        {
+          disabled,
+          onValueChange: (value) => onUpdateConfig("operator", value),
+          value: operator,
+          children: [
+            /* @__PURE__ */ jsx10(SelectTrigger, { id: "operator", children: /* @__PURE__ */ jsx10(SelectValue, { placeholder: "Select operator" }) }),
+            /* @__PURE__ */ jsx10(SelectContent, { children: operatorDefs.map((op) => /* @__PURE__ */ jsx10(SelectItem, { value: op.value, children: op.label }, op.value)) })
+          ]
+        }
+      )
+    ] }),
+    !isUnary && /* @__PURE__ */ jsxs5("div", { className: "space-y-2", children: [
+      /* @__PURE__ */ jsx10(Label, { htmlFor: "rightValue", children: "Compare Value" }),
+      /* @__PURE__ */ jsx10(
+        TemplateBadgeInput,
+        {
+          disabled,
+          id: "rightValue",
+          onChange: (value) => onUpdateConfig("rightValue", value),
+          placeholder: "e.g., 200 or {{OtherNode.field}}",
+          value: config?.rightValue || ""
+        }
+      )
+    ] })
   ] });
 }
 
 // src/client/components/workflow/config/schema-builder.tsx
 import { Plus, Trash2 } from "lucide-react";
 import { nanoid } from "nanoid";
-
-// src/client/components/ui/select.tsx
-import { Select as SelectPrimitive } from "radix-ui";
-import { CheckIcon, ChevronDownIcon, ChevronUpIcon } from "lucide-react";
-import { jsx as jsx10, jsxs as jsxs5 } from "react/jsx-runtime";
-function Select({
-  ...props
-}) {
-  return /* @__PURE__ */ jsx10(SelectPrimitive.Root, { "data-slot": "select", ...props });
-}
-function SelectGroup({
-  ...props
-}) {
-  return /* @__PURE__ */ jsx10(SelectPrimitive.Group, { "data-slot": "select-group", ...props });
-}
-function SelectValue({
-  ...props
-}) {
-  return /* @__PURE__ */ jsx10(SelectPrimitive.Value, { "data-slot": "select-value", ...props });
-}
-function SelectTrigger({
-  className,
-  size = "default",
-  children,
-  ...props
-}) {
-  return /* @__PURE__ */ jsxs5(
-    SelectPrimitive.Trigger,
-    {
-      "data-slot": "select-trigger",
-      "data-size": size,
-      className: cn(
-        "border-input data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive bg-transparent hover:bg-accent/50 flex w-fit items-center justify-between gap-2 rounded-md border px-3 py-2 text-sm whitespace-nowrap shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-9 data-[size=sm]:h-8 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
-        className
-      ),
-      ...props,
-      children: [
-        children,
-        /* @__PURE__ */ jsx10(SelectPrimitive.Icon, { asChild: true, children: /* @__PURE__ */ jsx10(ChevronDownIcon, { className: "size-4 opacity-50" }) })
-      ]
-    }
-  );
-}
-function SelectContent({
-  className,
-  children,
-  position = "popper",
-  align = "center",
-  ...props
-}) {
-  return /* @__PURE__ */ jsx10(SelectPrimitive.Portal, { children: /* @__PURE__ */ jsxs5(
-    SelectPrimitive.Content,
-    {
-      "data-slot": "select-content",
-      className: cn(
-        "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-(--radix-select-content-available-height) min-w-[8rem] origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border shadow-md",
-        position === "popper" && "data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
-        className
-      ),
-      position,
-      align,
-      ...props,
-      children: [
-        /* @__PURE__ */ jsx10(SelectScrollUpButton, {}),
-        /* @__PURE__ */ jsx10(
-          SelectPrimitive.Viewport,
-          {
-            className: cn(
-              "p-1",
-              position === "popper" && "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)] scroll-my-1"
-            ),
-            children
-          }
-        ),
-        /* @__PURE__ */ jsx10(SelectScrollDownButton, {})
-      ]
-    }
-  ) });
-}
-function SelectLabel({
-  className,
-  ...props
-}) {
-  return /* @__PURE__ */ jsx10(
-    SelectPrimitive.Label,
-    {
-      "data-slot": "select-label",
-      className: cn("text-muted-foreground px-2 py-1.5 text-xs", className),
-      ...props
-    }
-  );
-}
-function SelectItem({
-  className,
-  children,
-  ...props
-}) {
-  return /* @__PURE__ */ jsxs5(
-    SelectPrimitive.Item,
-    {
-      "data-slot": "select-item",
-      className: cn(
-        "focus:bg-accent focus:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
-        className
-      ),
-      ...props,
-      children: [
-        /* @__PURE__ */ jsx10("span", { className: "absolute right-2 flex size-3.5 items-center justify-center", children: /* @__PURE__ */ jsx10(SelectPrimitive.ItemIndicator, { children: /* @__PURE__ */ jsx10(CheckIcon, { className: "size-4" }) }) }),
-        /* @__PURE__ */ jsx10(SelectPrimitive.ItemText, { children })
-      ]
-    }
-  );
-}
-function SelectSeparator({
-  className,
-  ...props
-}) {
-  return /* @__PURE__ */ jsx10(
-    SelectPrimitive.Separator,
-    {
-      "data-slot": "select-separator",
-      className: cn("bg-border pointer-events-none -mx-1 my-1 h-px", className),
-      ...props
-    }
-  );
-}
-function SelectScrollUpButton({
-  className,
-  ...props
-}) {
-  return /* @__PURE__ */ jsx10(
-    SelectPrimitive.ScrollUpButton,
-    {
-      "data-slot": "select-scroll-up-button",
-      className: cn(
-        "flex cursor-default items-center justify-center py-1",
-        className
-      ),
-      ...props,
-      children: /* @__PURE__ */ jsx10(ChevronUpIcon, { className: "size-4" })
-    }
-  );
-}
-function SelectScrollDownButton({
-  className,
-  ...props
-}) {
-  return /* @__PURE__ */ jsx10(
-    SelectPrimitive.ScrollDownButton,
-    {
-      "data-slot": "select-scroll-down-button",
-      className: cn(
-        "flex cursor-default items-center justify-center py-1",
-        className
-      ),
-      ...props,
-      children: /* @__PURE__ */ jsx10(ChevronDownIcon, { className: "size-4" })
-    }
-  );
-}
-
-// src/client/components/workflow/config/schema-builder.tsx
 import { jsx as jsx11, jsxs as jsxs6 } from "react/jsx-runtime";
 function SchemaBuilder({
   schema,

package/dist/server/api/index.js

@@ -5,13 +5,14 @@ import {
   conditionAction,
   databaseQueryAction,
   escapeForTemplateLiteral,
+  evaluateOperator,
   findTriggerNodes,
   generateWorkflowModule,
   httpRequestAction,
   sanitizeFunctionName,
   sanitizeStepName,
   sanitizeVarName
-} from "../../chunk-MIBRBQIJ.js";
+} from "../../chunk-EMCA7GLF.js";
 import {
   auth,
   getAuthConfig
@@ -157,243 +158,6 @@ import { eq as eq2 } from "drizzle-orm";
 import { readdir, readFile } from "fs/promises";
 import { join } from "path";
 
-// src/server/lib/condition-validator.ts
-var DANGEROUS_PATTERNS = [
-  // Assignment operators
-  /(?<![=!<>])=(?!=)/g,
-  // = but not ==, ===, !=, !==, <=, >=
-  /\+=|-=|\*=|\/=|%=|\^=|\|=|&=/g,
-  // Code execution
-  /\beval\s*\(/gi,
-  /\bFunction\s*\(/gi,
-  /\bimport\s*\(/gi,
-  /\brequire\s*\(/gi,
-  /\bnew\s+\w/gi,
-  // Dangerous globals
-  /\bprocess\b/gi,
-  /\bglobal\b/gi,
-  /\bwindow\b/gi,
-  /\bdocument\b/gi,
-  /\bconstructor\b/gi,
-  /\b__proto__\b/gi,
-  /\bprototype\b/gi,
-  // Control flow that could be exploited
-  /\bwhile\s*\(/gi,
-  /\bfor\s*\(/gi,
-  /\bdo\s*\{/gi,
-  /\bswitch\s*\(/gi,
-  /\btry\s*\{/gi,
-  /\bcatch\s*\(/gi,
-  /\bfinally\s*\{/gi,
-  /\bthrow\s+/gi,
-  /\breturn\s+/gi,
-  // Template literals with expressions (could execute code)
-  /`[^`]*\$\{/g,
-  // Object literals (but NOT bracket property access)
-  /\{\s*\w+\s*:/g,
-  // Increment/decrement
-  /\+\+|--/g,
-  // Bitwise operators (rarely needed, often used in exploits)
-  /<<|>>|>>>/g,
-  // Comma operator (can chain expressions)
-  /,(?![^(]*\))/g,
-  // Comma not inside function call parentheses
-  // Semicolons (statement separator)
-  /;/g
-];
-var ALLOWED_METHODS = /* @__PURE__ */ new Set([
-  "includes",
-  "startsWith",
-  "endsWith",
-  "toString",
-  "toLowerCase",
-  "toUpperCase",
-  "trim",
-  "length"
-  // Actually a property, but accessed like .length
-]);
-var METHOD_CALL_PATTERN = /\.(\w+)\s*\(/g;
-var BRACKET_EXPRESSION_PATTERN = /(\w+)\s*\[([^\]]+)\]/g;
-var VALID_BRACKET_ACCESS_PATTERN = /^__v\d+$/;
-var VALID_BRACKET_CONTENT_PATTERN = /^(\d+|'[^']*'|"[^"]*")$/;
-var WHITESPACE_SPLIT_PATTERN = /\s+/;
-var VARIABLE_TOKEN_PATTERN = /^__v\d+/;
-var STRING_TOKEN_PATTERN = /^['"]/;
-var NUMBER_TOKEN_PATTERN = /^\d/;
-var LITERAL_TOKEN_PATTERN = /^(true|false|null|undefined)$/;
-var OPERATOR_TOKEN_PATTERN = /^(===|!==|==|!=|>=|<=|>|<|&&|\|\||!|\(|\))$/;
-var IDENTIFIER_TOKEN_PATTERN = /^[a-zA-Z_]\w*$/;
-function checkDangerousPatterns(expression) {
-  for (const pattern of DANGEROUS_PATTERNS) {
-    pattern.lastIndex = 0;
-    if (pattern.test(expression)) {
-      pattern.lastIndex = 0;
-      const match = expression.match(pattern);
-      return {
-        valid: false,
-        error: `Condition contains disallowed syntax: "${match?.[0] || "unknown"}"`
-      };
-    }
-  }
-  return { valid: true };
-}
-function checkBracketExpressions(expression) {
-  BRACKET_EXPRESSION_PATTERN.lastIndex = 0;
-  let match = null;
-  while (true) {
-    match = BRACKET_EXPRESSION_PATTERN.exec(expression);
-    if (match === null) {
-      break;
-    }
-    const beforeBracket = match[1];
-    const insideBracket = match[2].trim();
-    if (!VALID_BRACKET_ACCESS_PATTERN.test(beforeBracket)) {
-      return {
-        valid: false,
-        error: `Bracket notation is only allowed on workflow variables. Found: "${beforeBracket}[...]"`
-      };
-    }
-    if (!VALID_BRACKET_CONTENT_PATTERN.test(insideBracket)) {
-      return {
-        valid: false,
-        error: `Invalid bracket content: "[${insideBracket}]". Only numeric indices or string literals are allowed.`
-      };
-    }
-  }
-  const standaloneArrayPattern = /(?:^|[=!<>&|(\s])\s*\[/g;
-  standaloneArrayPattern.lastIndex = 0;
-  if (standaloneArrayPattern.test(expression)) {
-    return {
-      valid: false,
-      error: "Array literals are not allowed in conditions. Use workflow variables instead."
-    };
-  }
-  return { valid: true };
-}
-function checkMethodCalls(expression) {
-  METHOD_CALL_PATTERN.lastIndex = 0;
-  let match = null;
-  while (true) {
-    match = METHOD_CALL_PATTERN.exec(expression);
-    if (match === null) {
-      break;
-    }
-    const methodName = match[1];
-    if (!ALLOWED_METHODS.has(methodName)) {
-      return {
-        valid: false,
-        error: `Method "${methodName}" is not allowed in conditions. Allowed methods: ${Array.from(ALLOWED_METHODS).join(", ")}`
-      };
-    }
-  }
-  return { valid: true };
-}
-function checkParentheses(expression) {
-  let parenDepth = 0;
-  for (const char of expression) {
-    if (char === "(") {
-      parenDepth += 1;
-    }
-    if (char === ")") {
-      parenDepth -= 1;
-    }
-    if (parenDepth < 0) {
-      return { valid: false, error: "Unbalanced parentheses in condition" };
-    }
-  }
-  if (parenDepth !== 0) {
-    return { valid: false, error: "Unbalanced parentheses in condition" };
-  }
-  return { valid: true };
-}
-function isValidToken(token) {
-  if (VARIABLE_TOKEN_PATTERN.test(token)) {
-    return true;
-  }
-  if (STRING_TOKEN_PATTERN.test(token)) {
-    return true;
-  }
-  if (NUMBER_TOKEN_PATTERN.test(token)) {
-    return true;
-  }
-  if (LITERAL_TOKEN_PATTERN.test(token)) {
-    return true;
-  }
-  if (OPERATOR_TOKEN_PATTERN.test(token)) {
-    return true;
-  }
-  return false;
-}
-function checkUnauthorizedIdentifiers(expression) {
-  const tokens = expression.split(WHITESPACE_SPLIT_PATTERN).filter(Boolean);
-  for (const token of tokens) {
-    if (isValidToken(token)) {
-      continue;
-    }
-    if (IDENTIFIER_TOKEN_PATTERN.test(token) && !token.startsWith("__v")) {
-      return {
-        valid: false,
-        error: `Unknown identifier "${token}" in condition. Use template variables like {{@nodeId:Label.field}} to reference workflow data.`
-      };
-    }
-  }
-  return { valid: true };
-}
-function validateConditionExpression(expression) {
-  if (!expression || expression.trim() === "") {
-    return { valid: false, error: "Condition expression cannot be empty" };
-  }
-  const dangerousCheck = checkDangerousPatterns(expression);
-  if (!dangerousCheck.valid) {
-    return dangerousCheck;
-  }
-  const bracketCheck = checkBracketExpressions(expression);
-  if (!bracketCheck.valid) {
-    return bracketCheck;
-  }
-  const methodCheck = checkMethodCalls(expression);
-  if (!methodCheck.valid) {
-    return methodCheck;
-  }
-  const parenCheck = checkParentheses(expression);
-  if (!parenCheck.valid) {
-    return parenCheck;
-  }
-  const identifierCheck = checkUnauthorizedIdentifiers(expression);
-  if (!identifierCheck.valid) {
-    return identifierCheck;
-  }
-  return { valid: true };
-}
-function preValidateConditionExpression(expression) {
-  if (!expression || typeof expression !== "string") {
-    return { valid: false, error: "Condition must be a non-empty string" };
-  }
-  const dangerousKeywords = [
-    "eval",
-    "Function",
-    "import",
-    "require",
-    "process",
-    "global",
-    "window",
-    "document",
-    "__proto__",
-    "constructor",
-    "prototype"
-  ];
-  const lowerExpression = expression.toLowerCase();
-  for (const keyword of dangerousKeywords) {
-    if (lowerExpression.includes(keyword.toLowerCase())) {
-      return {
-        valid: false,
-        error: `Condition contains disallowed keyword: "${keyword}"`
-      };
-    }
-  }
-  return { valid: true };
-}
-
 // src/server/lib/steps/trigger.ts
 import "server-only";
 function executeTrigger(input) {
@@ -445,20 +209,18 @@ var SYSTEM_ACTIONS = {
     stepFunction: "mergeStep"
   }
 };
-function replaceTemplateVariable(match, nodeId, rest, outputs, evalContext, varCounter) {
-  const sanitizedNodeId = nodeId.replace(/[^a-zA-Z0-9]/g, "_");
-  const output = outputs[sanitizedNodeId];
-  if (!output) {
-    console.log("[Condition] Output not found for node:", sanitizedNodeId);
-    return match;
-  }
-  const dotIndex = rest.indexOf(".");
-  let value;
-  if (dotIndex === -1) {
-    value = output.data;
-  } else if (output.data === null || output.data === void 0) {
-    value = void 0;
-  } else {
+function resolveTemplateValue(value, outputs) {
+  if (value === void 0 || value === "") return void 0;
+  const templatePattern = /\{\{@([^:]+):([^}]+)\}\}/g;
+  const matches = [...value.matchAll(templatePattern)];
+  if (matches.length === 0) return value;
+  function extractValue(nodeId, rest) {
+    const sanitizedNodeId = nodeId.replace(/[^a-zA-Z0-9]/g, "_");
+    const output = outputs[sanitizedNodeId];
+    if (!output) return void 0;
+    const dotIndex = rest.indexOf(".");
+    if (dotIndex === -1) return output.data;
+    if (output.data === null || output.data === void 0) return void 0;
     const fieldPath = rest.substring(dotIndex + 1);
     const fields = fieldPath.split(".");
     let current = output.data;
@@ -470,78 +232,37 @@ function replaceTemplateVariable(match, nodeId, rest, outputs, evalContext, varC
       if (current && typeof current === "object") {
         current = current[field];
       } else {
-        console.log("[Condition] Field access failed:", fieldPath);
-        value = void 0;
-        break;
+        return void 0;
       }
     }
-    if (value === void 0 && current !== void 0) {
-      value = current;
-    }
+    return current;
   }
-  const varName = `__v${varCounter.value}`;
-  varCounter.value += 1;
-  evalContext[varName] = value;
-  return varName;
-}
-function evaluateConditionExpression(conditionExpression, outputs) {
-  console.log("[Condition] Original expression:", conditionExpression);
-  if (typeof conditionExpression === "boolean") {
-    return { result: conditionExpression, resolvedValues: {} };
+  if (matches.length === 1 && matches[0][0] === value) {
+    return extractValue(matches[0][1], matches[0][2]);
   }
-  if (typeof conditionExpression === "string") {
-    const preValidation = preValidateConditionExpression(conditionExpression);
-    if (!preValidation.valid) {
-      console.error("[Condition] Pre-validation failed:", preValidation.error);
-      console.error("[Condition] Expression was:", conditionExpression);
-      return { result: false, resolvedValues: {} };
-    }
-    try {
-      const evalContext = {};
-      const resolvedValues = {};
-      let transformedExpression = conditionExpression;
-      const templatePattern = /\{\{@([^:]+):([^}]+)\}\}/g;
-      const varCounter = { value: 0 };
-      transformedExpression = transformedExpression.replace(
-        templatePattern,
-        (match, nodeId, rest) => {
-          const varName = replaceTemplateVariable(
-            match,
-            nodeId,
-            rest,
-            outputs,
-            evalContext,
-            varCounter
-          );
-          resolvedValues[rest] = evalContext[varName];
-          return varName;
-        }
-      );
-      const validation = validateConditionExpression(transformedExpression);
-      if (!validation.valid) {
-        console.error("[Condition] Validation failed:", validation.error);
-        console.error("[Condition] Original expression:", conditionExpression);
-        console.error(
-          "[Condition] Transformed expression:",
-          transformedExpression
-        );
-        return { result: false, resolvedValues };
-      }
-      const varNames = Object.keys(evalContext);
-      const varValues = Object.values(evalContext);
-      const evalFunc = new Function(
-        ...varNames,
-        `return (${transformedExpression});`
-      );
-      const result = evalFunc(...varValues);
-      return { result: Boolean(result), resolvedValues };
-    } catch (error) {
-      console.error("[Condition] Failed to evaluate condition:", error);
-      console.error("[Condition] Expression was:", conditionExpression);
-      return { result: false, resolvedValues: {} };
+  return value.replace(templatePattern, (match, nodeId, rest) => {
+    const val = extractValue(nodeId, rest);
+    if (val === null || val === void 0) return "";
+    if (typeof val === "object") return JSON.stringify(val);
+    return String(val);
+  });
+}
+function evaluateStructuredCondition(config, outputs) {
+  const dataType = config.dataType || "string";
+  const operator = config.operator;
+  const leftRaw = config.leftValue;
+  const rightRaw = config.rightValue;
+  const leftResolved = resolveTemplateValue(leftRaw, outputs);
+  const rightResolved = resolveTemplateValue(rightRaw, outputs);
+  console.log("[Condition] Evaluating:", { dataType, operator, leftResolved, rightResolved });
+  const result = evaluateOperator(dataType, operator, leftResolved, rightResolved);
+  return {
+    result,
+    resolvedValues: {
+      leftValue: leftResolved,
+      rightValue: rightResolved
     }
-  }
-  return { result: Boolean(conditionExpression), resolvedValues: {} };
+  };
 }
 async function executeActionStep(input) {
   const { actionType, config, outputs, context } = input;
@@ -552,14 +273,14 @@ async function executeActionStep(input) {
   if (actionType === "Condition") {
     const systemAction2 = SYSTEM_ACTIONS.Condition;
     const module = await systemAction2.importer();
-    const originalExpression = stepInput.condition;
-    const { result: evaluatedCondition, resolvedValues } = evaluateConditionExpression(originalExpression, outputs);
+    const { result: evaluatedCondition, resolvedValues } = evaluateStructuredCondition(config, outputs);
     console.log("[Condition] Final result:", evaluatedCondition);
     return await module[systemAction2.stepFunction]({
       condition: evaluatedCondition,
-      // Include original expression and resolved values for logging purposes
-      expression: typeof originalExpression === "string" ? originalExpression : void 0,
-      values: Object.keys(resolvedValues).length > 0 ? resolvedValues : void 0,
+      dataType: config.dataType,
+      operator: config.operator,
+      leftValue: resolvedValues.leftValue,
+      rightValue: resolvedValues.rightValue,
       _context: context
     });
   }
@@ -776,16 +497,7 @@ async function executeWorkflow(input) {
           results[nodeId] = result;
           return;
         }
-        const configWithoutCondition = { ...config };
-        const originalCondition = config.condition;
-        configWithoutCondition.condition = void 0;
-        const processedConfig = processTemplates(
-          configWithoutCondition,
-          outputs
-        );
-        if (originalCondition !== void 0) {
-          processedConfig.condition = originalCondition;
-        }
+        const processedConfig = processTemplates(config, outputs);
         const stepContext = {
           executionId,
           nodeId: node.id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-workflow-builder",
-  "version": "0.4.7",
+  "version": "0.5.0",
   "type": "module",
   "description": "Next.js plugin for Workflow Builder",
   "repository": "https://github.com/emulienfou/next-workflow-builder",