@wildwinter/expr-editor 0.4.0 → 0.5.0

package/README.md

@@ -50,6 +50,11 @@ Notable options beyond the basics:
   outcome-style value cell: `valueEnumValues` offers a target's enum values on
   the root literal, and `valueField` makes an empty value render one editable
   "set a value…" pill instead of the condition clause-menu empty state.
+- `flagValue: { target }` — flat compact editor for a `set_flags(@target, …)`
+  value whose target is implied by context: renders only the flag-delta pills
+  plus an "+ flag" chip, hiding the function name and target arg, and seeds the
+  call on the first flag add. Pair with `requireNonEmpty` so the last flag
+  can't be removed.
 - `setText(on)` — the host's raw-text toggle (`</>`); unparseable input falls
   back to raw text automatically.
 

package/dist/index.cjs

@@ -541,7 +541,9 @@ function flagEditor(ctx, path, node, anchor) {
   const call = getNodeAt(ctx.getAst(), callPath);
   const flagsVar = call?.kind === "call" ? call.args[0] : void 0;
   const entry = flagsVar?.kind === "scopedvar" ? lookup(ctx.catalogue, flagsVar.scope, flagsVar.name) : null;
+  const flagCount = call?.kind === "call" ? call.args.filter((a) => a.kind === "flagdelta").length : 0;
   const used = call?.kind === "call" ? call.args.filter((a, i) => a.kind === "flagdelta" && i !== path[path.length - 1]).map((a) => a.name) : [];
+  const canRemove = !(ctx.requireNonEmpty && flagCount <= 1);
   ctx.openPopover(anchor, (close) => {
     const wrap = el("div", "exed-menu");
     wrap.append(el("div", "exed-menu-head", ["Flag set?"]));
@@ -566,6 +568,12 @@ function flagEditor(ctx, path, node, anchor) {
         close();
       } }));
     }
+    if (canRemove) {
+      wrap.append(button("exed-opt danger", "Remove flag", () => {
+        ctx.apply(deleteAt(ctx.getAst(), path));
+        close();
+      }));
+    }
     return wrap;
   });
 }
@@ -1075,8 +1083,12 @@ function mountExpressionEditor(host, opts) {
     closePopover();
     host.replaceChildren();
     const v = validateSource(src, opts.schema, opts.dialect);
-    if (raw || v.unparseable) {
+    const flagCompact = !!opts.flagValue && (opts.mode ?? "tree") === "flat";
+    const astIsFlagCall = v.ast?.kind === "call" && (v.ast.name === "set_flags" || v.ast.name === "check_flags");
+    if (raw || v.unparseable || flagCompact && !!v.ast && !astIsFlagCall) {
       host.append(rawArea());
+    } else if (flagCompact) {
+      host.append(flagValueBody(astIsFlagCall ? v.ast : null));
     } else if (!src.trim() || !v.ast) {
       host.append(opts.valueField ? valueEmptyState() : emptyState());
     } else {
@@ -1126,6 +1138,36 @@ function mountExpressionEditor(host, opts) {
     const ctx = buildCtx(strLit(""));
     return el("div", "exed-flat", [renderNode(strLit(""), [], ctx)]);
   }
+  function parseRef(ref) {
+    const bare = ref.replace(/^@/, "");
+    const dot = bare.indexOf(".");
+    return dot >= 0 ? scopedVar(bare.slice(0, dot), bare.slice(dot + 1)) : scopedVar(defaultScope, bare);
+  }
+  function flagValueBody(call) {
+    const wrap = el("div", "exed-flat exed-flagvalue");
+    if (call) {
+      const ctx = buildCtx(call);
+      call.args.forEach((arg, i) => {
+        if (arg.kind === "flagdelta") wrap.append(renderNode(arg, ["args", i], ctx));
+      });
+      wrap.append(addFlagChip(call));
+    } else {
+      wrap.append(addFlagChip(null));
+    }
+    return wrap;
+  }
+  function addFlagChip(call) {
+    return button("exed-add exed-addflag", "+ flag", () => {
+      if (call) {
+        pendingFocus = ["args", call.args.length];
+        emit(toSrc({ ...call, args: [...call.args, flagDelta("+", "")] }));
+      } else {
+        const seeded = callNode("set_flags", [parseRef(opts.flagValue.target), flagDelta("+", "")]);
+        pendingFocus = ["args", 1];
+        emit(toSrc(seeded));
+      }
+    }, "add a flag");
+  }
   function addTermControl(ctx) {
     const boolean = opts.addTerm === "boolean";
     const ops = boolean ? ["and", "or"] : ARITHMETIC_OPS;