@rohal12/spindle 0.59.10 → 0.59.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rohal12/spindle",
-  "version": "0.59.10",
+  "version": "0.59.11",
   "type": "module",
   "description": "A Preact-based story format for Twine 2.",
   "license": "Unlicense",

package/src/components/macros/If.tsx

@@ -1,8 +1,7 @@
 import { defineMacro } from '../../define-macro';
 import { MacroError } from './MacroError';
 import type { Branch } from '../../markup/ast';
-import { selectBranch } from './branches';
-import { wrapContent } from './display';
+import { selectBranch, renderBranch } from './branches';
 
 /**
  * The {if}/{elseif}/{else} branch whose condition holds, else the {else}
@@ -37,11 +36,7 @@ defineMacro({
       );
     }
     if (!branch) return null;
-    return wrapContent(
-      ctx.resolve!(branch.className),
-      ctx.resolve!(branch.id),
-      ctx.renderNodes(branch.children),
-    );
+    return renderBranch(branch, ctx);
   },
   text({ branches = [] }, ctx) {
     const branch = selectIfBranch(branches, ctx.evaluate);

package/src/components/macros/SaveManager.tsx

@@ -345,12 +345,15 @@ export function SaveManagerContent() {
                 class="playthrough-group"
                 key={group.playthrough.id}
               >
-                <div
+                <button
+                  type="button"
                   class="playthrough-header"
+                  aria-expanded={!isCollapsed}
                   onClick={() => toggleCollapse(group.playthrough.id)}
                 >
                   <span
                     class={`playthrough-chevron ${isCollapsed ? '' : 'open'}`}
+                    aria-hidden="true"
                   >
                     ▶
                   </span>
@@ -361,7 +364,7 @@ export function SaveManagerContent() {
                   <span class="playthrough-date">
                     {formatDate(group.playthrough.createdAt)}
                   </span>
-                </div>
+                </button>
 
                 {!isCollapsed && (
                   <div class="playthrough-saves">

package/src/components/macros/Switch.tsx

@@ -1,7 +1,7 @@
 import { defineMacro } from '../../define-macro';
 import { MacroError } from './MacroError';
 import type { Branch } from '../../markup/ast';
-import { selectBranch } from './branches';
+import { selectBranch, renderBranch } from './branches';
 
 /**
  * The first {case} branch whose value equals `value`, else the {default}
@@ -20,6 +20,7 @@ defineMacro({
   name: 'switch',
   subMacros: ['case', 'default'],
   parameters: [{ name: 'expression', type: 'expression', required: true }],
+  interpolate: true,
   merged: true,
   render({ rawArgs, branches = [] }, ctx) {
     let switchValue: unknown;
@@ -46,7 +47,8 @@ defineMacro({
       );
     }
 
-    return branch && <>{ctx.renderNodes(branch.children)}</>;
+    if (!branch) return null;
+    return renderBranch(branch, ctx);
   },
   text({ rawArgs, branches = [] }, ctx) {
     const branch = selectCase(ctx.evaluate(rawArgs), branches, ctx.evaluate);

package/src/components/macros/WidgetInvocation.tsx

@@ -7,6 +7,8 @@ import { splitArgs } from './arg-utils';
 import { createNamespace } from '../../utils/namespace';
 import { useRenderOptions } from '../../hooks/use-render-options';
 import { LocalsScope } from './locals-scope';
+import { useInterpolate } from '../../hooks/use-interpolate';
+import { wrapContent } from './display';
 
 export { splitArgs };
 
@@ -20,17 +22,14 @@ interface WidgetInvocationProps {
 }
 
 export function WidgetInvocation(props: WidgetInvocationProps) {
-  const { className, id } = props;
-  const content = <WidgetContent {...props} />;
-  // Invocation selectors (`{.badge#hero Stats}`) need an element to land on.
-  if (!className && !id) return content;
-  return (
-    <span
-      class={className}
-      id={id}
-    >
-      {content}
-    </span>
+  const resolve = useInterpolate();
+  // Invocation selectors (`{.badge#hero Stats}`) need an element to land on;
+  // dynamic ones (`{.{$theme} Stats}`) follow the state like a built-in
+  // macro's.
+  return wrapContent(
+    resolve(props.className),
+    resolve(props.id),
+    <WidgetContent {...props} />,
   );
 }
 
@@ -39,8 +38,6 @@ function WidgetContent({
   params,
   rawArgs,
   invocationChildren,
-  className,
-  id,
 }: WidgetInvocationProps) {
   const renderOptions = useRenderOptions();
   const parentValues = renderOptions.locals;

package/src/components/macros/branches.ts

@@ -1,4 +1,7 @@
+import type { ComponentChildren, VNode } from 'preact';
 import type { Branch } from '../../markup/ast';
+import type { MacroContext } from '../../define-macro';
+import { wrapContent } from './display';
 
 /**
  * The branch a conditional block ({if}, {switch}) shows: the first of
@@ -16,3 +19,20 @@ export function selectBranch(
   }
   return fallback;
 }
+
+/**
+ * A selected branch's content, in a wrapper if the branch has CSS selectors
+ * (`{.hot#id case 1}`). The macro must be defined with `interpolate`.
+ */
+export function renderBranch(
+  branch: Branch,
+  ctx: Pick<MacroContext, 'resolve'> & {
+    renderNodes: (nodes: Branch['children']) => ComponentChildren;
+  },
+): VNode<any> {
+  return wrapContent(
+    ctx.resolve!(branch.className),
+    ctx.resolve!(branch.id),
+    ctx.renderNodes(branch.children),
+  );
+}

package/src/hooks/use-modal-focus.ts

@@ -29,7 +29,12 @@ function isRendered(el: HTMLElement): boolean {
 
 function focusables(root: HTMLElement): HTMLElement[] {
   return Array.from(root.querySelectorAll<HTMLElement>(FOCUSABLE)).filter(
-    (el) => !el.hidden && !el.closest('[hidden], [inert]') && isRendered(el),
+    (el) =>
+      !el.hidden &&
+      !el.closest('[hidden], [inert]') &&
+      // Also covers controls disabled by a <fieldset disabled> ancestor
+      !el.matches(':disabled') &&
+      isRendered(el),
   );
 }
 

package/src/js-lexer.ts

@@ -128,7 +128,7 @@ const OPERAND_ENDS: ReadonlySet<TokenType> = new Set([
  * whether a `{` opens a block or an object literal, which decides whether a
  * `/` after its `}` opens a regex and a `%` a transient: after the `:` of a
  * conditional it opens an object literal (`a ? b : {} / 2`), not a block as
- * after a label; after a block's `}` it opens another block (`{}{} %n = 1`),
+ * after a label, and a `function` or `class` there is an expression; after a block's `}` it opens another block (`{}{} %n = 1`),
  * and so it does on a new line after a statement (`p⏎{} %n = 1`).
  */
 const SigilParser = class extends (Parser as unknown as Base) {
@@ -146,6 +146,8 @@ const SigilParser = class extends (Parser as unknown as Base) {
   closedBlock = false;
   /** The value of the token before the one being finished. */
   prevValue: unknown;
+  /** The type of the token before the last one. */
+  typeBeforeLast: TokenType = tt.eof;
   /** Look ahead after a `%name` starting a line (off in look-aheads). */
   lookahead = true;
   /**
@@ -222,6 +224,21 @@ const SigilParser = class extends (Parser as unknown as Base) {
         (prevType === tt.dot || prevType === tt.questionDot)) ||
       ((type === tt._function || type === tt._class) &&
         notABody(self.input, self.pos));
+    // acorn takes a `function` or `class` for a statement's (whose `}` a
+    // regex may follow) after the `:` of a conditional, and `async function`
+    // always. Both are expressions where an operand is (`a ? b : class {} / 2`,
+    // `x = async function () {} / 2`): read them as after what comes before.
+    if (!property && (type === tt._function || type === tt._class)) {
+      const afterAsync =
+        type === tt._function &&
+        prevType === tt.name &&
+        this.prevValue === 'async' &&
+        !this.breakHere;
+      const before = afterAsync ? this.typeBeforeLast : prevType;
+      self.type =
+        before === tt.colon && this.colonEndsTernary ? tt.parenL : before;
+    }
+    this.typeBeforeLast = prevType;
     // @ts-expect-error acorn internals
     super.finishToken(property ? tt.name : type, value);
     // A variable named `of` (`const of of list`): acorn takes it for the

package/src/markup/render.tsx

@@ -524,25 +524,43 @@ function useDirectAttributes(
   return direct.length > 0 ? elementRef : undefined;
 }
 
+const decodedText = new Map<string, string>();
 const decodedAttributeText = new Map<string, string>();
 
 /**
- * Decode character references (`&amp;`, `&#123;`) in attribute text the way
- * the HTML parser decodes an attribute value, by letting it parse one.
+ * Decode character references (`&amp;`, `&#123;`) in `text` the way the HTML
+ * parser decodes them, by letting it parse them: in an attribute value, or
+ * else in element text.
  */
-function decodeAttributeText(text: string): string {
+function decodeReferences(
+  text: string,
+  cache: Map<string, string>,
+  parse: (text: string) => string | null,
+): string {
   if (!text.includes('&')) return text;
-  let decoded = decodedAttributeText.get(text);
+  let decoded = cache.get(text);
   if (decoded === undefined) {
-    const html = `<i title="${text.replace(/"/g, '&quot;')}"></i>`;
-    decoded =
-      (parseHtmlInert(html).firstChild as Element).getAttribute('title') ??
-      text;
-    decodedAttributeText.set(text, decoded);
+    decoded = parse(text) ?? text;
+    cache.set(text, decoded);
   }
   return decoded;
 }
 
+function decodeAttributeText(text: string): string {
+  return decodeReferences(text, decodedAttributeText, (t) => {
+    const html = `<i title="${t.replace(/"/g, '&quot;')}"></i>`;
+    return (parseHtmlInert(html).firstChild as Element).getAttribute('title');
+  });
+}
+
+/** Literal text outside markdown (preformatted and SVG elements). */
+function decodeText(text: string): string {
+  return decodeReferences(text, decodedText, (t) => {
+    const html = `<i>${t.replace(/</g, '&lt;')}</i>`;
+    return parseHtmlInert(html).firstChild!.textContent;
+  });
+}
+
 /** A `{` and a sigil starting a reference, in a code attribute. */
 const SIGIL_REFERENCE = /\{[$_@%]\w/;
 
@@ -725,7 +743,8 @@ function renderMacro(node: MacroNode, key: string) {
  * Render a non-text AST node to a Preact element.
  */
 function renderSingleNode(node: ASTNode): preact.ComponentChildren {
-  if (node.type === 'text') return node.value;
+  // Authored text outside markdown still has its character references decoded
+  if (node.type === 'text') return decodeText(node.value);
   const key = nodeKey(node);
   switch (node.type) {
     case 'variable':

package/src/markup/spindle.peggy

@@ -233,6 +233,7 @@ Content
 Item
   = TextRun
   / Escape
+  / Comment
   / LinkLexeme
   / HtmlElement
   / VoidCloser
@@ -291,6 +292,7 @@ Tokens
 TokenItem
   = TextRun
   / Escape
+  / Comment
   / LinkLexeme
   / &{ return !textMode; } tag:HtmlOpen { return tag; }
   / &{ return !textMode; } tag:HtmlClose { return VOID_TAGS.has(tag.lower) ? null : tag; }
@@ -317,6 +319,15 @@ Here
 TextRun
   = value:$[^\\{[<]+ { return lexeme('text', location(), { value }); }
 
+/**
+ * A closed HTML comment, opaque: its tags and macros are not markup, and
+ * rendering drops it. (An unclosed `<!--` is ordinary text.)
+ */
+Comment
+  = value:$("<!--" (">" / "->" / (!"-->" .)* "-->")) {
+      return lexeme('text', location(), { value });
+    }
+
 /**
  * A backslash run. Before a brace, an odd run escapes it; in text mode the
  * run is also paired up (`\\` is one backslash), in passage text markdown

package/src/styles.css

@@ -430,6 +430,11 @@ tw-storydata {
 
 .playthrough-header {
   display: flex;
+  width: 100%;
+  border: 0;
+  background: none;
+  font-family: inherit;
+  text-align: left;
   align-items: center;
   gap: 0.5em;
   padding: 0.4em 0;

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;
     }