@rohal12/spindle 0.52.5 → 0.52.7

package/dist/pkg/macro-registry.json

@@ -3,6 +3,13 @@
     "name": "set",
     "block": false,
     "subMacros": [],
+    "parameters": [
+      {
+        "name": "code",
+        "type": "expression",
+        "required": true
+      }
+    ],
     "source": "builtin"
   },
   {
@@ -11,6 +18,13 @@
     "subMacros": [],
     "interpolate": true,
     "merged": true,
+    "parameters": [
+      {
+        "name": "expression",
+        "type": "expression",
+        "required": true
+      }
+    ],
     "source": "builtin"
   },
   {
@@ -18,6 +32,22 @@
     "block": false,
     "subMacros": [],
     "merged": true,
+    "parameters": [
+      {
+        "name": "target",
+        "type": "variable",
+        "required": true
+      },
+      {
+        "name": "=",
+        "type": "separator"
+      },
+      {
+        "name": "expression",
+        "type": "expression",
+        "required": true
+      }
+    ],
     "source": "builtin"
   },
   {
@@ -26,6 +56,22 @@
     "subMacros": [],
     "interpolate": true,
     "merged": true,
+    "parameters": [
+      {
+        "name": "current",
+        "type": "expression",
+        "required": true
+      },
+      {
+        "name": "max",
+        "type": "expression",
+        "required": true
+      },
+      {
+        "name": "label",
+        "type": "string"
+      }
+    ],
     "source": "builtin"
   },
   {
@@ -42,6 +88,22 @@
     "subMacros": [],
     "interpolate": true,
     "merged": true,
+    "parameters": [
+      {
+        "name": "variables",
+        "type": "names",
+        "required": true
+      },
+      {
+        "name": "of",
+        "type": "separator"
+      },
+      {
+        "name": "list",
+        "type": "expression",
+        "required": true
+      }
+    ],
     "source": "builtin"
   },
   {
@@ -55,6 +117,13 @@
     "block": true,
     "subMacros": [],
     "interpolate": true,
+    "parameters": [
+      {
+        "name": "delay",
+        "type": "delay",
+        "required": true
+      }
+    ],
     "source": "builtin"
   },
   {
@@ -62,6 +131,13 @@
     "block": true,
     "subMacros": [],
     "interpolate": true,
+    "parameters": [
+      {
+        "name": "label",
+        "type": "text",
+        "required": true
+      }
+    ],
     "source": "builtin"
   },
   {
@@ -69,6 +145,17 @@
     "block": true,
     "subMacros": [],
     "interpolate": true,
+    "parameters": [
+      {
+        "name": "text",
+        "type": "string",
+        "required": true
+      },
+      {
+        "name": "passage",
+        "type": "string"
+      }
+    ],
     "source": "builtin"
   },
   {
@@ -79,6 +166,13 @@
       "default"
     ],
     "merged": true,
+    "parameters": [
+      {
+        "name": "expression",
+        "type": "expression",
+        "required": true
+      }
+    ],
     "source": "builtin"
   },
   {
@@ -101,6 +195,13 @@
     "block": true,
     "subMacros": [],
     "interpolate": true,
+    "parameters": [
+      {
+        "name": "delay",
+        "type": "delay",
+        "required": true
+      }
+    ],
     "source": "builtin"
   },
   {
@@ -162,6 +263,17 @@
     "block": true,
     "subMacros": [],
     "interpolate": true,
+    "parameters": [
+      {
+        "name": "label",
+        "type": "text",
+        "required": true
+      },
+      {
+        "name": "noclose",
+        "type": "flag"
+      }
+    ],
     "source": "builtin"
   },
   {
@@ -182,6 +294,17 @@
     "subMacros": [],
     "interpolate": true,
     "merged": true,
+    "parameters": [
+      {
+        "name": "inline",
+        "type": "flag"
+      },
+      {
+        "name": "passage",
+        "type": "expression",
+        "required": true
+      }
+    ],
     "source": "builtin"
   },
   {
@@ -195,12 +318,26 @@
     "block": false,
     "subMacros": [],
     "merged": true,
+    "parameters": [
+      {
+        "name": "passage",
+        "type": "expression",
+        "required": true
+      }
+    ],
     "source": "builtin"
   },
   {
     "name": "unset",
     "block": false,
     "subMacros": [],
+    "parameters": [
+      {
+        "name": "variable",
+        "type": "variable",
+        "required": true
+      }
+    ],
     "source": "builtin"
   },
   {
@@ -208,6 +345,17 @@
     "block": false,
     "subMacros": [],
     "storeVar": true,
+    "parameters": [
+      {
+        "name": "variable",
+        "type": "variable",
+        "required": true
+      },
+      {
+        "name": "placeholder",
+        "type": "string"
+      }
+    ],
     "source": "builtin"
   },
   {
@@ -215,6 +363,17 @@
     "block": false,
     "subMacros": [],
     "storeVar": true,
+    "parameters": [
+      {
+        "name": "variable",
+        "type": "variable",
+        "required": true
+      },
+      {
+        "name": "placeholder",
+        "type": "string"
+      }
+    ],
     "source": "builtin"
   },
   {
@@ -222,6 +381,17 @@
     "block": false,
     "subMacros": [],
     "storeVar": true,
+    "parameters": [
+      {
+        "name": "variable",
+        "type": "variable",
+        "required": true
+      },
+      {
+        "name": "placeholder",
+        "type": "string"
+      }
+    ],
     "source": "builtin"
   },
   {
@@ -229,6 +399,17 @@
     "block": false,
     "subMacros": [],
     "storeVar": true,
+    "parameters": [
+      {
+        "name": "variable",
+        "type": "variable",
+        "required": true
+      },
+      {
+        "name": "label",
+        "type": "text"
+      }
+    ],
     "source": "builtin"
   },
   {
@@ -236,6 +417,22 @@
     "block": false,
     "subMacros": [],
     "storeVar": true,
+    "parameters": [
+      {
+        "name": "variable",
+        "type": "variable",
+        "required": true
+      },
+      {
+        "name": "value",
+        "type": "text",
+        "required": true
+      },
+      {
+        "name": "label",
+        "type": "text"
+      }
+    ],
     "source": "builtin"
   },
   {
@@ -245,6 +442,13 @@
       "option"
     ],
     "storeVar": true,
+    "parameters": [
+      {
+        "name": "variable",
+        "type": "variable",
+        "required": true
+      }
+    ],
     "source": "builtin"
   },
   {
@@ -252,6 +456,13 @@
     "block": true,
     "subMacros": [],
     "storeVar": true,
+    "parameters": [
+      {
+        "name": "variable",
+        "type": "variable",
+        "required": true
+      }
+    ],
     "source": "builtin"
   },
   {
@@ -271,12 +482,56 @@
     "name": "watch",
     "block": false,
     "subMacros": [],
+    "parameters": [
+      {
+        "name": "condition",
+        "type": "string",
+        "required": true
+      },
+      {
+        "name": "options",
+        "type": "options",
+        "parameters": [
+          {
+            "name": "goto",
+            "type": "string"
+          },
+          {
+            "name": "dialog",
+            "type": "string"
+          },
+          {
+            "name": "run",
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "type": "string"
+          },
+          {
+            "name": "priority",
+            "type": "number"
+          },
+          {
+            "name": "once",
+            "type": "flag"
+          }
+        ]
+      }
+    ],
     "source": "builtin"
   },
   {
     "name": "unwatch",
     "block": false,
     "subMacros": [],
+    "parameters": [
+      {
+        "name": "name",
+        "type": "text",
+        "required": true
+      }
+    ],
     "source": "builtin"
   }
 ]

package/dist/pkg/story-variables.js

@@ -248,6 +248,13 @@ var UNCLOSED = -1;
 var MALFORMED = -2;
 /** A frame result: the scan stops at index `s` inside it (`STOPPED - s`). */
 var STOPPED = -3;
+/**
+* The result of a frame that closes at `end`. `bodyStarted`: the code inside
+* started a function or class body. That body replaced the one to come, and
+* is gone once the frame is closed, so after the frame no body is to come —
+* a scan that skips the frame must know, as must the frames around it.
+*/
+var frameEnd = (end, bodyStarted) => end * 2 + +bodyStarted;
 /** The closers whose search for their frame a frame result may depend on. */
 var CLOSERS = [
 	")",
@@ -480,14 +487,30 @@ function scan(src, handlers, start, nesting, outer, ctx) {
 	]] : void 0;
 	/**
 	* How many function or class bodies to come the scan has started, and with
-	* `parens`, that count when each open frame opened. Code in a `(…)` or
-	* `[…]` that starts one replaces the one to come, and the new one can't
-	* follow once the frame is closed: none is to come then.
+	* `braces` or `parens`, that count when each open frame opened. Code in a
+	* frame that starts one replaces the one to come, and the new one can't
+	* follow once the frame is closed: none is to come then. A scan skipping
+	* the frame learns this from its result (`frameEnd`, `resume`), and counts
+	* the body as started too, for the frames around it to record.
 	*/
 	let bodyStarts = 0;
-	const startsAt = parens ? [0] : void 0;
+	const startsAt = braces || parens ? [0] : void 0;
 	/** A `(…)` or `[…]` frame result found in `parens`, to skip to. */
 	let parenTo;
+	/** The result of the frame at index `k`, closing at `i`. */
+	const closedAt = (k) => frameEnd(i, startsAt !== void 0 && bodyStarts !== startsAt[k]);
+	/**
+	* Go on after a frame an earlier scan lexed, whose result (`frameEnd`) is
+	* `result`: returns the index it closes at. A body started in it is gone
+	* after it, with the one it replaced.
+	*/
+	function resume(result) {
+		if (result % 2 === 1) {
+			pendingBody = void 0;
+			bodyStarts++;
+		}
+		return Math.floor(result / 2);
+	}
 	/** The closer `c` looked for its frame and found index `k`. */
 	function lookedFor(c, k) {
 		if (!lowest) return;
@@ -635,8 +658,8 @@ function scan(src, handlers, start, nesting, outer, ctx) {
 		if (lowest) {
 			for (let j = frames.length - 1; j >= k; j--) foldLowest(j);
 			lowest.length = k;
-			startsAt.length = k;
 		}
+		if (startsAt) startsAt.length = k;
 		frames.length = k;
 		if (stackIds) stackIds.length = k;
 		for (const list of Object.values(closers)) while (list.length && list[list.length - 1] >= k) list.pop();
@@ -713,6 +736,18 @@ function scan(src, handlers, start, nesting, outer, ctx) {
 		stmtNext = f.kind === "block";
 		keyNext = f.kind === "object" || f.kind === "class";
 	}
+	/**
+	* Go past frame `f` if an earlier scan lexed it: to just after it, or to
+	* the end of the source when it never closes. Whether it did, or
+	* MALFORMED when that scan found the code malformed.
+	*/
+	function skipLexed(f) {
+		const end = known(f);
+		if (end === void 0) return false;
+		if (end === MALFORMED) return MALFORMED;
+		i = end === UNCLOSED ? src.length : resume(end) + 1;
+		return true;
+	}
 	function openBrace() {
 		let f;
 		if (pendingBody?.depth === frames.length) {
@@ -756,10 +791,10 @@ function scan(src, handlers, start, nesting, outer, ctx) {
 			return;
 		}
 		const closed = frames[k];
+		const result = closedAt(k);
 		if (lowest && c !== "}") {
 			for (let j = frames.length - 1; j > k; j--) foldLowest(j);
-			const bodyStarted = bodyStarts !== startsAt[k];
-			recordParen(k, i * 2 + +bodyStarted);
+			recordParen(k, result);
 		}
 		truncate(k);
 		if (c === "]" && !ctx.lookahead) ctx.brackets.set(closed.open, i);
@@ -768,7 +803,7 @@ function scan(src, handlers, start, nesting, outer, ctx) {
 			stmtNext = closed.header;
 		} else if (c === "]") endPunct(c, false);
 		else {
-			record(closed, i);
+			record(closed, result);
 			afterBrace(closed);
 		}
 	}
@@ -870,23 +905,16 @@ function scan(src, handlers, start, nesting, outer, ctx) {
 			} else if (ch === "`") {
 				literal(ch, i);
 				if (frames.length === 1) return i + 1;
-				record(top(), i);
+				record(top(), closedAt(frames.length - 1));
 				i++;
 				truncate(frames.length - 1);
 				endOperand();
 			} else if (ch === "$" && src.charAt(i + 1) === "{") {
 				const f = frame("expr", "}", i);
 				f.interpolation = true;
-				const end = known(f);
-				if (end === MALFORMED) return malformed();
-				if (end === UNCLOSED) {
-					i = src.length;
-					break;
-				}
-				if (end !== void 0) {
-					i = end + 1;
-					continue;
-				}
+				const skipped = skipLexed(f);
+				if (skipped === MALFORMED) return malformed();
+				if (skipped) continue;
 				literal("${", i);
 				i += 2;
 				nesting++;
@@ -913,14 +941,9 @@ function scan(src, handlers, start, nesting, outer, ctx) {
 		if (ch === "`") {
 			endWord();
 			const f = frame("template", "`", i);
-			const end = known(f);
-			if (end === MALFORMED) return malformed();
-			if (end === UNCLOSED) {
-				i = src.length;
-				break;
-			}
-			if (end !== void 0) {
-				i = end + 1;
+			const skipped = skipLexed(f);
+			if (skipped === MALFORMED) return malformed();
+			if (skipped) {
 				endOperand();
 				continue;
 			}
@@ -939,7 +962,7 @@ function scan(src, handlers, start, nesting, outer, ctx) {
 			lookedFor("}", k);
 			if (frames[k].interpolation) {
 				endWord();
-				record(frames[k], i);
+				record(frames[k], closedAt(k));
 				truncate(k);
 				nesting--;
 				literal(ch, i);
@@ -1021,7 +1044,7 @@ function scan(src, handlers, start, nesting, outer, ctx) {
 				continue;
 			}
 		}
-		if (ch === outer.closer && frames.length === 1) break;
+		if (ch === outer.closer && (frames.length === 1 || ch === "]" && innermost("]") === 0 && innermost("}") === 0)) break;
 		trackCode(ch);
 		if (skipTo) {
 			const { frame: skipped, end } = skipTo;
@@ -1031,7 +1054,7 @@ function scan(src, handlers, start, nesting, outer, ctx) {
 				i = src.length;
 				break;
 			}
-			i = end;
+			i = resume(end);
 			afterBrace(skipped);
 			i++;
 			continue;
@@ -1049,8 +1072,7 @@ function scan(src, handlers, start, nesting, outer, ctx) {
 				strict.stopped = true;
 				return STOPPED - result;
 			}
-			i = Math.floor(result / 2);
-			if (result % 2 === 1) pendingBody = void 0;
+			i = resume(result);
 			if (skipped.closer === ")") {
 				endPunct(")", skipped.header);
 				stmtNext = skipped.header;

package/package.json

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

package/src/components/macros/Button.tsx

@@ -1,15 +1,13 @@
 import { defineMacro } from '../../define-macro';
-import { readWholeQuoted } from './arg-utils';
 import { useDetachedBody } from './detached-body';
 
 defineMacro({
   name: 'button',
   block: true,
   interpolate: true,
+  parameters: [{ name: 'label', type: 'text', required: true }],
   render({ rawArgs, children = [] }, ctx) {
-    const text =
-      readWholeQuoted(rawArgs.trim()) ?? rawArgs.replace(/^["']|["']$/g, '');
-    const label = ctx.resolve?.(text) ?? rawArgs;
+    const label = ctx.resolve?.(ctx.args.label ?? '') ?? rawArgs;
     const runBody = useDetachedBody();
 
     // Run the body outside the passage tree: all macro side effects ({set},

package/src/components/macros/Checkbox.tsx

@@ -1,21 +1,14 @@
 import { defineMacro } from '../../define-macro';
-import { readWholeQuoted, stripLooseQuotes } from './arg-utils';
-
-export function parseCheckboxLabel(rawArgs: string): string {
-  // `s`: a quoted label may span lines. Its trailing whitespace is trimmed
-  // here, not by the regex: `(.+?)\s*$` tries every position of a run of
-  // spaces in the label, taking time quadratic in its length.
-  const match = rawArgs.match(/^\s*["']?\$?[\w.]+["']?\s+(.+)$/s);
-  if (!match) return '';
-  const rest = match[1]!.trimEnd() || match[1]!;
-  return readWholeQuoted(rest) ?? stripLooseQuotes(rest);
-}
 
 defineMacro({
   name: 'checkbox',
   storeVar: true,
-  render({ rawArgs }, ctx) {
-    const label = parseCheckboxLabel(rawArgs);
+  parameters: [
+    { name: 'variable', type: 'variable', required: true },
+    { name: 'label', type: 'text' },
+  ],
+  render(_props, ctx) {
+    const label = ctx.args.label ?? '';
 
     ctx.useAction({
       type: 'checkbox',