rip-lang 3.16.2 → 3.17.0-wip.1

package/docs/dist/rip.js

@@ -1925,6 +1925,16 @@ function __schemaFkName(m)    { return ''; }   // ditto
 `;
 
   // src/parser.js
+  var __subLocsOn = false;
+  var setSubLocs = (on) => {
+    __subLocsOn = on;
+  };
+  var __sub = (node, subLocs) => {
+    if (subLocs && Array.isArray(node))
+      Object.defineProperty(node, "subLocs", { value: subLocs, enumerable: false, configurable: true, writable: true });
+    return node;
+  };
+  var __spl = (child) => child && child.subLocs ? child.subLocs : Array.isArray(child) ? child.map(() => null) : [];
   var parserInstance = {
     symbolIds: { $accept: 0, $end: 1, error: 2, Root: 3, Body: 4, Line: 5, TERMINATOR: 6, Expression: 7, ExpressionLine: 8, Statement: 9, Return: 10, STATEMENT: 11, Import: 12, Export: 13, Value: 14, Code: 15, Operation: 16, Assign: 17, ReactiveAssign: 18, ComputedAssign: 19, ReadonlyAssign: 20, Effect: 21, Gate: 22, If: 23, Try: 24, While: 25, For: 26, Switch: 27, Class: 28, Component: 29, Render: 30, Throw: 31, Yield: 32, Def: 33, Enum: 34, Schema: 35, CodeLine: 36, OperationLine: 37, Assignable: 38, Literal: 39, Parenthetical: 40, Range: 41, Invocation: 42, DoIife: 43, This: 44, Super: 45, MetaProperty: 46, MapLiteral: 47, Atom: 48, JS: 49, Regex: 50, UNDEFINED: 51, NULL: 52, BOOL: 53, INFINITY: 54, NAN: 55, SYMBOL: 56, NUMBER: 57, String: 58, Identifier: 59, IDENTIFIER: 60, Property: 61, PROPERTY: 62, STRING: 63, STRING_START: 64, Interpolations: 65, STRING_END: 66, InterpolationChunk: 67, INTERPOLATION_START: 68, INTERPOLATION_END: 69, INDENT: 70, OUTDENT: 71, REGEX: 72, REGEX_START: 73, REGEX_END: 74, RegexWithIndex: 75, ",": 76, "=": 77, REACTIVE_ASSIGN: 78, COMPUTED_ASSIGN: 79, Block: 80, READONLY_ASSIGN: 81, GATE: 82, EFFECT: 83, SimpleAssignable: 84, Array: 85, Object: 86, Subjectable: 87, ThisProperty: 88, ".": 89, "?.": 90, INDEX_START: 91, INDEX_END: 92, Slice: 93, PICK_START: 94, PickList: 95, OptComma: 96, PICK_END: 97, OPTPICK_START: 98, ES6_OPTIONAL_INDEX: 99, "{": 100, ObjAssignable: 101, ":": 102, FOR: 103, ForVariables: 104, FOROF: 105, "}": 106, WHEN: 107, OWN: 108, AssignList: 109, AssignObj: 110, ObjRestValue: 111, SimpleObjAssignable: 112, "[": 113, "]": 114, "@": 115, "...": 116, ObjSpreadExpr: 117, SUPER: 118, Arguments: 119, DYNAMIC_IMPORT: 120, MAP_START: 121, MapAssignList: 122, MAP_END: 123, MapAssignObj: 124, MapAssignable: 125, PickItem: 126, PickKey: 127, Elisions: 128, ArgElisionList: 129, OptElisions: 130, ArgElision: 131, Arg: 132, Elision: 133, RangeDots: 134, "..": 135, DEF: 136, CALL_START: 137, ParamList: 138, CALL_END: 139, PARAM_START: 140, PARAM_END: 141, ArrowKind: 142, "->": 143, "=>": 144, Param: 145, ParamVar: 146, Splat: 147, ES6_OPTIONAL_CALL: 148, ArgList: 149, SimpleArgs: 150, THIS: 151, NEW_TARGET: 152, IMPORT_META: 153, "(": 154, ")": 155, RETURN: 156, THROW: 157, YIELD: 158, FROM: 159, IfBlock: 160, IF: 161, IfElseTail: 162, ELSE: 163, UnlessBlock: 164, UNLESS: 165, POST_IF: 166, POST_UNLESS: 167, TRY: 168, Catch: 169, FINALLY: 170, CATCH: 171, SWITCH: 172, Cases: 173, When: 174, LEADING_WHEN: 175, WhileSource: 176, WHILE: 177, UNTIL: 178, Loop: 179, LOOP: 180, FORIN: 181, BY: 182, FORAS: 183, AWAIT: 184, FORASAWAIT: 185, ForValue: 186, ClassName: 187, CLASS: 188, EXTENDS: 189, ENUM: 190, SCHEMA: 191, SCHEMA_BODY: 192, COMPONENT: 193, ComponentBody: 194, ComponentLine: 195, OFFER: 196, ACCEPT: 197, RENDER: 198, IMPORT: 199, ImportDefaultSpecifier: 200, ImportNamespaceSpecifier: 201, ImportSpecifierList: 202, ImportSpecifier: 203, AS: 204, DEFAULT: 205, IMPORT_ALL: 206, EXPORT: 207, ExportSpecifierList: 208, EXPORT_ALL: 209, ExportSpecifier: 210, UNARY: 211, DO: 212, DO_IIFE: 213, UNARY_MATH: 214, "-": 215, "+": 216, "?": 217, PRESENCE: 218, "--": 219, "++": 220, MATH: 221, "**": 222, SHIFT: 223, COMPARE: 224, "&": 225, "^": 226, "|": 227, "||": 228, "??": 229, "&&": 230, RELATION: 231, TERNARY: 232, COMPOUND_ASSIGN: 233 },
     tokenNames: { 2: "error", 6: "TERMINATOR", 11: "STATEMENT", 49: "JS", 51: "UNDEFINED", 52: "NULL", 53: "BOOL", 54: "INFINITY", 55: "NAN", 56: "SYMBOL", 57: "NUMBER", 60: "IDENTIFIER", 62: "PROPERTY", 63: "STRING", 64: "STRING_START", 66: "STRING_END", 68: "INTERPOLATION_START", 69: "INTERPOLATION_END", 70: "INDENT", 71: "OUTDENT", 72: "REGEX", 73: "REGEX_START", 74: "REGEX_END", 76: ",", 77: "=", 78: "REACTIVE_ASSIGN", 79: "COMPUTED_ASSIGN", 81: "READONLY_ASSIGN", 82: "GATE", 83: "EFFECT", 89: ".", 90: "?.", 91: "INDEX_START", 92: "INDEX_END", 94: "PICK_START", 97: "PICK_END", 98: "OPTPICK_START", 99: "ES6_OPTIONAL_INDEX", 100: "{", 102: ":", 103: "FOR", 105: "FOROF", 106: "}", 107: "WHEN", 108: "OWN", 113: "[", 114: "]", 115: "@", 116: "...", 118: "SUPER", 120: "DYNAMIC_IMPORT", 121: "MAP_START", 123: "MAP_END", 135: "..", 136: "DEF", 137: "CALL_START", 139: "CALL_END", 140: "PARAM_START", 141: "PARAM_END", 143: "->", 144: "=>", 148: "ES6_OPTIONAL_CALL", 151: "THIS", 152: "NEW_TARGET", 153: "IMPORT_META", 154: "(", 155: ")", 156: "RETURN", 157: "THROW", 158: "YIELD", 159: "FROM", 161: "IF", 163: "ELSE", 165: "UNLESS", 166: "POST_IF", 167: "POST_UNLESS", 168: "TRY", 170: "FINALLY", 171: "CATCH", 172: "SWITCH", 175: "LEADING_WHEN", 177: "WHILE", 178: "UNTIL", 180: "LOOP", 181: "FORIN", 182: "BY", 183: "FORAS", 184: "AWAIT", 185: "FORASAWAIT", 188: "CLASS", 189: "EXTENDS", 190: "ENUM", 191: "SCHEMA", 192: "SCHEMA_BODY", 193: "COMPONENT", 196: "OFFER", 197: "ACCEPT", 198: "RENDER", 199: "IMPORT", 204: "AS", 205: "DEFAULT", 206: "IMPORT_ALL", 207: "EXPORT", 209: "EXPORT_ALL", 211: "UNARY", 212: "DO", 213: "DO_IIFE", 214: "UNARY_MATH", 215: "-", 216: "+", 217: "?", 218: "PRESENCE", 219: "--", 220: "++", 221: "MATH", 222: "**", 223: "SHIFT", 224: "COMPARE", 225: "&", 226: "^", 227: "|", 228: "||", 229: "??", 230: "&&", 231: "RELATION", 232: "TERNARY", 233: "COMPOUND_ASSIGN" },
@@ -1946,12 +1956,13 @@ function __schemaFkName(m)    { return ''; }   // ditto
     ruleTable: [0, 0, 3, 0, 3, 1, 4, 1, 4, 3, 4, 2, 5, 1, 5, 1, 5, 1, 9, 1, 9, 1, 9, 1, 9, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 48, 1, 48, 1, 59, 1, 61, 1, 58, 1, 58, 3, 65, 1, 65, 2, 67, 3, 67, 5, 67, 2, 67, 1, 50, 1, 50, 3, 75, 3, 75, 1, 17, 3, 17, 4, 17, 5, 18, 3, 18, 4, 18, 5, 19, 3, 19, 4, 19, 3, 20, 3, 20, 4, 20, 5, 22, 3, 21, 3, 21, 4, 21, 3, 21, 2, 21, 3, 21, 2, 38, 1, 38, 1, 38, 1, 87, 1, 87, 1, 84, 1, 84, 1, 84, 3, 84, 3, 84, 4, 84, 6, 84, 4, 84, 6, 84, 5, 84, 5, 84, 7, 84, 7, 84, 4, 84, 5, 84, 7, 86, 10, 86, 12, 86, 11, 86, 13, 86, 4, 109, 0, 109, 1, 109, 3, 109, 4, 109, 6, 110, 1, 110, 1, 110, 3, 110, 5, 110, 3, 110, 5, 112, 1, 112, 1, 112, 1, 101, 1, 101, 3, 101, 4, 101, 1, 111, 2, 111, 2, 117, 1, 117, 1, 117, 1, 117, 1, 117, 1, 117, 2, 117, 2, 117, 2, 117, 2, 117, 3, 117, 3, 117, 4, 117, 6, 117, 5, 117, 5, 117, 7, 117, 7, 47, 4, 122, 0, 122, 1, 122, 3, 122, 4, 122, 6, 124, 3, 124, 5, 124, 2, 95, 1, 95, 3, 95, 4, 95, 6, 126, 1, 126, 3, 126, 3, 126, 5, 127, 1, 127, 1, 125, 1, 125, 1, 125, 1, 125, 1, 125, 1, 125, 1, 125, 1, 125, 1, 125, 1, 125, 1, 125, 1, 125, 1, 125, 1, 125, 1, 85, 2, 85, 3, 85, 4, 129, 1, 129, 3, 129, 4, 129, 4, 129, 6, 131, 1, 131, 2, 130, 1, 130, 2, 128, 1, 128, 2, 133, 1, 133, 2, 134, 1, 134, 1, 41, 5, 93, 3, 93, 2, 93, 2, 93, 1, 33, 6, 33, 3, 15, 5, 15, 2, 36, 5, 36, 2, 142, 1, 142, 1, 138, 0, 138, 1, 138, 3, 138, 4, 138, 6, 145, 1, 145, 3, 145, 2, 145, 1, 146, 1, 146, 1, 146, 1, 146, 1, 147, 2, 42, 2, 42, 2, 42, 3, 42, 2, 42, 2, 119, 2, 119, 4, 149, 1, 149, 3, 149, 4, 149, 4, 149, 6, 132, 1, 132, 1, 132, 1, 132, 1, 150, 1, 150, 3, 44, 1, 44, 1, 88, 2, 45, 3, 45, 4, 45, 6, 46, 3, 46, 3, 80, 2, 80, 3, 40, 3, 40, 5, 96, 0, 96, 1, 10, 2, 10, 4, 10, 1, 31, 2, 31, 4, 32, 1, 32, 2, 32, 4, 32, 3, 160, 3, 160, 4, 162, 4, 162, 5, 162, 2, 164, 3, 164, 5, 23, 1, 23, 1, 23, 3, 23, 3, 23, 7, 23, 5, 23, 3, 23, 3, 24, 2, 24, 3, 24, 4, 24, 5, 169, 3, 169, 3, 169, 3, 169, 2, 27, 5, 27, 7, 27, 4, 27, 6, 173, 1, 173, 2, 174, 3, 174, 4, 176, 2, 176, 4, 176, 2, 176, 4, 25, 2, 25, 2, 25, 2, 25, 1, 179, 2, 179, 2, 179, 3, 26, 5, 26, 7, 26, 7, 26, 9, 26, 9, 26, 5, 26, 7, 26, 6, 26, 8, 26, 5, 26, 7, 26, 6, 26, 8, 26, 5, 26, 7, 26, 3, 26, 5, 26, 5, 26, 7, 26, 7, 26, 9, 26, 9, 26, 5, 26, 7, 26, 6, 26, 8, 26, 5, 26, 7, 26, 6, 26, 8, 26, 5, 26, 7, 26, 3, 26, 5, 186, 1, 186, 3, 104, 1, 104, 3, 187, 1, 187, 1, 28, 1, 28, 2, 28, 3, 28, 4, 28, 2, 28, 3, 28, 4, 28, 5, 34, 3, 35, 2, 29, 4, 29, 6, 194, 1, 194, 3, 194, 2, 195, 1, 195, 1, 195, 1, 195, 2, 195, 2, 30, 2, 30, 2, 12, 2, 12, 4, 12, 4, 12, 5, 12, 7, 12, 6, 12, 9, 202, 1, 202, 3, 202, 4, 202, 4, 202, 6, 203, 1, 203, 3, 203, 1, 203, 3, 200, 1, 201, 3, 13, 3, 13, 5, 13, 2, 13, 2, 13, 2, 13, 2, 13, 4, 13, 5, 13, 6, 13, 2, 13, 2, 13, 2, 13, 2, 13, 3, 13, 5, 13, 4, 13, 5, 13, 7, 208, 1, 208, 3, 208, 4, 208, 4, 208, 6, 210, 1, 210, 3, 210, 3, 210, 1, 210, 3, 37, 2, 37, 2, 37, 2, 16, 2, 16, 2, 16, 2, 16, 2, 16, 2, 16, 2, 16, 2, 16, 2, 16, 4, 16, 2, 16, 2, 16, 2, 16, 2, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 5, 16, 3, 16, 5, 16, 4, 43, 2],
     ruleActions: (rule, vals, locs, shared) => {
       const $ = vals;
+      const $L = locs;
       const $0 = vals.length - 1;
       switch (rule) {
         case 1:
-          return ["program"];
+          return __sub(["program"], __subLocsOn ? [null] : null);
         case 2:
-          return ["program", ...$[$0]];
+          return __sub(["program", ...$[$0]], __subLocsOn ? [null, ...__spl($[$0])] : null);
         case 3:
         case 62:
         case 117:
@@ -1961,24 +1972,22 @@ function __schemaFkName(m)    { return ''; }   // ditto
         case 198:
         case 218:
         case 238:
-        case 247:
         case 299:
         case 350:
         case 366:
         case 383:
         case 412:
-          return [$[$0]];
+          return __sub([$[$0]], __subLocsOn ? [$L[$0]] : null);
         case 4:
         case 118:
         case 156:
         case 163:
         case 219:
         case 239:
-        case 248:
         case 367:
         case 384:
         case 413:
-          return [...$[$0 - 2], $[$0]];
+          return __sub([...$[$0 - 2], $[$0]], __subLocsOn ? [...__spl($[$0 - 2]), $L[$0]] : null);
         case 5:
         case 64:
         case 201:
@@ -2106,14 +2115,14 @@ function __schemaFkName(m)    { return ''; }   // ditto
           return "null";
         case 55:
         case 185:
-          return ["symbol", $[$0]];
+          return __sub(["symbol", $[$0]], __subLocsOn ? [null, $L[$0]] : null);
         case 61:
-          return ["str", ...$[$0 - 1]];
+          return __sub(["str", ...$[$0 - 1]], __subLocsOn ? [null, ...__spl($[$0 - 1])] : null);
         case 63:
         case 195:
         case 199:
         case 300:
-          return [...$[$0 - 1], $[$0]];
+          return __sub([...$[$0 - 1], $[$0]], __subLocsOn ? [...__spl($[$0 - 1]), $L[$0]] : null);
         case 65:
         case 237:
         case 241:
@@ -2123,53 +2132,53 @@ function __schemaFkName(m)    { return ''; }   // ditto
         case 66:
           return "";
         case 69:
-          return ["regex", $[$0 - 1]];
+          return __sub(["regex", $[$0 - 1]], __subLocsOn ? [null, $L[$0 - 1]] : null);
         case 70:
-          return ["regex-index", $[$0 - 2], $[$0]];
+          return __sub(["regex-index", $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0]] : null);
         case 71:
-          return ["regex-index", $[$0], null];
+          return __sub(["regex-index", $[$0], null], __subLocsOn ? [null, $L[$0], null] : null);
         case 72:
         case 125:
-          return ["=", $[$0 - 2], $[$0]];
+          return __sub(["=", $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0]] : null);
         case 73:
-          return ["=", $[$0 - 3], $[$0]];
+          return __sub(["=", $[$0 - 3], $[$0]], __subLocsOn ? [null, $L[$0 - 3], $L[$0]] : null);
         case 74:
         case 126:
-          return ["=", $[$0 - 4], $[$0 - 1]];
+          return __sub(["=", $[$0 - 4], $[$0 - 1]], __subLocsOn ? [null, $L[$0 - 4], $L[$0 - 1]] : null);
         case 75:
-          return ["state", $[$0 - 2], $[$0]];
+          return __sub(["state", $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0]] : null);
         case 76:
-          return ["state", $[$0 - 3], $[$0]];
+          return __sub(["state", $[$0 - 3], $[$0]], __subLocsOn ? [null, $L[$0 - 3], $L[$0]] : null);
         case 77:
-          return ["state", $[$0 - 4], $[$0 - 1]];
+          return __sub(["state", $[$0 - 4], $[$0 - 1]], __subLocsOn ? [null, $L[$0 - 4], $L[$0 - 1]] : null);
         case 78:
         case 80:
-          return ["computed", $[$0 - 2], $[$0]];
+          return __sub(["computed", $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0]] : null);
         case 79:
-          return ["computed", $[$0 - 3], $[$0]];
+          return __sub(["computed", $[$0 - 3], $[$0]], __subLocsOn ? [null, $L[$0 - 3], $L[$0]] : null);
         case 81:
-          return ["readonly", $[$0 - 2], $[$0]];
+          return __sub(["readonly", $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0]] : null);
         case 82:
-          return ["readonly", $[$0 - 3], $[$0]];
+          return __sub(["readonly", $[$0 - 3], $[$0]], __subLocsOn ? [null, $L[$0 - 3], $L[$0]] : null);
         case 83:
-          return ["readonly", $[$0 - 4], $[$0 - 1]];
+          return __sub(["readonly", $[$0 - 4], $[$0 - 1]], __subLocsOn ? [null, $L[$0 - 4], $L[$0 - 1]] : null);
         case 84:
-          return ["gate", $[$0 - 2], $[$0]];
+          return __sub(["gate", $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0]] : null);
         case 85:
         case 87:
-          return ["effect", $[$0 - 2], $[$0]];
+          return __sub(["effect", $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0]] : null);
         case 86:
-          return ["effect", $[$0 - 3], $[$0]];
+          return __sub(["effect", $[$0 - 3], $[$0]], __subLocsOn ? [null, $L[$0 - 3], $L[$0]] : null);
         case 88:
         case 89:
         case 90:
-          return ["effect", null, $[$0]];
+          return __sub(["effect", null, $[$0]], __subLocsOn ? [null, null, $L[$0]] : null);
         case 98:
         case 145:
-          return [".", $[$0 - 2], $[$0]];
+          return __sub([".", $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0]] : null);
         case 99:
         case 146:
-          return ["?.", $[$0 - 2], $[$0]];
+          return __sub(["?.", $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0]] : null);
         case 100:
         case 102:
         case 147:
@@ -2180,22 +2189,22 @@ function __schemaFkName(m)    { return ''; }   // ditto
           return ["[]", $[$0 - 5], $[$0 - 2]];
         case 104:
         case 149:
-          return [".{}", $[$0 - 4], ...$[$0 - 2]];
+          return __sub([".{}", $[$0 - 4], ...$[$0 - 2]], __subLocsOn ? [null, $L[$0 - 4], ...__spl($[$0 - 2])] : null);
         case 105:
         case 150:
-          return ["?.{}", $[$0 - 4], ...$[$0 - 2]];
+          return __sub(["?.{}", $[$0 - 4], ...$[$0 - 2]], __subLocsOn ? [null, $L[$0 - 4], ...__spl($[$0 - 2])] : null);
         case 106:
         case 151:
-          return [".{}", $[$0 - 6], ...$[$0 - 3]];
+          return __sub([".{}", $[$0 - 6], ...$[$0 - 3]], __subLocsOn ? [null, $L[$0 - 6], ...__spl($[$0 - 3])] : null);
         case 107:
         case 152:
-          return ["?.{}", $[$0 - 6], ...$[$0 - 3]];
+          return __sub(["?.{}", $[$0 - 6], ...$[$0 - 3]], __subLocsOn ? [null, $L[$0 - 6], ...__spl($[$0 - 3])] : null);
         case 108:
           return [$[$0 - 1][0], $[$0 - 3], ...$[$0 - 1].slice(1)];
         case 109:
-          return ["optindex", $[$0 - 4], $[$0 - 1]];
+          return __sub(["optindex", $[$0 - 4], $[$0 - 1]], __subLocsOn ? [null, $L[$0 - 4], $L[$0 - 1]] : null);
         case 110:
-          return ["optindex", $[$0 - 6], $[$0 - 2]];
+          return __sub(["optindex", $[$0 - 6], $[$0 - 2]], __subLocsOn ? [null, $L[$0 - 6], $L[$0 - 2]] : null);
         case 111:
           return ["object-comprehension", $[$0 - 8], $[$0 - 6], [["for-of", $[$0 - 4], $[$0 - 2], false]], []];
         case 112:
@@ -2205,7 +2214,7 @@ function __schemaFkName(m)    { return ''; }   // ditto
         case 114:
           return ["object-comprehension", $[$0 - 11], $[$0 - 9], [["for-of", $[$0 - 6], $[$0 - 4], true]], [$[$0 - 2]]];
         case 115:
-          return ["object", ...$[$0 - 2]];
+          return __sub(["object", ...$[$0 - 2]], __subLocsOn ? [null, ...__spl($[$0 - 2])] : null);
         case 116:
         case 154:
         case 196:
@@ -2219,7 +2228,7 @@ function __schemaFkName(m)    { return ''; }   // ditto
         case 240:
         case 385:
         case 414:
-          return [...$[$0 - 3], $[$0]];
+          return __sub([...$[$0 - 3], $[$0]], __subLocsOn ? [...__spl($[$0 - 3]), $L[$0]] : null);
         case 120:
         case 158:
         case 165:
@@ -2227,59 +2236,59 @@ function __schemaFkName(m)    { return ''; }   // ditto
         case 242:
         case 387:
         case 416:
-          return [...$[$0 - 5], ...$[$0 - 2]];
+          return __sub([...$[$0 - 5], ...$[$0 - 2]], __subLocsOn ? [...__spl($[$0 - 5]), ...__spl($[$0 - 2])] : null);
         case 121:
-          return [null, $[$0], $[$0]];
+          return __sub([null, $[$0], $[$0]], __subLocsOn ? [null, $L[$0], $L[$0]] : null);
         case 123:
         case 159:
-          return [":", $[$0 - 2], $[$0]];
+          return __sub([":", $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0]] : null);
         case 124:
         case 160:
-          return [":", $[$0 - 4], $[$0 - 1]];
+          return __sub([":", $[$0 - 4], $[$0 - 1]], __subLocsOn ? [null, $L[$0 - 4], $L[$0 - 1]] : null);
         case 131:
-          return ["dynamicKey", $[$0 - 1]];
+          return __sub(["dynamicKey", $[$0 - 1]], __subLocsOn ? [null, $L[$0 - 1]] : null);
         case 132:
           return ["[]", "this", $[$0 - 1]];
         case 134:
         case 135:
         case 161:
         case 230:
-          return ["...", $[$0]];
+          return __sub(["...", $[$0]], __subLocsOn ? [null, $L[$0]] : null);
         case 141:
         case 234:
-          return ["super", ...$[$0]];
+          return __sub(["super", ...$[$0]], __subLocsOn ? [null, ...__spl($[$0])] : null);
         case 142:
         case 143:
         case 144:
         case 232:
         case 235:
-          return [$[$0 - 1], ...$[$0]];
+          return __sub([$[$0 - 1], ...$[$0]], __subLocsOn ? [$L[$0 - 1], ...__spl($[$0])] : null);
         case 153:
-          return ["map-literal", ...$[$0 - 2]];
+          return __sub(["map-literal", ...$[$0 - 2]], __subLocsOn ? [null, ...__spl($[$0 - 2])] : null);
         case 166:
-          return [$[$0], $[$0], null];
+          return __sub([$[$0], $[$0], null], __subLocsOn ? [$L[$0], $L[$0], null] : null);
         case 167:
-          return [$[$0 - 2], $[$0], null];
+          return __sub([$[$0 - 2], $[$0], null], __subLocsOn ? [$L[$0 - 2], $L[$0], null] : null);
         case 168:
-          return [$[$0 - 2], $[$0 - 2], $[$0]];
+          return __sub([$[$0 - 2], $[$0 - 2], $[$0]], __subLocsOn ? [$L[$0 - 2], $L[$0 - 2], $L[$0]] : null);
         case 169:
-          return [$[$0 - 4], $[$0 - 2], $[$0]];
+          return __sub([$[$0 - 4], $[$0 - 2], $[$0]], __subLocsOn ? [$L[$0 - 4], $L[$0 - 2], $L[$0]] : null);
         case 186:
-          return ["array"];
+          return __sub(["array"], __subLocsOn ? [null] : null);
         case 187:
-          return ["array", ...$[$0 - 1]];
+          return __sub(["array", ...$[$0 - 1]], __subLocsOn ? [null, ...__spl($[$0 - 1])] : null);
         case 188:
-          return ["array", ...$[$0 - 2], ...$[$0 - 1]];
+          return __sub(["array", ...$[$0 - 2], ...$[$0 - 1]], __subLocsOn ? [null, ...__spl($[$0 - 2]), ...__spl($[$0 - 1])] : null);
         case 190:
-          return [...$[$0 - 2], ...$[$0]];
+          return __sub([...$[$0 - 2], ...$[$0]], __subLocsOn ? [...__spl($[$0 - 2]), ...__spl($[$0])] : null);
         case 191:
-          return [...$[$0 - 3], ...$[$0]];
+          return __sub([...$[$0 - 3], ...$[$0]], __subLocsOn ? [...__spl($[$0 - 3]), ...__spl($[$0])] : null);
         case 192:
-          return [...$[$0 - 2], ...$[$0 - 1]];
+          return __sub([...$[$0 - 2], ...$[$0 - 1]], __subLocsOn ? [...__spl($[$0 - 2]), ...__spl($[$0 - 1])] : null);
         case 193:
-          return [...$[$0 - 5], ...$[$0 - 4], ...$[$0 - 2], ...$[$0 - 1]];
+          return __sub([...$[$0 - 5], ...$[$0 - 4], ...$[$0 - 2], ...$[$0 - 1]], __subLocsOn ? [...__spl($[$0 - 5]), ...__spl($[$0 - 4]), ...__spl($[$0 - 2]), ...__spl($[$0 - 1])] : null);
         case 197:
-          return [...$[$0]];
+          return __sub([...$[$0]], __subLocsOn ? [...__spl($[$0])] : null);
         case 200:
           return null;
         case 202:
@@ -2288,88 +2297,92 @@ function __schemaFkName(m)    { return ''; }   // ditto
         case 246:
           return "...";
         case 204:
-          return [$[$0 - 2], $[$0 - 3], $[$0 - 1]];
+          return __sub([$[$0 - 2], $[$0 - 3], $[$0 - 1]], __subLocsOn ? [$L[$0 - 2], $L[$0 - 3], $L[$0 - 1]] : null);
         case 205:
         case 440:
         case 442:
         case 443:
         case 456:
         case 458:
-          return [$[$0 - 1], $[$0 - 2], $[$0]];
+          return __sub([$[$0 - 1], $[$0 - 2], $[$0]], __subLocsOn ? [$L[$0 - 1], $L[$0 - 2], $L[$0]] : null);
         case 206:
-          return [$[$0], $[$0 - 1], null];
+          return __sub([$[$0], $[$0 - 1], null], __subLocsOn ? [$L[$0], $L[$0 - 1], null] : null);
         case 207:
-          return [$[$0 - 1], null, $[$0]];
+          return __sub([$[$0 - 1], null, $[$0]], __subLocsOn ? [$L[$0 - 1], null, $L[$0]] : null);
         case 208:
-          return [$[$0], null, null];
+          return __sub([$[$0], null, null], __subLocsOn ? [$L[$0], null, null] : null);
         case 209:
-          return ["def", $[$0 - 4], $[$0 - 2], $[$0]];
+          return __sub(["def", $[$0 - 4], $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 4], $L[$0 - 2], $L[$0]] : null);
         case 210:
           return ["def", $[$0 - 1], [], $[$0]];
         case 211:
         case 213:
-          return [$[$0 - 1], $[$0 - 3], $[$0]];
+          return __sub([$[$0 - 1], $[$0 - 3], $[$0]], __subLocsOn ? [$L[$0 - 1], $L[$0 - 3], $L[$0]] : null);
         case 212:
         case 214:
           return [$[$0 - 1], [], $[$0]];
         case 223:
         case 349:
-          return ["default", $[$0 - 2], $[$0]];
+          return __sub(["default", $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0]] : null);
         case 224:
-          return ["rest", $[$0]];
+          return __sub(["rest", $[$0]], __subLocsOn ? [null, $L[$0]] : null);
         case 225:
-          return ["expansion"];
+          return __sub(["expansion"], __subLocsOn ? [null] : null);
         case 231:
-          return ["tagged-template", $[$0 - 1], $[$0]];
+          return __sub(["tagged-template", $[$0 - 1], $[$0]], __subLocsOn ? [null, $L[$0 - 1], $L[$0]] : null);
         case 233:
-          return ["optcall", $[$0 - 2], ...$[$0]];
+          return __sub(["optcall", $[$0 - 2], ...$[$0]], __subLocsOn ? [null, $L[$0 - 2], ...__spl($[$0])] : null);
+        case 247:
+          return [$[$0]];
+        case 248:
+          return [...$[$0 - 2], $[$0]];
         case 249:
         case 250:
           return "this";
         case 251:
-          return [".", "this", $[$0]];
+          return __sub([".", "this", $[$0]], __subLocsOn ? [null, null, $L[$0]] : null);
         case 252:
-          return [".", "super", $[$0]];
+          return __sub([".", "super", $[$0]], __subLocsOn ? [null, null, $L[$0]] : null);
         case 253:
           return ["[]", "super", $[$0 - 1]];
         case 254:
           return ["[]", "super", $[$0 - 2]];
         case 255:
-          return [".", "new", $[$0]];
+          return __sub([".", "new", $[$0]], __subLocsOn ? [null, null, $L[$0]] : null);
         case 256:
-          return [".", "import", $[$0]];
+          return __sub([".", "import", $[$0]], __subLocsOn ? [null, null, $L[$0]] : null);
         case 257:
-          return ["block"];
+          return __sub(["block"], __subLocsOn ? [null] : null);
         case 258:
-          return ["block", ...$[$0 - 1]];
+          return __sub(["block", ...$[$0 - 1]], __subLocsOn ? [null, ...__spl($[$0 - 1])] : null);
         case 259:
           return $[$0 - 1].length === 1 ? (Array.isArray($[$0 - 1][0]) && ($[$0 - 1][0].parenthesized = true), $[$0 - 1][0]) : ["block", ...$[$0 - 1]];
         case 260:
           return $[$0 - 2].length === 1 ? (Array.isArray($[$0 - 2][0]) && ($[$0 - 2][0].parenthesized = true), $[$0 - 2][0]) : ["block", ...$[$0 - 2]];
         case 263:
-          return ["return", $[$0]];
+          return __sub(["return", $[$0]], __subLocsOn ? [null, $L[$0]] : null);
         case 264:
-          return ["return", $[$0 - 1]];
+          return __sub(["return", $[$0 - 1]], __subLocsOn ? [null, $L[$0 - 1]] : null);
         case 265:
-          return ["return"];
+          return __sub(["return"], __subLocsOn ? [null] : null);
         case 266:
-          return ["throw", $[$0]];
+          return __sub(["throw", $[$0]], __subLocsOn ? [null, $L[$0]] : null);
         case 267:
-          return ["throw", $[$0 - 1]];
+          return __sub(["throw", $[$0 - 1]], __subLocsOn ? [null, $L[$0 - 1]] : null);
         case 268:
-          return ["yield"];
+          return __sub(["yield"], __subLocsOn ? [null] : null);
         case 269:
-          return ["yield", $[$0]];
+          return __sub(["yield", $[$0]], __subLocsOn ? [null, $L[$0]] : null);
         case 270:
-          return ["yield", $[$0 - 1]];
+          return __sub(["yield", $[$0 - 1]], __subLocsOn ? [null, $L[$0 - 1]] : null);
         case 271:
-          return ["yield-from", $[$0]];
+          return __sub(["yield-from", $[$0]], __subLocsOn ? [null, $L[$0]] : null);
         case 272:
         case 274:
-          return ["if", $[$0 - 1], $[$0]];
+          return __sub(["if", $[$0 - 1], $[$0]], __subLocsOn ? [null, $L[$0 - 1], $L[$0]] : null);
         case 273:
         case 275:
-          return ["if", $[$0 - 2], $[$0 - 1], $[$0]];
+          return __sub(["if", $[$0 - 2], $[$0 - 1], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0 - 1], $L[$0]] : null);
         case 277:
           return ["if", ["!", $[$0 - 1]], $[$0]];
         case 278:
@@ -2378,45 +2391,45 @@ function __schemaFkName(m)    { return ''; }   // ditto
         case 282:
           return ["if", $[$0], [$[$0 - 2]]];
         case 283:
-          return ["?:", $[$0 - 4], $[$0 - 6], $[$0 - 1]];
+          return __sub(["?:", $[$0 - 4], $[$0 - 6], $[$0 - 1]], __subLocsOn ? [null, $L[$0 - 4], $L[$0 - 6], $L[$0 - 1]] : null);
         case 284:
-          return ["?:", $[$0 - 2], $[$0 - 4], $[$0]];
+          return __sub(["?:", $[$0 - 2], $[$0 - 4], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0 - 4], $L[$0]] : null);
         case 285:
         case 286:
           return ["if", ["!", $[$0]], [$[$0 - 2]]];
         case 287:
-          return ["try", $[$0]];
+          return __sub(["try", $[$0]], __subLocsOn ? [null, $L[$0]] : null);
         case 288:
-          return ["try", $[$0 - 1], $[$0]];
+          return __sub(["try", $[$0 - 1], $[$0]], __subLocsOn ? [null, $L[$0 - 1], $L[$0]] : null);
         case 289:
-          return ["try", $[$0 - 2], $[$0]];
+          return __sub(["try", $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0]] : null);
         case 290:
-          return ["try", $[$0 - 3], $[$0 - 2], $[$0]];
+          return __sub(["try", $[$0 - 3], $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 3], $L[$0 - 2], $L[$0]] : null);
         case 291:
         case 292:
         case 293:
         case 422:
         case 425:
         case 427:
-          return [$[$0 - 1], $[$0]];
+          return __sub([$[$0 - 1], $[$0]], __subLocsOn ? [$L[$0 - 1], $L[$0]] : null);
         case 294:
-          return [null, $[$0]];
+          return __sub([null, $[$0]], __subLocsOn ? [null, $L[$0]] : null);
         case 295:
-          return ["switch", $[$0 - 3], $[$0 - 1], null];
+          return __sub(["switch", $[$0 - 3], $[$0 - 1], null], __subLocsOn ? [null, $L[$0 - 3], $L[$0 - 1], null] : null);
         case 296:
-          return ["switch", $[$0 - 5], $[$0 - 3], $[$0 - 1]];
+          return __sub(["switch", $[$0 - 5], $[$0 - 3], $[$0 - 1]], __subLocsOn ? [null, $L[$0 - 5], $L[$0 - 3], $L[$0 - 1]] : null);
         case 297:
-          return ["switch", null, $[$0 - 1], null];
+          return __sub(["switch", null, $[$0 - 1], null], __subLocsOn ? [null, null, $L[$0 - 1], null] : null);
         case 298:
-          return ["switch", null, $[$0 - 3], $[$0 - 1]];
+          return __sub(["switch", null, $[$0 - 3], $[$0 - 1]], __subLocsOn ? [null, null, $L[$0 - 3], $L[$0 - 1]] : null);
         case 301:
-          return ["when", $[$0 - 1], $[$0]];
+          return __sub(["when", $[$0 - 1], $[$0]], __subLocsOn ? [null, $L[$0 - 1], $L[$0]] : null);
         case 302:
-          return ["when", $[$0 - 2], $[$0 - 1]];
+          return __sub(["when", $[$0 - 2], $[$0 - 1]], __subLocsOn ? [null, $L[$0 - 2], $L[$0 - 1]] : null);
         case 303:
-          return ["while", $[$0]];
+          return __sub(["while", $[$0]], __subLocsOn ? [null, $L[$0]] : null);
         case 304:
-          return ["while", $[$0 - 2], $[$0]];
+          return __sub(["while", $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0]] : null);
         case 305:
           return ["while", ["!", $[$0]]];
         case 306:
@@ -2427,39 +2440,39 @@ function __schemaFkName(m)    { return ''; }   // ditto
         case 309:
           return $[$0].length === 2 ? [$[$0][0], $[$0][1], [$[$0 - 1]]] : [$[$0][0], $[$0][1], $[$0][2], [$[$0 - 1]]];
         case 311:
-          return ["loop", $[$0]];
+          return __sub(["loop", $[$0]], __subLocsOn ? [null, $L[$0]] : null);
         case 312:
           return ["loop", [$[$0]]];
         case 313:
-          return ["loop-n", $[$0 - 1], $[$0]];
+          return __sub(["loop-n", $[$0 - 1], $[$0]], __subLocsOn ? [null, $L[$0 - 1], $L[$0]] : null);
         case 314:
-          return ["for-in", $[$0 - 3], $[$0 - 1], null, null, $[$0]];
+          return __sub(["for-in", $[$0 - 3], $[$0 - 1], null, null, $[$0]], __subLocsOn ? [null, $L[$0 - 3], $L[$0 - 1], null, null, $L[$0]] : null);
         case 315:
-          return ["for-in", $[$0 - 5], $[$0 - 3], null, $[$0 - 1], $[$0]];
+          return __sub(["for-in", $[$0 - 5], $[$0 - 3], null, $[$0 - 1], $[$0]], __subLocsOn ? [null, $L[$0 - 5], $L[$0 - 3], null, $L[$0 - 1], $L[$0]] : null);
         case 316:
-          return ["for-in", $[$0 - 5], $[$0 - 3], $[$0 - 1], null, $[$0]];
+          return __sub(["for-in", $[$0 - 5], $[$0 - 3], $[$0 - 1], null, $[$0]], __subLocsOn ? [null, $L[$0 - 5], $L[$0 - 3], $L[$0 - 1], null, $L[$0]] : null);
         case 317:
-          return ["for-in", $[$0 - 7], $[$0 - 5], $[$0 - 1], $[$0 - 3], $[$0]];
+          return __sub(["for-in", $[$0 - 7], $[$0 - 5], $[$0 - 1], $[$0 - 3], $[$0]], __subLocsOn ? [null, $L[$0 - 7], $L[$0 - 5], $L[$0 - 1], $L[$0 - 3], $L[$0]] : null);
         case 318:
-          return ["for-in", $[$0 - 7], $[$0 - 5], $[$0 - 3], $[$0 - 1], $[$0]];
+          return __sub(["for-in", $[$0 - 7], $[$0 - 5], $[$0 - 3], $[$0 - 1], $[$0]], __subLocsOn ? [null, $L[$0 - 7], $L[$0 - 5], $L[$0 - 3], $L[$0 - 1], $L[$0]] : null);
         case 319:
-          return ["for-of", $[$0 - 3], $[$0 - 1], false, null, $[$0]];
+          return __sub(["for-of", $[$0 - 3], $[$0 - 1], false, null, $[$0]], __subLocsOn ? [null, $L[$0 - 3], $L[$0 - 1], null, null, $L[$0]] : null);
         case 320:
-          return ["for-of", $[$0 - 5], $[$0 - 3], false, $[$0 - 1], $[$0]];
+          return __sub(["for-of", $[$0 - 5], $[$0 - 3], false, $[$0 - 1], $[$0]], __subLocsOn ? [null, $L[$0 - 5], $L[$0 - 3], null, $L[$0 - 1], $L[$0]] : null);
         case 321:
-          return ["for-of", $[$0 - 3], $[$0 - 1], true, null, $[$0]];
+          return __sub(["for-of", $[$0 - 3], $[$0 - 1], true, null, $[$0]], __subLocsOn ? [null, $L[$0 - 3], $L[$0 - 1], null, null, $L[$0]] : null);
         case 322:
-          return ["for-of", $[$0 - 5], $[$0 - 3], true, $[$0 - 1], $[$0]];
+          return __sub(["for-of", $[$0 - 5], $[$0 - 3], true, $[$0 - 1], $[$0]], __subLocsOn ? [null, $L[$0 - 5], $L[$0 - 3], null, $L[$0 - 1], $L[$0]] : null);
         case 323:
-          return ["for-as", $[$0 - 3], $[$0 - 1], false, null, $[$0]];
+          return __sub(["for-as", $[$0 - 3], $[$0 - 1], false, null, $[$0]], __subLocsOn ? [null, $L[$0 - 3], $L[$0 - 1], null, null, $L[$0]] : null);
         case 324:
-          return ["for-as", $[$0 - 5], $[$0 - 3], false, $[$0 - 1], $[$0]];
+          return __sub(["for-as", $[$0 - 5], $[$0 - 3], false, $[$0 - 1], $[$0]], __subLocsOn ? [null, $L[$0 - 5], $L[$0 - 3], null, $L[$0 - 1], $L[$0]] : null);
         case 325:
         case 327:
-          return ["for-as", $[$0 - 3], $[$0 - 1], true, null, $[$0]];
+          return __sub(["for-as", $[$0 - 3], $[$0 - 1], true, null, $[$0]], __subLocsOn ? [null, $L[$0 - 3], $L[$0 - 1], null, null, $L[$0]] : null);
         case 326:
         case 328:
-          return ["for-as", $[$0 - 5], $[$0 - 3], true, $[$0 - 1], $[$0]];
+          return __sub(["for-as", $[$0 - 5], $[$0 - 3], true, $[$0 - 1], $[$0]], __subLocsOn ? [null, $L[$0 - 5], $L[$0 - 3], null, $L[$0 - 1], $L[$0]] : null);
         case 329:
           return ["for-in", [], $[$0 - 1], null, null, $[$0]];
         case 330:
@@ -2504,56 +2517,56 @@ function __schemaFkName(m)    { return ''; }   // ditto
         case 418:
         case 419:
         case 421:
-          return [$[$0 - 2], $[$0]];
+          return __sub([$[$0 - 2], $[$0]], __subLocsOn ? [$L[$0 - 2], $L[$0]] : null);
         case 354:
-          return ["class", null, null];
+          return __sub(["class", null, null], __subLocsOn ? [null, null, null] : null);
         case 355:
-          return ["class", null, null, $[$0]];
+          return __sub(["class", null, null, $[$0]], __subLocsOn ? [null, null, null, $L[$0]] : null);
         case 356:
-          return ["class", null, $[$0]];
+          return __sub(["class", null, $[$0]], __subLocsOn ? [null, null, $L[$0]] : null);
         case 357:
-          return ["class", null, $[$0 - 1], $[$0]];
+          return __sub(["class", null, $[$0 - 1], $[$0]], __subLocsOn ? [null, null, $L[$0 - 1], $L[$0]] : null);
         case 358:
-          return ["class", $[$0], null];
+          return __sub(["class", $[$0], null], __subLocsOn ? [null, $L[$0], null] : null);
         case 359:
-          return ["class", $[$0 - 1], null, $[$0]];
+          return __sub(["class", $[$0 - 1], null, $[$0]], __subLocsOn ? [null, $L[$0 - 1], null, $L[$0]] : null);
         case 360:
-          return ["class", $[$0 - 2], $[$0]];
+          return __sub(["class", $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0]] : null);
         case 361:
-          return ["class", $[$0 - 3], $[$0 - 1], $[$0]];
+          return __sub(["class", $[$0 - 3], $[$0 - 1], $[$0]], __subLocsOn ? [null, $L[$0 - 3], $L[$0 - 1], $L[$0]] : null);
         case 362:
-          return ["enum", $[$0 - 1], $[$0]];
+          return __sub(["enum", $[$0 - 1], $[$0]], __subLocsOn ? [null, $L[$0 - 1], $L[$0]] : null);
         case 363:
-          return ["schema", $[$0]];
+          return __sub(["schema", $[$0]], __subLocsOn ? [null, $L[$0]] : null);
         case 364:
           return ["component", null, ["block", ...$[$0 - 1]]];
         case 365:
           return ["component", $[$0 - 3], ["block", ...$[$0 - 1]]];
         case 372:
-          return ["offer", $[$0]];
+          return __sub(["offer", $[$0]], __subLocsOn ? [null, $L[$0]] : null);
         case 373:
-          return ["accept", $[$0]];
+          return __sub(["accept", $[$0]], __subLocsOn ? [null, $L[$0]] : null);
         case 374:
         case 375:
-          return ["render", $[$0]];
+          return __sub(["render", $[$0]], __subLocsOn ? [null, $L[$0]] : null);
         case 376:
         case 379:
-          return ["import", "{}", $[$0]];
+          return __sub(["import", "{}", $[$0]], __subLocsOn ? [null, null, $L[$0]] : null);
         case 377:
         case 378:
-          return ["import", $[$0 - 2], $[$0]];
+          return __sub(["import", $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0]] : null);
         case 380:
-          return ["import", $[$0 - 4], $[$0]];
+          return __sub(["import", $[$0 - 4], $[$0]], __subLocsOn ? [null, $L[$0 - 4], $L[$0]] : null);
         case 381:
-          return ["import", $[$0 - 4], $[$0 - 2], $[$0]];
+          return __sub(["import", $[$0 - 4], $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 4], $L[$0 - 2], $L[$0]] : null);
         case 382:
-          return ["import", $[$0 - 7], $[$0 - 4], $[$0]];
+          return __sub(["import", $[$0 - 7], $[$0 - 4], $[$0]], __subLocsOn ? [null, $L[$0 - 7], $L[$0 - 4], $L[$0]] : null);
         case 393:
-          return ["*", $[$0]];
+          return __sub(["*", $[$0]], __subLocsOn ? [null, $L[$0]] : null);
         case 394:
-          return ["export", "{}"];
+          return __sub(["export", "{}"], __subLocsOn ? [null, null] : null);
         case 395:
-          return ["export", $[$0 - 2]];
+          return __sub(["export", $[$0 - 2]], __subLocsOn ? [null, $L[$0 - 2]] : null);
         case 396:
         case 397:
         case 398:
@@ -2562,7 +2575,7 @@ function __schemaFkName(m)    { return ''; }   // ditto
         case 404:
         case 405:
         case 406:
-          return ["export", $[$0]];
+          return __sub(["export", $[$0]], __subLocsOn ? [null, $L[$0]] : null);
         case 400:
           return ["export", ["=", $[$0 - 2], $[$0]]];
         case 401:
@@ -2570,71 +2583,71 @@ function __schemaFkName(m)    { return ''; }   // ditto
         case 402:
           return ["export", ["=", $[$0 - 4], $[$0 - 1]]];
         case 407:
-          return ["export-default", $[$0]];
+          return __sub(["export-default", $[$0]], __subLocsOn ? [null, $L[$0]] : null);
         case 408:
-          return ["export-default", $[$0 - 1]];
+          return __sub(["export-default", $[$0 - 1]], __subLocsOn ? [null, $L[$0 - 1]] : null);
         case 409:
-          return ["export-all", $[$0]];
+          return __sub(["export-all", $[$0]], __subLocsOn ? [null, $L[$0]] : null);
         case 410:
-          return ["export-from", "{}", $[$0]];
+          return __sub(["export-from", "{}", $[$0]], __subLocsOn ? [null, null, $L[$0]] : null);
         case 411:
-          return ["export-from", $[$0 - 4], $[$0]];
+          return __sub(["export-from", $[$0 - 4], $[$0]], __subLocsOn ? [null, $L[$0 - 4], $L[$0]] : null);
         case 423:
         case 424:
         case 426:
         case 461:
-          return ["do-iife", $[$0]];
+          return __sub(["do-iife", $[$0]], __subLocsOn ? [null, $L[$0]] : null);
         case 428:
-          return ["-", $[$0]];
+          return __sub(["-", $[$0]], __subLocsOn ? [null, $L[$0]] : null);
         case 429:
-          return ["+", $[$0]];
+          return __sub(["+", $[$0]], __subLocsOn ? [null, $L[$0]] : null);
         case 430:
-          return ["?", $[$0 - 1]];
+          return __sub(["?", $[$0 - 1]], __subLocsOn ? [null, $L[$0 - 1]] : null);
         case 431:
-          return ["presence", $[$0 - 1]];
+          return __sub(["presence", $[$0 - 1]], __subLocsOn ? [null, $L[$0 - 1]] : null);
         case 432:
-          return ["await", $[$0]];
+          return __sub(["await", $[$0]], __subLocsOn ? [null, $L[$0]] : null);
         case 433:
-          return ["await", $[$0 - 1]];
+          return __sub(["await", $[$0 - 1]], __subLocsOn ? [null, $L[$0 - 1]] : null);
         case 434:
-          return ["--", $[$0], false];
+          return __sub(["--", $[$0], false], __subLocsOn ? [null, $L[$0], null] : null);
         case 435:
-          return ["++", $[$0], false];
+          return __sub(["++", $[$0], false], __subLocsOn ? [null, $L[$0], null] : null);
         case 436:
-          return ["--", $[$0 - 1], true];
+          return __sub(["--", $[$0 - 1], true], __subLocsOn ? [null, $L[$0 - 1], null] : null);
         case 437:
-          return ["++", $[$0 - 1], true];
+          return __sub(["++", $[$0 - 1], true], __subLocsOn ? [null, $L[$0 - 1], null] : null);
         case 438:
-          return ["+", $[$0 - 2], $[$0]];
+          return __sub(["+", $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0]] : null);
         case 439:
-          return ["-", $[$0 - 2], $[$0]];
+          return __sub(["-", $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0]] : null);
         case 441:
-          return ["**", $[$0 - 2], $[$0]];
+          return __sub(["**", $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0]] : null);
         case 444:
-          return ["&", $[$0 - 2], $[$0]];
+          return __sub(["&", $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0]] : null);
         case 445:
-          return ["^", $[$0 - 2], $[$0]];
+          return __sub(["^", $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0]] : null);
         case 446:
-          return ["|", $[$0 - 2], $[$0]];
+          return __sub(["|", $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0]] : null);
         case 447:
         case 448:
         case 449:
         case 450:
         case 451:
         case 452:
-          return ["control", $[$0 - 1], $[$0 - 2], $[$0]];
+          return __sub(["control", $[$0 - 1], $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 1], $L[$0 - 2], $L[$0]] : null);
         case 453:
-          return ["&&", $[$0 - 2], $[$0]];
+          return __sub(["&&", $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0]] : null);
         case 454:
-          return ["||", $[$0 - 2], $[$0]];
+          return __sub(["||", $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0]] : null);
         case 455:
-          return ["??", $[$0 - 2], $[$0]];
+          return __sub(["??", $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 2], $L[$0]] : null);
         case 457:
-          return ["?:", $[$0 - 4], $[$0 - 2], $[$0]];
+          return __sub(["?:", $[$0 - 4], $[$0 - 2], $[$0]], __subLocsOn ? [null, $L[$0 - 4], $L[$0 - 2], $L[$0]] : null);
         case 459:
-          return [$[$0 - 3], $[$0 - 4], $[$0 - 1]];
+          return __sub([$[$0 - 3], $[$0 - 4], $[$0 - 1]], __subLocsOn ? [$L[$0 - 3], $L[$0 - 4], $L[$0 - 1]] : null);
         case 460:
-          return [$[$0 - 2], $[$0 - 3], $[$0]];
+          return __sub([$[$0 - 2], $[$0 - 3], $[$0]], __subLocsOn ? [$L[$0 - 2], $L[$0 - 3], $L[$0]] : null);
       }
     },
     parseError(str, hash) {
@@ -2654,7 +2667,7 @@ function __schemaFkName(m)    { return ''; }   // ditto
       }
     },
     parse(input) {
-      let EOF, TERROR, action, errStr, expected, len, lex, lexer, loc, locs, newState, p, parseTable, preErrorSymbol, r, recovering, rv, sharedState, state, stk, symbol, tokenLen, tokenLine, tokenLoc, tokenText, vals;
+      let EOF, TERROR, action, errStr, expected, last, len, lex, lexer, loc, locs, n, newState, p, parseTable, preErrorSymbol, r, recovering, rv, sharedState, state, stk, symbol, tokenLen, tokenLine, tokenLoc, tokenText, vals;
       [stk, vals, locs] = [[0], [null], []];
       [parseTable, tokenText, tokenLine, tokenLen, recovering] = [this.parseTable, "", 0, 0, 0];
       [TERROR, EOF] = [2, 1];
@@ -2727,7 +2740,9 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
           len = this.ruleTable[-action * 2 + 1];
           rv.$ = vals[vals.length - len];
           loc = locs[locs.length - (len || 1)];
-          rv._$ = { r: loc.r, c: loc.c };
+          last = len ? locs[locs.length - 1] : loc;
+          n = last != null && last.r === loc.r && loc.c != null && last.c != null ? last.c + (last.n || 0) - loc.c : loc.n || 0;
+          rv._$ = { r: loc.r, c: loc.c, n };
           r = this.ruleActions.call(rv, -action, vals, locs, sharedState.ctx);
           if (r != null)
             rv.$ = r;
@@ -2776,10 +2791,10 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
     int: "integer",
     whole: "integer",
     float: "number",
-    money: "number",
-    money_even: "number",
+    money: "integer",
+    money_even: "integer",
     cents: "integer",
-    cents_even: "integer",
+    decimal: "string",
     bool: "boolean",
     truthy: "boolean",
     falsy: "boolean",
@@ -4829,12 +4844,236 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
     } catch {}
   }
 
+  // src/error.js
+  class RipError extends Error {
+    constructor(message, {
+      code = null,
+      file = null,
+      line = null,
+      column = null,
+      length = 1,
+      source = null,
+      suggestion = null,
+      phase = null
+    } = {}) {
+      super(message);
+      this.name = "RipError";
+      this.code = code;
+      this.file = file;
+      this.line = line;
+      this.column = column;
+      this.length = length;
+      this.source = source;
+      this.suggestion = suggestion;
+      this.phase = phase;
+    }
+    static fromLexer(err, source, file) {
+      let loc = err.location || {};
+      return new RipError(err.message, {
+        code: "E_SYNTAX",
+        file,
+        line: loc.first_line ?? null,
+        column: loc.first_column ?? null,
+        length: loc.last_column != null && loc.first_column != null ? loc.last_column - loc.first_column + 1 : 1,
+        source,
+        phase: "lexer"
+      });
+    }
+    static fromParser(err, source, file) {
+      let h = err.hash || {};
+      let loc = h.loc || {};
+      let line = h.line ?? loc.r ?? null;
+      let column = loc.first_column ?? loc.c ?? null;
+      let suggestion = null;
+      if (h.expected?.length) {
+        let first5 = h.expected.slice(0, 5).map((e) => e.replace(/'/g, ""));
+        suggestion = `Expected ${first5.join(", ")}`;
+        if (h.expected.length > 5)
+          suggestion += `, ... (${h.expected.length} total)`;
+      }
+      let token = h.token || "token";
+      let expectedSet = new Set((h.expected || []).map((e) => e.replace(/'/g, "")));
+      let TERNARY_ENDERS = new Set([
+        "TERMINATOR",
+        ",",
+        ")",
+        "]",
+        "OUTDENT",
+        "CALL_END",
+        "INDEX_END",
+        "PARAM_END",
+        "EOF"
+      ]);
+      if (expectedSet.has(":") && (expectedSet.has("POST_IF") || expectedSet.has("POST_UNLESS") || expectedSet.has("FOR") || expectedSet.has("WHILE")) && TERNARY_ENDERS.has(token)) {
+        suggestion = "Binary `x ? y` was removed — use `x ?? y` for nullish coalescing, or a full ternary `x ? y : z`";
+      }
+      let near = h.text ? ` near '${h.text}'` : "";
+      let message = `Unexpected ${token}${near}`;
+      return new RipError(message, {
+        code: "E_PARSE",
+        file,
+        line,
+        column,
+        length: h.text?.length || 1,
+        source,
+        suggestion,
+        phase: "parser"
+      });
+    }
+    static fromSExpr(message, sexpr, source, file, suggestion) {
+      let loc = sexpr?.loc || {};
+      return new RipError(message, {
+        code: "E_CODEGEN",
+        file,
+        line: loc.r ?? null,
+        column: loc.c ?? null,
+        length: loc.n ?? 1,
+        source,
+        suggestion,
+        phase: "codegen"
+      });
+    }
+    get locationString() {
+      let parts = [];
+      if (this.file)
+        parts.push(this.file);
+      if (this.line != null) {
+        parts.push(`${this.line + 1}:${(this.column ?? 0) + 1}`);
+      }
+      return parts.join(":");
+    }
+    format({ color = true } = {}) {
+      let c = color ? {
+        red: "\x1B[31m",
+        yellow: "\x1B[33m",
+        cyan: "\x1B[36m",
+        dim: "\x1B[2m",
+        bold: "\x1B[1m",
+        reset: "\x1B[0m"
+      } : { red: "", yellow: "", cyan: "", dim: "", bold: "", reset: "" };
+      let lines = [];
+      let loc = this.locationString;
+      let header = loc ? `${c.cyan}${loc}${c.reset} ` : "";
+      lines.push(`${header}${c.red}${c.bold}error${c.reset}${c.bold}: ${this.message}${c.reset}`);
+      let snippet = this._snippet();
+      if (snippet) {
+        lines.push("");
+        for (let s of snippet) {
+          if (s.type === "source") {
+            lines.push(`${c.dim}${s.gutter}${c.reset}${s.text}`);
+          } else if (s.type === "caret") {
+            lines.push(`${c.dim}${s.gutter}${c.reset}${c.red}${c.bold}${s.text}${c.reset}`);
+          }
+        }
+      }
+      if (this.suggestion) {
+        lines.push("");
+        lines.push(`${c.yellow}hint${c.reset}: ${this.suggestion}`);
+      }
+      return lines.join(`
+`);
+    }
+    formatHTML() {
+      let lines = [];
+      lines.push('<div class="rip-error">');
+      lines.push("<style>");
+      lines.push(`.rip-error { font-family: ui-monospace, "SF Mono", Menlo, Monaco, monospace; font-size: 13px; line-height: 1.5; padding: 16px 20px; background: #1e1e2e; color: #cdd6f4; border-radius: 8px; overflow-x: auto; }`);
+      lines.push(`.rip-error .re-header { color: #f38ba8; font-weight: 600; }`);
+      lines.push(`.rip-error .re-loc { color: #89b4fa; }`);
+      lines.push(`.rip-error .re-gutter { color: #585b70; user-select: none; }`);
+      lines.push(`.rip-error .re-caret { color: #f38ba8; font-weight: 700; }`);
+      lines.push(`.rip-error .re-hint { color: #f9e2af; }`);
+      lines.push(`.rip-error .re-snippet { margin: 8px 0; }`);
+      lines.push("</style>");
+      let loc = this.locationString;
+      let locSpan = loc ? `<span class="re-loc">${esc(loc)}</span> ` : "";
+      lines.push(`<div class="re-header">${locSpan}error: ${esc(this.message)}</div>`);
+      let snippet = this._snippet();
+      if (snippet) {
+        lines.push('<pre class="re-snippet">');
+        for (let s of snippet) {
+          if (s.type === "source") {
+            lines.push(`<span class="re-gutter">${esc(s.gutter)}</span>${esc(s.text)}`);
+          } else if (s.type === "caret") {
+            lines.push(`<span class="re-gutter">${esc(s.gutter)}</span><span class="re-caret">${esc(s.text)}</span>`);
+          }
+        }
+        lines.push("</pre>");
+      }
+      if (this.suggestion) {
+        lines.push(`<div class="re-hint">hint: ${esc(this.suggestion)}</div>`);
+      }
+      lines.push("</div>");
+      return lines.join(`
+`);
+    }
+    _snippet() {
+      if (this.source == null || this.line == null)
+        return null;
+      let sourceLines = this.source.split(`
+`);
+      let errLine = this.line;
+      if (errLine < 0 || errLine >= sourceLines.length)
+        return null;
+      let contextRadius = 2;
+      let start = Math.max(0, errLine - contextRadius);
+      let end = Math.min(sourceLines.length - 1, errLine + contextRadius);
+      let gutterWidth = String(end + 1).length;
+      let result = [];
+      for (let i = start;i <= end; i++) {
+        let lineNum = String(i + 1).padStart(gutterWidth);
+        let gutter = ` ${lineNum} │ `;
+        result.push({ type: "source", gutter, text: sourceLines[i] });
+        if (i === errLine && this.column != null) {
+          let pad = " ".repeat(this.column);
+          let caretLen = Math.max(1, Math.min(this.length || 1, sourceLines[i].length - this.column));
+          let carets = "^".repeat(caretLen);
+          let emptyGutter = " ".repeat(gutterWidth + 2) + "│ ";
+          result.push({ type: "caret", gutter: emptyGutter, text: `${pad}${carets}` });
+        }
+      }
+      return result;
+    }
+  }
+  function isLexerError(err) {
+    return err instanceof SyntaxError && err.location != null;
+  }
+  function isParserError(err) {
+    return !(err instanceof SyntaxError) && err.hash != null;
+  }
+  function toRipError(err, source, file) {
+    if (err instanceof RipError) {
+      if (file && !err.file)
+        err.file = file;
+      if (source && !err.source)
+        err.source = source;
+      return err;
+    }
+    if (isLexerError(err))
+      return RipError.fromLexer(err, source, file);
+    if (isParserError(err))
+      return RipError.fromParser(err, source, file);
+    return new RipError(err.message, { file, source, phase: "unknown" });
+  }
+  function formatError(err, { source, file, color = true } = {}) {
+    let re = err instanceof RipError ? err : toRipError(err, source, file);
+    return re.format({ color });
+  }
+  function formatErrorHTML(err, { source, file } = {}) {
+    let re = err instanceof RipError ? err : toRipError(err, source, file);
+    return re.formatHTML();
+  }
+  function esc(s) {
+    return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+  }
+
   // src/types.js
   function installTypeSupport(Lexer) {
     let proto = Lexer.prototype;
     proto.rewriteTypes = function() {
       let tokens = this.tokens;
       let typeRefNames = this.typeRefNames = new Set;
+      reclassifyColonTypes(tokens);
       let gen = (tag, val, origin) => {
         let t = [tag, val];
         t.pre = 0;
@@ -4883,7 +5122,19 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
           let prevToken = tokens2[i - 1];
           if (!prevToken)
             return 1;
-          let typeTokens = collectTypeExpression(tokens2, i + 1);
+          let isArrowReturn = prevToken[0] === "PARAM_END";
+          let typeTokens = collectTypeExpression(tokens2, i + 1, { stopAtFatArrow: isArrowReturn });
+          if (isArrowReturn && looksLikeBareFunctionType(typeTokens)) {
+            let loc = tokens2[i + 1]?.loc;
+            throw new RipError("A function-type return on an arrow must be parenthesized", {
+              code: "E_SYNTAX",
+              phase: "lexer",
+              line: loc?.r ?? null,
+              column: loc?.c ?? null,
+              length: loc?.n ?? 1,
+              suggestion: "wrap the whole function type in parens — " + "`(x):: ((a: T) => R) => body`, not `(x):: (a: T) => R => body`"
+            });
+          }
           let typeStr = buildTypeString(typeTokens);
           let target = prevToken;
           let propName = "type";
@@ -5068,45 +5319,465 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
       }
     };
   }
-  function collectTypeExpression(tokens, j) {
-    let typeTokens = [];
+  function looksLikeBareFunctionType(typeTokens) {
+    const isOpen = (t) => t === "(" || t === "PARAM_START" || t === "CALL_START";
+    const isClose = (t) => t === ")" || t === "PARAM_END" || t === "CALL_END";
+    if (typeTokens.length < 2 || !isOpen(typeTokens[0][0]))
+      return false;
     let depth = 0;
-    let bracketStack = [];
-    let startJ = j;
-    while (j < tokens.length) {
-      let t = tokens[j];
-      let tTag = t[0];
-      let isOpen = tTag === "(" || tTag === "[" || tTag === "{" || tTag === "CALL_START" || tTag === "PARAM_START" || tTag === "INDEX_START" || tTag === "COMPARE" && t[1] === "<";
-      let isClose = tTag === ")" || tTag === "]" || tTag === "}" || tTag === "CALL_END" || tTag === "PARAM_END" || tTag === "INDEX_END" || tTag === "COMPARE" && t[1] === ">";
-      if (tTag === "SHIFT" && t[1] === ">>" && depth >= 2) {
-        depth -= 2;
-        if (bracketStack[bracketStack.length - 1] === "<")
-          bracketStack.pop();
-        if (bracketStack[bracketStack.length - 1] === "<")
-          bracketStack.pop();
-        typeTokens.push(t);
-        j++;
-        continue;
-      }
-      if (isOpen) {
+    for (let k = 0;k < typeTokens.length; k++) {
+      const tag = typeTokens[k][0];
+      if (isOpen(tag))
         depth++;
-        let kind = tTag === "{" ? "{" : tTag === "[" || tTag === "INDEX_START" ? "[" : tTag === "COMPARE" && t[1] === "<" ? "<" : "(";
-        bracketStack.push(kind);
-        typeTokens.push(t);
-        j++;
-        continue;
+      else if (isClose(tag)) {
+        if (--depth === 0 && k !== typeTokens.length - 1)
+          return false;
       }
-      if (isClose) {
-        if (depth > 0) {
-          depth--;
-          bracketStack.pop();
-          typeTokens.push(t);
-          j++;
-          continue;
-        }
-        break;
+    }
+    if (depth !== 0)
+      return false;
+    if (typeTokens.length === 2)
+      return true;
+    let d = 0, pendingTernary = false;
+    for (const t of typeTokens) {
+      const tag = t[0];
+      if (isOpen(tag) || tag === "[" || tag === "{" || tag === "INDEX_START")
+        d++;
+      else if (isClose(tag) || tag === "]" || tag === "}" || tag === "INDEX_END")
+        d--;
+      else if (d === 1 && tag === "TERNARY")
+        pendingTernary = true;
+      else if (d === 1 && tag === ":") {
+        if (pendingTernary)
+          pendingTernary = false;
+        else
+          return true;
+      }
+    }
+    return false;
+  }
+  function isCompleteTypeExpr(tokens, a, b) {
+    if (b <= a)
+      return false;
+    const SEP = new Set(["|", "&", ",", ":", "?", ".", "...", "=>"]);
+    let par = 0, brk = 0, brc = 0, gen = 0, atomEnd = false;
+    for (let j = a;j < b; j++) {
+      const t = tokens[j][0], v = tokens[j][1];
+      if (t === "(" || t === "PARAM_START") {
+        par++;
+        atomEnd = false;
+        continue;
+      }
+      if (t === ")" || t === "PARAM_END") {
+        if (--par < 0)
+          return false;
+        atomEnd = true;
+        continue;
+      }
+      if (t === "[" || t === "INDEX_START") {
+        brk++;
+        atomEnd = false;
+        continue;
+      }
+      if (t === "]" || t === "INDEX_END") {
+        if (--brk < 0)
+          return false;
+        atomEnd = true;
+        continue;
+      }
+      if (t === "{") {
+        brc++;
+        atomEnd = false;
+        continue;
+      }
+      if (t === "}") {
+        if (--brc < 0)
+          return false;
+        atomEnd = true;
+        continue;
+      }
+      if (t === "COMPARE") {
+        if (v === "<") {
+          gen++;
+          atomEnd = false;
+          continue;
+        }
+        if (v === ">") {
+          if (gen <= 0)
+            return false;
+          gen--;
+          atomEnd = true;
+          continue;
+        }
+        return false;
+      }
+      if (t === "SHIFT") {
+        if (v === ">>") {
+          if (gen < 2)
+            return false;
+          gen -= 2;
+          atomEnd = true;
+          continue;
+        }
+        return false;
+      }
+      if (t === "=") {
+        if (gen > 0) {
+          atomEnd = false;
+          continue;
+        }
+        return false;
+      }
+      if (SEP.has(t)) {
+        atomEnd = false;
+        continue;
+      }
+      if (t === "IDENTIFIER" || t === "PROPERTY" || t === "NUMBER" || t === "STRING" || t === "NULL" || t === "UNDEFINED" || t === "BOOL") {
+        if (atomEnd)
+          return false;
+        atomEnd = true;
+        continue;
+      }
+      return false;
+    }
+    return par === 0 && brk === 0 && brc === 0 && gen === 0 && atomEnd;
+  }
+  function assignedLaterInBlock(tokens, start, name) {
+    const ASSIGN = new Set(["=", "REACTIVE_ASSIGN", "COMPUTED_ASSIGN", "READONLY_ASSIGN"]);
+    let indent = 0, bracket = 0, closureDepth = 0;
+    const closureAt = [];
+    for (let j = start;j < tokens.length; j++) {
+      const g = tokens[j][0];
+      if (g === "INDENT") {
+        indent++;
+        const p = tokens[j - 1]?.[0];
+        if (p === "->" || p === "=>") {
+          closureAt.push(indent);
+          closureDepth++;
+        }
+        continue;
+      }
+      if (g === "OUTDENT") {
+        if (indent === 0)
+          return false;
+        if (closureAt[closureAt.length - 1] === indent) {
+          closureAt.pop();
+          closureDepth--;
+        }
+        indent--;
+        continue;
+      }
+      if (g === "(" || g === "CALL_START" || g === "PARAM_START" || g === "[" || g === "INDEX_START" || g === "{") {
+        bracket++;
+        continue;
+      }
+      if (g === ")" || g === "CALL_END" || g === "PARAM_END" || g === "]" || g === "INDEX_END" || g === "}") {
+        bracket--;
+        continue;
+      }
+      if (closureDepth === 0 && bracket === 0 && (g === "IDENTIFIER" || g === "PROPERTY") && tokens[j][1] === name && ASSIGN.has(tokens[j + 1]?.[0]))
+        return true;
+    }
+    return false;
+  }
+  function reclassifyColonTypes(tokens) {
+    const isOpen = (t) => t === "(" || t === "CALL_START" || t === "PARAM_START" || t === "{" || t === "[" || t === "INDEX_START";
+    const isClose = (t) => t === ")" || t === "CALL_END" || t === "PARAM_END" || t === "}" || t === "]" || t === "INDEX_END";
+    const isDefParamStart = (i) => {
+      let j = i - 1;
+      const g0 = tokens[j]?.[0], v0 = tokens[j]?.[1];
+      if (g0 === "COMPARE" && v0 === ">" || g0 === "SHIFT" && v0 === ">>") {
+        let depth = g0 === "SHIFT" ? 2 : 1;
+        j--;
+        while (j >= 0 && depth > 0) {
+          const g = tokens[j][0], v = tokens[j][1];
+          if (g === "COMPARE" && v === ">")
+            depth++;
+          else if (g === "SHIFT" && v === ">>")
+            depth += 2;
+          else if (g === "COMPARE" && v === "<")
+            depth--;
+          else if (g === "SHIFT" && v === "<<")
+            depth -= 2;
+          j--;
+        }
+      }
+      if (tokens[j]?.[0] !== "IDENTIFIER" && tokens[j]?.[0] !== "PROPERTY")
+        return false;
+      return tokens[j - 1]?.[0] === "DEF";
+    };
+    const STMT_START = new Set(["TERMINATOR", "INDENT", "OUTDENT", "EXPORT"]);
+    const BINDING_OPS = new Set(["=", "REACTIVE_ASSIGN", "COMPUTED_ASSIGN", "READONLY_ASSIGN"]);
+    const atStatementStart = (t) => !t || STMT_START.has(t[0]);
+    const declBindsBeforeArrow = (start) => {
+      let depth = 0;
+      for (let j = start;j < tokens.length; j++) {
+        const g = tokens[j][0];
+        if (isOpen(g))
+          depth++;
+        else if (isClose(g))
+          depth--;
+        else if (depth === 0) {
+          if (g === "->" || g === "=>")
+            return false;
+          if (BINDING_OPS.has(g))
+            return true;
+          if ((g === "EFFECT" || g === "GATE") && j > start)
+            return true;
+          if (g === "TERMINATOR" || g === "INDENT" || g === "OUTDENT")
+            return false;
+        }
+      }
+      return false;
+    };
+    const valueIsMethod = (start) => {
+      let depth = 0;
+      for (let j = start;j < tokens.length; j++) {
+        const g = tokens[j][0];
+        if (isOpen(g))
+          depth++;
+        else if (isClose(g))
+          depth--;
+        else if (depth === 0) {
+          if (g === "->" || g === "=>")
+            return true;
+          if (g === "TERMINATOR" || g === "INDENT" || g === "OUTDENT")
+            return false;
+        }
+      }
+      return false;
+    };
+    let pendingBody = false;
+    const indentStack = [];
+    const inTypedBody = () => indentStack.length > 0 && indentStack[indentStack.length - 1];
+    const nameAtStatementStart = (i) => {
+      const p = tokens[i - 1]?.[0];
+      if (p !== "PROPERTY" && p !== "IDENTIFIER")
+        return false;
+      if (tokens[i - 2]?.[0] === "@")
+        return atStatementStart(tokens[i - 3]);
+      return atStatementStart(tokens[i - 2]);
+    };
+    let inType = false, typeStartDepth = 0;
+    const enterType = () => {
+      inType = true;
+      typeStartDepth = stack.length;
+    };
+    let prevSiblingKV = false, curLineKV = false;
+    const stack = [];
+    for (let i = 0;i < tokens.length; i++) {
+      const tag = tokens[i][0];
+      if (tag === "CLASS" || tag === "COMPONENT") {
+        pendingBody = true;
+        continue;
+      }
+      if (tag === "INDENT") {
+        indentStack.push(pendingBody);
+        pendingBody = false;
+        prevSiblingKV = curLineKV = false;
+        if (inType && stack.length <= typeStartDepth)
+          inType = false;
+        continue;
+      }
+      if (tag === "OUTDENT") {
+        indentStack.pop();
+        prevSiblingKV = curLineKV = false;
+        if (inType && stack.length <= typeStartDepth)
+          inType = false;
+        continue;
+      }
+      if (isOpen(tag)) {
+        let kind = "other";
+        if (!inType) {
+          if (tag === "PARAM_START")
+            kind = "param";
+          else if ((tag === "CALL_START" || tag === "(") && isDefParamStart(i))
+            kind = "defparam";
+        }
+        stack.push({ kind, sawEq: false, sawType: false });
+        continue;
+      }
+      if (isClose(tag)) {
+        const f2 = stack.pop();
+        if (f2?.kind === "defparam") {
+          (tokens[i].data ??= {}).isDefParamEnd = true;
+        }
+        if (inType && stack.length < typeStartDepth)
+          inType = false;
+        continue;
+      }
+      if (tag === "TYPE_ANNOTATION") {
+        if (!inType)
+          enterType();
+        continue;
+      }
+      if (inType) {
+        if (stack.length <= typeStartDepth && (tag === "=" || tag === "," || tag === "TERMINATOR" || tag === "->" || BINDING_OPS.has(tag))) {
+          inType = false;
+        } else {
+          continue;
+        }
+      }
+      if (tag === "TERMINATOR" && stack.length === 0) {
+        prevSiblingKV = curLineKV;
+        curLineKV = false;
+      }
+      if (tag === ":") {
+        const prev = tokens[i - 1];
+        const prevTag = prev?.[0];
+        if (stack.length === 0 && (prevTag === "IDENTIFIER" || prevTag === "PROPERTY") && atStatementStart(tokens[i - 2]))
+          curLineKV = true;
+        if (prevTag === "PARAM_END" || (prevTag === ")" || prevTag === "CALL_END") && prev.data?.isDefParamEnd) {
+          tokens[i][0] = "TYPE_ANNOTATION";
+          enterType();
+          continue;
+        }
+        if ((prevTag === "IDENTIFIER" || prevTag === "PROPERTY") && tokens[i - 2]?.[0] === "DEF") {
+          if (prevTag === "PROPERTY")
+            prev[0] = "IDENTIFIER";
+          tokens[i][0] = "TYPE_ANNOTATION";
+          enterType();
+          continue;
+        }
+        if (stack.length === 0 && nameAtStatementStart(i) && declBindsBeforeArrow(i + 1)) {
+          if (prevTag === "PROPERTY" && tokens[i - 2]?.[0] !== "@")
+            prev[0] = "IDENTIFIER";
+          tokens[i][0] = "TYPE_ANNOTATION";
+          enterType();
+          continue;
+        }
+        if (stack.length === 0 && nameAtStatementStart(i)) {
+          let depth = 0;
+          for (let j = i + 1;j < tokens.length; j++) {
+            const g = tokens[j][0];
+            if (isOpen(g))
+              depth++;
+            else if (isClose(g)) {
+              if (depth === 0)
+                break;
+              depth--;
+            } else if (depth === 0) {
+              if (g === "TERMINATOR" || g === "INDENT" || g === "OUTDENT")
+                break;
+              if (g === "=" && isCompleteTypeExpr(tokens, i + 1, j)) {
+                if (prevTag === "PROPERTY" && tokens[i - 2]?.[0] !== "@")
+                  prev[0] = "IDENTIFIER";
+                tokens[i][0] = "TYPE_ANNOTATION";
+                enterType();
+                break;
+              }
+            }
+          }
+          if (tokens[i][0] === "TYPE_ANNOTATION")
+            continue;
+        }
+        if (inTypedBody() && stack.length === 0 && nameAtStatementStart(i) && !valueIsMethod(i + 1)) {
+          if (prevTag === "PROPERTY" && tokens[i - 2]?.[0] !== "@")
+            prev[0] = "IDENTIFIER";
+          tokens[i][0] = "TYPE_ANNOTATION";
+          enterType();
+          continue;
+        }
+        if (stack.length === 0 && nameAtStatementStart(i) && tokens[i - 2]?.[0] !== "@") {
+          let depth = 0, end = -1;
+          for (let j = i + 1;j < tokens.length; j++) {
+            const g = tokens[j][0];
+            if (isOpen(g))
+              depth++;
+            else if (isClose(g)) {
+              if (depth === 0)
+                break;
+              depth--;
+            } else if (depth === 0) {
+              if (g === "TERMINATOR") {
+                end = j;
+                break;
+              }
+              if (g === "INDENT" || g === "OUTDENT" || g === "=" || BINDING_OPS.has(g))
+                break;
+            }
+          }
+          const nk = tokens[end + 1];
+          const nextKV = nk && (nk[0] === "IDENTIFIER" || nk[0] === "PROPERTY") && tokens[end + 2]?.[0] === ":";
+          if (end > i + 1 && nk && nk[0] !== "OUTDENT" && !prevSiblingKV && !nextKV && isCompleteTypeExpr(tokens, i + 1, end) && assignedLaterInBlock(tokens, end + 1, prev[1])) {
+            if (prevTag === "PROPERTY")
+              prev[0] = "IDENTIFIER";
+            tokens[i][0] = "TYPE_ANNOTATION";
+            enterType();
+            continue;
+          }
+        }
+      }
+      const f = stack[stack.length - 1];
+      if (f && (f.kind === "param" || f.kind === "defparam")) {
+        if (tag === ",") {
+          f.sawEq = false;
+          f.sawType = false;
+          continue;
+        }
+        if (tag === "=") {
+          f.sawEq = true;
+          continue;
+        }
+        if (tag === ":" && !f.sawEq && !f.sawType) {
+          const prev = tokens[i - 1];
+          const prevTag = prev?.[0];
+          if (prevTag === "PROPERTY" || prevTag === "IDENTIFIER") {
+            if (prevTag === "PROPERTY" && tokens[i - 2]?.[0] !== "@")
+              prev[0] = "IDENTIFIER";
+            tokens[i][0] = "TYPE_ANNOTATION";
+            f.sawType = true;
+            enterType();
+          } else if (prevTag === "}" || prevTag === "]" || prevTag === "INDEX_END") {
+            tokens[i][0] = "TYPE_ANNOTATION";
+            f.sawType = true;
+            enterType();
+          }
+        }
+      }
+    }
+  }
+  function collectTypeExpression(tokens, j, opts = {}) {
+    let typeTokens = [];
+    let depth = 0;
+    let bracketStack = [];
+    let startJ = j;
+    while (j < tokens.length) {
+      let t = tokens[j];
+      let tTag = t[0];
+      let isOpen = tTag === "(" || tTag === "[" || tTag === "{" || tTag === "CALL_START" || tTag === "PARAM_START" || tTag === "INDEX_START" || tTag === "COMPARE" && t[1] === "<";
+      let isClose = tTag === ")" || tTag === "]" || tTag === "}" || tTag === "CALL_END" || tTag === "PARAM_END" || tTag === "INDEX_END" || tTag === "COMPARE" && t[1] === ">";
+      if (tTag === "SHIFT" && t[1] === ">>" && depth >= 2) {
+        depth -= 2;
+        if (bracketStack[bracketStack.length - 1] === "<")
+          bracketStack.pop();
+        if (bracketStack[bracketStack.length - 1] === "<")
+          bracketStack.pop();
+        typeTokens.push(t);
+        j++;
+        continue;
+      }
+      if (isOpen) {
+        depth++;
+        let kind = tTag === "{" ? "{" : tTag === "[" || tTag === "INDEX_START" ? "[" : tTag === "COMPARE" && t[1] === "<" ? "<" : "(";
+        bracketStack.push(kind);
+        typeTokens.push(t);
+        j++;
+        continue;
+      }
+      if (isClose) {
+        if (depth > 0) {
+          depth--;
+          bracketStack.pop();
+          typeTokens.push(t);
+          j++;
+          continue;
+        }
+        break;
       }
       if (depth === 0) {
+        if (opts.stopAtFatArrow && tTag === "=>")
+          break;
         if (tTag === "INDENT" && typeTokens.length > 0 && typeTokens[typeTokens.length - 1][0] === "=>") {
           j++;
           let nest = 1;
@@ -5575,7 +6246,8 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
     "LOOP",
     "TERMINATOR",
     "||",
-    "&&"
+    "&&",
+    "??"
   ]);
   var IMPLICIT_COMMA_BEFORE_ARROW = new Set([
     "STRING",
@@ -6208,6 +6880,11 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
             depth--;
           if (depth === 0 && tk[0] === "TYPE_ANNOTATION")
             return false;
+          if (depth === 0 && tk[0] === ":") {
+            let pv = this.tokens[k - 1];
+            if (pv && (pv[0] === ")" || pv[0] === "PARAM_END" || pv[0] === "CALL_END"))
+              return false;
+          }
           if (depth === 0 && tk[0] === "IDENTIFIER" && tk[1] === "type")
             return false;
           if (tk[0] === "INTERFACE")
@@ -6737,7 +7414,7 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
           } else if (tg === "(" || tg === "[" || tg === "{" || tg === "CALL_START" || tg === "PARAM_START" || tg === "INDEX_START" || tg === "COMPARE" && tk[1] === "<") {
             depth--;
           } else if (depth === 0) {
-            if (tg === "TYPE_ANNOTATION") {
+            if (tg === "TYPE_ANNOTATION" || tg === ":") {
               if (j > 0 && this.tokens[j - 1][0] === ")")
                 found = j - 1;
               break;
@@ -6750,6 +7427,22 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
         if (found < 0)
           return this.tagDoIife();
         closeIdx = found;
+      } else {
+        let d = 0, op = -1;
+        for (let k = closeIdx;k >= 0; k--) {
+          let tg = this.tokens[k][0];
+          if (tg === ")" || tg === "CALL_END" || tg === "PARAM_END")
+            d++;
+          else if (tg === "(" || tg === "CALL_START" || tg === "PARAM_START") {
+            if (--d === 0) {
+              op = k;
+              break;
+            }
+          }
+        }
+        if (op > 1 && this.tokens[op - 1][0] === "TYPE_ANNOTATION" && this.tokens[op - 2]?.[0] === ")") {
+          closeIdx = op - 2;
+        }
       }
       let i = closeIdx;
       let stack = [];
@@ -6889,7 +7582,7 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
       let indent = null;
       let outdent = null;
       let condition = (token, i) => {
-        return token[1] !== ";" && SINGLE_CLOSERS.has(token[0]) && !(token[0] === "TERMINATOR" && EXPRESSION_CLOSE.has(this.tokens[i + 1]?.[0])) && !(token[0] === "ELSE" && starter !== "THEN") || token[0] === "INDENT" && !token.generated && (starter === "->" || starter === "=>") || token[0] === "," && (starter === "->" || starter === "=>") && !this.commaInImplicitCall(i) && !this.commaInImplicitObject(i) || CALL_CLOSERS.has(token[0]) && (this.tokens[i - 1]?.newLine || this.tokens[i - 1]?.[0] === "OUTDENT");
+        return token[1] !== ";" && SINGLE_CLOSERS.has(token[0]) && !(token[0] === "TERMINATOR" && EXPRESSION_CLOSE.has(this.tokens[i + 1]?.[0])) && !(token[0] === "ELSE" && starter !== "THEN") || token[0] === "INDENT" && !token.generated && (starter === "->" || starter === "=>") || token[0] === "," && (starter === "->" || starter === "=>" || starter === "THEN" || starter === "ELSE") && !this.commaInImplicitCall(i) && !this.commaInImplicitObject(i) || CALL_CLOSERS.has(token[0]) && (this.tokens[i - 1]?.newLine || this.tokens[i - 1]?.[0] === "OUTDENT");
       };
       let action = (token, i) => {
         let idx = this.tokens[i - 1]?.[0] === "," ? i - 1 : i;
@@ -7153,7 +7846,7 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
           }
         }
         let newLine = prevTag === "OUTDENT" || prevToken.newLine;
-        let isLogicalOp = tag === "||" || tag === "&&";
+        let isLogicalOp = tag === "||" || tag === "&&" || tag === "??";
         let logicalKeep = false;
         if (isLogicalOp) {
           let j = i + 1, t = tokens[j]?.[0];
@@ -7857,12 +8550,19 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
       };
       let startsWithTag = (tokens, i) => {
         let j = i;
+        while (j > 0 && tokens[j][0] === "OUTDENT") {
+          j = skipBalancedPair(tokens, j - 1, "OUTDENT", "INDENT");
+        }
         while (j > 0) {
           let pt = tokens[j - 1][0];
           if (pt === "TERMINATOR" || pt === "RENDER") {
             break;
           }
-          if (pt === "INDENT" || pt === "OUTDENT") {
+          if (pt === "OUTDENT") {
+            j = skipBalancedPair(tokens, j - 2, "OUTDENT", "INDENT");
+            continue;
+          }
+          if (pt === "INDENT") {
             let jt = tokens[j][0];
             if (jt === "CALL_END" || jt === ")") {
               j = skipBalancedPair(tokens, j - 1, jt, jt === "CALL_END" ? "CALL_START" : "(");
@@ -8078,7 +8778,7 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
             isTemplateElement = true;
           } else if (tag === "IDENTIFIER" && !isAfterControlFlow) {
             isTemplateElement = atLineStart || startsWithTag(tokens, i);
-          } else if (tag === "PROPERTY" || tag === "STRING" || tag === "STRING_END" || tag === "NUMBER" || tag === "BOOL" || tag === "CALL_END" || tag === ")" || tag === "PRESENCE") {
+          } else if (tag === "PROPERTY" || tag === "STRING" || tag === "STRING_END" || tag === "NUMBER" || tag === "BOOL" || tag === "CALL_END" || tag === ")" || tag === "]" || tag === "INDEX_END" || tag === "}" || tag === "MAP_END" || tag === "PRESENCE") {
             isTemplateElement = startsWithTag(tokens, i);
           }
           if (isTemplateElement) {
@@ -8448,25 +9148,32 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
         if (hookDecls.length)
           sl.push("  " + hookDecls.join(" "));
         sl.push("  emit(_name: string, _detail?: any): void {}");
-        const propEntries = [];
+        const baseEntries = [];
+        const requiredBindUnions = [];
         for (const { name, type, isPublic, required, optional } of stateVars) {
           if (!isPublic)
             continue;
-          const ts = expandType(type);
-          const opt = optional ?? !required ? "?" : "";
-          propEntries.push(`${name}${opt}: ${ts || "any"}`);
-          propEntries.push(`__bind_${name}__?: Signal<${ts || "any"}>`);
+          const ts = expandType(type) || "any";
+          if (optional ?? !required) {
+            baseEntries.push(`${name}?: ${ts}`);
+            baseEntries.push(`__bind_${name}__?: Signal<${ts}>`);
+          } else {
+            requiredBindUnions.push(`({ ${name}: ${ts}; __bind_${name}__?: Signal<${ts}> } | { ${name}?: ${ts}; __bind_${name}__: Signal<${ts}> })`);
+          }
         }
         for (const { name, type, isPublic } of readonlyVars) {
           if (!isPublic)
             continue;
-          const ts = expandType(type);
-          propEntries.push(`${name}?: ${ts || "any"}`);
+          const ts = expandType(type) || "any";
+          baseEntries.push(`${name}?: ${ts}`);
         }
         {
-          const hasRequired = propEntries.length > 0 && stateVars.some((v) => v.isPublic && v.required && !v.optional);
-          const propsOpt = hasRequired ? "" : "?";
-          let propsType = propEntries.length > 0 ? `{${propEntries.join("; ")}}` : "{}";
+          const propsOpt = requiredBindUnions.length > 0 ? "" : "?";
+          const parts = [];
+          if (baseEntries.length)
+            parts.push(`{${baseEntries.join("; ")}}`);
+          parts.push(...requiredBindUnions);
+          let propsType = parts.length ? parts.join(" & ") : "{}";
           if (inheritsTag)
             propsType += ` & __RipProps<'${inheritsTag}'>`;
           sl.push(`  constructor(_props${propsOpt}: ${propsType}) {}`);
@@ -8620,12 +9327,7 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
             let [, params, methodBody] = func;
             if ((!params || Array.isArray(params) && params.length === 0) && this.containsIt(methodBody))
               params = ["it"];
-            let paramStr = Array.isArray(params) ? params.map((p) => {
-              let base = this.formatParam(p);
-              if (p?.type)
-                base += `: ${p.type}`;
-              return base;
-            }).join(", ") : "";
+            let paramStr = Array.isArray(params) ? params.map((p) => this.formatParam(p)).join(", ") : "";
             const boundEvent = eventMethodTypes.get(name);
             if (boundEvent && Array.isArray(params) && params.length > 0) {
               const firstParam = params[0];
@@ -8665,7 +9367,25 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
           const sourceLines = this.options.source?.split(`
 `);
           const wrapCompHref = (val) => typeof val === "string" && /^["'`]\//.test(val) ? `__ripRoute(${val})` : val;
-          const extractProps = (args) => {
+          const FLAG_RE = /^[a-zA-Z_$][\w$]*$/;
+          const isFlagArg = (a) => typeof a === "string" && FLAG_RE.test(a) && !/^(?:true|false|null|undefined)$/.test(a) && !CodeEmitter.GENERATORS[a] && !this._isInScopeValue(a);
+          const findFlagLine = (name, fromLine) => {
+            if (fromLine == null || !sourceLines)
+              return fromLine;
+            const re = new RegExp(`(?<![\\w$.#@])${name}(?![\\w$])`);
+            for (let ln = fromLine;ln < sourceLines.length; ln++) {
+              if (sourceLines[ln] && re.test(sourceLines[ln]))
+                return ln;
+            }
+            return fromLine;
+          };
+          const emitFlag = (name, fromLine, headLine) => {
+            const srcLine = findFlagLine(name, fromLine);
+            if (srcLine != null && srcLine === headLine)
+              return;
+            constructions.push(`    ({ ${name}: true });` + (srcLine != null ? ` // @rip-src:${srcLine}` : ""));
+          };
+          const extractProps = (args, nodeLine) => {
             const props = [];
             const sideExprs = [];
             for (const arg of args) {
@@ -8673,12 +9393,18 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
               if (this.is(arg, "object")) {
                 obj = arg;
               } else if (Array.isArray(arg) && (arg[0] === "->" || arg[0] === "=>") && this.is(arg[2], "block")) {
+                const blockLine = arg[2].loc?.r ?? nodeLine;
                 for (let k = 1;k < arg[2].length; k++) {
-                  if (this.is(arg[2][k], "object")) {
-                    obj = arg[2][k];
-                    break;
-                  }
+                  const bc = arg[2][k];
+                  if (this.is(bc, "object")) {
+                    if (!obj)
+                      obj = bc;
+                  } else if (isFlagArg(bc))
+                    emitFlag(bc, blockLine, nodeLine);
                 }
+              } else if (isFlagArg(arg)) {
+                emitFlag(arg, nodeLine, nodeLine);
+                continue;
               }
               if (obj) {
                 for (let j = 1;j < obj.length; j++) {
@@ -8715,7 +9441,7 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
             props.sideExprs = sideExprs;
             return props;
           };
-          const extractIntrinsicProps = (args, tagName) => {
+          const extractIntrinsicProps = (args, tagName, nodeLine) => {
             const props = [];
             const wrapHrefVal = (val) => {
               if (tagName !== "a")
@@ -8735,12 +9461,18 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
               if (this.is(arg, "object")) {
                 obj = arg;
               } else if (Array.isArray(arg) && (arg[0] === "->" || arg[0] === "=>") && this.is(arg[2], "block")) {
+                const blockLine = arg[2].loc?.r ?? nodeLine;
                 for (let k = 1;k < arg[2].length; k++) {
-                  if (this.is(arg[2][k], "object")) {
-                    obj = arg[2][k];
-                    break;
-                  }
+                  const bc = arg[2][k];
+                  if (this.is(bc, "object")) {
+                    if (!obj)
+                      obj = bc;
+                  } else if (isFlagArg(bc))
+                    emitFlag(bc, blockLine, nodeLine);
                 }
+              } else if (isFlagArg(arg)) {
+                emitFlag(arg, nodeLine, nodeLine);
+                continue;
               }
               if (obj) {
                 for (let j = 1;j < obj.length; j++) {
@@ -8887,10 +9619,14 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
                 } else {
                   constructions.push(`    for (const ${varPattern} of ${iterCode}) {${srcMarker}`);
                 }
+                const asName = (v) => typeof v === "string" || v instanceof String ? String(v) : null;
+                const loopFrame = Array.isArray(vars) ? { itemVar: asName(vars[0]), indexVar: asName(vars[1]) } : { itemVar: asName(vars), indexVar: null };
+                (this._loopVarStack || (this._loopVarStack = [])).push(loopFrame);
                 for (let bi = 3;bi < node.length; bi++) {
                   if (node[bi] != null)
                     walkRender(node[bi]);
                 }
+                this._loopVarStack.pop();
                 constructions.push(`    }`);
                 return;
               }
@@ -8968,9 +9704,9 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
               }
               if (this.componentMembers && this.componentMembers.has(child)) {
                 constructions.push(`    this.${child};${srcMarker}`);
-              } else if (isTextChild) {
+              } else if (this._isInScopeValue(child)) {
                 constructions.push(`    ${child};${srcMarker}`);
-              } else {
+              } else if (!isTextChild && this.isHtmlTag(child)) {
                 constructions.push(`    __ripEl('${child}');${srcMarker}`);
               }
             };
@@ -8978,6 +9714,9 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
             if (head2 === "block") {
               for (let i = 1;i < node.length; i++)
                 emitBareIdent(node[i], node, false);
+            } else if (typeof head2 === "string" && /^[A-Z]/.test(head2)) {
+              for (let i = 1;i < node.length; i++)
+                emitBareIdent(node[i], node, true);
             } else if (isTagHead) {
               for (let i = 1;i < node.length; i++)
                 emitBareIdent(node[i], node, true);
@@ -9009,7 +9748,7 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
             for (let i = 1;i < node.length; i++)
               walkRender(node[i]);
             if (typeof head2 === "string" && /^[A-Z]/.test(head2)) {
-              const props = extractProps(node.slice(1));
+              const props = extractProps(node.slice(1), node.loc?.r);
               const varName = `_${constructionIdx++}`;
               const propsType = `ConstructorParameters<typeof ${head2}>[0] & {}`;
               if (props.length === 0) {
@@ -9039,23 +9778,24 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
               }
             } else if (typeof head2 === "string" && !CodeEmitter.GENERATORS[head2] && (TEMPLATE_TAGS.has(head2.split(/[.#]/)[0]) || /^[a-z][\w-]*$/.test(head2) && node.length > 1)) {
               const tagName = head2.split(/[.#]/)[0];
-              const iProps = extractIntrinsicProps(node.slice(1), tagName);
+              const elFn = SVG_TAGS.has(tagName) ? "__ripSvgEl" : "__ripEl";
+              const iProps = extractIntrinsicProps(node.slice(1), tagName, node.loc?.r);
               const tagLine = node.loc?.r;
               const srcMarker = tagLine != null ? ` // @rip-src:${tagLine}` : "";
               if (iProps.length === 0) {
-                constructions.push(`    __ripEl('${tagName}');${srcMarker}`);
+                constructions.push(`    ${elFn}('${tagName}');${srcMarker}`);
               } else if (iProps.length === 1) {
                 const srcLine = iProps[0].srcLine ?? tagLine;
                 const marker = srcLine != null ? ` // @rip-src:${srcLine}` : "";
-                constructions.push(`    __ripEl('${tagName}', {${iProps[0].code}});${marker}`);
+                constructions.push(`    ${elFn}('${tagName}', {${iProps[0].code}});${marker}`);
               } else {
                 const distinctLines = new Set(iProps.map((p) => p.srcLine).filter((l) => l != null));
                 if (distinctLines.size <= 1) {
                   const srcLine = iProps[0].srcLine ?? tagLine;
                   const marker = srcLine != null ? ` // @rip-src:${srcLine}` : "";
-                  constructions.push(`    __ripEl('${tagName}', {${iProps.map((p) => p.code).join(", ")}});${marker}`);
+                  constructions.push(`    ${elFn}('${tagName}', {${iProps.map((p) => p.code).join(", ")}});${marker}`);
                 } else {
-                  constructions.push(`    __ripEl('${tagName}', {${srcMarker}`);
+                  constructions.push(`    ${elFn}('${tagName}', {${srcMarker}`);
                   for (const p of iProps) {
                     constructions.push(`      ${p.code},` + (p.srcLine != null ? ` // @rip-src:${p.srcLine}` : ""));
                   }
@@ -9243,6 +9983,9 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
         for (const line of result.createLines) {
           lines.push(`    ${line}`);
         }
+        if (this._fragChildren.has(result.rootVar)) {
+          lines.push(`    this._nodes = [...${result.rootVar}.childNodes];`);
+        }
         lines.push(`    return ${result.rootVar};`);
         lines.push("  }");
         if (result.setupLines.length > 0) {
@@ -9411,6 +10154,19 @@ ${blockFactoriesCode}return ${lines.join(`
       }
       return false;
     };
+    proto._isInScopeValue = function(name) {
+      if (!name || typeof name !== "string")
+        return false;
+      if (this.reactiveMembers && this.reactiveMembers.has(name))
+        return true;
+      if (this.componentMembers && this.componentMembers.has(name))
+        return true;
+      if (this._isRenderLocal(name))
+        return true;
+      if (this.moduleBindings && this.moduleBindings.has(name))
+        return true;
+      return false;
+    };
     proto.emitNode = function(sexpr) {
       if (this._isRenderBinding(sexpr)) {
         const [op, name, expr] = sexpr;
@@ -9610,6 +10366,8 @@ ${blockFactoriesCode}return ${lines.join(`
           if (!this._isRenderLocal(baseName) && (this.isHtmlTag(baseName || "div") || this.isComponent(baseName))) {
             const childVar = this.emitNode(arg);
             this._createLines.push(`${elVar}.appendChild(${childVar});`);
+          } else if (/^[A-Za-z_$][\w$]*$/.test(val) && !this._isInScopeValue(val)) {
+            this.emitAttributes(elVar, ["object", [":", val, "true"]]);
           } else {
             const textVar = this.newTextVar();
             if (val.startsWith('"') || val.startsWith("'") || val.startsWith("`")) {
@@ -9775,10 +10533,11 @@ ${blockFactoriesCode}return ${lines.join(`
                 this._pushEffect(`${elVar}.className = __clsx(${valueCode2});`);
               }
             } else {
+              const out = Array.isArray(value) ? `__clsx(${valueCode2})` : valueCode2;
               if (this._svgDepth > 0) {
-                this._createLines.push(`${elVar}.setAttribute('class', ${valueCode2});`);
+                this._createLines.push(`${elVar}.setAttribute('class', ${out});`);
               } else {
-                this._createLines.push(`${elVar}.className = ${valueCode2};`);
+                this._createLines.push(`${elVar}.className = ${out};`);
               }
             }
             continue;
@@ -10019,17 +10778,17 @@ ${blockFactoriesCode}return ${lines.join(`
       }
       factoryLines.push(`    },`);
       factoryLines.push(`    d(detaching) {`);
-      factoryLines.push(`      for (const __c of _factoryChildren) { try { __c.unmount?.({removeDOM: false}); } catch (__e) { console.error('[Rip] factory child unmount error:', __e); } }`);
+      factoryLines.push(`      for (const __c of _factoryChildren) { try { __c.unmount?.({removeDOM: detaching}); } catch (__e) { console.error('[Rip] factory child unmount error:', __e); } }`);
       factoryLines.push(`      _factoryChildren = [];`);
       if (hasEffects) {
         factoryLines.push(`      disposers.forEach(d => d());`);
       }
       if (fragChildren) {
         for (const child of fragChildren) {
-          factoryLines.push(`      if (detaching && ${child}) ${child}.remove();`);
+          factoryLines.push(`      if (detaching) __detach(${child});`);
         }
       } else {
-        factoryLines.push(`      if (detaching && ${rootVar}) ${rootVar}.remove();`);
+        factoryLines.push(`      if (detaching) __detach(${rootVar});`);
       }
       factoryLines.push(`    }`);
       factoryLines.push(`  };`);
@@ -10200,7 +10959,7 @@ ${blockFactoriesCode}return ${lines.join(`
       for (const arg of args) {
         if (this.is(arg, "object")) {
           addObjectProps(arg);
-        } else if (isBareIdent(arg)) {
+        } else if (isBareIdent(arg) && !this._isInScopeValue(arg)) {
           addProp(arg, "true");
         } else if (Array.isArray(arg) && (arg[0] === "->" || arg[0] === "=>")) {
           let block = arg[2];
@@ -10210,6 +10969,8 @@ ${blockFactoriesCode}return ${lines.join(`
               for (const child of block.slice(1)) {
                 if (this.is(child, "object")) {
                   addObjectProps(child);
+                } else if (isBareIdent(child) && !this._isInScopeValue(child)) {
+                  addProp(child, "true");
                 } else {
                   domChildren.push(child);
                 }
@@ -10350,6 +11111,17 @@ ${blockFactoriesCode}return ${lines.join(`
 
 let __currentComponent = null;
 
+// Remove a node from the DOM, tolerant of what it actually is. A
+// DocumentFragment (a multi-root component's _root) is skipped: it is emptied
+// the moment it is inserted, so it owns nothing to remove — its real top-level
+// nodes are tracked on the component instance (_nodes) and removed there. A
+// detached node (parentNode null) is a harmless no-op.
+function __detach(node) {
+  if (!node || node.nodeType === 11) return;
+  if (typeof node.remove === 'function') node.remove();
+  else if (node.parentNode) node.parentNode.removeChild(node);
+}
+
 function __pushComponent(component) {
   // The component stack tracks the currently-active scope (so __effect
   // and friends can find it). Parent assignment happens ONCE — on the
@@ -10646,6 +11418,7 @@ class __Component {
   constructor(props = {}) {
     Object.assign(this, props);
     if (!this.app && globalThis.__ripApp) this.app = globalThis.__ripApp;
+    if (!this.router && globalThis.__ripRouter) this.router = globalThis.__ripRouter;
     // A component with render gates (<~) is honored only via route
     // matching — the renderer sets __ripGateMount around each route/layout
     // construction. Constructed as an embedded child (a parent scope is
@@ -10740,9 +11513,16 @@ class __Component {
     try {
       if (this.unmounted) this.unmounted();
     } catch (e) { console.error('[Rip] unmounted error:', e); }
-    if (removeDOM && this._root && this._root.parentNode) {
-      this._root.parentNode.removeChild(this._root);
+    if (removeDOM) {
+      if (this._nodes) {
+        // Multi-root: detach each captured top-level node (the _root fragment
+        // is empty and owns nothing).
+        for (const n of this._nodes) __detach(n);
+      } else if (this._root && this._root.parentNode) {
+        this._root.parentNode.removeChild(this._root);
+      }
     }
+    this._nodes = null;
   }
   emit(name, detail) {
     if (this._root) {
@@ -10756,7 +11536,7 @@ class __Component {
 
 // Register on globalThis for runtime deduplication
 if (typeof globalThis !== 'undefined') {
-  globalThis.__ripComponent = { __pushComponent, __popComponent, __getCurrentComponent, setContext, getContext, hasContext, __clsx, __lis, __reconcile, __transition, __handleComponentError, __gateBind, __Component };
+  globalThis.__ripComponent = { __pushComponent, __popComponent, __getCurrentComponent, setContext, getContext, hasContext, __clsx, __lis, __reconcile, __transition, __handleComponentError, __gateBind, __detach, __Component };
 }
 
 `;
@@ -11018,312 +11798,198 @@ if (typeof globalThis !== 'undefined') {
       for (let li = 0;li < info.perLineSegs.length; li++) {
         const target = info.lineOffset + li;
         if (target >= mergedPerLineSegs.length) {
-          while (mergedPerLineSegs.length <= target)
-            mergedPerLineSegs.push([]);
-        }
-        for (const seg of info.perLineSegs[li]) {
-          if (seg.src == null) {
-            mergedPerLineSegs[target].push({ genCol: seg.genCol });
-          } else {
-            const remapped = {
-              genCol: seg.genCol,
-              src: info.srcRemap[seg.src],
-              origLine: seg.origLine,
-              origCol: seg.origCol
-            };
-            if (seg.name != null)
-              remapped.name = info.nameRemap[seg.name];
-            mergedPerLineSegs[target].push(remapped);
-          }
-        }
-      }
-    }
-    const mergedMappings = encodeMappings(mergedPerLineSegs);
-    const mergedMap = {
-      version: 3,
-      sources: mergedSources,
-      sourcesContent: mergedSourcesContent,
-      names: mergedNames,
-      mappings: mergedMappings
-    };
-    return { js: mergedJS, mapJSON: JSON.stringify(mergedMap) };
-  }
-  function utf8ToBase64(str) {
-    if (typeof Buffer !== "undefined") {
-      return Buffer.from(str, "utf8").toString("base64");
-    }
-    const bytes = new TextEncoder().encode(str);
-    let bin = "";
-    for (let i = 0;i < bytes.length; i++)
-      bin += String.fromCharCode(bytes[i]);
-    return btoa(bin);
-  }
-  function mergeChunksWithInlineMap(chunks) {
-    const { js, mapJSON } = mergeChunks(chunks);
-    if (!mapJSON)
-      return js;
-    const b64 = utf8ToBase64(mapJSON);
-    return js + `
-//# sourceMappingURL=data:application/json;base64,` + b64 + `
-`;
-  }
-
-  // src/stdlib.js
-  function getStdlibCode() {
-    return `// rip:stdlib:begin
-globalThis.abort  ??= (msg) => { if (msg) console.error(msg); process.exit(1); };
-globalThis.assert ??= (v, msg) => { if (!v) throw new Error(msg || "Assertion failed"); };
-globalThis.exit   ??= (code) => process.exit(code || 0);
-globalThis.kind   ??= (v) => v != null ? (v.constructor?.name || Object.prototype.toString.call(v).slice(8, -1)).toLowerCase() : String(v);
-globalThis.noop   ??= () => {};
-globalThis.p      ??= console.log;
-globalThis.pp     ??= (v) => { console.dir(v, { depth: null, colors: true }); return v; };
-globalThis.pj     ??= (v) => { console.log(JSON.stringify(v, null, 2)); return v; };
-globalThis.pr     ??= (() => {
-  const BARE = /^[A-Za-z_$][A-Za-z0-9_$]*$/;
-  const esc = (s, q) => s.replace(/\\\\/g, "\\\\\\\\").replace(/\\n/g, "\\\\n").replace(/\\r/g, "\\\\r").replace(/\\t/g, "\\\\t").replace(new RegExp(q, 'g'), "\\\\" + q);
-  const qs = (s) => !s.includes("'") ? "'" + esc(s, "'") + "'" : !s.includes('"') ? '"' + esc(s, '"').split("#{").join("\\\\#{") + '"' : "'" + esc(s, "'") + "'";
-  const ks = (k) => { if (typeof k === 'symbol') { const n = Symbol.keyFor(k); return n && BARE.test(n) ? ':' + n : qs(String(k)); } return BARE.test(k) ? k : qs(k); };
-  const fmt = (v, d) => {
-    if (v === null) return 'null';
-    if (v === undefined) return 'undefined';
-    const t = typeof v;
-    if (t === 'number' || t === 'boolean') return String(v);
-    if (t === 'string') return qs(v);
-    if (t === 'symbol') { const n = Symbol.keyFor(v); return n && BARE.test(n) ? ':' + n : null; }
-    if (Array.isArray(v)) {
-      if (v.length === 0) return '[]';
-      const pad = '  '.repeat(d + 1), end = '  '.repeat(d);
-      return '[\\n' + pad + v.map(x => fmt(x, d + 1) ?? 'null').join('\\n' + pad) + '\\n' + end + ']';
-    }
-    if (t === 'object') {
-      const proto = Object.getPrototypeOf(v);
-      if (proto !== Object.prototype && proto !== null) return null;
-      const keys = Object.keys(v);
-      if (keys.length === 0) return '{}';
-      const pad = '  '.repeat(d + 1), end = '  '.repeat(d);
-      return '{\\n' + pad + keys.map(k => ks(k) + ': ' + (fmt(v[k], d + 1) ?? 'null')).join('\\n' + pad) + '\\n' + end + '}';
-    }
-    return null;
-  };
-  return (v) => { const s = fmt(v, 0); s !== null ? console.log(s) : console.dir(v, { depth: null, colors: true }); return v; };
-})();
-globalThis.raise  ??= (a, b) => { throw (b !== undefined ? new a(b) : new Error(a)); };
-globalThis.rand   ??= (a, b) => b !== undefined ? (a > b && ([a, b] = [b, a]), Math.floor(Math.random() * (b - a + 1) + a)) : a ? Math.floor(Math.random() * a) : Math.random();
-globalThis.sleep  ??= (ms) => new Promise(r => setTimeout(r, ms));
-globalThis.todo   ??= (msg) => { throw new Error(msg || "Not implemented"); };
-globalThis.warn   ??= console.warn;
-globalThis.zip    ??= (...a) => a[0].map((_, i) => a.map(b => b[i]));
-// rip:stdlib:end
-`;
-  }
-
-  // src/error.js
-  class RipError extends Error {
-    constructor(message, {
-      code = null,
-      file = null,
-      line = null,
-      column = null,
-      length = 1,
-      source = null,
-      suggestion = null,
-      phase = null
-    } = {}) {
-      super(message);
-      this.name = "RipError";
-      this.code = code;
-      this.file = file;
-      this.line = line;
-      this.column = column;
-      this.length = length;
-      this.source = source;
-      this.suggestion = suggestion;
-      this.phase = phase;
-    }
-    static fromLexer(err, source, file) {
-      let loc = err.location || {};
-      return new RipError(err.message, {
-        code: "E_SYNTAX",
-        file,
-        line: loc.first_line ?? null,
-        column: loc.first_column ?? null,
-        length: loc.last_column != null && loc.first_column != null ? loc.last_column - loc.first_column + 1 : 1,
-        source,
-        phase: "lexer"
-      });
-    }
-    static fromParser(err, source, file) {
-      let h = err.hash || {};
-      let loc = h.loc || {};
-      let line = h.line ?? loc.r ?? null;
-      let column = loc.first_column ?? loc.c ?? null;
-      let suggestion = null;
-      if (h.expected?.length) {
-        let first5 = h.expected.slice(0, 5).map((e) => e.replace(/'/g, ""));
-        suggestion = `Expected ${first5.join(", ")}`;
-        if (h.expected.length > 5)
-          suggestion += `, ... (${h.expected.length} total)`;
-      }
-      let token = h.token || "token";
-      let near = h.text ? ` near '${h.text}'` : "";
-      let message = `Unexpected ${token}${near}`;
-      return new RipError(message, {
-        code: "E_PARSE",
-        file,
-        line,
-        column,
-        length: h.text?.length || 1,
-        source,
-        suggestion,
-        phase: "parser"
-      });
-    }
-    static fromSExpr(message, sexpr, source, file, suggestion) {
-      let loc = sexpr?.loc || {};
-      return new RipError(message, {
-        code: "E_CODEGEN",
-        file,
-        line: loc.r ?? null,
-        column: loc.c ?? null,
-        length: loc.n ?? 1,
-        source,
-        suggestion,
-        phase: "codegen"
-      });
-    }
-    get locationString() {
-      let parts = [];
-      if (this.file)
-        parts.push(this.file);
-      if (this.line != null) {
-        parts.push(`${this.line + 1}:${(this.column ?? 0) + 1}`);
-      }
-      return parts.join(":");
-    }
-    format({ color = true } = {}) {
-      let c = color ? {
-        red: "\x1B[31m",
-        yellow: "\x1B[33m",
-        cyan: "\x1B[36m",
-        dim: "\x1B[2m",
-        bold: "\x1B[1m",
-        reset: "\x1B[0m"
-      } : { red: "", yellow: "", cyan: "", dim: "", bold: "", reset: "" };
-      let lines = [];
-      let loc = this.locationString;
-      let header = loc ? `${c.cyan}${loc}${c.reset} ` : "";
-      lines.push(`${header}${c.red}${c.bold}error${c.reset}${c.bold}: ${this.message}${c.reset}`);
-      let snippet = this._snippet();
-      if (snippet) {
-        lines.push("");
-        for (let s of snippet) {
-          if (s.type === "source") {
-            lines.push(`${c.dim}${s.gutter}${c.reset}${s.text}`);
-          } else if (s.type === "caret") {
-            lines.push(`${c.dim}${s.gutter}${c.reset}${c.red}${c.bold}${s.text}${c.reset}`);
-          }
-        }
-      }
-      if (this.suggestion) {
-        lines.push("");
-        lines.push(`${c.yellow}hint${c.reset}: ${this.suggestion}`);
-      }
-      return lines.join(`
-`);
-    }
-    formatHTML() {
-      let lines = [];
-      lines.push('<div class="rip-error">');
-      lines.push("<style>");
-      lines.push(`.rip-error { font-family: ui-monospace, "SF Mono", Menlo, Monaco, monospace; font-size: 13px; line-height: 1.5; padding: 16px 20px; background: #1e1e2e; color: #cdd6f4; border-radius: 8px; overflow-x: auto; }`);
-      lines.push(`.rip-error .re-header { color: #f38ba8; font-weight: 600; }`);
-      lines.push(`.rip-error .re-loc { color: #89b4fa; }`);
-      lines.push(`.rip-error .re-gutter { color: #585b70; user-select: none; }`);
-      lines.push(`.rip-error .re-caret { color: #f38ba8; font-weight: 700; }`);
-      lines.push(`.rip-error .re-hint { color: #f9e2af; }`);
-      lines.push(`.rip-error .re-snippet { margin: 8px 0; }`);
-      lines.push("</style>");
-      let loc = this.locationString;
-      let locSpan = loc ? `<span class="re-loc">${esc(loc)}</span> ` : "";
-      lines.push(`<div class="re-header">${locSpan}error: ${esc(this.message)}</div>`);
-      let snippet = this._snippet();
-      if (snippet) {
-        lines.push('<pre class="re-snippet">');
-        for (let s of snippet) {
-          if (s.type === "source") {
-            lines.push(`<span class="re-gutter">${esc(s.gutter)}</span>${esc(s.text)}`);
-          } else if (s.type === "caret") {
-            lines.push(`<span class="re-gutter">${esc(s.gutter)}</span><span class="re-caret">${esc(s.text)}</span>`);
-          }
-        }
-        lines.push("</pre>");
-      }
-      if (this.suggestion) {
-        lines.push(`<div class="re-hint">hint: ${esc(this.suggestion)}</div>`);
-      }
-      lines.push("</div>");
-      return lines.join(`
-`);
-    }
-    _snippet() {
-      if (this.source == null || this.line == null)
-        return null;
-      let sourceLines = this.source.split(`
-`);
-      let errLine = this.line;
-      if (errLine < 0 || errLine >= sourceLines.length)
-        return null;
-      let contextRadius = 2;
-      let start = Math.max(0, errLine - contextRadius);
-      let end = Math.min(sourceLines.length - 1, errLine + contextRadius);
-      let gutterWidth = String(end + 1).length;
-      let result = [];
-      for (let i = start;i <= end; i++) {
-        let lineNum = String(i + 1).padStart(gutterWidth);
-        let gutter = ` ${lineNum} │ `;
-        result.push({ type: "source", gutter, text: sourceLines[i] });
-        if (i === errLine && this.column != null) {
-          let pad = " ".repeat(this.column);
-          let caretLen = Math.max(1, Math.min(this.length || 1, sourceLines[i].length - this.column));
-          let carets = "^".repeat(caretLen);
-          let emptyGutter = " ".repeat(gutterWidth + 2) + "│ ";
-          result.push({ type: "caret", gutter: emptyGutter, text: `${pad}${carets}` });
+          while (mergedPerLineSegs.length <= target)
+            mergedPerLineSegs.push([]);
+        }
+        for (const seg of info.perLineSegs[li]) {
+          if (seg.src == null) {
+            mergedPerLineSegs[target].push({ genCol: seg.genCol });
+          } else {
+            const remapped = {
+              genCol: seg.genCol,
+              src: info.srcRemap[seg.src],
+              origLine: seg.origLine,
+              origCol: seg.origCol
+            };
+            if (seg.name != null)
+              remapped.name = info.nameRemap[seg.name];
+            mergedPerLineSegs[target].push(remapped);
+          }
         }
       }
-      return result;
     }
+    const mergedMappings = encodeMappings(mergedPerLineSegs);
+    const mergedMap = {
+      version: 3,
+      sources: mergedSources,
+      sourcesContent: mergedSourcesContent,
+      names: mergedNames,
+      mappings: mergedMappings
+    };
+    return { js: mergedJS, mapJSON: JSON.stringify(mergedMap) };
   }
-  function isLexerError(err) {
-    return err instanceof SyntaxError && err.location != null;
+  function utf8ToBase64(str) {
+    if (typeof Buffer !== "undefined") {
+      return Buffer.from(str, "utf8").toString("base64");
+    }
+    const bytes = new TextEncoder().encode(str);
+    let bin = "";
+    for (let i = 0;i < bytes.length; i++)
+      bin += String.fromCharCode(bytes[i]);
+    return btoa(bin);
   }
-  function isParserError(err) {
-    return !(err instanceof SyntaxError) && err.hash != null;
+  function mergeChunksWithInlineMap(chunks) {
+    const { js, mapJSON } = mergeChunks(chunks);
+    if (!mapJSON)
+      return js;
+    const b64 = utf8ToBase64(mapJSON);
+    return js + `
+//# sourceMappingURL=data:application/json;base64,` + b64 + `
+`;
   }
-  function toRipError(err, source, file) {
-    if (err instanceof RipError) {
-      if (file && !err.file)
-        err.file = file;
-      if (source && !err.source)
-        err.source = source;
-      return err;
+  var MARK_OPEN = "";
+  var MARK_SHUT = "";
+  var MARK_SEP = "";
+
+  class MarkerRecorder {
+    constructor() {
+      this.nextId = 1;
+      this.meta = new Map;
+    }
+    wrap(kind, loc, text, data = null) {
+      if (loc == null || text == null || text === "")
+        return text;
+      const id = this.nextId++;
+      this.meta.set(id, { kind, loc, data });
+      return `${MARK_OPEN}${id}${MARK_SEP}${text}${MARK_SHUT}${id}${MARK_SEP}`;
+    }
+    get active() {
+      return this.nextId > 1;
     }
-    if (isLexerError(err))
-      return RipError.fromLexer(err, source, file);
-    if (isParserError(err))
-      return RipError.fromParser(err, source, file);
-    return new RipError(err.message, { file, source, phase: "unknown" });
   }
-  function formatError(err, { source, file, color = true } = {}) {
-    let re = err instanceof RipError ? err : toRipError(err, source, file);
-    return re.format({ color });
+  function stripMarkers(markedCode, recorder) {
+    let out = "";
+    let offset = 0, line = 0, column = 0;
+    const marks = [];
+    const stack = [];
+    const readTag = (i) => {
+      let j = i + 1;
+      const sepAt = markedCode.indexOf(MARK_SEP, j);
+      if (sepAt < 0)
+        throw new Error("markers: unterminated tag");
+      const id = Number(markedCode.slice(j, sepAt));
+      if (!Number.isInteger(id))
+        throw new Error("markers: malformed marker id");
+      return { id, next: sepAt + 1 };
+    };
+    for (let i = 0;i < markedCode.length; ) {
+      const ch = markedCode[i];
+      if (ch === MARK_OPEN) {
+        const { id, next } = readTag(i);
+        const meta = recorder.meta.get(id);
+        if (!meta)
+          throw new Error(`markers: unknown open id ${id}`);
+        stack.push({ id, meta, genStart: offset, genLine: line, genCol: column });
+        i = next;
+        continue;
+      }
+      if (ch === MARK_SHUT) {
+        const { id, next } = readTag(i);
+        const open = stack.pop();
+        if (!open || open.id !== id)
+          throw new Error(`markers: unbalanced close id ${id}`);
+        marks.push({
+          kind: open.meta.kind,
+          loc: open.meta.loc,
+          data: open.meta.data,
+          genStart: open.genStart,
+          genEnd: offset,
+          genLine: open.genLine,
+          genCol: open.genCol
+        });
+        i = next;
+        continue;
+      }
+      out += ch;
+      if (ch === `
+`) {
+        line++;
+        column = 0;
+      } else {
+        column++;
+      }
+      offset++;
+      i++;
+    }
+    if (stack.length)
+      throw new Error("markers: unclosed marker(s)");
+    return { code: out, marks };
   }
-  function formatErrorHTML(err, { source, file } = {}) {
-    let re = err instanceof RipError ? err : toRipError(err, source, file);
-    return re.formatHTML();
+
+  // src/stdlib.js
+  function getStdlibCode() {
+    return `// rip:stdlib:begin
+globalThis.abort  ??= (msg) => { if (msg) console.error(msg); process.exit(1); };
+globalThis.assert ??= (v, msg) => { if (!v) throw new Error(msg || "Assertion failed"); };
+globalThis.exit   ??= (code) => process.exit(code || 0);
+globalThis.kind   ??= (v) => v != null ? (v.constructor?.name || Object.prototype.toString.call(v).slice(8, -1)).toLowerCase() : String(v);
+globalThis.noop   ??= () => {};
+globalThis.p      ??= console.log;
+globalThis.pp     ??= (v) => { console.dir(v, { depth: null, colors: true }); return v; };
+globalThis.pj     ??= (v) => { console.log(JSON.stringify(v, null, 2)); return v; };
+globalThis.pr     ??= (() => {
+  const BARE = /^[A-Za-z_$][A-Za-z0-9_$]*$/;
+  const esc = (s, q) => s.replace(/\\\\/g, "\\\\\\\\").replace(/\\n/g, "\\\\n").replace(/\\r/g, "\\\\r").replace(/\\t/g, "\\\\t").replace(new RegExp(q, 'g'), "\\\\" + q);
+  const qs = (s) => !s.includes("'") ? "'" + esc(s, "'") + "'" : !s.includes('"') ? '"' + esc(s, '"').split("#{").join("\\\\#{") + '"' : "'" + esc(s, "'") + "'";
+  const ks = (k) => { if (typeof k === 'symbol') { const n = Symbol.keyFor(k); return n && BARE.test(n) ? ':' + n : qs(String(k)); } return BARE.test(k) ? k : qs(k); };
+  const fmt = (v, d) => {
+    if (v === null) return 'null';
+    if (v === undefined) return 'undefined';
+    const t = typeof v;
+    if (t === 'number' || t === 'boolean') return String(v);
+    if (t === 'string') return qs(v);
+    if (t === 'symbol') { const n = Symbol.keyFor(v); return n && BARE.test(n) ? ':' + n : null; }
+    if (Array.isArray(v)) {
+      if (v.length === 0) return '[]';
+      const pad = '  '.repeat(d + 1), end = '  '.repeat(d);
+      return '[\\n' + pad + v.map(x => fmt(x, d + 1) ?? 'null').join('\\n' + pad) + '\\n' + end + ']';
+    }
+    if (t === 'object') {
+      const proto = Object.getPrototypeOf(v);
+      if (proto !== Object.prototype && proto !== null) return null;
+      const keys = Object.keys(v);
+      if (keys.length === 0) return '{}';
+      const pad = '  '.repeat(d + 1), end = '  '.repeat(d);
+      return '{\\n' + pad + keys.map(k => ks(k) + ': ' + (fmt(v[k], d + 1) ?? 'null')).join('\\n' + pad) + '\\n' + end + '}';
+    }
+    return null;
+  };
+  return (v) => { const s = fmt(v, 0); s !== null ? console.log(s) : console.dir(v, { depth: null, colors: true }); return v; };
+})();
+globalThis.raise  ??= (a, b) => { throw (b !== undefined ? new a(b) : new Error(a)); };
+globalThis.rand   ??= (a, b) => b !== undefined ? (a > b && ([a, b] = [b, a]), Math.floor(Math.random() * (b - a + 1) + a)) : a ? Math.floor(Math.random() * a) : Math.random();
+globalThis.sleep  ??= (ms) => new Promise(r => setTimeout(r, ms));
+globalThis.todo   ??= (msg) => { throw new Error(msg || "Not implemented"); };
+globalThis.warn   ??= console.warn;
+globalThis.zip    ??= (...a) => a[0].map((_, i) => a.map(b => b[i]));
+// rip:stdlib:end
+`;
   }
-  function esc(s) {
-    return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+
+  // src/params.js
+  function ripToTs(typeStr) {
+    if (!typeStr)
+      return typeStr;
+    return typeStr.replace(/::/g, ":");
+  }
+  function emitTsParam({ name, ripType, optional, hasDefault }, mode) {
+    let isOptional = optional || mode === "declaration" && hasDefault;
+    let type = ripToTs(ripType);
+    if (type)
+      return `${name}${isOptional ? "?" : ""}: ${type}`;
+    if (isOptional)
+      return `${name}?: any`;
+    return name;
   }
 
   // src/compiler.js
@@ -11647,12 +12313,44 @@ globalThis.zip    ??= (...a) => a[0].map((_, i) => a.map(b => b[i]));
       if (this.options.foldProjections)
         foldDerivedSchemas(sexpr);
       this.collectProgramVariables(sexpr);
-      let code = this.emit(sexpr);
+      this.moduleBindings = new Set;
+      this.collectModuleBindings(sexpr);
+      this.validateComprehensionFilters(sexpr);
+      let code;
+      if (this.options.exactMarks) {
+        this.markRecorder = new MarkerRecorder;
+        const marked = this.emit(sexpr);
+        const stripped = stripMarkers(marked, this.markRecorder);
+        this.markRecorder = null;
+        code = stripped.code;
+        this.exactMarks = stripped.marks;
+      } else {
+        code = this.emit(sexpr);
+      }
       if (this.sourceMap)
         this.buildMappings();
       return code;
     }
+    markIdent(code, node, loc) {
+      if (!this.markRecorder || !loc)
+        return code;
+      if (typeof node === "string" || node instanceof String) {
+        const name = str(node);
+        if (/^[A-Za-z_$][\w$]*$/.test(name))
+          return this.markRecorder.wrap("ident", loc, code);
+      }
+      return code;
+    }
     buildMappings() {
+      this._exactSrc = new Set;
+      if (this.exactMarks) {
+        for (const m of this.exactMarks) {
+          if (!m.loc)
+            continue;
+          this.sourceMap.addMapping(m.genLine, m.genCol, m.loc.r, m.loc.c);
+          this._exactSrc.add(m.loc.r + ":" + m.loc.c);
+        }
+      }
       if (this._importEntries) {
         let importLineOffset = 0;
         for (let entry of this._importEntries) {
@@ -11791,6 +12489,8 @@ globalThis.zip    ??= (...a) => a[0].map((_, i) => a.map(b => b[i]));
         return ranges;
       };
       for (let { name, origLine, origCol } of subs) {
+        if (this._exactSrc?.has(origLine + ":" + origCol))
+          continue;
         let escaped = name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
         let re = new RegExp("\\b" + escaped + "\\b", "g");
         let m;
@@ -11910,6 +12610,70 @@ globalThis.zip    ??= (...a) => a[0].map((_, i) => a.map(b => b[i]));
       }
       return null;
     }
+    collectModuleBindings(program) {
+      if (!Array.isArray(program))
+        return;
+      let statements;
+      if (str(program[0]) === "program")
+        statements = program.slice(1);
+      else if (Array.isArray(program[0]))
+        statements = program;
+      else
+        statements = [program];
+      for (const stmt of statements)
+        this._collectTopLevelBinding(stmt);
+    }
+    _addModuleBinding(name) {
+      const s = name && name.valueOf ? name.valueOf() : name;
+      if (typeof s === "string" && /^[A-Za-z_$][\w$]*$/.test(s))
+        this.moduleBindings.add(s);
+    }
+    _collectTopLevelBinding(stmt) {
+      if (!Array.isArray(stmt))
+        return;
+      const head = str(stmt[0]) ?? stmt[0];
+      if (head === "export" || head === "export-default")
+        return this._collectTopLevelBinding(stmt[1]);
+      if (CodeEmitter.ASSIGNMENT_OPS.has(head)) {
+        const target = stmt[1];
+        if (typeof target === "string" || target instanceof String)
+          this._addModuleBinding(target);
+        else if (this.is(target, "array"))
+          this.collectVarsFromArray(target, this.moduleBindings);
+        else if (this.is(target, "object"))
+          this.collectVarsFromObject(target, this.moduleBindings);
+        return;
+      }
+      if (head === "def")
+        return this._addModuleBinding(stmt[1]);
+      if (head === "import")
+        return this._collectImportNames(stmt.slice(1));
+    }
+    _collectImportNames(rest) {
+      const addSpec = (spec) => {
+        if (typeof spec === "string" || spec instanceof String)
+          this._addModuleBinding(spec);
+        else if (Array.isArray(spec)) {
+          if (spec[0] === "*" && spec.length === 2)
+            this._addModuleBinding(spec[1]);
+          else
+            for (const i of spec) {
+              if (Array.isArray(i) && i.length === 2)
+                this._addModuleBinding(i[1]);
+              else
+                this._addModuleBinding(i);
+            }
+        }
+      };
+      if (rest.length === 1)
+        return;
+      if (rest.length === 3) {
+        this._addModuleBinding(rest[0]);
+        addSpec(rest[1]);
+        return;
+      }
+      addSpec(rest[0]);
+    }
     collectProgramVariables(sexpr) {
       if (!Array.isArray(sexpr))
         return;
@@ -12327,10 +13091,10 @@ globalThis.zip    ??= (...a) => a[0].map((_, i) => a.map(b => b[i]));
       }
       if (this.usesTemplates && !skip) {
         if (skipRT) {
-          code += `var { __pushComponent, __popComponent, setContext, getContext, hasContext, __clsx, __lis, __reconcile, __transition, __handleComponentError, __gateBind, __Component } = globalThis.__ripComponent;
+          code += `var { __pushComponent, __popComponent, setContext, getContext, hasContext, __clsx, __lis, __reconcile, __transition, __handleComponentError, __gateBind, __detach, __Component } = globalThis.__ripComponent;
 `;
         } else if (typeof globalThis !== "undefined" && globalThis.__ripComponent) {
-          code += `const { __pushComponent, __popComponent, setContext, getContext, hasContext, __clsx, __lis, __reconcile, __transition, __handleComponentError, __gateBind, __Component } = globalThis.__ripComponent;
+          code += `const { __pushComponent, __popComponent, setContext, getContext, hasContext, __clsx, __lis, __reconcile, __transition, __handleComponentError, __gateBind, __detach, __Component } = globalThis.__ripComponent;
 `;
         } else {
           code += this.getComponentRuntime();
@@ -12621,7 +13385,7 @@ function _setDataSection() {
       let v = this.emit(value, "value"), r = this.emit(regex, "value");
       let idx = captureIndex !== null ? this.emit(captureIndex, "value") : "0";
       let allowNL = r.includes("/m") ? ", true" : "";
-      return `(_ = toMatchable(${v}${allowNL}).match(${r})) && _[${idx}]`;
+      return `((_ = toMatchable(${v}${allowNL}).match(${r})) && _[${idx}])`;
     }
     emitIndexAccess(head, rest) {
       let [arr, index] = rest;
@@ -12698,7 +13462,14 @@ function _setDataSection() {
       let bodyCode = this.emitFunctionBody(body, params, sideEffectOnly);
       let isAsync = this.containsAwait(body);
       let isGen = this.containsYield(body);
-      return `${isAsync ? "async " : ""}function${isGen ? "*" : ""} ${cleanName}(${paramList}) ${bodyCode}`;
+      let ret = this.inlineReturnType(name);
+      return `${isAsync ? "async " : ""}function${isGen ? "*" : ""} ${cleanName}(${paramList})${ret} ${bodyCode}`;
+    }
+    inlineReturnType(node) {
+      if (!this.options.inlineTypes)
+        return "";
+      let rt = meta(node, "returnType");
+      return rt ? `: ${ripToTs(rt)}` : "";
     }
     emitThinArrow(head, rest, context, sexpr) {
       let [params, body] = rest;
@@ -12709,7 +13480,8 @@ function _setDataSection() {
       let bodyCode = this.emitFunctionBody(body, params, sideEffectOnly);
       let isAsync = this.containsAwait(body);
       let isGen = this.containsYield(body);
-      let fn = `${isAsync ? "async " : ""}function${isGen ? "*" : ""}(${paramList}) ${bodyCode}`;
+      let ret = this.inlineReturnType(sexpr?.[0]);
+      let fn = `${isAsync ? "async " : ""}function${isGen ? "*" : ""}(${paramList})${ret} ${bodyCode}`;
       return context === "value" ? `(${fn})` : fn;
     }
     emitFatArrow(head, rest, context, sexpr) {
@@ -12718,7 +13490,8 @@ function _setDataSection() {
         params = ["it"];
       let sideEffectOnly = sexpr.isVoid || false;
       let paramList = this.emitParamList(params);
-      let isSingle = params.length === 1 && typeof params[0] === "string" && !paramList.includes("=") && !paramList.includes("...") && !paramList.includes("[") && !paramList.includes("{");
+      let ret = this.inlineReturnType(sexpr?.[0]);
+      let isSingle = !ret && params.length === 1 && typeof params[0] === "string" && !paramList.includes("=") && !paramList.includes("...") && !paramList.includes("[") && !paramList.includes("{");
       let paramSyntax = isSingle ? paramList : `(${paramList})`;
       let isAsync = this.containsAwait(body);
       let prefix = isAsync ? "async " : "";
@@ -12730,18 +13503,18 @@ function _setDataSection() {
             let code = this.emit(expr, "value");
             if (code[0] === "{")
               code = `(${code})`;
-            return `${prefix}${paramSyntax} => ${code}`;
+            return `${prefix}${paramSyntax}${ret} => ${code}`;
           }
         }
         if (!Array.isArray(body) || body[0] !== "block") {
           let code = this.emit(body, "value");
           if (code[0] === "{")
             code = `(${code})`;
-          return `${prefix}${paramSyntax} => ${code}`;
+          return `${prefix}${paramSyntax}${ret} => ${code}`;
         }
       }
       let bodyCode = this.emitFunctionBody(body, params, sideEffectOnly);
-      return `${prefix}${paramSyntax} => ${bodyCode}`;
+      return `${prefix}${paramSyntax}${ret} => ${bodyCode}`;
     }
     emitReturn(head, rest, context, sexpr) {
       if (rest.length === 0)
@@ -12914,6 +13687,127 @@ function _setDataSection() {
       let [condition, thenBranch, ...elseBranches] = rest;
       return context === "value" ? this.emitIfAsExpression(condition, thenBranch, elseBranches) : this.emitIfAsStatement(condition, thenBranch, elseBranches);
     }
+    validateComprehensionFilters(node) {
+      if (!Array.isArray(node))
+        return;
+      if (str(node[0]) === "if") {
+        let [, condition, thenBranch, ...elseBranches] = node;
+        this._checkComprehensionFilterTrap(condition, thenBranch, elseBranches, node);
+      }
+      for (let i = 0;i < node.length; i++)
+        this.validateComprehensionFilters(node[i]);
+    }
+    _checkComprehensionFilterTrap(condition, thenBranch, elseBranches, sexpr) {
+      if (elseBranches.length)
+        return;
+      let thenVars = this._collectLeakVars(thenBranch);
+      if (thenVars.size && this._referencesAnyName(condition, thenVars)) {
+        this._throwComprehensionFilterTrap(sexpr);
+      }
+      let condVars = this._collectLeakVars(condition);
+      if (condVars.size && this._referencesAnyName(thenBranch, condVars)) {
+        this._throwComprehensionFilterTrap(sexpr);
+      }
+    }
+    _collectLeakVars(node) {
+      let names = new Set;
+      let walk = (n) => {
+        if (!Array.isArray(n))
+          return;
+        let h = str(n[0]);
+        if (h === "comprehension" || h === "object-comprehension") {
+          for (let v of this._collectComprehensionVars(n))
+            names.add(v);
+        }
+        for (let i = 0;i < n.length; i++)
+          walk(n[i]);
+      };
+      walk(node);
+      return names;
+    }
+    _throwComprehensionFilterTrap(sexpr) {
+      this.error("Comprehensions filter with `when`, not `if` — the trailing `if` wraps the whole comprehension and its loop variable is out of scope here", sexpr, { suggestion: "Use `(expr for x in xs when cond)` instead of `(expr for x in xs if cond)`" });
+    }
+    _collectComprehensionVars(comp) {
+      let names = new Set;
+      let addLeaves = (v) => {
+        if (typeof v === "string") {
+          names.add(v);
+          return;
+        }
+        if (v instanceof String) {
+          names.add(v.valueOf());
+          return;
+        }
+        if (!Array.isArray(v))
+          return;
+        let head = str(v[0]);
+        if (head === "default") {
+          addLeaves(v[1]);
+          return;
+        }
+        if (head === "..." || head === "rest") {
+          addLeaves(v[1]);
+          return;
+        }
+        if (head === "array") {
+          for (let i = 1;i < v.length; i++)
+            if (v[i] !== "," && v[i] != null)
+              addLeaves(v[i]);
+          return;
+        }
+        if (head === "object") {
+          for (let i = 1;i < v.length; i++) {
+            let entry = v[i];
+            if (!Array.isArray(entry))
+              continue;
+            let h = str(entry[0]);
+            if (h === null || h === ":")
+              addLeaves(entry[2]);
+            else if (h === "=" || h === "...")
+              addLeaves(entry[1]);
+          }
+          return;
+        }
+      };
+      let iterators = (str(comp[0]) === "object-comprehension" ? comp[3] : comp[2]) || [];
+      for (let iter of iterators) {
+        let vars = iter[1];
+        if (Array.isArray(vars))
+          for (let v of vars)
+            addLeaves(v);
+        else
+          addLeaves(vars);
+      }
+      return names;
+    }
+    _referencesAnyName(node, names) {
+      if (typeof node === "string")
+        return names.has(node);
+      if (node instanceof String)
+        return names.has(node.valueOf());
+      if (!Array.isArray(node))
+        return false;
+      let head = str(node[0]);
+      if ((head === "." || head === "?.") && node.length === 3) {
+        return this._referencesAnyName(node[1], names);
+      }
+      if (head === "comprehension" || head === "object-comprehension") {
+        let inner = this._collectComprehensionVars(node);
+        if ([...inner].some((n) => names.has(n))) {
+          names = new Set([...names].filter((n) => !inner.has(n)));
+          if (names.size === 0)
+            return false;
+        }
+      }
+      if (names.has(head))
+        return true;
+      for (let i = 1;i < node.length; i++) {
+        if (this._referencesAnyName(node[i], names))
+          return true;
+      }
+      return false;
+    }
     emitForIn(head, rest, context, sexpr) {
       let [vars, iterable, step, guard, body] = rest;
       if (context === "value" && this.comprehensionDepth === 0) {
@@ -13198,8 +14092,11 @@ ${this.indent()}}`;
       let result = `(${v} in ${c})`;
       return isNeg ? `(!${result})` : result;
     }
-    emitRegexMatch(head, rest) {
+    emitRegexMatch(head, rest, context, sexpr) {
       let [left, right] = rest;
+      if (this.is(left, "=~") && !left.parenthesized) {
+        this.error("`=~` does not chain — `a =~ b =~ c` would match the first match result against the second pattern", sexpr, { suggestion: "Parenthesize the intended match, e.g. `(a =~ b) =~ c`, or split into separate expressions" });
+      }
       this.helpers.add("toMatchable");
       this.programVars.add("_");
       let r = this.emit(right, "value");
@@ -14065,18 +14962,21 @@ export default ${expr[1]}`;
         return `${tagCode}\`${content.slice(1, -1)}\``;
       return `${tagCode}\`${content}\``;
     }
+    escapeTemplateText(s) {
+      return s.replace(/`/g, "\\`").replace(/\$\{/g, "\\${");
+    }
     emitString(head, rest) {
       let result = "`";
       for (let part of rest) {
         if (part instanceof String) {
-          result += this.extractStringContent(part);
+          result += this.escapeTemplateText(this.extractStringContent(part));
         } else if (typeof part === "string") {
           if (part.startsWith('"') || part.startsWith("'")) {
             if (this.options.debug)
               console.warn("[Rip] Unexpected quoted primitive in str:", part);
-            result += part.slice(1, -1);
+            result += this.escapeTemplateText(part.slice(1, -1));
           } else {
-            result += part;
+            result += this.escapeTemplateText(part);
           }
         } else if (Array.isArray(part)) {
           if (part.length === 1 && typeof part[0] === "string" && !Array.isArray(part[0])) {
@@ -14152,12 +15052,67 @@ export default ${expr[1]}`;
       this.restMiddleParam = null;
       return params.map((p) => this.formatParam(p)).join(", ");
     }
+    destructuredType(node) {
+      if (this.is(node, "object")) {
+        let parts = [], hasType = false;
+        for (let pair of node.slice(1)) {
+          if (this.is(pair, "...")) {
+            parts.push("[key: string]: unknown");
+            continue;
+          }
+          let [op, key, value] = pair;
+          let propName = str(key);
+          if (op === "=") {
+            let t2 = key instanceof String ? key.type : null;
+            if (t2)
+              hasType = true;
+            parts.push(`${propName}?: ${t2 ? ripToTs(t2) : "any"}`);
+            continue;
+          }
+          if (this.is(value, "object") || this.is(value, "array")) {
+            let inner = this.destructuredType(value);
+            if (inner.hasType)
+              hasType = true;
+            parts.push(`${propName}: ${inner.type}`);
+            continue;
+          }
+          let t = value instanceof String && value.type || key instanceof String && key.type || null;
+          if (t)
+            hasType = true;
+          parts.push(`${propName}: ${t ? ripToTs(t) : "any"}`);
+        }
+        return { type: `{${parts.join(", ")}}`, hasType };
+      }
+      if (this.is(node, "array")) {
+        let parts = [], hasType = false;
+        for (let el of node.slice(1)) {
+          if (el === "," || el === "...")
+            continue;
+          if (this.is(el, "...")) {
+            parts.push("...any[]");
+            continue;
+          }
+          let typedEl = this.is(el, "=") ? el[1] : el;
+          let t = typedEl instanceof String ? typedEl.type : null;
+          if (t)
+            hasType = true;
+          parts.push(t ? ripToTs(t) : "any");
+        }
+        return { type: `[${parts.join(", ")}]`, hasType };
+      }
+      return { type: "any", hasType: false };
+    }
     formatParam(param) {
       if (typeof param === "string")
         return param;
       if (param instanceof String) {
-        if (this.options.inlineTypes && param.type) {
-          return `${param.valueOf()}: ${param.type.replace(/::/g, ":")}`;
+        if (this.options.inlineTypes) {
+          return emitTsParam({
+            name: param.valueOf(),
+            ripType: param.type,
+            optional: !!meta(param, "optional"),
+            hasDefault: false
+          }, "implementation");
         }
         return param.valueOf();
       }
@@ -14173,6 +15128,18 @@ export default ${expr[1]}`;
       }
       if (this.is(param, ".") && param[1] === "this")
         return param[2];
+      if ((this.is(param, "object") || this.is(param, "array")) && this.options.inlineTypes) {
+        let { type, hasType } = this.destructuredType(param);
+        let saved = this.options.inlineTypes;
+        this.options.inlineTypes = false;
+        let pattern;
+        try {
+          pattern = this.formatParam(param);
+        } finally {
+          this.options.inlineTypes = saved;
+        }
+        return hasType ? `${pattern}: ${type}` : pattern;
+      }
       if (this.is(param, "array")) {
         let els = param.slice(1).map((el) => {
           if (el === ",")
@@ -14268,10 +15235,11 @@ export default ${expr[1]}`;
 `;
         }
         let firstIsSuper = autoAssignments.length > 0 && statements.length > 0 && Array.isArray(statements[0]) && statements[0][0] === "super";
-        let genStatements = (stmts) => {
+        let genStatements = (stmts, locBase = null) => {
           stmts.forEach((stmt, index) => {
             let isLast = index === stmts.length - 1;
             let h = Array.isArray(stmt) ? stmt[0] : null;
+            let stmtLoc = locBase != null && body.subLocs ? body.subLocs[locBase + index] : null;
             if (!isLast && h === "comprehension") {
               let [, expr, iters, guards] = stmt;
               code += this.indent() + this.emitComprehensionAsLoop(expr, iters, guards) + `
@@ -14330,7 +15298,7 @@ export default ${expr[1]}`;
             let ctx = needsReturn ? "value" : "statement";
             let sc = this.emit(stmt, ctx);
             if (needsReturn)
-              code += this.indent() + "return " + sc + `;
+              code += this.indent() + "return " + this.markIdent(sc, stmt, stmtLoc) + `;
 `;
             else
               code += this.indent() + this.addSemicolon(stmt, sc) + `
@@ -14353,7 +15321,8 @@ export default ${expr[1]}`;
           for (let a of autoAssignments)
             code += this.indent() + a + `;
 `;
-          genStatements(statements);
+          let locBase = this.is(body, "block") && body.subLocs && statements.length === body.length - 1 ? 1 : null;
+          genStatements(statements, locBase);
         }
         if (sideEffectOnly && statements.length > 0) {
           let lastH = Array.isArray(statements[statements.length - 1]) ? statements[statements.length - 1][0] : null;
@@ -15836,6 +16805,7 @@ if (typeof globalThis !== 'undefined') {
           return token[0];
         }
       };
+      setSubLocs(!!this.options.exactMarks);
       let sexpr;
       try {
         sexpr = parser.parse(source);
@@ -15881,6 +16851,7 @@ if (typeof globalThis !== 'undefined') {
         inlineTypes: this.options.inlineTypes,
         schemaMode: this.options.schemaMode,
         foldProjections: this.options.foldProjections,
+        exactMarks: this.options.exactMarks,
         sourceMap
       });
       let code = generator.compile(sexpr);
@@ -15952,8 +16923,8 @@ if (typeof globalThis !== 'undefined') {
     return new CodeEmitter({}).getComponentRuntime();
   }
   // src/browser.js
-  var VERSION = "3.16.1";
-  var BUILD_DATE = "2026-06-19@18:03:41GMT";
+  var VERSION = "3.17.0-wip.1";
+  var BUILD_DATE = "2026-06-28@00:08:17GMT";
   if (typeof globalThis !== "undefined") {
     if (!globalThis.__rip)
       new Function(getReactiveRuntime())();
@@ -16051,18 +17022,28 @@ ${tagged}
       sanitizeSourceURL
     };
   }
+  function flag(el, name, def, enums = []) {
+    const raw = el?.getAttribute(name);
+    if (raw == null)
+      return def;
+    const v = raw.trim().toLowerCase();
+    if (v === "" || v === "true" || v === "on" || v === "yes" || v === "1")
+      return true;
+    if (v === "false" || v === "off" || v === "no" || v === "0")
+      return false;
+    if (enums.includes(v))
+      return v;
+    console.error(`Rip: invalid ${name}="${raw}" (expected ${["true", "false", ...enums].join(" | ")}); using ${JSON.stringify(def)}`);
+    return def;
+  }
   async function processRipScripts() {
     const sources = [];
     let lastBundle;
     const runtimeTag = document.querySelector('script[src$="rip.min.js"], script[src$="rip.js"]');
-    const dataSrc = runtimeTag?.getAttribute("data-src");
-    if (dataSrc !== null && dataSrc !== undefined) {
-      for (const url of dataSrc.trim().split(/\s+/)) {
-        if (url)
-          sources.push({ url });
-      }
-    } else if (runtimeTag && /^https?:$/.test(location.protocol)) {
-      sources.push({ url: "/app", optional: true });
+    const dataSrc = runtimeTag?.getAttribute("data-src")?.trim();
+    if (dataSrc) {
+      for (const url of dataSrc.split(/\s+/))
+        sources.push({ url });
     }
     for (const script of document.querySelectorAll('script[type="text/rip"]')) {
       if (script.src) {
@@ -16101,18 +17082,18 @@ ${tagged}
         else if (s.code)
           individual.push(s);
       }
-      const routerAttr = runtimeTag?.getAttribute("data-router");
       lastBundle = bundles[bundles.length - 1];
+      const router = flag(runtimeTag, "data-router", "auto", ["hash", "history"]);
       let hasRouter, hashRouter;
-      if (routerAttr != null) {
-        hasRouter = routerAttr !== "false";
-        hashRouter = routerAttr === "hash";
-      } else {
+      if (router === "auto") {
         hasRouter = !!lastBundle?.data?.router;
         hashRouter = false;
+      } else {
+        hasRouter = router !== false;
+        hashRouter = router === "hash";
       }
       if (hasRouter && bundles.length > 0) {
-        const debug = runtimeTag?.getAttribute("data-debug") !== "false";
+        const debug = flag(runtimeTag, "data-debug", true);
         if (globalThis.__ripDebug)
           globalThis.__ripDebug.enabled = debug;
         const baseOpts = { skipRuntimes: true, skipExports: true, skipImports: true };
@@ -16137,10 +17118,10 @@ ${js}
         }
         const app = importRip.modules?.["app.rip"];
         if (app?.launch) {
-          const persistAttr = runtimeTag.getAttribute("data-persist");
+          const persist = flag(runtimeTag, "data-persist", false, ["session", "local"]);
           const launchOpts = { bundle: lastBundle, hash: hashRouter };
-          if (persistAttr != null)
-            launchOpts.persist = persistAttr === "local" ? "local" : true;
+          if (persist)
+            launchOpts.persist = persist === "local" ? "local" : true;
           await app.launch(launchOpts);
         }
       } else {
@@ -16176,7 +17157,7 @@ ${js}
             window.__RIP__.components = sourceStore;
           }
         }
-        const debug = runtimeTag?.getAttribute("data-debug") !== "false";
+        const debug = flag(runtimeTag, "data-debug", true);
         if (globalThis.__ripDebug)
           globalThis.__ripDebug.enabled = debug;
         const baseOpts = { skipRuntimes: true, skipExports: true, skipImports: true };
@@ -16210,9 +17191,9 @@ ${js}
             globalThis.__ripApp = app;
             if (typeof window !== "undefined")
               window.app = app;
-            const persistAttr = runtimeTag.getAttribute("data-persist");
-            if (persistAttr != null && globalThis.persistStash) {
-              globalThis.persistStash(app, { local: persistAttr === "local" });
+            const persist = flag(runtimeTag, "data-persist", false, ["session", "local"]);
+            if (persist && globalThis.persistStash) {
+              globalThis.persistStash(app, { local: persist === "local" });
             }
           }
         }
@@ -16241,8 +17222,8 @@ ${wrapped}
         }
       }
     }
-    const reloadAttr = runtimeTag?.getAttribute("data-reload");
-    const shouldReload = reloadAttr != null ? reloadAttr !== "false" : !!lastBundle?.data?.watch;
+    const reload = flag(runtimeTag, "data-reload", "auto");
+    const shouldReload = reload === "auto" ? !!lastBundle?.data?.watch : reload === true;
     if (shouldReload && !globalThis.__ripLaunched) {
       let ready = false;
       let retryDelay = 1000;
@@ -17429,24 +18410,29 @@ ${indented}`);
       _pending.value = true;
       _succeeded.value = false;
       _error.value = null;
-      return await (async () => {
+      try {
+        r = await fn(...args);
+      } catch (e) {
+        if (!(me === generation))
+          return;
+        _error.value = e;
         try {
-          r = await fn(...args);
-          if (me === generation) {
-            _succeeded.value = true;
-            await opts.onSuccess?.(r);
-          }
-          return r;
-        } catch (e) {
-          if (!(me === generation))
-            return;
-          _error.value = e;
           if (opts.onError) {
-            await opts.onError(e);
+            return await opts.onError(e);
           } else {
             throw e;
           }
-          return;
+        } finally {
+          _pending.value = false;
+        }
+      }
+      if (!(me === generation))
+        return;
+      return await (async () => {
+        try {
+          _succeeded.value = true;
+          await opts.onSuccess?.(r);
+          return r;
         } finally {
           if (me === generation)
             _pending.value = false;
@@ -19142,6 +20128,7 @@ ${indented}`);
         return console.error(`[Rip] Error ${err.status}: ${err.message || err.path}`);
       }
     });
+    globalThis.__ripRouter = router;
     renderer = createRenderer({
       router,
       app,
@@ -19171,6 +20158,7 @@ ${indented}`);
       persistDisposer?.();
       delete globalThis[classesKey];
       delete globalThis.__ripApp;
+      delete globalThis.__ripRouter;
       delete globalThis.__ripLaunched;
       if (win.app === app) {
         delete win.app;