@rohal12/spindle 0.59.10 → 0.59.12

package/src/triggers.ts

@@ -251,7 +251,7 @@ export function checkTriggersOnNavigation(): void {
 
 /**
  * Re-evaluate watchers whenever a namespace their conditions can read
- * ($variables, _temporary, %transient) changes. Navigation is left to the
+ * ($variables, _temporary, %transient) or the render counts change. Navigation is left to the
  * store: navigate() checks watchers once the new moment is complete
  * (checkTriggersOnNavigation), while history traversal and loads
  * reinitialize watcher state instead of firing.
@@ -269,7 +269,9 @@ export function connectTriggersToStore(): () => void {
     if (
       state.variables === before.variables &&
       state.temporary === before.temporary &&
-      state.transient === before.transient
+      state.transient === before.transient &&
+      // hasRendered() / rendered() read the counts an {include} bumps
+      state.renderCounts === before.renderCounts
     ) {
       return;
     }

package/src/utils/control-edits.ts

@@ -0,0 +1,15 @@
+/**
+ * Counts the edits a reader made through a control bound to a story
+ * variable (`{textbox}`, `{checkbox}`, ...). {for} tells these apart from a
+ * list that is replaced: typing into a control inside an iteration changes
+ * its item, but must not remount the iteration and drop the control's focus.
+ */
+let version = 0;
+
+export function noteControlEdit(): void {
+  version++;
+}
+
+export function controlEditVersion(): number {
+  return version;
+}

package/src/widgets/register-widget-def.ts

@@ -0,0 +1,44 @@
+import { registerWidget } from './widget-registry';
+import { astContainsChildren } from './ast-scanner';
+import { registerBlockMacro, type ASTNode } from '../markup/ast';
+import { errorMessage } from '../utils/error-message';
+import { parseWidgetDef, type WidgetDef } from './widget-def';
+
+/**
+ * Register the widget a definition declares, with its body. Widgets whose
+ * body renders {@children} take a closing tag, so they are registered as
+ * block macros too: passages parsed later nest their content. A parameter
+ * that no namespace can hold throws (see registerWidget), registering
+ * nothing.
+ */
+export function registerWidgetDef(
+  { name, params }: WidgetDef,
+  body: ASTNode[],
+): void {
+  const isBlock = astContainsChildren(body);
+  registerWidget(name, body, params, isBlock);
+  if (isBlock) registerBlockMacro(name);
+}
+
+/**
+ * Register the widgets `nodes` (a passage's markup) define at its top level,
+ * as the {widget} macro does when it renders. A widget that fails to register
+ * is reported; the others still register.
+ */
+export function registerWidgetDefinitions(
+  nodes: ASTNode[],
+  passageName: string,
+): void {
+  for (const node of nodes) {
+    if (node.type === 'macro' && node.name === 'widget' && node.rawArgs) {
+      const def = parseWidgetDef(node.rawArgs);
+      try {
+        registerWidgetDef(def, node.children as ASTNode[]);
+      } catch (err) {
+        console.error(
+          `spindle: widget "${def.name}" in passage "${passageName}" was not registered: ${errorMessage(err)}`,
+        );
+      }
+    }
+  }
+}