@wildwinter/expr-editor 0.10.3 → 0.12.0

package/README.md

@@ -35,6 +35,20 @@ Notable options beyond the basics:
   multi-step flow (e.g. tag → operator → threshold) with no editor changes.
   Templates without a wizard insert-then-refine: the editor auto-opens the
   first unfilled slot of the inserted clause.
+- **Qualities** (the `quality` property type) need nothing from the host beyond a
+  catalogue entry carrying `stages` — the ladder, in order. The editor then offers
+  the property in a comparison clause, gives it the **ordering** operators (a
+  ladder exists for "at or past a stage"), lists its stages wherever a value is
+  picked, labels that list "stage", and seeds an outcome on it with
+  `advance(@ref)` — the form that keeps a story insertion-safe, because it names
+  no destination. That seed is the same on both paths (adding an effect and
+  re-pointing one), via `initialValueFor`, and a quality skips the value wizard
+  entirely: there is no question left worth asking. A host still passing a
+  ladder through `enumValues` keeps its value picker, but not the ordering
+  affordances.
+- `valueWizard`'s `expectedChoices` supersedes `expectedEnumValues` — one
+  channel for "the target's closed set of values", filled with `choicesOf(entry)`
+  so a quality's ladder arrives with its type. The old name still works.
 - `onEditingChange(editing)` — fires as popover micro-editors open/close, so the
   host can suppress its own validation display mid-edit.
 - `messages: false` — hide the editor's internal validation list when the host

package/dist/index.cjs

@@ -222,6 +222,10 @@ var BINARY_LABEL = {
 var UNARY_LABEL = { not: "NOT", neg: "\u2212" };
 var COMPARISON_OPS = ["==", "!=", ">", ">=", "<", "<="];
 var ARITHMETIC_OPS = ["+", "-", "*", "/"];
+var COMPARABLE_TYPES = ["boolean", "number", "string", "enum", "quality"];
+var comparisonOpsFor = (t) => t === "number" || t === "quality" ? COMPARISON_OPS : EQUALITY_OPS;
+var EQUALITY_OPS = ["==", "!="];
+var rhsTypesFor = (t) => t === "number" ? ["number"] : t === "boolean" ? ["boolean"] : t === "quality" ? ["quality"] : t === "enum" ? ["enum", "string"] : ["string", "enum"];
 function opSwapGroup(op) {
   if (COMPARISON_OPS.includes(op)) return COMPARISON_OPS;
   if (ARITHMETIC_OPS.includes(op)) return ARITHMETIC_OPS;
@@ -251,6 +255,12 @@ function formatNumber(n) {
 }
 
 // src/schema.ts
+var choicesOf = (e) => {
+  if (!e) return void 0;
+  if (e.type === "quality") return e.stages?.length ? e.stages : e.enumValues;
+  if (e.type === "enum") return e.enumValues;
+  return void 0;
+};
 var refOf = (e, defaultScope) => e.scope === defaultScope ? `@${e.name}` : `@${e.scope}.${e.name}`;
 var displayName = (e, defaultScope) => e.scope === defaultScope ? e.name : `${e.scope}.${e.name}`;
 function filterCatalogue(entries, filter = {}) {
@@ -554,8 +564,9 @@ 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";
+  const peerChoices = choicesOf(enumEntry);
+  const enumValues = peerChoices?.length ? peerChoices : rootValueEnums;
+  const enumHeadLabel = enumEntry ? `${displayName(enumEntry, ctx.defaultScope)} ${enumEntry.type === "quality" ? "stage" : "value"}` : "Value";
   ctx.openPopover(anchor, (close) => {
     if (enumValues?.length) {
       const wrap = el("div", "exed-menu");
@@ -705,7 +716,6 @@ function propertyPicker(ctx, opts) {
 }
 
 // src/clausewizard.ts
-var EQUALITY = ["==", "!="];
 var OP_WORD = {
   "==": "equals",
   "!=": "not equal to",
@@ -719,8 +729,6 @@ var opButton = (o, onClick) => {
   b.append(el("span", "exed-opt-name", [BINARY_LABEL[o]]), el("span", "exed-opt-purpose", [OP_WORD[o] ?? ""]));
   return b;
 };
-var opsForType = (t) => t === "number" ? COMPARISON_OPS : EQUALITY;
-var rhsTypesFor = (t) => t === "number" ? ["number"] : t === "boolean" ? ["boolean"] : t === "enum" ? ["enum", "string"] : ["string", "enum"];
 function header(host, title, back, cancel) {
   const h = el("div", "exed-vwiz-head");
   if (back) h.append(button("exed-vwiz-back", "\u2190", back, "Back"));
@@ -751,8 +759,8 @@ function valueStep(host, w, lhs, op, back, cancel, commit) {
       const row = el("div", "exed-field-row");
       row.append(button("exed-opt", "true", () => done(boolLit(true))), button("exed-opt", "false", () => done(boolLit(false))));
       body.append(row);
-    } else if (lhs.type === "enum" && lhs.enumValues?.length) {
-      for (const v of lhs.enumValues) body.append(button("exed-opt", v, () => done(strLit(v))));
+    } else if (choicesOf(lhs)?.length) {
+      for (const v of choicesOf(lhs)) body.append(button("exed-opt", v, () => done(strLit(v))));
     } else if (lhs.type === "number") {
       body.append(textField({ caption: "Number", placeholder: "e.g. 3", validate: (v) => v.trim() !== "" && Number.isFinite(Number(v)), onCommit: (v) => done(numLit(Number(v))) }));
     } else {
@@ -774,8 +782,13 @@ function comparisonWizard(host, w, commit, cancel) {
     const body = el("div", "exed-vwiz-body");
     host.append(body);
     body.append(propertyPicker(pickCtxOf(w), {
-      accept: ["boolean", "number", "string", "enum"],
-      onPick: (e) => pickOp({ ref: refDisplay(w, e), type: e.type, ...e.enumValues ? { enumValues: e.enumValues } : {} })
+      accept: COMPARABLE_TYPES,
+      onPick: (e) => pickOp({
+        ref: refDisplay(w, e),
+        type: e.type,
+        ...e.enumValues ? { enumValues: e.enumValues } : {},
+        ...e.stages ? { stages: e.stages } : {}
+      })
     }));
   };
   const pickOp = (lhs) => {
@@ -783,7 +796,7 @@ function comparisonWizard(host, w, commit, cancel) {
     header(host, el("span", void 0, ["Operator for ", mono(lhs.ref)]), pickLhs, cancel);
     const body = el("div", "exed-vwiz-body");
     host.append(body);
-    for (const o of opsForType(lhs.type)) {
+    for (const o of comparisonOpsFor(lhs.type)) {
       body.append(opButton(o, () => valueStep(host, w, lhs, o, () => pickOp(lhs), cancel, commit)));
     }
   };
@@ -1337,7 +1350,9 @@ function valueWizard(opts) {
   host.append(head("Pick a value"));
   const body = el("div", "exed-vwiz-body");
   host.append(body);
-  let kind = opts.expectedType === "number" ? "number" : opts.expectedType === "string" ? "text" : opts.expectedType === "boolean" ? "bool" : opts.expectedType === "enum" && opts.expectedEnumValues?.length ? "enum" : "menu";
+  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 draw = () => {
     body.replaceChildren();
     const other = () => button("exed-vwiz-other", "\u21A9 a different kind", () => {
@@ -1362,7 +1377,7 @@ function valueWizard(opts) {
           kind = "bool";
           draw();
         }));
-        if (opts.expectedEnumValues?.length) body.append(optBtn("A listed value", () => {
+        if (choices?.length) body.append(optBtn(isStage ? "A stage" : "A listed value", () => {
           kind = "enum";
           draw();
         }));
@@ -1386,7 +1401,8 @@ function valueWizard(opts) {
         break;
       }
       case "enum":
-        for (const v of opts.expectedEnumValues ?? []) body.append(optBtn(v, () => opts.onCommit(enumSrc(v))));
+        body.append(el("div", "exed-vwiz-note", [isStage ? "Stages, in ladder order:" : ""]));
+        for (const v of choices ?? []) body.append(optBtn(v, () => opts.onCommit(enumSrc(v))));
         body.append(other());
         break;
     }
@@ -1435,14 +1451,23 @@ function removeArgAt(list, i, argIdx) {
   cur.args.splice(argIdx, 1);
   return next;
 }
-function seedValueSrc(type, enumValues) {
+function initialValueFor(entry, defaultScope) {
+  const ref = refOf(entry, defaultScope);
+  return {
+    src: seedValueSrc(entry.type, choicesOf(entry), ref),
+    ask: entry.type !== "quality"
+  };
+}
+function seedValueSrc(type, values, ref) {
   switch (type) {
     case "boolean":
       return "true";
     case "number":
       return "0";
     case "enum":
-      return JSON.stringify(enumValues?.[0] ?? "");
+      return JSON.stringify(values?.[0] ?? "");
+    case "quality":
+      return ref ? `advance(${ref})` : JSON.stringify(values?.[0] ?? "");
     case "string":
       return '""';
     default:
@@ -1472,7 +1497,9 @@ function mountEffectsEditor(host, opts) {
       scopeOrder: opts.scopeOrder ?? [],
       defaultScope,
       ...expected?.type ? { expectedType: expected.type } : {},
-      ...expected?.enumValues ? { expectedEnumValues: expected.enumValues } : {},
+      // 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) } : {},
       onCommit: (src) => {
         onCommit(src);
         close();
@@ -1540,7 +1567,7 @@ 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: seedValueSrc(entry.type, entry.enumValues) }));
+        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", ["="]));
@@ -1626,7 +1653,14 @@ function mountEffectsEditor(host, opts) {
     const bar = el("div", "exed-effect-addbar");
     bar.append(button("exed-eff-add", "+ set property", (e) => {
       const anchor = e.currentTarget;
-      pickTarget(anchor, void 0, (entry) => openValueWizard(anchor, entry, (src) => commit(addSet(effects, refOf(entry, defaultScope), src))));
+      pickTarget(anchor, void 0, (entry) => {
+        const { src, ask } = initialValueFor(entry, defaultScope);
+        if (!ask) {
+          commit(addSet(effects, refOf(entry, defaultScope), src));
+          return;
+        }
+        openValueWizard(anchor, entry, (chosen) => commit(addSet(effects, refOf(entry, defaultScope), chosen)));
+      });
     }));
     if (opts.allowEmit !== false) {
       bar.append(button("exed-eff-add", "+ emit event", (e) => editEvent(e.currentTarget, "", (name) => commit(addEmit(effects, name)))));
@@ -1716,7 +1750,9 @@ function renderEffectsPreview(effects, o) {
 
 exports.ARITHMETIC_OPS = ARITHMETIC_OPS;
 exports.BINARY_LABEL = BINARY_LABEL;
+exports.COMPARABLE_TYPES = COMPARABLE_TYPES;
 exports.COMPARISON_OPS = COMPARISON_OPS;
+exports.EQUALITY_OPS = EQUALITY_OPS;
 exports.UNARY_LABEL = UNARY_LABEL;
 exports.addArg = addArg;
 exports.addChildToContainer = addChildToContainer;
@@ -1727,6 +1763,8 @@ exports.binary = binary;
 exports.boolLit = boolLit;
 exports.buildSubGroupClause = buildSubGroupClause;
 exports.callNode = callNode;
+exports.choicesOf = choicesOf;
+exports.comparisonOpsFor = comparisonOpsFor;
 exports.deleteAt = deleteAt;
 exports.displayName = displayName;
 exports.filterCatalogue = filterCatalogue;
@@ -1759,6 +1797,7 @@ exports.removeArgAt = removeArgAt;
 exports.removeAt = removeAt;
 exports.renderConditionPreview = renderConditionPreview;
 exports.renderEffectsPreview = renderEffectsPreview;
+exports.rhsTypesFor = rhsTypesFor;
 exports.scopedVar = scopedVar;
 exports.searchCatalogue = searchCatalogue;
 exports.seedValueSrc = seedValueSrc;