@wildwinter/expr-editor 0.11.0 → 0.12.0

package/README.md

@@ -41,8 +41,14 @@ Notable options beyond the basics:
   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. A host still passing a ladder through `enumValues` keeps its
-  value picker, but not the ordering affordances.
+  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

@@ -1350,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", () => {
@@ -1375,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();
         }));
@@ -1399,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;
     }
@@ -1448,6 +1451,13 @@ function removeArgAt(list, i, argIdx) {
   cur.args.splice(argIdx, 1);
   return next;
 }
+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":
@@ -1487,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();
@@ -1555,8 +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) => {
-        const ref = refOf(entry, defaultScope);
-        commit(updateAt(effects, i, { target: ref, value: seedValueSrc(entry.type, choicesOf(entry), ref) }));
+        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", ["="]));
@@ -1642,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)))));