@wildwinter/expr-editor 0.12.1 → 0.12.3

package/dist/index.cjs

@@ -84,14 +84,15 @@ function toggleNotAt(ast, path) {
   }
   return wrapInNotAt(ast, path);
 }
-function findEnumPeer(ast, path) {
+function findChoicePeer(ast, path) {
   const last = path[path.length - 1];
   if (last !== "left" && last !== "right") return null;
   const parent = getNodeAt(ast, path.slice(0, -1));
-  if (parent?.kind !== "binary" || parent.op !== "==" && parent.op !== "!=") return null;
+  if (parent?.kind !== "binary" || !isComparisonOp(parent.op)) return null;
   const other = last === "left" ? parent.right : parent.left;
   return other.kind === "scopedvar" ? { scope: other.scope, name: other.name } : null;
 }
+var findEnumPeer = findChoicePeer;
 function firstEmptyLeafPath(node, base = []) {
   switch (node.kind) {
     case "string":
@@ -220,6 +221,22 @@ var BINARY_LABEL = {
   "/": "\xF7"
 };
 var UNARY_LABEL = { not: "NOT", neg: "\u2212" };
+var OP_WORD = {
+  "==": "equals",
+  "!=": "not equal to",
+  ">": "greater than",
+  ">=": "at least",
+  "<": "less than",
+  "<=": "at most",
+  and: "and",
+  or: "or",
+  "+": "plus",
+  "-": "minus",
+  "*": "times",
+  "/": "divided by",
+  not: "not",
+  neg: "negative"
+};
 var COMPARISON_OPS = ["==", "!=", ">", ">=", "<", "<="];
 var ARITHMETIC_OPS = ["+", "-", "*", "/"];
 var COMPARABLE_TYPES = ["boolean", "number", "string", "enum", "quality"];
@@ -405,20 +422,6 @@ function pill(kind, label, onClick, opts = {}) {
   if (opts.path) b.dataset["exedPath"] = opts.path.join("/");
   return b;
 }
-var OP_ARIA = {
-  "==": "equals",
-  "!=": "not equal to",
-  ">": "greater than",
-  ">=": "at least",
-  "<": "less than",
-  "<=": "at most",
-  "and": "and",
-  "or": "or",
-  "+": "plus",
-  "-": "minus",
-  "*": "times",
-  "/": "divided by"
-};
 var issueText = (ctx, path) => {
   const list = issuesAt(ctx.byPath, path);
   return list.length ? list.map((i) => i.message).join("; ") : void 0;
@@ -472,7 +475,7 @@ function renderNode(node, path, ctx, parentOp, side) {
     }
     case "unary": {
       const row = el("span", "exed-unary");
-      row.append(pill("op", UNARY_LABEL[node.op], () => ctx.apply(deleteOrUnwrapNot(ctx, path, node)), { title: "remove", aria: `${OP_ARIA[node.op] ?? node.op} (click to remove)` }));
+      row.append(pill("op", UNARY_LABEL[node.op], () => ctx.apply(deleteOrUnwrapNot(ctx, path, node)), { title: "remove", aria: `${OP_WORD[node.op]} (click to remove)` }));
       row.append(renderNode(node.operand, [...path, "operand"], ctx));
       return row;
     }
@@ -484,7 +487,7 @@ function renderNode(node, path, ctx, parentOp, side) {
       const swap = opSwapGroup(node.op);
       const opPill = pill("op", BINARY_LABEL[node.op], (b) => {
         if (swap) operatorEditor(ctx, path, node.op, swap, b);
-      }, { title: swap ? "swap operator" : void 0, aria: OP_ARIA[node.op] ?? node.op });
+      }, { title: swap ? "swap operator" : void 0, aria: OP_WORD[node.op] });
       if (!swap) opPill.classList.add("exed-op-structural");
       row.append(opPill);
       row.append(renderNode(node.right, [...path, "right"], ctx, node.op, "right"));
@@ -561,7 +564,7 @@ function numberEditor(ctx, path, value, anchor) {
   }));
 }
 function stringEditor(ctx, path, node, anchor) {
-  const peer = findEnumPeer(ctx.getAst(), path);
+  const peer = findChoicePeer(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 peerChoices = choicesOf(enumEntry);
@@ -595,12 +598,14 @@ function operatorEditor(ctx, path, current, group, anchor) {
     const wrap = el("div", "exed-menu");
     wrap.append(el("div", "exed-menu-head", ["Operator"]));
     for (const op of group) {
-      wrap.append(button(`exed-opt${op === current ? " sel" : ""}`, `${BINARY_LABEL[op]}  ${op}`, () => {
+      const row = button(`exed-opt exed-opt-op${op === current ? " sel" : ""}`, "", () => {
         const node = ctx.getAst();
         const cur = setNodeAt(node, path, { ...getBinary(ctx, path), op });
         ctx.apply(cur);
         close();
-      }));
+      });
+      row.append(el("span", "exed-opt-name", [BINARY_LABEL[op]]), el("span", "exed-opt-purpose", [OP_WORD[op]]));
+      wrap.append(row);
     }
     return wrap;
   });
@@ -716,17 +721,9 @@ function propertyPicker(ctx, opts) {
 }
 
 // src/clausewizard.ts
-var OP_WORD = {
-  "==": "equals",
-  "!=": "not equal to",
-  ">": "greater than",
-  ">=": "at least",
-  "<": "less than",
-  "<=": "at most"
-};
 var opButton = (o, onClick) => {
-  const b = button("exed-opt", "", onClick);
-  b.append(el("span", "exed-opt-name", [BINARY_LABEL[o]]), el("span", "exed-opt-purpose", [OP_WORD[o] ?? ""]));
+  const b = button("exed-opt exed-opt-op", "", onClick);
+  b.append(el("span", "exed-opt-name", [BINARY_LABEL[o]]), el("span", "exed-opt-purpose", [OP_WORD[o]]));
   return b;
 };
 function header(host, title, back, cancel) {
@@ -1753,6 +1750,7 @@ exports.BINARY_LABEL = BINARY_LABEL;
 exports.COMPARABLE_TYPES = COMPARABLE_TYPES;
 exports.COMPARISON_OPS = COMPARISON_OPS;
 exports.EQUALITY_OPS = EQUALITY_OPS;
+exports.OP_WORD = OP_WORD;
 exports.UNARY_LABEL = UNARY_LABEL;
 exports.addArg = addArg;
 exports.addChildToContainer = addChildToContainer;
@@ -1768,6 +1766,7 @@ exports.comparisonOpsFor = comparisonOpsFor;
 exports.deleteAt = deleteAt;
 exports.displayName = displayName;
 exports.filterCatalogue = filterCatalogue;
+exports.findChoicePeer = findChoicePeer;
 exports.findEnumPeer = findEnumPeer;
 exports.firstEmptyLeafPath = firstEmptyLeafPath;
 exports.flagDelta = flagDelta;