@wildwinter/expr-editor 0.12.3 → 0.13.1

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":
@@ -463,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", ["("]));
@@ -1146,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 } : {}
@@ -1409,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: [] }];
@@ -1505,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, {
@@ -1516,7 +1545,13 @@ function mountEffectsEditor(host, opts) {
       scopeOrder: opts.scopeOrder,
       functions: opts.functions,
       mode: "flat",
+      // Every editor here holds a VALUE (a set's value, an emit's argument), never a condition. Say
+      // so, or emptying one falls back to the condition empty state and an outcome row reads
+      // "always / + Add your first condition" - condition vocabulary, offering clauses where a value
+      // belongs, and no way back to a value. `valueField` renders an editable empty literal instead.
+      valueField: true,
       ...addTerm ? { addTerm } : {},
+      ...selfAdvanceRef ? { selfAdvanceRef } : {},
       ...opts.popoverContainer ? { popoverContainer: opts.popoverContainer } : {},
       text: textMode,
       onChange
@@ -1567,11 +1602,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;
   }
@@ -1685,7 +1727,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,
@@ -1704,6 +1746,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,
@@ -1714,8 +1757,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) {
@@ -1727,9 +1770,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)"]));
@@ -1756,6 +1800,7 @@ exports.addArg = addArg;
 exports.addChildToContainer = addChildToContainer;
 exports.addEmit = addEmit;
 exports.addSet = addSet;
+exports.advancedRef = advancedRef;
 exports.astToTree = astToTree;
 exports.binary = binary;
 exports.boolLit = boolLit;
@@ -1786,6 +1831,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;