@wildwinter/expr-editor 0.12.1 → 0.12.3

package/dist/index.d.cts

@@ -34,14 +34,25 @@ declare function wrapInNotAt(ast: ExprNode, path: AstPath): ExprNode;
 /** Add a `not` if absent, strip it if present. */
 declare function toggleNotAt(ast: ExprNode, path: AstPath): ExprNode;
 /**
- * If the node at `path` is one operand of an equality comparison (`==` / `!=`)
- * whose OTHER operand is a property reference, return that property — so a string
- * literal can offer the property's enum values. Null otherwise.
+ * If the node at `path` is one operand of a COMPARISON whose other operand is a property
+ * reference, return that property - so a literal can offer that property's choices (an enum's
+ * values, a quality's stages).
+ *
+ * Every comparison counts, not just `==` / `!=`. Equality was enough while an enum was the only
+ * type with a closed value list, because an enum is never ordered; a QUALITY is ordered, and
+ * `@investigation >= "certain"` is the shape its type exists for. Restricting to equality left
+ * exactly that clause offering a free-text box where the ladder should be.
+ *
+ * Whether the peer HAS choices is not decided here - that is `choicesOf`'s job. This answers only
+ * "which property is this literal being compared against", so a number's `> 1` resolves its peer
+ * and then offers nothing, as before.
  */
-declare function findEnumPeer(ast: ExprNode, path: AstPath): {
+declare function findChoicePeer(ast: ExprNode, path: AstPath): {
     scope: string;
     name: string;
 } | null;
+/** @deprecated Renamed to {@link findChoicePeer} - it serves qualities as well as enums now. */
+declare const findEnumPeer: typeof findChoicePeer;
 /**
  * DFS for the first unfilled slot in a template-inserted clause: an empty string
  * literal (a tag / value the author still has to set) or an unnamed flag delta.
@@ -97,6 +108,12 @@ declare function moveChildInContainer(ast: ExprNode, chainPath: AstPath, from: n
 /** Human label for a binary operator (words for logical, glyphs for relational). */
 declare const BINARY_LABEL: Record<BinaryOp, string>;
 declare const UNARY_LABEL: Record<UnaryOp, string>;
+/** Plain-language name for an operator. ONE table, because it is wanted in three places that must
+ *  agree: a pill's accessible label, the clause wizard's operator step, and the swap menu. The swap
+ *  menu once printed the label and the raw source instead ("> >"), which is what a second table
+ *  buys you. Never the glyph twice: this reads NEXT to `BINARY_LABEL`, so it must say something the
+ *  glyph does not. */
+declare const OP_WORD: Record<BinaryOp | UnaryOp, string>;
 declare const COMPARISON_OPS: BinaryOp[];
 declare const ARITHMETIC_OPS: BinaryOp[];
 /** Property types a comparison clause can be built on - what the clause wizard offers as a left-hand
@@ -481,4 +498,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, 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 };
+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, OP_WORD, 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, findChoicePeer, 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

@@ -34,14 +34,25 @@ declare function wrapInNotAt(ast: ExprNode, path: AstPath): ExprNode;
 /** Add a `not` if absent, strip it if present. */
 declare function toggleNotAt(ast: ExprNode, path: AstPath): ExprNode;
 /**
- * If the node at `path` is one operand of an equality comparison (`==` / `!=`)
- * whose OTHER operand is a property reference, return that property — so a string
- * literal can offer the property's enum values. Null otherwise.
+ * If the node at `path` is one operand of a COMPARISON whose other operand is a property
+ * reference, return that property - so a literal can offer that property's choices (an enum's
+ * values, a quality's stages).
+ *
+ * Every comparison counts, not just `==` / `!=`. Equality was enough while an enum was the only
+ * type with a closed value list, because an enum is never ordered; a QUALITY is ordered, and
+ * `@investigation >= "certain"` is the shape its type exists for. Restricting to equality left
+ * exactly that clause offering a free-text box where the ladder should be.
+ *
+ * Whether the peer HAS choices is not decided here - that is `choicesOf`'s job. This answers only
+ * "which property is this literal being compared against", so a number's `> 1` resolves its peer
+ * and then offers nothing, as before.
  */
-declare function findEnumPeer(ast: ExprNode, path: AstPath): {
+declare function findChoicePeer(ast: ExprNode, path: AstPath): {
     scope: string;
     name: string;
 } | null;
+/** @deprecated Renamed to {@link findChoicePeer} - it serves qualities as well as enums now. */
+declare const findEnumPeer: typeof findChoicePeer;
 /**
  * DFS for the first unfilled slot in a template-inserted clause: an empty string
  * literal (a tag / value the author still has to set) or an unnamed flag delta.
@@ -97,6 +108,12 @@ declare function moveChildInContainer(ast: ExprNode, chainPath: AstPath, from: n
 /** Human label for a binary operator (words for logical, glyphs for relational). */
 declare const BINARY_LABEL: Record<BinaryOp, string>;
 declare const UNARY_LABEL: Record<UnaryOp, string>;
+/** Plain-language name for an operator. ONE table, because it is wanted in three places that must
+ *  agree: a pill's accessible label, the clause wizard's operator step, and the swap menu. The swap
+ *  menu once printed the label and the raw source instead ("> >"), which is what a second table
+ *  buys you. Never the glyph twice: this reads NEXT to `BINARY_LABEL`, so it must say something the
+ *  glyph does not. */
+declare const OP_WORD: Record<BinaryOp | UnaryOp, string>;
 declare const COMPARISON_OPS: BinaryOp[];
 declare const ARITHMETIC_OPS: BinaryOp[];
 /** Property types a comparison clause can be built on - what the clause wizard offers as a left-hand
@@ -481,4 +498,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, 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 };
+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, OP_WORD, 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, findChoicePeer, 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

@@ -82,14 +82,15 @@ function toggleNotAt(ast, path) {
   }
   return wrapInNotAt(ast, path);
 }
-function findEnumPeer(ast, path) {
+function findChoicePeer(ast, path) {
   const last = path[path.length - 1];
   if (last !== "left" && last !== "right") return null;
   const parent = getNodeAt(ast, path.slice(0, -1));
-  if (parent?.kind !== "binary" || parent.op !== "==" && parent.op !== "!=") return null;
+  if (parent?.kind !== "binary" || !isComparisonOp(parent.op)) return null;
   const other = last === "left" ? parent.right : parent.left;
   return other.kind === "scopedvar" ? { scope: other.scope, name: other.name } : null;
 }
+var findEnumPeer = findChoicePeer;
 function firstEmptyLeafPath(node, base = []) {
   switch (node.kind) {
     case "string":
@@ -218,6 +219,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"];
@@ -403,20 +420,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;
@@ -470,7 +473,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;
     }
@@ -482,7 +485,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"));
@@ -559,7 +562,7 @@ function numberEditor(ctx, path, value, anchor) {
   }));
 }
 function stringEditor(ctx, path, node, anchor) {
-  const peer = findEnumPeer(ctx.getAst(), path);
+  const peer = findChoicePeer(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 peerChoices = choicesOf(enumEntry);
@@ -593,12 +596,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;
   });
@@ -714,17 +719,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) {
@@ -1746,6 +1743,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, 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 };
+export { ARITHMETIC_OPS, BINARY_LABEL, COMPARABLE_TYPES, COMPARISON_OPS, EQUALITY_OPS, OP_WORD, UNARY_LABEL, addArg, addChildToContainer, addEmit, addSet, astToTree, binary, boolLit, buildSubGroupClause, callNode, choicesOf, comparisonOpsFor, deleteAt, displayName, filterCatalogue, findChoicePeer, 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