@rohal12/spindle 0.59.13 → 0.59.15

package/dist/pkg/story-variables.js

@@ -69,6 +69,11 @@ var LINK_SEPARATORS = [
 ];
 var NO_SELECTORS = {};
 /**
+* A CommonMark email autolink, `<` an address `>` (without braces, which
+* are markup), as markdown reads one.
+*/
+var EMAIL_AUTOLINK = /^<[a-zA-Z0-9.!#$%&'*+/=?^_`|~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*>$/;
+/**
 * A link's display text and target, from its text `inner` (at `at` in the
 * input), with where the target is written.
 */
@@ -346,10 +351,11 @@ function peg$parse(input, options) {
 	const peg$c10 = " ";
 	const peg$c11 = "}";
 	const peg$c12 = "/";
-	const peg$c13 = "</";
-	const peg$c14 = "=";
-	const peg$c15 = "\"";
-	const peg$c16 = "'";
+	const peg$c13 = "@";
+	const peg$c14 = "</";
+	const peg$c15 = "=";
+	const peg$c16 = "\"";
+	const peg$c17 = "'";
 	const peg$r0 = /^[^\\{[<]/;
 	const peg$r1 = /^[{}]/;
 	const peg$r2 = /^[$_@%(!\/a-zA-Z]/;
@@ -360,14 +366,16 @@ function peg$parse(input, options) {
 	const peg$r7 = /^[$_@%(!]/;
 	const peg$r8 = /^[a-zA-Z]/;
 	const peg$r9 = /^[^ \t\n\r\v\f\xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF}]/;
-	const peg$r10 = /^[\t-\r \/>\xA0\u1680\u2000-\u200A\u2028-\u2029\u202F\u205F\u3000\uFEFF]/;
-	const peg$r11 = /^[a-zA-Z0-9\-]/;
-	const peg$r12 = /^[\t-\r "'\/<->{}\xA0\u1680\u2000-\u200A\u2028-\u2029\u202F\u205F\u3000\uFEFF]/;
-	const peg$r13 = /^[^"]/;
-	const peg$r14 = /^[^']/;
-	const peg$r15 = /^["']/;
-	const peg$r16 = /^[^ \t\n\r\v\f\xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF>]/;
-	const peg$r17 = /^[ \t\n\r\v\f\xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]/;
+	const peg$r10 = /^[a-zA-Z0-9.!#$%&'*+\/=?\^_`|~\-]/;
+	const peg$r11 = /^[a-zA-Z0-9.\-]/;
+	const peg$r12 = /^[\t-\r \/>\xA0\u1680\u2000-\u200A\u2028-\u2029\u202F\u205F\u3000\uFEFF]/;
+	const peg$r13 = /^[a-zA-Z0-9\-]/;
+	const peg$r14 = /^[\t-\r "'\/<->{}\xA0\u1680\u2000-\u200A\u2028-\u2029\u202F\u205F\u3000\uFEFF]/;
+	const peg$r15 = /^[^"]/;
+	const peg$r16 = /^[^']/;
+	const peg$r17 = /^["']/;
+	const peg$r18 = /^[^ \t\n\r\v\f\xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF>]/;
+	const peg$r19 = /^[ \t\n\r\v\f\xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]/;
 	const peg$e0 = peg$anyExpectation();
 	const peg$e1 = peg$classExpectation([
 		"\\",
@@ -449,6 +457,37 @@ function peg$parse(input, options) {
 		"}"
 	], true, false, false);
 	const peg$e24 = peg$classExpectation([
+		["a", "z"],
+		["A", "Z"],
+		["0", "9"],
+		".",
+		"!",
+		"#",
+		"$",
+		"%",
+		"&",
+		"'",
+		"*",
+		"+",
+		"/",
+		"=",
+		"?",
+		"^",
+		"_",
+		"`",
+		"|",
+		"~",
+		"-"
+	], false, false, false);
+	const peg$e25 = peg$literalExpectation("@", false);
+	const peg$e26 = peg$classExpectation([
+		["a", "z"],
+		["A", "Z"],
+		["0", "9"],
+		".",
+		"-"
+	], false, false, false);
+	const peg$e27 = peg$classExpectation([
 		["	", "\r"],
 		" ",
 		"/",
@@ -462,14 +501,14 @@ function peg$parse(input, options) {
 		"　",
 		""
 	], false, false, false);
-	const peg$e25 = peg$literalExpectation("</", false);
-	const peg$e26 = peg$classExpectation([
+	const peg$e28 = peg$literalExpectation("</", false);
+	const peg$e29 = peg$classExpectation([
 		["a", "z"],
 		["A", "Z"],
 		["0", "9"],
 		"-"
 	], false, false, false);
-	const peg$e27 = peg$classExpectation([
+	const peg$e30 = peg$classExpectation([
 		["	", "\r"],
 		" ",
 		"\"",
@@ -487,13 +526,13 @@ function peg$parse(input, options) {
 		"　",
 		""
 	], false, false, false);
-	const peg$e28 = peg$literalExpectation("=", false);
-	const peg$e29 = peg$literalExpectation("\"", false);
-	const peg$e30 = peg$classExpectation(["\""], true, false, false);
-	const peg$e31 = peg$literalExpectation("'", false);
-	const peg$e32 = peg$classExpectation(["'"], true, false, false);
-	const peg$e33 = peg$classExpectation(["\"", "'"], false, false, false);
-	const peg$e34 = peg$classExpectation([
+	const peg$e31 = peg$literalExpectation("=", false);
+	const peg$e32 = peg$literalExpectation("\"", false);
+	const peg$e33 = peg$classExpectation(["\""], true, false, false);
+	const peg$e34 = peg$literalExpectation("'", false);
+	const peg$e35 = peg$classExpectation(["'"], true, false, false);
+	const peg$e36 = peg$classExpectation(["\"", "'"], false, false, false);
+	const peg$e37 = peg$classExpectation([
 		" ",
 		"	",
 		"\n",
@@ -511,7 +550,7 @@ function peg$parse(input, options) {
 		"",
 		">"
 	], true, false, false);
-	const peg$e35 = peg$classExpectation([
+	const peg$e38 = peg$classExpectation([
 		" ",
 		"	",
 		"\n",
@@ -804,16 +843,22 @@ function peg$parse(input, options) {
 	function peg$f67(s) {
 		fail("A closing tag starts with a letter after " + LB + "/", location());
 	}
-	function peg$f68() {
+	function peg$f68(value) {
+		return EMAIL_AUTOLINK.test(value);
+	}
+	function peg$f69(value) {
+		return lexeme("text", location(), { value });
+	}
+	function peg$f70() {
 		return !textMode;
 	}
-	function peg$f69(tag) {
+	function peg$f71(tag) {
 		return VOID_TAGS.has(tag.lower);
 	}
-	function peg$f70(tag) {
+	function peg$f72(tag) {
 		return null;
 	}
-	function peg$f71(tag, list, slash) {
+	function peg$f73(tag, list, slash) {
 		const lower = tag.toLowerCase();
 		return lexeme("html", location(), {
 			tag,
@@ -823,7 +868,7 @@ function peg$parse(input, options) {
 			isSelfClose: !!slash || VOID_TAGS.has(lower)
 		});
 	}
-	function peg$f72(tag, bad) {
+	function peg$f74(tag, bad) {
 		const c = input.charAt(bad);
 		if (!c) fail("Unclosed tag <" + tag + ": no > ends it (write &lt; for a < that starts no tag)", location());
 		const at = {
@@ -841,7 +886,7 @@ function peg$parse(input, options) {
 		};
 		fail("Unexpected " + JSON.stringify(c) + " in the tag <" + tag + ">: expected an attribute, or > to end the tag", at);
 	}
-	function peg$f73(tag) {
+	function peg$f75(tag) {
 		return lexeme("html", location(), {
 			tag,
 			lower: tag.toLowerCase(),
@@ -850,44 +895,44 @@ function peg$parse(input, options) {
 			isSelfClose: false
 		});
 	}
-	function peg$f74(name) {
+	function peg$f76(name) {
 		attrCode = hooks.isCodeAttribute(name);
 		return true;
 	}
-	function peg$f75(name, v) {
+	function peg$f77(name, v) {
 		return v;
 	}
-	function peg$f76(name, value) {
+	function peg$f78(name, value) {
 		return [name, value ?? ""];
 	}
-	function peg$f77(v) {
+	function peg$f79(v) {
 		return v;
 	}
-	function peg$f78(v) {
+	function peg$f80(v) {
 		return v;
 	}
-	function peg$f79(q) {
+	function peg$f81(q) {
 		fail("Unclosed attribute value: the " + q + " here has no closing " + q, location());
 	}
-	function peg$f80() {
+	function peg$f82() {
 		return !attrCode;
 	}
-	function peg$f81(bs) {
+	function peg$f83(bs) {
 		return bs.length % 2 === 1;
 	}
-	function peg$f82() {
+	function peg$f84() {
 		return !attrCode;
 	}
-	function peg$f83(start, nameEnd) {
+	function peg$f85(start, nameEnd) {
 		return skipTo(hooks.closeBrace(input, nameEnd, start));
 	}
-	function peg$f84(start, nameEnd) {
+	function peg$f86(start, nameEnd) {
 		return skipEnd - offset();
 	}
-	function peg$f85() {
+	function peg$f87() {
 		return !attrCode;
 	}
-	function peg$f86() {
+	function peg$f88() {
 		return attrCode;
 	}
 	let peg$currPos = options.peg$currPos | 0;
@@ -1078,14 +1123,17 @@ function peg$parse(input, options) {
 				if (s0 === peg$FAILED) {
 					s0 = peg$parseLinkLexeme();
 					if (s0 === peg$FAILED) {
-						s0 = peg$parseHtmlElement();
+						s0 = peg$parseEmailAutolink();
 						if (s0 === peg$FAILED) {
-							s0 = peg$parseVoidCloser();
+							s0 = peg$parseHtmlElement();
 							if (s0 === peg$FAILED) {
-								s0 = peg$parseValue();
+								s0 = peg$parseVoidCloser();
 								if (s0 === peg$FAILED) {
-									s0 = peg$parseMacroElement();
-									if (s0 === peg$FAILED) s0 = peg$parseLiteral();
+									s0 = peg$parseValue();
+									if (s0 === peg$FAILED) {
+										s0 = peg$parseMacroElement();
+										if (s0 === peg$FAILED) s0 = peg$parseLiteral();
+									}
 								}
 							}
 						}
@@ -1433,35 +1481,18 @@ function peg$parse(input, options) {
 				if (s0 === peg$FAILED) {
 					s0 = peg$parseLinkLexeme();
 					if (s0 === peg$FAILED) {
-						s0 = peg$currPos;
-						peg$savedPos = peg$currPos;
-						s1 = peg$f29();
-						if (s1) s1 = void 0;
-						else s1 = peg$FAILED;
-						if (s1 !== peg$FAILED) {
-							s2 = peg$parseHtmlOpen();
-							if (s2 !== peg$FAILED) {
-								peg$savedPos = s0;
-								s0 = peg$f30(s2);
-							} else {
-								peg$currPos = s0;
-								s0 = peg$FAILED;
-							}
-						} else {
-							peg$currPos = s0;
-							s0 = peg$FAILED;
-						}
+						s0 = peg$parseEmailAutolink();
 						if (s0 === peg$FAILED) {
 							s0 = peg$currPos;
 							peg$savedPos = peg$currPos;
-							s1 = peg$f31();
+							s1 = peg$f29();
 							if (s1) s1 = void 0;
 							else s1 = peg$FAILED;
 							if (s1 !== peg$FAILED) {
-								s2 = peg$parseHtmlClose();
+								s2 = peg$parseHtmlOpen();
 								if (s2 !== peg$FAILED) {
 									peg$savedPos = s0;
-									s0 = peg$f32(s2);
+									s0 = peg$f30(s2);
 								} else {
 									peg$currPos = s0;
 									s0 = peg$FAILED;
@@ -1471,37 +1502,57 @@ function peg$parse(input, options) {
 								s0 = peg$FAILED;
 							}
 							if (s0 === peg$FAILED) {
-								s0 = peg$parseValue();
+								s0 = peg$currPos;
+								peg$savedPos = peg$currPos;
+								s1 = peg$f31();
+								if (s1) s1 = void 0;
+								else s1 = peg$FAILED;
+								if (s1 !== peg$FAILED) {
+									s2 = peg$parseHtmlClose();
+									if (s2 !== peg$FAILED) {
+										peg$savedPos = s0;
+										s0 = peg$f32(s2);
+									} else {
+										peg$currPos = s0;
+										s0 = peg$FAILED;
+									}
+								} else {
+									peg$currPos = s0;
+									s0 = peg$FAILED;
+								}
 								if (s0 === peg$FAILED) {
-									s0 = peg$currPos;
-									s1 = peg$parseMacroTag();
-									if (s1 !== peg$FAILED) {
-										s2 = peg$currPos;
-										peg$savedPos = peg$currPos;
-										s3 = peg$f33(s1);
-										if (s3) s3 = void 0;
-										else s3 = peg$FAILED;
-										if (s3 !== peg$FAILED) {
-											s4 = peg$parseRawTokens();
-											if (s4 !== peg$FAILED) {
-												peg$savedPos = s2;
-												s2 = peg$f34(s1, s4);
+									s0 = peg$parseValue();
+									if (s0 === peg$FAILED) {
+										s0 = peg$currPos;
+										s1 = peg$parseMacroTag();
+										if (s1 !== peg$FAILED) {
+											s2 = peg$currPos;
+											peg$savedPos = peg$currPos;
+											s3 = peg$f33(s1);
+											if (s3) s3 = void 0;
+											else s3 = peg$FAILED;
+											if (s3 !== peg$FAILED) {
+												s4 = peg$parseRawTokens();
+												if (s4 !== peg$FAILED) {
+													peg$savedPos = s2;
+													s2 = peg$f34(s1, s4);
+												} else {
+													peg$currPos = s2;
+													s2 = peg$FAILED;
+												}
 											} else {
 												peg$currPos = s2;
 												s2 = peg$FAILED;
 											}
+											if (s2 === peg$FAILED) s2 = null;
+											peg$savedPos = s0;
+											s0 = peg$f35(s1, s2);
 										} else {
-											peg$currPos = s2;
-											s2 = peg$FAILED;
+											peg$currPos = s0;
+											s0 = peg$FAILED;
 										}
-										if (s2 === peg$FAILED) s2 = null;
-										peg$savedPos = s0;
-										s0 = peg$f35(s1, s2);
-									} else {
-										peg$currPos = s0;
-										s0 = peg$FAILED;
+										if (s0 === peg$FAILED) s0 = peg$parseLiteral();
 									}
-									if (s0 === peg$FAILED) s0 = peg$parseLiteral();
 								}
 							}
 						}
@@ -2643,23 +2694,136 @@ function peg$parse(input, options) {
 		else s0 = s1;
 		return s0;
 	}
+	function peg$parseEmailAutolink() {
+		let s0, s1, s2, s3, s4, s5, s6, s7;
+		s0 = peg$currPos;
+		s1 = peg$currPos;
+		s2 = peg$currPos;
+		if (input.charCodeAt(peg$currPos) === 60) {
+			s3 = peg$c6;
+			peg$currPos++;
+		} else {
+			s3 = peg$FAILED;
+			if (peg$silentFails === 0) peg$fail(peg$e10);
+		}
+		if (s3 !== peg$FAILED) {
+			s4 = [];
+			s5 = input.charAt(peg$currPos);
+			if (peg$r10.test(s5)) peg$currPos++;
+			else {
+				s5 = peg$FAILED;
+				if (peg$silentFails === 0) peg$fail(peg$e24);
+			}
+			if (s5 !== peg$FAILED) while (s5 !== peg$FAILED) {
+				s4.push(s5);
+				s5 = input.charAt(peg$currPos);
+				if (peg$r10.test(s5)) peg$currPos++;
+				else {
+					s5 = peg$FAILED;
+					if (peg$silentFails === 0) peg$fail(peg$e24);
+				}
+			}
+			else s4 = peg$FAILED;
+			if (s4 !== peg$FAILED) {
+				if (input.charCodeAt(peg$currPos) === 64) {
+					s5 = peg$c13;
+					peg$currPos++;
+				} else {
+					s5 = peg$FAILED;
+					if (peg$silentFails === 0) peg$fail(peg$e25);
+				}
+				if (s5 !== peg$FAILED) {
+					s6 = [];
+					s7 = input.charAt(peg$currPos);
+					if (peg$r11.test(s7)) peg$currPos++;
+					else {
+						s7 = peg$FAILED;
+						if (peg$silentFails === 0) peg$fail(peg$e26);
+					}
+					if (s7 !== peg$FAILED) while (s7 !== peg$FAILED) {
+						s6.push(s7);
+						s7 = input.charAt(peg$currPos);
+						if (peg$r11.test(s7)) peg$currPos++;
+						else {
+							s7 = peg$FAILED;
+							if (peg$silentFails === 0) peg$fail(peg$e26);
+						}
+					}
+					else s6 = peg$FAILED;
+					if (s6 !== peg$FAILED) {
+						if (input.charCodeAt(peg$currPos) === 62) {
+							s7 = peg$c1;
+							peg$currPos++;
+						} else {
+							s7 = peg$FAILED;
+							if (peg$silentFails === 0) peg$fail(peg$e3);
+						}
+						if (s7 !== peg$FAILED) {
+							s3 = [
+								s3,
+								s4,
+								s5,
+								s6,
+								s7
+							];
+							s2 = s3;
+						} else {
+							peg$currPos = s2;
+							s2 = peg$FAILED;
+						}
+					} else {
+						peg$currPos = s2;
+						s2 = peg$FAILED;
+					}
+				} else {
+					peg$currPos = s2;
+					s2 = peg$FAILED;
+				}
+			} else {
+				peg$currPos = s2;
+				s2 = peg$FAILED;
+			}
+		} else {
+			peg$currPos = s2;
+			s2 = peg$FAILED;
+		}
+		if (s2 !== peg$FAILED) s1 = input.substring(s1, peg$currPos);
+		else s1 = s2;
+		if (s1 !== peg$FAILED) {
+			peg$savedPos = peg$currPos;
+			s2 = peg$f68(s1);
+			if (s2) s2 = void 0;
+			else s2 = peg$FAILED;
+			if (s2 !== peg$FAILED) {
+				peg$savedPos = s0;
+				s0 = peg$f69(s1);
+			} else {
+				peg$currPos = s0;
+				s0 = peg$FAILED;
+			}
+		} else {
+			peg$currPos = s0;
+			s0 = peg$FAILED;
+		}
+		return s0;
+	}
 	function peg$parseVoidCloser() {
 		let s0, s1, s2, s3;
 		s0 = peg$currPos;
 		peg$savedPos = peg$currPos;
-		s1 = peg$f68();
+		s1 = peg$f70();
 		if (s1) s1 = void 0;
 		else s1 = peg$FAILED;
 		if (s1 !== peg$FAILED) {
 			s2 = peg$parseHtmlClose();
 			if (s2 !== peg$FAILED) {
 				peg$savedPos = peg$currPos;
-				s3 = peg$f69(s2);
+				s3 = peg$f71(s2);
 				if (s3) s3 = void 0;
 				else s3 = peg$FAILED;
 				if (s3 !== peg$FAILED) {
 					peg$savedPos = s0;
-					s0 = peg$f70(s2);
+					s0 = peg$f72(s2);
 				} else {
 					peg$currPos = s0;
 					s0 = peg$FAILED;
@@ -2711,7 +2875,7 @@ function peg$parse(input, options) {
 				}
 				if (s6 !== peg$FAILED) {
 					peg$savedPos = s0;
-					s0 = peg$f71(s2, s3, s5);
+					s0 = peg$f73(s2, s3, s5);
 				} else {
 					peg$currPos = s0;
 					s0 = peg$FAILED;
@@ -2739,10 +2903,10 @@ function peg$parse(input, options) {
 					s3 = peg$currPos;
 					peg$silentFails++;
 					s4 = input.charAt(peg$currPos);
-					if (peg$r10.test(s4)) peg$currPos++;
+					if (peg$r12.test(s4)) peg$currPos++;
 					else {
 						s4 = peg$FAILED;
-						if (peg$silentFails === 0) peg$fail(peg$e24);
+						if (peg$silentFails === 0) peg$fail(peg$e27);
 					}
 					if (s4 === peg$FAILED) {
 						s4 = peg$currPos;
@@ -2776,7 +2940,7 @@ function peg$parse(input, options) {
 						s5 = peg$parse_();
 						s6 = peg$parseHere();
 						peg$savedPos = s0;
-						s0 = peg$f72(s2, s6);
+						s0 = peg$f74(s2, s6);
 					} else {
 						peg$currPos = s0;
 						s0 = peg$FAILED;
@@ -2795,12 +2959,12 @@ function peg$parse(input, options) {
 	function peg$parseHtmlClose() {
 		let s0, s1, s2, s4;
 		s0 = peg$currPos;
-		if (input.substr(peg$currPos, 2) === peg$c13) {
-			s1 = peg$c13;
+		if (input.substr(peg$currPos, 2) === peg$c14) {
+			s1 = peg$c14;
 			peg$currPos += 2;
 		} else {
 			s1 = peg$FAILED;
-			if (peg$silentFails === 0) peg$fail(peg$e25);
+			if (peg$silentFails === 0) peg$fail(peg$e28);
 		}
 		if (s1 !== peg$FAILED) {
 			s2 = peg$parseTagName();
@@ -2815,7 +2979,7 @@ function peg$parse(input, options) {
 				}
 				if (s4 !== peg$FAILED) {
 					peg$savedPos = s0;
-					s0 = peg$f73(s2);
+					s0 = peg$f75(s2);
 				} else {
 					peg$currPos = s0;
 					s0 = peg$FAILED;
@@ -2843,18 +3007,18 @@ function peg$parse(input, options) {
 		if (s2 !== peg$FAILED) {
 			s3 = [];
 			s4 = input.charAt(peg$currPos);
-			if (peg$r11.test(s4)) peg$currPos++;
+			if (peg$r13.test(s4)) peg$currPos++;
 			else {
 				s4 = peg$FAILED;
-				if (peg$silentFails === 0) peg$fail(peg$e26);
+				if (peg$silentFails === 0) peg$fail(peg$e29);
 			}
 			while (s4 !== peg$FAILED) {
 				s3.push(s4);
 				s4 = input.charAt(peg$currPos);
-				if (peg$r11.test(s4)) peg$currPos++;
+				if (peg$r13.test(s4)) peg$currPos++;
 				else {
 					s4 = peg$FAILED;
-					if (peg$silentFails === 0) peg$fail(peg$e26);
+					if (peg$silentFails === 0) peg$fail(peg$e29);
 				}
 			}
 			s2 = [s2, s3];
@@ -2877,10 +3041,10 @@ function peg$parse(input, options) {
 		s5 = peg$currPos;
 		peg$silentFails++;
 		s6 = input.charAt(peg$currPos);
-		if (peg$r12.test(s6)) peg$currPos++;
+		if (peg$r14.test(s6)) peg$currPos++;
 		else {
 			s6 = peg$FAILED;
-			if (peg$silentFails === 0) peg$fail(peg$e27);
+			if (peg$silentFails === 0) peg$fail(peg$e30);
 		}
 		peg$silentFails--;
 		if (s6 === peg$FAILED) s5 = void 0;
@@ -2913,10 +3077,10 @@ function peg$parse(input, options) {
 			s5 = peg$currPos;
 			peg$silentFails++;
 			s6 = input.charAt(peg$currPos);
-			if (peg$r12.test(s6)) peg$currPos++;
+			if (peg$r14.test(s6)) peg$currPos++;
 			else {
 				s6 = peg$FAILED;
-				if (peg$silentFails === 0) peg$fail(peg$e27);
+				if (peg$silentFails === 0) peg$fail(peg$e30);
 			}
 			peg$silentFails--;
 			if (s6 === peg$FAILED) s5 = void 0;
@@ -2949,25 +3113,25 @@ function peg$parse(input, options) {
 		else s2 = s3;
 		if (s2 !== peg$FAILED) {
 			peg$savedPos = peg$currPos;
-			s3 = peg$f74(s2);
+			s3 = peg$f76(s2);
 			if (s3) s3 = void 0;
 			else s3 = peg$FAILED;
 			if (s3 !== peg$FAILED) {
 				s4 = peg$currPos;
 				s5 = peg$parse_();
 				if (input.charCodeAt(peg$currPos) === 61) {
-					s6 = peg$c14;
+					s6 = peg$c15;
 					peg$currPos++;
 				} else {
 					s6 = peg$FAILED;
-					if (peg$silentFails === 0) peg$fail(peg$e28);
+					if (peg$silentFails === 0) peg$fail(peg$e31);
 				}
 				if (s6 !== peg$FAILED) {
 					peg$parse_();
 					s8 = peg$parseAttrValue();
 					if (s8 !== peg$FAILED) {
 						peg$savedPos = s4;
-						s4 = peg$f75(s2, s8);
+						s4 = peg$f77(s2, s8);
 					} else {
 						peg$currPos = s4;
 						s4 = peg$FAILED;
@@ -2978,7 +3142,7 @@ function peg$parse(input, options) {
 				}
 				if (s4 === peg$FAILED) s4 = null;
 				peg$savedPos = s0;
-				s0 = peg$f76(s2, s4);
+				s0 = peg$f78(s2, s4);
 			} else {
 				peg$currPos = s0;
 				s0 = peg$FAILED;
@@ -2993,11 +3157,11 @@ function peg$parse(input, options) {
 		let s0, s1, s2, s3, s4;
 		s0 = peg$currPos;
 		if (input.charCodeAt(peg$currPos) === 34) {
-			s1 = peg$c15;
+			s1 = peg$c16;
 			peg$currPos++;
 		} else {
 			s1 = peg$FAILED;
-			if (peg$silentFails === 0) peg$fail(peg$e29);
+			if (peg$silentFails === 0) peg$fail(peg$e32);
 		}
 		if (s1 !== peg$FAILED) {
 			s2 = peg$currPos;
@@ -3005,10 +3169,10 @@ function peg$parse(input, options) {
 			s4 = peg$parseValuePart();
 			if (s4 === peg$FAILED) {
 				s4 = input.charAt(peg$currPos);
-				if (peg$r13.test(s4)) peg$currPos++;
+				if (peg$r15.test(s4)) peg$currPos++;
 				else {
 					s4 = peg$FAILED;
-					if (peg$silentFails === 0) peg$fail(peg$e30);
+					if (peg$silentFails === 0) peg$fail(peg$e33);
 				}
 			}
 			while (s4 !== peg$FAILED) {
@@ -3016,24 +3180,24 @@ function peg$parse(input, options) {
 				s4 = peg$parseValuePart();
 				if (s4 === peg$FAILED) {
 					s4 = input.charAt(peg$currPos);
-					if (peg$r13.test(s4)) peg$currPos++;
+					if (peg$r15.test(s4)) peg$currPos++;
 					else {
 						s4 = peg$FAILED;
-						if (peg$silentFails === 0) peg$fail(peg$e30);
+						if (peg$silentFails === 0) peg$fail(peg$e33);
 					}
 				}
 			}
 			s2 = input.substring(s2, peg$currPos);
 			if (input.charCodeAt(peg$currPos) === 34) {
-				s3 = peg$c15;
+				s3 = peg$c16;
 				peg$currPos++;
 			} else {
 				s3 = peg$FAILED;
-				if (peg$silentFails === 0) peg$fail(peg$e29);
+				if (peg$silentFails === 0) peg$fail(peg$e32);
 			}
 			if (s3 !== peg$FAILED) {
 				peg$savedPos = s0;
-				s0 = peg$f77(s2);
+				s0 = peg$f79(s2);
 			} else {
 				peg$currPos = s0;
 				s0 = peg$FAILED;
@@ -3045,11 +3209,11 @@ function peg$parse(input, options) {
 		if (s0 === peg$FAILED) {
 			s0 = peg$currPos;
 			if (input.charCodeAt(peg$currPos) === 39) {
-				s1 = peg$c16;
+				s1 = peg$c17;
 				peg$currPos++;
 			} else {
 				s1 = peg$FAILED;
-				if (peg$silentFails === 0) peg$fail(peg$e31);
+				if (peg$silentFails === 0) peg$fail(peg$e34);
 			}
 			if (s1 !== peg$FAILED) {
 				s2 = peg$currPos;
@@ -3057,10 +3221,10 @@ function peg$parse(input, options) {
 				s4 = peg$parseValuePart();
 				if (s4 === peg$FAILED) {
 					s4 = input.charAt(peg$currPos);
-					if (peg$r14.test(s4)) peg$currPos++;
+					if (peg$r16.test(s4)) peg$currPos++;
 					else {
 						s4 = peg$FAILED;
-						if (peg$silentFails === 0) peg$fail(peg$e32);
+						if (peg$silentFails === 0) peg$fail(peg$e35);
 					}
 				}
 				while (s4 !== peg$FAILED) {
@@ -3068,24 +3232,24 @@ function peg$parse(input, options) {
 					s4 = peg$parseValuePart();
 					if (s4 === peg$FAILED) {
 						s4 = input.charAt(peg$currPos);
-						if (peg$r14.test(s4)) peg$currPos++;
+						if (peg$r16.test(s4)) peg$currPos++;
 						else {
 							s4 = peg$FAILED;
-							if (peg$silentFails === 0) peg$fail(peg$e32);
+							if (peg$silentFails === 0) peg$fail(peg$e35);
 						}
 					}
 				}
 				s2 = input.substring(s2, peg$currPos);
 				if (input.charCodeAt(peg$currPos) === 39) {
-					s3 = peg$c16;
+					s3 = peg$c17;
 					peg$currPos++;
 				} else {
 					s3 = peg$FAILED;
-					if (peg$silentFails === 0) peg$fail(peg$e31);
+					if (peg$silentFails === 0) peg$fail(peg$e34);
 				}
 				if (s3 !== peg$FAILED) {
 					peg$savedPos = s0;
-					s0 = peg$f78(s2);
+					s0 = peg$f80(s2);
 				} else {
 					peg$currPos = s0;
 					s0 = peg$FAILED;
@@ -3097,32 +3261,32 @@ function peg$parse(input, options) {
 			if (s0 === peg$FAILED) {
 				s0 = peg$currPos;
 				s1 = input.charAt(peg$currPos);
-				if (peg$r15.test(s1)) peg$currPos++;
+				if (peg$r17.test(s1)) peg$currPos++;
 				else {
 					s1 = peg$FAILED;
-					if (peg$silentFails === 0) peg$fail(peg$e33);
+					if (peg$silentFails === 0) peg$fail(peg$e36);
 				}
 				if (s1 !== peg$FAILED) {
 					peg$savedPos = s0;
-					s1 = peg$f79(s1);
+					s1 = peg$f81(s1);
 				}
 				s0 = s1;
 				if (s0 === peg$FAILED) {
 					s0 = peg$currPos;
 					s1 = [];
 					s2 = input.charAt(peg$currPos);
-					if (peg$r16.test(s2)) peg$currPos++;
+					if (peg$r18.test(s2)) peg$currPos++;
 					else {
 						s2 = peg$FAILED;
-						if (peg$silentFails === 0) peg$fail(peg$e34);
+						if (peg$silentFails === 0) peg$fail(peg$e37);
 					}
 					while (s2 !== peg$FAILED) {
 						s1.push(s2);
 						s2 = input.charAt(peg$currPos);
-						if (peg$r16.test(s2)) peg$currPos++;
+						if (peg$r18.test(s2)) peg$currPos++;
 						else {
 							s2 = peg$FAILED;
-							if (peg$silentFails === 0) peg$fail(peg$e34);
+							if (peg$silentFails === 0) peg$fail(peg$e37);
 						}
 					}
 					s0 = input.substring(s0, peg$currPos);
@@ -3135,7 +3299,7 @@ function peg$parse(input, options) {
 		let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13;
 		s0 = peg$currPos;
 		peg$savedPos = peg$currPos;
-		s1 = peg$f80();
+		s1 = peg$f82();
 		if (s1) s1 = void 0;
 		else s1 = peg$FAILED;
 		if (s1 !== peg$FAILED) {
@@ -3164,7 +3328,7 @@ function peg$parse(input, options) {
 			if (s2 !== peg$FAILED) {
 				s3 = peg$currPos;
 				peg$savedPos = peg$currPos;
-				s4 = peg$f81(s2);
+				s4 = peg$f83(s2);
 				if (s4) s4 = void 0;
 				else s4 = peg$FAILED;
 				if (s4 !== peg$FAILED) {
@@ -3203,7 +3367,7 @@ function peg$parse(input, options) {
 		if (s0 === peg$FAILED) {
 			s0 = peg$currPos;
 			peg$savedPos = peg$currPos;
-			s1 = peg$f82();
+			s1 = peg$f84();
 			if (s1) s1 = void 0;
 			else s1 = peg$FAILED;
 			if (s1 !== peg$FAILED) {
@@ -3230,12 +3394,12 @@ function peg$parse(input, options) {
 						if (s6 !== peg$FAILED) {
 							s7 = peg$parseHere();
 							peg$savedPos = peg$currPos;
-							s8 = peg$f83(s4, s7);
+							s8 = peg$f85(s4, s7);
 							if (s8) s8 = void 0;
 							else s8 = peg$FAILED;
 							if (s8 !== peg$FAILED) {
 								s9 = peg$currPos;
-								s10 = peg$f84(s4, s7);
+								s10 = peg$f86(s4, s7);
 								s11 = peg$currPos;
 								s12 = [];
 								if (s12.length >= (s10 | 0)) s13 = peg$FAILED;
@@ -3317,7 +3481,7 @@ function peg$parse(input, options) {
 			if (s0 === peg$FAILED) {
 				s0 = peg$currPos;
 				peg$savedPos = peg$currPos;
-				s1 = peg$f85();
+				s1 = peg$f87();
 				if (s1) s1 = void 0;
 				else s1 = peg$FAILED;
 				if (s1 !== peg$FAILED) {
@@ -3408,7 +3572,7 @@ function peg$parse(input, options) {
 				if (s0 === peg$FAILED) {
 					s0 = peg$currPos;
 					peg$savedPos = peg$currPos;
-					s1 = peg$f86();
+					s1 = peg$f88();
 					if (s1) s1 = void 0;
 					else s1 = peg$FAILED;
 					if (s1 !== peg$FAILED) {
@@ -3490,10 +3654,10 @@ function peg$parse(input, options) {
 	function peg$parse_c() {
 		let s0;
 		s0 = input.charAt(peg$currPos);
-		if (peg$r17.test(s0)) peg$currPos++;
+		if (peg$r19.test(s0)) peg$currPos++;
 		else {
 			s0 = peg$FAILED;
-			if (peg$silentFails === 0) peg$fail(peg$e35);
+			if (peg$silentFails === 0) peg$fail(peg$e38);
 		}
 		return s0;
 	}
@@ -10431,28 +10595,34 @@ function parseWidgetDef(rawArgs) {
 	return widgetDef(parseMacroArgs(rawArgs, WIDGET_PARAMETERS));
 }
 /**
-* A definition: its arguments (read like a {widget} macro's, see
-* parseWidgetDef) and its body. Macro names are not case-sensitive.
-*/
-var WIDGET_DEFINITION = /\{widget\s+([^}]*)\}([\s\S]*?)\{\/widget\}/gi;
-/** `{@children}`, also with selectors such as `{.highlight @children}`. */
-var CHILDREN_PLACEHOLDER = /\{[^{}]*@children\s*\}/;
-/**
 * The names of the block widgets (those whose body renders `{@children}`)
 * that StoryInit and the passages tagged `widget` define. They must be
 * known as block macros before any passage is parsed, so that passages
 * invoking them nest their content whatever the passage order.
+*
+* The passages are read as flat tokens, which need no block macros to be
+* known, so a `{@children}` in an HTML comment or in a `{do}` body is text
+* here as it is to the parser, and does not make a block widget (#387).
 */
 function blockWidgetNames(passages) {
 	const names = [];
 	for (const passage of passages) {
 		if (passage.name !== "StoryInit" && !passage.tags?.includes("widget")) continue;
-		for (const match of passage.content.matchAll(WIDGET_DEFINITION)) {
-			if (!CHILDREN_PLACEHOLDER.test(match[2])) continue;
+		const open = [];
+		for (const token of tokenizeMarkupTolerant(passage.content).tokens) if (token.type === "macro" && token.name.toLowerCase() === "widget") {
+			if (!token.isClose) {
+				open.push({
+					rawArgs: token.rawArgs,
+					isBlock: false
+				});
+				continue;
+			}
+			const def = open.pop();
+			if (!def?.isBlock) continue;
 			try {
-				names.push(parseWidgetDef(match[1]).name);
+				names.push(parseWidgetDef(def.rawArgs).name);
 			} catch {}
-		}
+		} else if (token.type === "variable" && token.scope === "local" && token.name === "children" && open.length > 0) open[open.length - 1].isBlock = true;
 	}
 	return names;
 }