@wildwinter/expr-editor 0.3.0 → 0.5.0

package/dist/index.d.cts

@@ -224,6 +224,14 @@ interface EditCtx {
      *  next render — used by insert-then-refine templates so the author lands
      *  straight in the first unfilled slot instead of chasing the error ring. */
     requestFocus?(path: AstPath): void;
+    /** When true, a delete that would empty the whole expression is blocked (the
+     *  Delete affordance is withheld). Used by single-value fields that must
+     *  always hold at least one term; conditions leave it false (empty = always). */
+    requireNonEmpty?: boolean;
+    /** Enum values offered when editing the single root literal of a value field
+     *  (an enum-typed outcome target). Lets the string editor show an enum picker
+     *  even without a comparison peer. No effect on non-root literals. */
+    valueEnumValues?: string[];
 }
 
 interface ExpressionEditorOptions {
@@ -258,6 +266,25 @@ interface ExpressionEditorOptions {
      *  container inside a focus-trapping dialog (Radix, etc.) so opening a pill's
      *  popover does not dismiss the surrounding dialog. */
     popoverContainer?: HTMLElement;
+    /** Block a delete that would empty the whole expression (single-value fields
+     *  that must always hold a term). Conditions leave this off (empty = always). */
+    requireNonEmpty?: boolean;
+    /** Enum values for the single root literal of a value field (an enum-typed
+     *  target): the literal editor then offers them as a picker. Flat mode only. */
+    valueEnumValues?: string[];
+    /** Flat single-value field: an empty value renders one editable "set a value…"
+     *  placeholder pill (a root string literal) rather than the condition
+     *  clause-menu empty state. Pairs with mode:"flat". */
+    valueField?: boolean;
+    /** Flat compact editor for a `set_flags(@target, +a, -b)` value whose target is
+     *  implied by context (an outcome row's target column). Renders only the
+     *  flag-delta pills plus an "+ flag" chip, hiding the function name and target
+     *  arg. `target` is the name-form ref of the flags property (e.g. "@quests");
+     *  it seeds the call on the first flag add. Pairs with mode:"flat", and set
+     *  requireNonEmpty so the last flag can't be removed. */
+    flagValue?: {
+        target: string;
+    };
     /** Emitted on every edit (name-form; "" when cleared). */
     onChange: (src: string) => void;
     /** Notified when the author starts (true) / stops (false) editing inside a popover

package/dist/index.d.ts

@@ -224,6 +224,14 @@ interface EditCtx {
      *  next render — used by insert-then-refine templates so the author lands
      *  straight in the first unfilled slot instead of chasing the error ring. */
     requestFocus?(path: AstPath): void;
+    /** When true, a delete that would empty the whole expression is blocked (the
+     *  Delete affordance is withheld). Used by single-value fields that must
+     *  always hold at least one term; conditions leave it false (empty = always). */
+    requireNonEmpty?: boolean;
+    /** Enum values offered when editing the single root literal of a value field
+     *  (an enum-typed outcome target). Lets the string editor show an enum picker
+     *  even without a comparison peer. No effect on non-root literals. */
+    valueEnumValues?: string[];
 }
 
 interface ExpressionEditorOptions {
@@ -258,6 +266,25 @@ interface ExpressionEditorOptions {
      *  container inside a focus-trapping dialog (Radix, etc.) so opening a pill's
      *  popover does not dismiss the surrounding dialog. */
     popoverContainer?: HTMLElement;
+    /** Block a delete that would empty the whole expression (single-value fields
+     *  that must always hold a term). Conditions leave this off (empty = always). */
+    requireNonEmpty?: boolean;
+    /** Enum values for the single root literal of a value field (an enum-typed
+     *  target): the literal editor then offers them as a picker. Flat mode only. */
+    valueEnumValues?: string[];
+    /** Flat single-value field: an empty value renders one editable "set a value…"
+     *  placeholder pill (a root string literal) rather than the condition
+     *  clause-menu empty state. Pairs with mode:"flat". */
+    valueField?: boolean;
+    /** Flat compact editor for a `set_flags(@target, +a, -b)` value whose target is
+     *  implied by context (an outcome row's target column). Renders only the
+     *  flag-delta pills plus an "+ flag" chip, hiding the function name and target
+     *  arg. `target` is the name-form ref of the flags property (e.g. "@quests");
+     *  it seeds the call on the first flag add. Pairs with mode:"flat", and set
+     *  requireNonEmpty so the last flag can't be removed. */
+    flagValue?: {
+        target: string;
+    };
     /** Emitted on every edit (name-form; "" when cleared). */
     onChange: (src: string) => void;
     /** Notified when the author starts (true) / stops (false) editing inside a popover

package/dist/index.js

@@ -488,11 +488,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();
@@ -536,7 +539,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?"]));
@@ -561,9 +566,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");
@@ -575,10 +587,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;
   });
 }
@@ -589,10 +603,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) {
@@ -1057,6 +1071,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 } : {}
     };
@@ -1065,10 +1081,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");
@@ -1112,6 +1132,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;