@wildwinter/expr-editor 0.11.0 → 0.12.1

package/dist/index.d.cts

@@ -407,6 +407,23 @@ declare function updateAt(list: EditorEffect[], i: number, patch: Partial<Editor
 declare function setArgAt(list: EditorEffect[], i: number, argIdx: number, value: string): EditorEffect[];
 declare function addArg(list: EditorEffect[], i: number, value?: string): EditorEffect[];
 declare function removeArgAt(list: EditorEffect[], i: number, argIdx: number): EditorEffect[];
+/**
+ * What a freshly targeted property's value should be, and whether the guided value wizard still has a
+ * question worth asking.
+ *
+ * BOTH paths that target a property go through this - "+ set property" (add) and re-picking an
+ * existing effect's target - because when they answered separately they drifted: 0.11.0 seeded a
+ * quality with `advance(...)` on re-pick while the add path opened a wizard that did not know what a
+ * quality was, so the same job offered two different affordances depending on how you arrived.
+ *
+ * `ask: false` means the type has a canonical outcome and the wizard would be ceremony: a QUALITY
+ * moves to its next stage, which is the insertion-safe form the type exists for, and an author who
+ * meant a specific stage clicks the pill.
+ */
+declare function initialValueFor(entry: CatalogueEntry, defaultScope: string): {
+    src: string;
+    ask: boolean;
+};
 /** A sensible starting value-expression for a freshly targeted property. Literals
  *  are seeded so the value editor opens on an editable pill, never the empty state.
  *
@@ -450,6 +467,11 @@ interface ValueWizardOptions {
     defaultScope: string;
     /** When known (a `set` target's declared type), the picker leads straight to that input. */
     expectedType?: PropertyType;
+    /** The target's closed set of values, when it has one: an enum's values, or a QUALITY's stages in
+     *  ladder order. Callers should fill this with `choicesOf(entry)` rather than reading a single
+     *  field, so a quality is never handed a wizard that knows its type but not its ladder. */
+    expectedChoices?: string[];
+    /** @deprecated Use `expectedChoices`. Kept so a 0.11.x caller keeps working. */
     expectedEnumValues?: string[];
     /** Receives the chosen value as name-form source. */
     onCommit: (src: string) => void;
@@ -459,4 +481,4 @@ interface ValueWizardOptions {
 /** Build the wizard UI into a fresh element (drive it via the host's popover). */
 declare function valueWizard(opts: ValueWizardOptions): HTMLElement;
 
-export { ARITHMETIC_OPS, BINARY_LABEL, COMPARABLE_TYPES, COMPARISON_OPS, type CatalogueEntry, EQUALITY_OPS, type EditCtx, type EditorEffect, type EffectsEditorHandle, type EffectsEditorOptions, type ExpressionEditorHandle, type ExpressionEditorOptions, type Filter, type FunctionTemplateSpec, type PreviewOptions, type TreeRow, UNARY_LABEL, type Validation, type ValueWizardOptions, type WizardSpec, type WizardStepSpec, type WizardValue, addArg, addChildToContainer, addEmit, addSet, astToTree, binary, boolLit, buildSubGroupClause, callNode, choicesOf, comparisonOpsFor, deleteAt, displayName, filterCatalogue, findEnumPeer, firstEmptyLeafPath, flagDelta, flipContainerOp, formatNumber, getNodeAt, groupByScope, insertSiblingClauseAt, isComparisonOp, isPlaceholderForOp, isWrappedInNot, issuesAt, lookup, mountEffectsEditor, mountExpressionEditor, moveAt, moveChildInContainer, needsParens, notNode, numLit, opSwapGroup, pathKey, placeholderForOp, redirectDeleteForPlaceholderSibling, refOf, removeArgAt, removeAt, renderConditionPreview, renderEffectsPreview, rhsTypesFor, scopedVar, searchCatalogue, seedValueSrc, setArgAt, setNodeAt, strLit, toggleContainerNot, toggleNotAt, updateAt, validateSource, valueWizard, wrapInNotAt };
+export { ARITHMETIC_OPS, BINARY_LABEL, COMPARABLE_TYPES, COMPARISON_OPS, type CatalogueEntry, EQUALITY_OPS, type EditCtx, type EditorEffect, type EffectsEditorHandle, type EffectsEditorOptions, type ExpressionEditorHandle, type ExpressionEditorOptions, type Filter, type FunctionTemplateSpec, type PreviewOptions, type TreeRow, UNARY_LABEL, type Validation, type ValueWizardOptions, type WizardSpec, type WizardStepSpec, type WizardValue, addArg, addChildToContainer, addEmit, addSet, astToTree, binary, boolLit, buildSubGroupClause, callNode, choicesOf, comparisonOpsFor, deleteAt, displayName, filterCatalogue, findEnumPeer, firstEmptyLeafPath, flagDelta, flipContainerOp, formatNumber, getNodeAt, groupByScope, initialValueFor, insertSiblingClauseAt, isComparisonOp, isPlaceholderForOp, isWrappedInNot, issuesAt, lookup, mountEffectsEditor, mountExpressionEditor, moveAt, moveChildInContainer, needsParens, notNode, numLit, opSwapGroup, pathKey, placeholderForOp, redirectDeleteForPlaceholderSibling, refOf, removeArgAt, removeAt, renderConditionPreview, renderEffectsPreview, rhsTypesFor, scopedVar, searchCatalogue, seedValueSrc, setArgAt, setNodeAt, strLit, toggleContainerNot, toggleNotAt, updateAt, validateSource, valueWizard, wrapInNotAt };

package/dist/index.d.ts

@@ -407,6 +407,23 @@ declare function updateAt(list: EditorEffect[], i: number, patch: Partial<Editor
 declare function setArgAt(list: EditorEffect[], i: number, argIdx: number, value: string): EditorEffect[];
 declare function addArg(list: EditorEffect[], i: number, value?: string): EditorEffect[];
 declare function removeArgAt(list: EditorEffect[], i: number, argIdx: number): EditorEffect[];
+/**
+ * What a freshly targeted property's value should be, and whether the guided value wizard still has a
+ * question worth asking.
+ *
+ * BOTH paths that target a property go through this - "+ set property" (add) and re-picking an
+ * existing effect's target - because when they answered separately they drifted: 0.11.0 seeded a
+ * quality with `advance(...)` on re-pick while the add path opened a wizard that did not know what a
+ * quality was, so the same job offered two different affordances depending on how you arrived.
+ *
+ * `ask: false` means the type has a canonical outcome and the wizard would be ceremony: a QUALITY
+ * moves to its next stage, which is the insertion-safe form the type exists for, and an author who
+ * meant a specific stage clicks the pill.
+ */
+declare function initialValueFor(entry: CatalogueEntry, defaultScope: string): {
+    src: string;
+    ask: boolean;
+};
 /** A sensible starting value-expression for a freshly targeted property. Literals
  *  are seeded so the value editor opens on an editable pill, never the empty state.
  *
@@ -450,6 +467,11 @@ interface ValueWizardOptions {
     defaultScope: string;
     /** When known (a `set` target's declared type), the picker leads straight to that input. */
     expectedType?: PropertyType;
+    /** The target's closed set of values, when it has one: an enum's values, or a QUALITY's stages in
+     *  ladder order. Callers should fill this with `choicesOf(entry)` rather than reading a single
+     *  field, so a quality is never handed a wizard that knows its type but not its ladder. */
+    expectedChoices?: string[];
+    /** @deprecated Use `expectedChoices`. Kept so a 0.11.x caller keeps working. */
     expectedEnumValues?: string[];
     /** Receives the chosen value as name-form source. */
     onCommit: (src: string) => void;
@@ -459,4 +481,4 @@ interface ValueWizardOptions {
 /** Build the wizard UI into a fresh element (drive it via the host's popover). */
 declare function valueWizard(opts: ValueWizardOptions): HTMLElement;
 
-export { ARITHMETIC_OPS, BINARY_LABEL, COMPARABLE_TYPES, COMPARISON_OPS, type CatalogueEntry, EQUALITY_OPS, type EditCtx, type EditorEffect, type EffectsEditorHandle, type EffectsEditorOptions, type ExpressionEditorHandle, type ExpressionEditorOptions, type Filter, type FunctionTemplateSpec, type PreviewOptions, type TreeRow, UNARY_LABEL, type Validation, type ValueWizardOptions, type WizardSpec, type WizardStepSpec, type WizardValue, addArg, addChildToContainer, addEmit, addSet, astToTree, binary, boolLit, buildSubGroupClause, callNode, choicesOf, comparisonOpsFor, deleteAt, displayName, filterCatalogue, findEnumPeer, firstEmptyLeafPath, flagDelta, flipContainerOp, formatNumber, getNodeAt, groupByScope, insertSiblingClauseAt, isComparisonOp, isPlaceholderForOp, isWrappedInNot, issuesAt, lookup, mountEffectsEditor, mountExpressionEditor, moveAt, moveChildInContainer, needsParens, notNode, numLit, opSwapGroup, pathKey, placeholderForOp, redirectDeleteForPlaceholderSibling, refOf, removeArgAt, removeAt, renderConditionPreview, renderEffectsPreview, rhsTypesFor, scopedVar, searchCatalogue, seedValueSrc, setArgAt, setNodeAt, strLit, toggleContainerNot, toggleNotAt, updateAt, validateSource, valueWizard, wrapInNotAt };
+export { ARITHMETIC_OPS, BINARY_LABEL, COMPARABLE_TYPES, COMPARISON_OPS, type CatalogueEntry, EQUALITY_OPS, type EditCtx, type EditorEffect, type EffectsEditorHandle, type EffectsEditorOptions, type ExpressionEditorHandle, type ExpressionEditorOptions, type Filter, type FunctionTemplateSpec, type PreviewOptions, type TreeRow, UNARY_LABEL, type Validation, type ValueWizardOptions, type WizardSpec, type WizardStepSpec, type WizardValue, addArg, addChildToContainer, addEmit, addSet, astToTree, binary, boolLit, buildSubGroupClause, callNode, choicesOf, comparisonOpsFor, deleteAt, displayName, filterCatalogue, findEnumPeer, firstEmptyLeafPath, flagDelta, flipContainerOp, formatNumber, getNodeAt, groupByScope, initialValueFor, insertSiblingClauseAt, isComparisonOp, isPlaceholderForOp, isWrappedInNot, issuesAt, lookup, mountEffectsEditor, mountExpressionEditor, moveAt, moveChildInContainer, needsParens, notNode, numLit, opSwapGroup, pathKey, placeholderForOp, redirectDeleteForPlaceholderSibling, refOf, removeArgAt, removeAt, renderConditionPreview, renderEffectsPreview, rhsTypesFor, scopedVar, searchCatalogue, seedValueSrc, setArgAt, setNodeAt, strLit, toggleContainerNot, toggleNotAt, updateAt, validateSource, valueWizard, wrapInNotAt };

package/dist/index.js

@@ -1348,7 +1348,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", () => {
@@ -1373,7 +1375,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();
         }));
@@ -1397,7 +1399,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;
     }
@@ -1446,6 +1449,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":
@@ -1485,7 +1495,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();
@@ -1553,8 +1565,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", ["="]));
@@ -1640,7 +1651,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)))));
@@ -1728,6 +1746,6 @@ function renderEffectsPreview(effects, o) {
   return wrap;
 }
 
-export { ARITHMETIC_OPS, BINARY_LABEL, COMPARABLE_TYPES, COMPARISON_OPS, EQUALITY_OPS, UNARY_LABEL, addArg, addChildToContainer, addEmit, addSet, astToTree, binary, boolLit, buildSubGroupClause, callNode, choicesOf, comparisonOpsFor, deleteAt, displayName, filterCatalogue, findEnumPeer, firstEmptyLeafPath, flagDelta, flipContainerOp, formatNumber, getNodeAt, groupByScope, insertSiblingClauseAt, isComparisonOp, isPlaceholderForOp, isWrappedInNot, issuesAt, lookup, mountEffectsEditor, mountExpressionEditor, moveAt, moveChildInContainer, needsParens, notNode, numLit, opSwapGroup, pathKey, placeholderForOp, redirectDeleteForPlaceholderSibling, refOf, removeArgAt, removeAt, renderConditionPreview, renderEffectsPreview, rhsTypesFor, scopedVar, searchCatalogue, seedValueSrc, setArgAt, setNodeAt, strLit, toggleContainerNot, toggleNotAt, updateAt, validateSource, valueWizard, wrapInNotAt };
+export { ARITHMETIC_OPS, BINARY_LABEL, COMPARABLE_TYPES, COMPARISON_OPS, EQUALITY_OPS, UNARY_LABEL, addArg, addChildToContainer, addEmit, addSet, astToTree, binary, boolLit, buildSubGroupClause, callNode, choicesOf, comparisonOpsFor, deleteAt, displayName, filterCatalogue, findEnumPeer, firstEmptyLeafPath, flagDelta, flipContainerOp, formatNumber, getNodeAt, groupByScope, initialValueFor, insertSiblingClauseAt, isComparisonOp, isPlaceholderForOp, isWrappedInNot, issuesAt, lookup, mountEffectsEditor, mountExpressionEditor, moveAt, moveChildInContainer, needsParens, notNode, numLit, opSwapGroup, pathKey, placeholderForOp, redirectDeleteForPlaceholderSibling, refOf, removeArgAt, removeAt, renderConditionPreview, renderEffectsPreview, rhsTypesFor, scopedVar, searchCatalogue, seedValueSrc, setArgAt, setNodeAt, strLit, toggleContainerNot, toggleNotAt, updateAt, validateSource, valueWizard, wrapInNotAt };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map