@wildwinter/expr-editor 0.12.2 → 0.13.0

package/dist/index.cjs

@@ -93,6 +93,16 @@ function findChoicePeer(ast, path) {
   return other.kind === "scopedvar" ? { scope: other.scope, name: other.name } : null;
 }
 var findEnumPeer = findChoicePeer;
+var normaliseRef = (ref, defaultScope) => {
+  const low = ref.toLowerCase();
+  const prefix = `@${defaultScope.toLowerCase()}.`;
+  return low.startsWith(prefix) ? `@${low.slice(prefix.length)}` : low;
+};
+function advancedRef(node, defaultScope) {
+  if (node.kind !== "call" || node.name !== "advance" || node.args.length !== 1) return null;
+  const arg = node.args[0];
+  return arg.kind === "scopedvar" ? normaliseRef(`@${arg.scope}.${arg.name}`, defaultScope) : null;
+}
 function firstEmptyLeafPath(node, base = []) {
   switch (node.kind) {
     case "string":
@@ -221,6 +231,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"];
@@ -406,20 +432,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;
@@ -461,6 +473,16 @@ function renderNode(node, path, ctx, parentOp, side) {
         for (let i = 1; i < node.args.length; i++) row2.append(renderNode(node.args[i], [...path, "args", i], ctx));
         return row2;
       }
+      if (ctx.selfAdvanceRef && advancedRef(node, ctx.defaultScope) === normaliseRef(ctx.selfAdvanceRef, ctx.defaultScope)) {
+        const row2 = el("span", "exed-call exed-call-advance");
+        row2.append(pill(
+          "advance",
+          "advances",
+          (b) => callEditor(ctx, path, node, b),
+          { issue, title: "advance one stage", aria: "advances one stage" }
+        ));
+        return row2;
+      }
       const row = el("span", "exed-call");
       row.append(pill("func", node.name, (b) => callEditor(ctx, path, node, b), { issue }));
       row.append(el("span", "exed-paren", ["("]));
@@ -473,7 +495,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;
     }
@@ -485,7 +507,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"));
@@ -596,12 +618,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;
   });
@@ -717,17 +741,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) {
@@ -1150,6 +1166,7 @@ function mountExpressionEditor(host, opts) {
       },
       ...opts.requireNonEmpty ? { requireNonEmpty: true } : {},
       ...opts.valueEnumValues ? { valueEnumValues: opts.valueEnumValues } : {},
+      ...opts.selfAdvanceRef ? { selfAdvanceRef: opts.selfAdvanceRef } : {},
       ...opts.propertyActions ? { propertyActions: opts.propertyActions } : {},
       ...opts.pickNode ? { pickNode: opts.pickNode } : {},
       ...opts.nodeLabel ? { nodeLabel: opts.nodeLabel } : {}
@@ -1413,6 +1430,14 @@ function valueWizard(opts) {
 }
 
 // src/effects.ts
+function isSelfAdvance(eff, defaultScope, dialect) {
+  if (eff.kind !== "set" || !eff.target) return false;
+  try {
+    return advancedRef(expr.parse(eff.value, dialect), defaultScope) === normaliseRef(eff.target, defaultScope);
+  } catch {
+    return false;
+  }
+}
 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: [] }];
@@ -1509,7 +1534,7 @@ function mountEffectsEditor(host, opts) {
     }), { container: opts.popoverContainer });
   };
   const targetType = (target) => opts.catalogue.find((e) => refOf(e, defaultScope) === target)?.type;
-  const valueDisplay = (value, onChange, type) => {
+  const valueDisplay = (value, onChange, type, selfAdvanceRef) => {
     const sub = el("div", "exed-effect-value");
     const addTerm = type === "number" ? "arithmetic" : type === "boolean" ? "boolean" : void 0;
     inner.push(mountExpressionEditor(sub, {
@@ -1521,6 +1546,7 @@ function mountEffectsEditor(host, opts) {
       functions: opts.functions,
       mode: "flat",
       ...addTerm ? { addTerm } : {},
+      ...selfAdvanceRef ? { selfAdvanceRef } : {},
       ...opts.popoverContainer ? { popoverContainer: opts.popoverContainer } : {},
       text: textMode,
       onChange
@@ -1571,11 +1597,18 @@ function mountEffectsEditor(host, opts) {
         commit(updateAt(effects, i, { target: refOf(entry, defaultScope), value: initialValueFor(entry, defaultScope).src }));
       });
     }, "change the target property");
-    row.append(targetBtn, el("span", "exed-effect-eq", ["="]));
+    const advances = isSelfAdvance(eff, defaultScope, opts.dialect);
+    row.append(targetBtn);
+    if (!advances) row.append(el("span", "exed-effect-eq", ["="]));
     row.append(valueDisplay(eff.value, (src) => {
-      effects = updateAt(effects, i, { value: src });
+      const next = updateAt(effects, i, { value: src });
+      if (isSelfAdvance(next[i], defaultScope, opts.dialect) !== advances) {
+        commit(next);
+        return;
+      }
+      effects = next;
       opts.onChange(effects);
-    }, targetType(eff.target)));
+    }, targetType(eff.target), advances ? eff.target : void 0));
     row.append(rowActions2(i));
     return row;
   }
@@ -1689,7 +1722,7 @@ function mountEffectsEditor(host, opts) {
 }
 
 // src/preview.ts
-function frozenCtx(src, o) {
+function frozenCtx(src, o, selfAdvanceRef) {
   const v = validateSource(src, o.schema, o.dialect);
   const ctx = {
     schema: o.schema,
@@ -1708,6 +1741,7 @@ function frozenCtx(src, o) {
     pickNode: () => {
     },
     // enables labelled node pills; never fires (preview is read-only)
+    ...selfAdvanceRef ? { selfAdvanceRef } : {},
     ...o.nodeLabel ? { nodeLabel: o.nodeLabel } : {},
     ...o.propertyActions ? {
       propertyActions: o.propertyActions,
@@ -1718,8 +1752,8 @@ function frozenCtx(src, o) {
   };
   return { ctx, ast: v.ast };
 }
-function exprPills(src, o) {
-  const { ctx, ast } = frozenCtx(src, o);
+function exprPills(src, o, selfAdvanceRef) {
+  const { ctx, ast } = frozenCtx(src, o, selfAdvanceRef);
   return ast ? renderNode(ast, [], ctx) : el("span", "exed-preview-raw", [src]);
 }
 function renderConditionPreview(src, o) {
@@ -1731,9 +1765,10 @@ function renderEffectsPreview(effects, o) {
   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(el("span", "exed-effect-eq", ["="]));
-      row.append(exprPills(eff.value, o));
+      if (!advances) row.append(el("span", "exed-effect-eq", ["="]));
+      row.append(exprPills(eff.value, o, advances ? eff.target : void 0));
     } else {
       row.append(el("span", "exed-effect-kw", ["emit"]));
       row.append(el("span", "exed-pill exed-pill-event", [eff.event ? `"${eff.event}"` : "(name)"]));
@@ -1754,11 +1789,13 @@ 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;
 exports.addEmit = addEmit;
 exports.addSet = addSet;
+exports.advancedRef = advancedRef;
 exports.astToTree = astToTree;
 exports.binary = binary;
 exports.boolLit = boolLit;
@@ -1789,6 +1826,7 @@ exports.mountExpressionEditor = mountExpressionEditor;
 exports.moveAt = moveAt;
 exports.moveChildInContainer = moveChildInContainer;
 exports.needsParens = needsParens;
+exports.normaliseRef = normaliseRef;
 exports.notNode = notNode;
 exports.numLit = numLit;
 exports.opSwapGroup = opSwapGroup;