@wildwinter/expr-editor 0.3.0 → 0.5.0

package/README.md

@@ -43,6 +43,18 @@ Notable options beyond the basics:
   `document.body`). Pass a container inside a focus-trapping dialog (Radix,
   etc.) so opening a pill's popover counts as "inside" that layer and does not
   dismiss the dialog; the popover is then positioned relative to that container.
+- `requireNonEmpty` — block a delete that would empty the whole expression
+  (single-value fields that must always hold a term). Conditions leave it off
+  (an empty condition is the valid "always" state).
+- `valueEnumValues` + `valueField` — flat single-value editing for an
+  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

@@ -490,11 +490,14 @@ function numberEditor(ctx, path, value, anchor) {
 function stringEditor(ctx, path, node, anchor) {
   const peer = findEnumPeer(ctx.getAst(), path);
   const enumEntry = peer ? lookup(ctx.catalogue, peer.scope, peer.name) : null;
+  const rootValueEnums = path.length === 0 && ctx.valueEnumValues?.length ? ctx.valueEnumValues : null;
+  const enumValues = enumEntry?.enumValues?.length ? enumEntry.enumValues : rootValueEnums;
+  const enumHeadLabel = enumEntry ? `${displayName(enumEntry, ctx.defaultScope)} value` : "Value";
   ctx.openPopover(anchor, (close) => {
-    if (enumEntry?.enumValues?.length) {
+    if (enumValues?.length) {
       const wrap = el("div", "exed-menu");
-      wrap.append(el("div", "exed-menu-head", [`${displayName(enumEntry, ctx.defaultScope)} value`]));
-      for (const v of enumEntry.enumValues) {
+      wrap.append(el("div", "exed-menu-head", [enumHeadLabel]));
+      for (const v of enumValues) {
         wrap.append(button(`exed-opt${v === node.value ? " sel" : ""}`, v, () => {
           replace(ctx, path, strLit(v));
           close();
@@ -538,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?"]));
@@ -563,9 +568,16 @@ 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;
   });
 }
+var canDelete = (ctx, path) => !(ctx.requireNonEmpty && path.length === 0);
 function callEditor(ctx, path, node, anchor) {
   ctx.openPopover(anchor, (close) => {
     const wrap = el("div", "exed-menu");
@@ -577,10 +589,12 @@ function callEditor(ctx, path, node, anchor) {
         close();
       }));
     }
-    wrap.append(button("exed-opt danger", "Delete", () => {
-      ctx.apply(deleteAt(ctx.getAst(), path));
-      close();
-    }));
+    if (canDelete(ctx, path)) {
+      wrap.append(button("exed-opt danger", "Delete", () => {
+        ctx.apply(deleteAt(ctx.getAst(), path));
+        close();
+      }));
+    }
     return wrap;
   });
 }
@@ -591,10 +605,10 @@ function variableEditor(ctx, path, node, anchor) {
       replace(ctx, path, scopedVar(entry.scope, entry.name));
       close();
     },
-    footer: button("exed-opt danger", "Delete", () => {
+    ...canDelete(ctx, path) ? { footer: button("exed-opt danger", "Delete", () => {
       ctx.apply(deleteAt(ctx.getAst(), path));
       close();
-    })
+    }) } : {}
   }));
 }
 function propertyPicker(ctx, opts) {
@@ -1059,6 +1073,8 @@ function mountExpressionEditor(host, opts) {
       requestFocus: (p) => {
         pendingFocus = p;
       },
+      ...opts.requireNonEmpty ? { requireNonEmpty: true } : {},
+      ...opts.valueEnumValues ? { valueEnumValues: opts.valueEnumValues } : {},
       ...opts.pickNode ? { pickNode: opts.pickNode } : {},
       ...opts.nodeLabel ? { nodeLabel: opts.nodeLabel } : {}
     };
@@ -1067,10 +1083,14 @@ 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(emptyState());
+      host.append(opts.valueField ? valueEmptyState() : emptyState());
     } else {
       const ctx = buildCtx(v.ast);
       const body = el("div", "exed-body");
@@ -1114,6 +1134,40 @@ function mountExpressionEditor(host, opts) {
     }));
     return wrap;
   }
+  function valueEmptyState() {
+    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;