@wildwinter/expr-editor 0.14.0 → 0.15.0

package/dist/index.cjs

@@ -98,6 +98,7 @@ var normaliseRef = (ref, defaultScope) => {
   const prefix = `@${defaultScope.toLowerCase()}.`;
   return low.startsWith(prefix) ? `@${low.slice(prefix.length)}` : low;
 };
+var flagChangeSrc = (targetRef, sign, flag) => `set_flags(${targetRef}, ${sign}${flag})`;
 function advancedRef(node, defaultScope) {
   if (node.kind !== "call" || node.name !== "advance" || node.args.length !== 1) return null;
   const arg = node.args[0];
@@ -296,6 +297,7 @@ var propertyTip = (e) => {
   return lines.length ? lines.join("\n") : void 0;
 };
 var refOf = (e, defaultScope) => e.scope === defaultScope ? `@${e.name}` : `@${e.scope}.${e.name}`;
+var targetRefOf = (e) => `@${e.scope}.${e.name}`;
 var displayName = (e, defaultScope) => e.scope === defaultScope ? e.name : `${e.scope}.${e.name}`;
 function filterCatalogue(entries, filter = {}) {
   return entries.filter(
@@ -429,6 +431,14 @@ function textField(opts) {
   setTimeout(() => input.focus(), 0);
   return wrap;
 }
+function propertyMenuBody(actions, close) {
+  const wrap = el("div", "exed-menu");
+  for (const a of actions) wrap.append(button("exed-opt", a.label, () => {
+    a.run();
+    close();
+  }));
+  return wrap;
+}
 
 // src/flat.ts
 var FLAG_FNS = /* @__PURE__ */ new Set(["check_flags", "set_flags"]);
@@ -547,14 +557,7 @@ function attachPropertyMenu(ctx, node, pillEl) {
   const open = ctx.openMenu ?? ctx.openPopover;
   pillEl.addEventListener("contextmenu", (e) => {
     e.preventDefault();
-    open(pillEl, (close) => {
-      const wrap = el("div", "exed-menu");
-      for (const a of actions) wrap.append(button("exed-opt", a.label, () => {
-        a.run();
-        close();
-      }));
-      return wrap;
-    });
+    open(pillEl, (close) => propertyMenuBody(actions, close));
   });
 }
 function isCompoundComparison(node, ctx) {
@@ -1083,7 +1086,7 @@ function seedClause(ctx) {
 function clauseMenu(ctx, anchor, onPick) {
   ctx.openPopover(anchor, (close) => {
     const wrap = el("div", "exed-menu");
-    wrap.append(el("div", "exed-menu-head", ["Add a clause"]));
+    wrap.append(el("div", "exed-menu-head", ["Add a condition"]));
     const add = (label, hint, make, disabled = false) => {
       const b = button(`exed-opt${disabled ? " disabled" : ""}`, "", () => {
         if (disabled) return;
@@ -1382,7 +1385,8 @@ function valueWizard(opts) {
   host.append(body);
   const choices = opts.expectedChoices?.length ? opts.expectedChoices : opts.expectedEnumValues;
   const isStage = opts.expectedType === "quality";
-  let kind = opts.expectedType === "number" ? "number" : opts.expectedType === "string" ? "text" : opts.expectedType === "boolean" ? "bool" : (opts.expectedType === "enum" || opts.expectedType === "quality") && choices?.length ? "enum" : "menu";
+  const flagsReady = opts.expectedType === "flags" && opts.expectedRef !== void 0;
+  let kind = opts.expectedType === "number" ? "number" : opts.expectedType === "string" ? "text" : opts.expectedType === "boolean" ? "bool" : (opts.expectedType === "enum" || opts.expectedType === "quality") && choices?.length ? "enum" : flagsReady ? "flags" : "menu";
   const draw = () => {
     body.replaceChildren();
     const other = () => button("exed-vwiz-other", "\u21A9 a different kind", () => {
@@ -1391,6 +1395,10 @@ function valueWizard(opts) {
     });
     switch (kind) {
       case "menu":
+        if (flagsReady) body.append(optBtn("Set or clear a flag\u2026", () => {
+          kind = "flags";
+          draw();
+        }));
         body.append(optBtn("A property\u2026", () => {
           kind = "property";
           draw();
@@ -1412,6 +1420,22 @@ function valueWizard(opts) {
           draw();
         }));
         break;
+      case "flags": {
+        const flags = opts.expectedFlags ?? [];
+        if (!flags.length) body.append(el("div", "exed-hint", ["This property declares no flag values yet."]));
+        for (const sign of ["+", "-"]) {
+          if (!flags.length) break;
+          body.append(el("div", "exed-vwiz-note", [sign === "+" ? "Set a flag:" : "Clear a flag:"]));
+          const row = el("div", "exed-field-row");
+          for (const f of flags) row.append(optBtn(`${sign} ${f}`, () => opts.onCommit(flagChangeSrc(opts.expectedRef, sign, f))));
+          body.append(row);
+        }
+        body.append(button("exed-vwiz-other", "\u21A9 a different kind (replaces every flag)", () => {
+          kind = "menu";
+          draw();
+        }));
+        break;
+      }
       case "property":
         body.append(propertyPicker(pickCtx, { onPick: (e) => opts.onCommit(refOf(e, opts.defaultScope)) }));
         body.append(other());
@@ -1450,6 +1474,10 @@ function isSelfAdvance(eff, defaultScope, dialect) {
     return false;
   }
 }
+function entryForTarget(catalogue, target, defaultScope) {
+  const want = normaliseRef(target, defaultScope);
+  return catalogue.find((e) => normaliseRef(`@${e.scope}.${e.name}`, defaultScope) === want);
+}
 var clone = (list) => list.map((e) => e.kind === "set" ? { ...e } : { ...e, args: [...e.args] });
 var addSet = (list, target, value) => [...clone(list), { kind: "set", target, value }];
 var addEmit = (list, event) => [...clone(list), { kind: "emit", event, args: [] }];
@@ -1538,6 +1566,11 @@ function mountEffectsEditor(host, opts) {
       // choicesOf, never a raw field: a quality's ladder lives in `stages`, and reading `enumValues`
       // here told the wizard the type and withheld the values.
       ...choicesOf(expected) ? { expectedChoices: choicesOf(expected) } : {},
+      // The flags step needs the target itself: its declared flags, and the
+      // qualified ref its set_flags(...) is written against. choicesOf stays
+      // out of it deliberately - flags are not a pick-one list, and a pinned
+      // test holds it to that.
+      ...expected?.type === "flags" ? { expectedRef: targetRefOf(expected), expectedFlags: expected.enumValues ?? [] } : {},
       onCommit: (src) => {
         onCommit(src);
         close();
@@ -1545,7 +1578,7 @@ function mountEffectsEditor(host, opts) {
       onCancel: close
     }), { container: opts.popoverContainer });
   };
-  const targetType = (target) => opts.catalogue.find((e) => refOf(e, defaultScope) === target)?.type;
+  const targetType = (target) => entryForTarget(opts.catalogue, target, defaultScope)?.type;
   const valueDisplay = (value, onChange, type, selfAdvanceRef) => {
     const sub = el("div", "exed-effect-value");
     const addTerm = type === "number" ? "arithmetic" : type === "boolean" ? "boolean" : void 0;
@@ -1612,10 +1645,10 @@ function mountEffectsEditor(host, opts) {
     const row = el("div", "exed-effect exed-effect-set");
     const targetBtn = button("exed-pill exed-pill-prop", eff.target || "(pick property)", (e) => {
       pickTarget(e.currentTarget, void 0, (entry) => {
-        commit(updateAt(effects, i, { target: refOf(entry, defaultScope), value: initialValueFor(entry, defaultScope).src }));
+        commit(updateAt(effects, i, { target: targetRefOf(entry), value: initialValueFor(entry, defaultScope).src }));
       });
     }, "change the target property");
-    const targetEntry = opts.catalogue.find((e) => refOf(e, defaultScope) === eff.target);
+    const targetEntry = entryForTarget(opts.catalogue, eff.target, defaultScope);
     const tip = propertyTip(targetEntry);
     if (tip) targetBtn.title = tip;
     if (targetEntry && opts.propertyActions) {
@@ -1623,14 +1656,7 @@ function mountEffectsEditor(host, opts) {
       if (actions.length) targetBtn.addEventListener("contextmenu", (e) => {
         e.preventDefault();
         closePopover();
-        popover = openPopover(targetBtn, (close) => {
-          const wrap = el("div", "exed-menu");
-          for (const a of actions) wrap.append(button("exed-opt", a.label, () => {
-            a.run();
-            close();
-          }));
-          return wrap;
-        }, { container: opts.popoverContainer });
+        popover = openPopover(targetBtn, (close) => propertyMenuBody(actions, close), { container: opts.popoverContainer });
       });
     }
     const advances = isSelfAdvance(eff, defaultScope, opts.dialect);
@@ -1726,10 +1752,10 @@ function mountEffectsEditor(host, opts) {
       pickTarget(anchor, void 0, (entry) => {
         const { src, ask } = initialValueFor(entry, defaultScope);
         if (!ask) {
-          commit(addSet(effects, refOf(entry, defaultScope), src));
+          commit(addSet(effects, targetRefOf(entry), src));
           return;
         }
-        openValueWizard(anchor, entry, (chosen) => commit(addSet(effects, refOf(entry, defaultScope), chosen)));
+        openValueWizard(anchor, entry, (chosen) => commit(addSet(effects, targetRefOf(entry), chosen)));
       });
     }));
     if (opts.allowEmit !== false) {
@@ -1796,13 +1822,26 @@ function renderConditionPreview(src, o) {
   const cls = o.propertyActions ? "exed-preview exed-preview-interactive" : "exed-preview";
   return el("div", cls, [exprPills(src, o)]);
 }
+function targetPill(ref, o) {
+  const pill2 = el("span", "exed-pill exed-pill-prop", [ref || "(property)"]);
+  const entry = o.catalogue.find((e) => refOf(e, o.dialect.defaultScope) === ref);
+  if (!entry) return pill2;
+  const tip = propertyTip(entry);
+  if (tip) pill2.title = tip;
+  const actions = o.propertyActions?.({ scope: entry.scope, name: entry.name }) ?? [];
+  if (actions.length) pill2.addEventListener("contextmenu", (e) => {
+    e.preventDefault();
+    openPopover(pill2, (close) => propertyMenuBody(actions, close), { container: o.popoverContainer });
+  });
+  return pill2;
+}
 function renderEffectsPreview(effects, o) {
-  const wrap = el("div", "exed-preview exed-preview-effects");
+  const wrap = el("div", `exed-preview exed-preview-effects${o.propertyActions ? " exed-preview-interactive" : ""}`);
   for (const eff of effects) {
     const row = el("div", "exed-preview-eff");
     if (eff.kind === "set") {
       const advances = isSelfAdvance(eff, o.dialect.defaultScope, o.dialect);
-      row.append(el("span", "exed-pill exed-pill-prop", [eff.target || "(property)"]));
+      row.append(targetPill(eff.target, o));
       if (!advances) row.append(el("span", "exed-effect-eq", ["="]));
       row.append(exprPills(eff.value, o, advances ? eff.target : void 0));
     } else {
@@ -1845,6 +1884,7 @@ exports.filterCatalogue = filterCatalogue;
 exports.findChoicePeer = findChoicePeer;
 exports.findEnumPeer = findEnumPeer;
 exports.firstEmptyLeafPath = firstEmptyLeafPath;
+exports.flagChangeSrc = flagChangeSrc;
 exports.flagDelta = flagDelta;
 exports.flipContainerOp = flipContainerOp;
 exports.formatNumber = formatNumber;
@@ -1882,6 +1922,7 @@ exports.seedValueSrc = seedValueSrc;
 exports.setArgAt = setArgAt;
 exports.setNodeAt = setNodeAt;
 exports.strLit = strLit;
+exports.targetRefOf = targetRefOf;
 exports.toggleContainerNot = toggleContainerNot;
 exports.toggleNotAt = toggleNotAt;
 exports.updateAt = updateAt;