@wildwinter/expr-editor 0.12.0 → 0.12.2

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.
@@ -407,6 +418,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.
  *
@@ -464,4 +492,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, 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.
@@ -407,6 +418,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.
  *
@@ -464,4 +492,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, 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":
@@ -559,7 +560,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);
@@ -1746,6 +1747,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, 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