rip-lang 3.16.0 → 3.16.1

package/docs/dist/rip.js

@@ -2284,7 +2284,7 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
       if (dname === "belongs_to" || dname === "has_many" || dname === "has_one" || dname === "one" || dname === "many" || dname === "mixin") {
         let t0 = argTokens[0];
         if (t0 && (t0[0] === "IDENTIFIER" || t0[0] === "PROPERTY")) {
-          let optional = t0.data?.predicate === true;
+          let optional = t0.data?.optional === true;
           if (!optional && argTokens[1]?.[0] === "?")
             optional = true;
           args = [{ target: t0[1], optional }];
@@ -2961,7 +2961,7 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
         throw schemaError(t0 || tokens[tokens.length - 1], `@${name} requires a target name.`);
       }
       let target = t0[1];
-      let optional = t0.data?.predicate === true;
+      let optional = t0.data?.optional === true;
       let pos = 1;
       if (!optional && tokens[pos]?.[0] === "?") {
         optional = true;
@@ -3147,9 +3147,9 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
   function collectModifiers(identToken) {
     let mods = [];
     let d = identToken.data;
-    if (d?.await === true)
+    if (d?.bang === true)
       mods.push("!");
-    if (d?.predicate === true)
+    if (d?.optional === true)
       mods.push("?");
     return mods;
   }
@@ -3501,6 +3501,7 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
   function collectTypeExpression(tokens, j) {
     let typeTokens = [];
     let depth = 0;
+    let bracketStack = [];
     let startJ = j;
     while (j < tokens.length) {
       let t = tokens[j];
@@ -3509,12 +3510,18 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
       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;
@@ -3522,6 +3529,7 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
       if (isClose) {
         if (depth > 0) {
           depth--;
+          bracketStack.pop();
           typeTokens.push(t);
           j++;
           continue;
@@ -3550,6 +3558,23 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
           break;
         }
       }
+      if (depth > 0 && (tTag === "INDENT" || tTag === "OUTDENT")) {
+        j++;
+        continue;
+      }
+      if (depth > 0 && tTag === "TERMINATOR") {
+        typeTokens.push(["", ";"]);
+        j++;
+        continue;
+      }
+      if (tTag === "PROPERTY" && bracketStack[bracketStack.length - 1] === "{") {
+        let prev = typeTokens[typeTokens.length - 1];
+        let prevTag = prev?.[0];
+        let prevVal = prev?.[1];
+        let needsSep = prev && prevTag !== "{" && prevTag !== "," && !(prevTag === "" && prevVal === ";");
+        if (needsSep)
+          typeTokens.push(["", ";"]);
+      }
       typeTokens.push(t);
       j++;
     }
@@ -3561,7 +3586,31 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
       return "";
     if (typeTokens[0]?.[0] === "=>")
       typeTokens.unshift(["", "()"]);
-    let typeStr = typeTokens.map((t) => t[1]).join(" ").replace(/\s+/g, " ").trim();
+    {
+      let curlyDepth = 0;
+      for (let t of typeTokens) {
+        let tag = t[0];
+        if (tag === "{")
+          curlyDepth++;
+        else if (tag === "}")
+          curlyDepth--;
+        else if (tag === "TYPE_ANNOTATION" && curlyDepth > 0) {
+          let loc = t.loc;
+          let where = loc ? ` (line ${loc.r}, col ${loc.c})` : "";
+          let err = new Error(`Use \`:\` (not \`::\`) inside a structural type literal${where}. ` + `\`::\` binds a name to a type; inside \`{ ... }\` in type ` + `position, fields use \`:\` (TS-style).`);
+          err.loc = loc;
+          throw err;
+        }
+      }
+    }
+    let parts = typeTokens.map((t, i) => {
+      let next = typeTokens[i + 1];
+      if (t.data?.optional && next && (next[0] === "TYPE_ANNOTATION" || next[0] === ":")) {
+        return `${t[1]}?`;
+      }
+      return t[1];
+    });
+    let typeStr = parts.join(" ").replace(/\s+/g, " ").trim();
     typeStr = typeStr.replace(/\s*<\s*/g, "<").replace(/\s*>\s*/g, ">").replace(/\s*\[\s*/g, "[").replace(/\s*\]\s*/g, "]").replace(/\s*\(\s*/g, "(").replace(/\s*\)\s*/g, ")").replace(/\s*,\s*/g, ", ").replace(/\s*=>\s*/g, " => ").replace(/ :: /g, ": ").replace(/:: /g, ": ").replace(/ : /g, ": ");
     return typeStr;
   }
@@ -3639,11 +3688,11 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
         if (propName === "readonly" && tokens[j] && (tokens[j][0] === "PROPERTY" || tokens[j][0] === "IDENTIFIER" || /^[a-zA-Z_$]/.test(tokens[j][1]) && tokens[j + 1]?.[0] === "TYPE_ANNOTATION")) {
           readonly = true;
           propName = tokens[j][1];
-          if (tokens[j].data?.predicate)
+          if (tokens[j].data?.optional)
             optional = true;
           j++;
         }
-        if (t.data?.predicate)
+        if (t.data?.optional)
           optional = true;
         if (tokens[j]?.[1] === "?" && !tokens[j]?.spaced) {
           optional = true;
@@ -4384,11 +4433,11 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
         }
       }
       if (id.length > 1 && id.endsWith("!")) {
-        data.await = true;
+        data.bang = true;
         id = id.slice(0, -1);
       }
       if (id.length > 1 && id.endsWith("?")) {
-        data.predicate = true;
+        data.optional = true;
         id = id.slice(0, -1);
       }
       let t = this.emit(tag, id, { len: idLen, data: Object.keys(data).length ? data : null });
@@ -5108,9 +5157,35 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
       return val.length;
     }
     tagParameters() {
-      if (this.prevTag() !== ")")
-        return this.tagDoIife();
-      let i = this.tokens.length - 1;
+      let closeIdx = this.tokens.length - 1;
+      if (this.tokens[closeIdx]?.[0] !== ")") {
+        let n = this.tokens.length;
+        let depth = 0;
+        let j = n - 1;
+        let found = -1;
+        while (j >= 0) {
+          let tk = this.tokens[j];
+          let tg = tk[0];
+          if (tg === ")" || tg === "]" || tg === "}" || tg === "CALL_END" || tg === "PARAM_END" || tg === "INDEX_END" || tg === "COMPARE" && tk[1] === ">") {
+            depth++;
+          } 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 (j > 0 && this.tokens[j - 1][0] === ")")
+                found = j - 1;
+              break;
+            }
+            if (tg === "TERMINATOR" || tg === "INDENT" || tg === "OUTDENT" || tg === "=" || tg === "->" || tg === "=>")
+              break;
+          }
+          j--;
+        }
+        if (found < 0)
+          return this.tagDoIife();
+        closeIdx = found;
+      }
+      let i = closeIdx;
       let stack = [];
       this.tokens[i][0] = "PARAM_END";
       while (i-- > 0) {
@@ -5124,7 +5199,7 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
             tok2[0] = "PARAM_START";
             return this.tagDoIife(i - 1);
           } else {
-            this.tokens[this.tokens.length - 1][0] = "CALL_END";
+            this.tokens[closeIdx][0] = "CALL_END";
             return;
           }
         }
@@ -5143,10 +5218,10 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
       this.closeMergeAssignments();
       this.closeOpenCalls();
       this.closeOpenIndexes();
+      this.rewriteTypes();
       this.normalizeLines();
       this.rewriteRender?.();
       this.rewriteSchema?.();
-      this.rewriteTypes();
       this.tagPostfixConditionals();
       this.rewriteTaggedTemplates();
       this.addImplicitBracesAndParens();
@@ -6023,7 +6098,7 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
   // src/components.js
   var BIND_PREFIX = "__bind_";
   var BIND_SUFFIX = "__";
-  var LIFECYCLE_HOOKS = new Set(["beforeMount", "mounted", "updated", "beforeUnmount", "unmounted", "onError"]);
+  var LIFECYCLE_HOOKS = new Set(["beforeMount", "mounted", "beforeUnmount", "unmounted", "onError"]);
   var BOOLEAN_ATTRS = new Set([
     "disabled",
     "hidden",
@@ -6077,6 +6152,13 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
       return target[2].type;
     return null;
   }
+  function getMemberOptional(target) {
+    if (target instanceof String && target.optional)
+      return true;
+    if (Array.isArray(target) && target[2] instanceof String && target[2].optional)
+      return true;
+    return false;
+  }
   function installComponentSupport(CodeEmitter, Lexer2) {
     let meta = (node, key) => node instanceof String ? node[key] : undefined;
     const origClassify = Lexer2.prototype.classifyKeyword;
@@ -6435,11 +6517,61 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
       if (!(from instanceof String))
         return to;
       const s = new String(to);
-      if (from.predicate)
-        s.predicate = true;
-      if (from.await)
-        s.await = true;
-      return s.predicate || s.await ? s : to;
+      if (from.optional)
+        s.optional = true;
+      if (from.bang)
+        s.bang = true;
+      return s.optional || s.bang ? s : to;
+    };
+    proto.addBodyRipSrcMarkers = function(bodyCode, bodySexpr) {
+      if (typeof bodyCode !== "string" || !bodyCode)
+        return bodyCode;
+      const stmts = Array.isArray(bodySexpr) && bodySexpr[0] === "block" ? bodySexpr.slice(1) : Array.isArray(bodySexpr) ? [bodySexpr] : [];
+      if (stmts.length === 0)
+        return bodyCode;
+      const getLoc = (s) => {
+        if (s == null)
+          return null;
+        if (!Array.isArray(s))
+          return s?.loc?.r ?? null;
+        if (s.loc?.r)
+          return s.loc.r;
+        if (s[0]?.loc?.r)
+          return s[0].loc.r;
+        for (const child of s) {
+          if (child?.loc?.r)
+            return child.loc.r;
+          if (Array.isArray(child)) {
+            const l = getLoc(child);
+            if (l != null)
+              return l;
+          }
+        }
+        return null;
+      };
+      const srcLines = stmts.map(getLoc);
+      if (srcLines.every((l) => l == null))
+        return bodyCode;
+      const lines = bodyCode.split(`
+`);
+      let si = 0;
+      for (let i = 0;i < lines.length && si < srcLines.length; i++) {
+        const trimmed = lines[i].trim();
+        if (!trimmed)
+          continue;
+        if (trimmed === "{" || trimmed === "}" || trimmed.startsWith("//"))
+          continue;
+        if (lines[i].includes("@rip-src:")) {
+          si++;
+          continue;
+        }
+        if (srcLines[si] != null) {
+          lines[i] = `${lines[i]} // @rip-src:${srcLines[si]}`;
+        }
+        si++;
+      }
+      return lines.join(`
+`);
     };
     proto.transformComponentMembers = function(sexpr, localScope = new Set) {
       const self = this._self;
@@ -6548,28 +6680,29 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
         } else if (op === "." && stmt[1] === "this" && getMemberName(stmt)) {
           const varName = typeof stmt[2] === "string" || stmt[2] instanceof String ? stmt[2].valueOf() : null;
           if (varName) {
-            stateVars.push({ name: varName, value: undefined, isPublic: true, type: stmt[2]?.type || null, required: true });
+            const optional = getMemberOptional(stmt);
+            stateVars.push({ name: varName, value: undefined, isPublic: true, type: stmt[2]?.type || null, required: !optional, optional, srcLine: stmt.loc?.r });
             memberNames.add(varName);
             reactiveMembers.add(varName);
           }
         } else if (op === "state") {
           const varName = getMemberName(stmt[1]);
           if (varName) {
-            stateVars.push({ name: varName, value: stmt[2], isPublic: isPublicProp(stmt[1]), type: getMemberType(stmt[1]) });
+            stateVars.push({ name: varName, value: stmt[2], isPublic: isPublicProp(stmt[1]), type: getMemberType(stmt[1]), optional: getMemberOptional(stmt[1]), srcLine: stmt.loc?.r });
             memberNames.add(varName);
             reactiveMembers.add(varName);
           }
         } else if (op === "computed") {
           const varName = getMemberName(stmt[1]);
           if (varName) {
-            derivedVars.push({ name: varName, expr: stmt[2], type: getMemberType(stmt[1]) });
+            derivedVars.push({ name: varName, expr: stmt[2], type: getMemberType(stmt[1]), srcLine: stmt.loc?.r });
             memberNames.add(varName);
             reactiveMembers.add(varName);
           }
         } else if (op === "readonly") {
           const varName = getMemberName(stmt[1]);
           if (varName) {
-            readonlyVars.push({ name: varName, value: stmt[2], isPublic: isPublicProp(stmt[1]), type: getMemberType(stmt[1]) });
+            readonlyVars.push({ name: varName, value: stmt[2], isPublic: isPublicProp(stmt[1]), type: getMemberType(stmt[1]), optional: getMemberOptional(stmt[1]), srcLine: stmt.loc?.r });
             memberNames.add(varName);
           }
         } else if (op === "=") {
@@ -6583,7 +6716,7 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
                 methods.push({ name: varName, func: val });
                 memberNames.add(varName);
               } else {
-                stateVars.push({ name: varName, value: val, isPublic: isPublicProp(stmt[1]) });
+                stateVars.push({ name: varName, value: val, isPublic: isPublicProp(stmt[1]), srcLine: stmt.loc?.r });
                 memberNames.add(varName);
                 reactiveMembers.add(varName);
               }
@@ -6637,18 +6770,32 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
       this._autoEventHandlers = autoEventHandlers.size > 0 ? autoEventHandlers : null;
       this._inheritsTag = inheritsTag || null;
       if (this.options.stubComponents) {
-        const expandType = (t) => t ? t.replace(/::/g, ":").replace(/(\w+(?:<[^>]+>)?)\?\?/g, "$1 | null | undefined").replace(/(\w+(?:<[^>]+>)?)\?(?![.:])/g, "$1 | undefined").replace(/(\w+(?:<[^>]+>)?)\!/g, "NonNullable<$1>") : null;
+        const expandType = (t) => t ? t.replace(/::/g, ":") : null;
         const sl = [];
         const componentTypeParams = this._componentTypeParams || "";
         sl.push(`class ${componentTypeParams}{`);
-        sl.push("  declare _root: Element | null; declare app: any;");
+        sl.push("  declare _root: Element | null; declare app: any; declare router: any; declare params: Record<string, string>; declare query: URLSearchParams; declare children: any;");
+        const userHookNames = new Set(lifecycleHooks.map((h) => h.name));
+        const hookDecls = [];
+        if (!userHookNames.has("beforeMount"))
+          hookDecls.push("beforeMount?(): void;");
+        if (!userHookNames.has("mounted"))
+          hookDecls.push("mounted?(): void;");
+        if (!userHookNames.has("beforeUnmount"))
+          hookDecls.push("beforeUnmount?(): void;");
+        if (!userHookNames.has("unmounted"))
+          hookDecls.push("unmounted?(): void;");
+        if (!userHookNames.has("onError"))
+          hookDecls.push("onError?(err: { status?: number; message?: string; error?: Error; path?: string }): void;");
+        if (hookDecls.length)
+          sl.push("  " + hookDecls.join(" "));
         sl.push("  emit(_name: string, _detail?: any): void {}");
         const propEntries = [];
-        for (const { name, type, isPublic, required } of stateVars) {
+        for (const { name, type, isPublic, required, optional } of stateVars) {
           if (!isPublic)
             continue;
           const ts = expandType(type);
-          const opt = required ? "" : "?";
+          const opt = optional ?? !required ? "?" : "";
           propEntries.push(`${name}${opt}: ${ts || "any"}`);
           propEntries.push(`__bind_${name}__?: Signal<${ts || "any"}>`);
         }
@@ -6659,7 +6806,7 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
           propEntries.push(`${name}?: ${ts || "any"}`);
         }
         {
-          const hasRequired = propEntries.length > 0 && stateVars.some((v) => v.isPublic && v.required);
+          const hasRequired = propEntries.length > 0 && stateVars.some((v) => v.isPublic && v.required && !v.optional);
           const propsOpt = hasRequired ? "" : "?";
           let propsType = propEntries.length > 0 ? `{${propEntries.join("; ")}}` : "{}";
           if (inheritsTag)
@@ -6678,9 +6825,12 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
             return "string";
           return null;
         };
-        for (const { name, type, value } of stateVars) {
+        for (const { name, type, value, optional, srcLine } of stateVars) {
           const ts = expandType(type) || inferLiteralType(value);
-          sl.push(ts ? `  declare ${name}: Signal<${ts}>;` : `  declare ${name}: Signal<any>;`);
+          const optNoDefault = optional && value === undefined;
+          const wrapped = ts ? optNoDefault ? `${ts} | undefined` : ts : null;
+          const marker = srcLine != null ? ` // @rip-src:${srcLine}` : "";
+          sl.push((wrapped ? `  declare ${name}: Signal<${wrapped}>;` : `  declare ${name}: Signal<any>;`) + marker);
         }
         if (inheritsTag) {
           sl.push(`  declare rest: Signal<__RipProps<'${inheritsTag}'>>;`);
@@ -6702,19 +6852,21 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
           }
         }
         sl.push("  _init(props) {");
-        for (const { name, value, isPublic } of readonlyVars) {
+        for (const { name, value, isPublic, srcLine } of readonlyVars) {
           const val = this.emitInComponent(value, "value");
-          sl.push(isPublic ? `    this.${name} = props.${name} ?? ${val};` : `    this.${name} = ${val};`);
+          const marker = srcLine != null ? ` // @rip-src:${srcLine}` : "";
+          sl.push((isPublic ? `    this.${name} = props.${name} ?? ${val};` : `    this.${name} = ${val};`) + marker);
         }
-        for (const { name, value, isPublic, required, type } of stateVars) {
-          if (isPublic && required) {
-            sl.push(`    this.${name} = __state(props.__bind_${name}__ ?? props.${name});`);
+        for (const { name, value, isPublic, required, type, srcLine } of stateVars) {
+          const marker = srcLine != null ? ` // @rip-src:${srcLine}` : "";
+          if (isPublic && (required || value === undefined)) {
+            sl.push(`    this.${name} = __state(props.__bind_${name}__ ?? props.${name});` + marker);
           } else if (isPublic) {
             const val = this.emitInComponent(value, "value");
-            sl.push(`    this.${name} = __state(props.__bind_${name}__ ?? props.${name} ?? ${val});`);
+            sl.push(`    this.${name} = __state(props.__bind_${name}__ ?? props.${name} ?? ${val});` + marker);
           } else {
             const val = this.emitInComponent(value, "value");
-            sl.push(`    this.${name} = __state(${val});`);
+            sl.push(`    this.${name} = __state(${val});` + marker);
           }
         }
         for (const effect of effects) {
@@ -6795,7 +6947,8 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
             }
             const transformed = this.reactiveMembers ? this.transformComponentMembers(methodBody) : methodBody;
             const isAsync = this.containsAwait(methodBody);
-            const bodyCode = this.emitFunctionBody(transformed, params || []);
+            let bodyCode = this.emitFunctionBody(transformed, params || []);
+            bodyCode = this.addBodyRipSrcMarkers(bodyCode, methodBody);
             sl.push(`  ${isAsync ? "async " : ""}${name}(${paramStr}) ${bodyCode}`);
           }
         }
@@ -6805,7 +6958,8 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
             const paramStr = Array.isArray(params) ? params.map((p) => this.formatParam(p)).join(", ") : "";
             const transformed = this.reactiveMembers ? this.transformComponentMembers(hookBody) : hookBody;
             const isAsync = this.containsAwait(hookBody);
-            const bodyCode = this.emitFunctionBody(transformed, params || []);
+            let bodyCode = this.emitFunctionBody(transformed, params || []);
+            bodyCode = this.addBodyRipSrcMarkers(bodyCode, hookBody);
             sl.push(`  ${isAsync ? "async " : ""}${name}(${paramStr}) ${bodyCode}`);
           }
         }
@@ -6863,8 +7017,21 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
             props.sideExprs = sideExprs;
             return props;
           };
-          const extractIntrinsicProps = (args) => {
+          const extractIntrinsicProps = (args, tagName) => {
             const props = [];
+            const wrapHrefVal = (val) => {
+              if (tagName !== "a")
+                return val;
+              if (typeof val !== "string")
+                return val;
+              if (val.length < 2)
+                return val;
+              if (val[0] !== "`")
+                return val;
+              if (val[1] !== "/")
+                return val;
+              return `__ripRoute(${val})`;
+            };
             for (const arg of args) {
               let obj = null;
               if (this.is(arg, "object")) {
@@ -6904,7 +7071,8 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
                       props.push({ code: `${propName}: ${val}`, srcLine });
                     } else {
                       const val = this.emitInComponent(value, "value");
-                      props.push({ code: `${key}: ${val}`, srcLine });
+                      const finalVal = key === "href" ? wrapHrefVal(val) : val;
+                      props.push({ code: `${key}: ${finalVal}`, srcLine });
                     }
                   }
                 }
@@ -7139,7 +7307,7 @@ 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));
+              const iProps = extractIntrinsicProps(node.slice(1), tagName);
               const tagLine = node.loc?.r;
               const srcMarker = tagLine != null ? ` // @rip-src:${tagLine}` : "";
               if (iProps.length === 0) {
@@ -7194,7 +7362,7 @@ Expecting ${expected.join(", ")}, got '${this.tokenNames[symbol] || symbol}'`;
         lines.push(`    this.${name} = getContext('${name}');`);
       }
       for (const { name, value, isPublic, required } of stateVars) {
-        if (isPublic && required) {
+        if (isPublic && (required || value === undefined)) {
           lines.push(`    this.${name} = __state(props.__bind_${name}__ ?? props.${name});`);
         } else if (isPublic) {
           const val = this.emitInComponent(value, "value");
@@ -8179,7 +8347,8 @@ ${blockFactoriesCode}return ${lines.join(`
       this._renderLocalScope = new Set;
       const outerParams = this._loopVarStack.map((v) => `${v.itemVar}, ${v.indexVar}`).join(", ");
       const outerExtra = outerParams ? `, ${outerParams}` : "";
-      this._loopVarStack.push({ itemVar, indexVar });
+      const reactiveSource = this.hasReactiveDeps(collection);
+      this._loopVarStack.push({ itemVar, indexVar, reactiveSource });
       const itemNode = this.emitTemplateBlock(body);
       this._loopVarStack.pop();
       const itemCreateLines = this._createLines;
@@ -8355,6 +8524,9 @@ ${blockFactoriesCode}return ${lines.join(`
       if (sexpr[0] === "." && this._rootsAtThis(sexpr[1])) {
         return true;
       }
+      if ((sexpr[0] === "." || sexpr[0] === "[]") && this._rootsAtReactiveLoopVar(sexpr)) {
+        return true;
+      }
       if (Array.isArray(sexpr[0]) && sexpr[0][0] === "." && sexpr[0][1] === "this") {
         const name = _str(sexpr[0][2]);
         if (name && this.componentMembers?.has(name))
@@ -8414,6 +8586,23 @@ ${blockFactoriesCode}return ${lines.join(`
         return false;
       return this._rootsAtThis(sexpr[1]);
     };
+    proto._rootsAtReactiveLoopVar = function(sexpr) {
+      if (typeof sexpr === "string") {
+        if (!this._loopVarStack || this._loopVarStack.length === 0)
+          return false;
+        for (let i = this._loopVarStack.length - 1;i >= 0; i--) {
+          const v = this._loopVarStack[i];
+          if (v.itemVar === sexpr)
+            return !!v.reactiveSource;
+        }
+        return false;
+      }
+      if (!Array.isArray(sexpr))
+        return false;
+      if (sexpr[0] === "." || sexpr[0] === "[]")
+        return this._rootsAtReactiveLoopVar(sexpr[1]);
+      return false;
+    };
     proto.getComponentRuntime = function() {
       return `
 // ============================================================================
@@ -9690,6 +9879,19 @@ globalThis.zip    ??= (...a) => a[0].map((_, i) => a.map(b => b[i]));
       return code;
     }
     buildMappings() {
+      if (this._importEntries) {
+        let importLineOffset = 0;
+        for (let entry of this._importEntries) {
+          if (entry.loc) {
+            this.sourceMap.addMapping(importLineOffset, 0, entry.loc.r, entry.loc.c);
+          }
+          if (entry.sexpr && entry.loc) {
+            this.recordSubMappings(entry.code, entry.sexpr, importLineOffset);
+          }
+          importLineOffset += entry.code.split(`
+`).length;
+        }
+      }
       if (!this._stmtEntries)
         return;
       let lineOffset = this._preambleLines;
@@ -9775,6 +9977,45 @@ globalThis.zip    ??= (...a) => a[0].map((_, i) => a.map(b => b[i]));
         ripSrcCache.set(genLineInStmt, v);
         return v;
       };
+      const inlineTypeRangesCache = new Map;
+      const getInlineTypeRanges = (genLineInStmt) => {
+        if (inlineTypeRangesCache.has(genLineInStmt))
+          return inlineTypeRangesCache.get(genLineInStmt);
+        const lt = codeLines[genLineInStmt];
+        const ranges = [];
+        if (lt && /\)\s*(\{|=>)\s*$/.test(lt)) {
+          const annotRe = /\b[a-zA-Z_$][\w$]*\??\s*:\s*\{/g;
+          let am;
+          while ((am = annotRe.exec(lt)) !== null) {
+            const braceStart = am.index + am[0].length - 1;
+            if (CodeEmitter._isColInsideString(lt, braceStart))
+              continue;
+            let depth = 1, j = braceStart + 1, inStr = false, quote = "";
+            while (j < lt.length && depth > 0) {
+              const ch = lt[j];
+              if (inStr) {
+                if (ch === "\\") {
+                  j += 2;
+                  continue;
+                }
+                if (ch === quote)
+                  inStr = false;
+              } else if (ch === '"' || ch === "'" || ch === "`") {
+                inStr = true;
+                quote = ch;
+              } else if (ch === "{")
+                depth++;
+              else if (ch === "}")
+                depth--;
+              j++;
+            }
+            ranges.push([braceStart, j]);
+            annotRe.lastIndex = j;
+          }
+        }
+        inlineTypeRangesCache.set(genLineInStmt, ranges);
+        return ranges;
+      };
       for (let { name, origLine, origCol } of subs) {
         let escaped = name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
         let re = new RegExp("\\b" + escaped + "\\b", "g");
@@ -9790,6 +10031,9 @@ globalThis.zip    ??= (...a) => a[0].map((_, i) => a.map(b => b[i]));
           const annotMatches = annotSrc != null && annotSrc === origLine;
           if (lineText && CodeEmitter._isColInsideString(lineText, genCol) && !annotMatches)
             continue;
+          const itRanges = getInlineTypeRanges(genLineInStmt);
+          if (itRanges.length && itRanges.some(([s, e]) => genCol >= s && genCol < e))
+            continue;
           let genLine = lineOffset + genLineInStmt;
           let dist = annotMatches ? Math.abs(genCol - origCol) : Math.abs(genLineInStmt - origLineInStmt) * 1e4 + Math.abs(genCol - origCol);
           if (dist < bestDist) {
@@ -9835,14 +10079,29 @@ globalThis.zip    ??= (...a) => a[0].map((_, i) => a.map(b => b[i]));
               identCol = node.loc.c + node[1].length + 1;
             }
           }
-        } else if (typeof head === "string" && /^[=+\-*/%<>!&|?~^]|^\.\.?$|^def$|^class$|^state$|^computed$|^readonly$|^for-/.test(head)) {
-          if (typeof node[1] === "string" && /^[a-zA-Z_$]/.test(node[1]))
+        } else if (typeof head === "string" && /^[=+\-*/%<>!&|?~^]|^\.{1,3}$|^def$|^class$|^state$|^computed$|^readonly$|^for-/.test(head)) {
+          if (typeof node[1] === "string" && /^[a-zA-Z_$]/.test(node[1])) {
             ident = node[1];
+            if (head === "...")
+              identCol = node.loc.c + 3;
+          }
         } else if (typeof head === "string" && /^[a-zA-Z_$]/.test(head)) {
           ident = head;
         }
         if (ident)
           result.push({ name: ident, origLine: node.loc.r, origCol: identCol });
+        if ((head === "->" || head === "=>") && Array.isArray(node[2]) && str(node[2][0]) === "block") {
+          const body = node[2];
+          for (let i = 1;i < body.length; i++) {
+            const leaf = body[i];
+            const leafStr = typeof leaf === "string" || leaf instanceof String ? str(leaf) : null;
+            if (leafStr && /^[a-zA-Z_$][\w$]*$/.test(leafStr) && !leaf.loc) {
+              const anchor = this._scanForIdentAfter(leafStr, node.loc);
+              if (anchor)
+                result.push(anchor);
+            }
+          }
+        }
       }
       if (Array.isArray(node._anchors)) {
         for (const a of node._anchors)
@@ -9854,6 +10113,29 @@ globalThis.zip    ??= (...a) => a[0].map((_, i) => a.map(b => b[i]));
           this.collectSubExprs(node[i], result);
       }
     }
+    _scanForIdentAfter(ident, startLoc) {
+      const source = this.options && this.options.source;
+      if (!source || !startLoc)
+        return null;
+      const lines = this._sourceLinesCache || (this._sourceLinesCache = source.split(`
+`));
+      const re = new RegExp("\\b" + ident.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") + "\\b", "g");
+      const startRow = startLoc.r;
+      const startCol = startLoc.c;
+      for (let r = startRow;r < Math.min(lines.length, startRow + 20); r++) {
+        const line = lines[r];
+        if (!line)
+          continue;
+        re.lastIndex = r === startRow ? startCol : 0;
+        let m;
+        while ((m = re.exec(line)) !== null) {
+          if (CodeEmitter._isColInsideString(line, m.index))
+            continue;
+          return { name: ident, origLine: r, origCol: m.index };
+        }
+      }
+      return null;
+    }
     collectProgramVariables(sexpr) {
       if (!Array.isArray(sexpr))
         return;
@@ -9900,7 +10182,6 @@ globalThis.zip    ??= (...a) => a[0].map((_, i) => a.map(b => b[i]));
         return;
       }
       if (head === "for-in" || head === "for-of" || head === "for-as") {
-        this.collectVarsFromLoopHead(rest[0], this.programVars);
         rest.slice(1).forEach((item) => this.collectProgramVariables(item));
         return;
       }
@@ -9964,7 +10245,6 @@ globalThis.zip    ??= (...a) => a[0].map((_, i) => a.map(b => b[i]));
           return;
         }
         if (head === "for-in" || head === "for-of" || head === "for-as") {
-          this.collectVarsFromLoopHead(rest[0], vars);
           rest.slice(1).forEach(collect);
           return;
         }
@@ -9998,12 +10278,38 @@ globalThis.zip    ??= (...a) => a[0].map((_, i) => a.map(b => b[i]));
       collect(body);
       return vars;
     }
+    collectTypedLocals(body) {
+      let typed = new Map;
+      let walk = (sexpr) => {
+        if (!Array.isArray(sexpr))
+          return;
+        let [head, ...rest] = sexpr;
+        head = str(head);
+        if (Array.isArray(head)) {
+          sexpr.forEach(walk);
+          return;
+        }
+        if (CodeEmitter.ASSIGNMENT_OPS.has(head)) {
+          let [target, value] = rest;
+          if (target instanceof String && target.type && !typed.has(str(target))) {
+            typed.set(str(target), target.type);
+          }
+          walk(value);
+          return;
+        }
+        if (head === "def" || head === "->" || head === "=>" || head === "effect")
+          return;
+        rest.forEach(walk);
+      };
+      walk(body);
+      return typed;
+    }
     emit(sexpr, context = "statement") {
       if (sexpr instanceof String) {
-        if (meta(sexpr, "await") === true) {
+        if (meta(sexpr, "bang") === true) {
           return `await ${str(sexpr)}()`;
         }
-        if (meta(sexpr, "predicate")) {
+        if (meta(sexpr, "optional")) {
           return `(${str(sexpr)} != null)`;
         }
         if (meta(sexpr, "delimiter") === "///" && meta(sexpr, "heregex")) {
@@ -10055,7 +10361,7 @@ globalThis.zip    ??= (...a) => a[0].map((_, i) => a.map(b => b[i]));
       if (!Array.isArray(sexpr))
         this.error(`Invalid s-expression: ${JSON.stringify(sexpr)}`, sexpr);
       let [head, ...rest] = sexpr;
-      let headAwaitMeta = meta(head, "await");
+      let headBangMeta = meta(head, "bang");
       head = str(head);
       let method = CodeEmitter.GENERATORS[head];
       if (method)
@@ -10069,7 +10375,7 @@ globalThis.zip    ??= (...a) => a[0].map((_, i) => a.map(b => b[i]));
         let postfix = this._tryPostfixCall(head, rest, context);
         if (postfix)
           return postfix;
-        let needsAwait = headAwaitMeta === true;
+        let needsAwait = headBangMeta === true;
         let callStr = `${this.emit(head, "value")}(${this._emitArgs(rest)})`;
         return needsAwait ? `await ${callStr}` : callStr;
       }
@@ -10091,11 +10397,11 @@ globalThis.zip    ??= (...a) => a[0].map((_, i) => a.map(b => b[i]));
           return postfix;
         let needsAwait = false;
         let calleeCode;
-        if (head[0] === "." && meta(head[2], "await") === true) {
+        if (head[0] === "." && meta(head[2], "bang") === true) {
           needsAwait = true;
           let [obj, prop] = head.slice(1);
           let objCode = this.emit(obj, "value");
-          let needsParens = CodeEmitter.NUMBER_LITERAL_RE.test(objCode) || (this.is(obj, "object") || this.is(obj, "await") || this.is(obj, "yield"));
+          let needsParens = CodeEmitter.NUMBER_LITERAL_RE.test(objCode) || (this.is(obj, "object") || this.is(obj, "await") || this.is(obj, "yield")) || /^(await|yield)\s/.test(objCode);
           let base = needsParens ? `(${objCode})` : objCode;
           calleeCode = `${base}.${str(prop)}`;
         } else {
@@ -10149,7 +10455,12 @@ globalThis.zip    ??= (...a) => a[0].map((_, i) => a.map(b => b[i]));
 `);
       let needsBlank = false;
       if (imports.length > 0) {
-        code += imports.map((s) => this.addSemicolon(s, this.emit(s, "statement"))).join(`
+        let importEntries = imports.map((s) => {
+          let generated = this.addSemicolon(s, this.emit(s, "statement"));
+          return { code: generated, loc: Array.isArray(s) ? s.loc : null, sexpr: Array.isArray(s) ? s : null };
+        });
+        this._importEntries = importEntries;
+        code += importEntries.map((e) => e.code).join(`
 `);
         needsBlank = true;
       }
@@ -10349,14 +10660,7 @@ function _setDataSection() {
         }
         return `if (${guardCode} != null) ${targetCode2} ${op} ${valueCode2}`;
       }
-      let isFnValue = this.is(value, "->") || this.is(value, "=>") || this.is(value, "def");
-      if (target instanceof String && meta(target, "await") !== undefined && !isFnValue) {
-        let sigil = meta(target, "await") === true ? "!" : "&";
-        this.error(`Cannot use ${sigil} sigil in variable declaration '${str(target)}'`, sexpr);
-      }
-      if (target instanceof String && meta(target, "await") === true && isFnValue) {
-        this.nextFunctionIsVoid = true;
-      }
+      this.applyVoidMarker(target, value, sexpr);
       let isEmptyArr = this.is(target, "array", 0);
       let isEmptyObj = this.is(target, "object", 0);
       if (isEmptyArr || isEmptyObj) {
@@ -10438,7 +10742,7 @@ function _setDataSection() {
         }
       }
       let targetCode;
-      if (target instanceof String && meta(target, "await") !== undefined) {
+      if (target instanceof String && meta(target, "bang") !== undefined) {
         targetCode = str(target);
       } else if (typeof target === "string" && this.reactiveVars?.has(target)) {
         targetCode = `${target}.value`;
@@ -10478,9 +10782,9 @@ function _setDataSection() {
       let objCode = this.emit(obj, "value");
       let needsParens = CodeEmitter.NUMBER_LITERAL_RE.test(objCode) || objCode.startsWith("await ") || (this.is(obj, "object") || this.is(obj, "yield"));
       let base = needsParens ? `(${objCode})` : objCode;
-      if (meta(prop, "await") === true)
+      if (meta(prop, "bang") === true)
         return `await ${base}.${str(prop)}()`;
-      if (meta(prop, "predicate"))
+      if (meta(prop, "optional"))
         return `(${base}.${str(prop)} != null)`;
       return `${base}.${str(prop)}`;
     }
@@ -10603,7 +10907,7 @@ function _setDataSection() {
     }
     emitDef(head, rest, context, sexpr) {
       let [name, params, body] = rest;
-      let sideEffectOnly = meta(name, "await") === true;
+      let sideEffectOnly = meta(name, "bang") === true;
       let cleanName = str(name);
       let paramList = this.emitParamList(params);
       let bodyCode = this.emitFunctionBody(body, params, sideEffectOnly);
@@ -10615,8 +10919,7 @@ function _setDataSection() {
       let [params, body] = rest;
       if ((!params || Array.isArray(params) && params.length === 0) && this.containsIt(body))
         params = ["it"];
-      let sideEffectOnly = this.nextFunctionIsVoid || false;
-      this.nextFunctionIsVoid = false;
+      let sideEffectOnly = sexpr.isVoid || false;
       let paramList = this.emitParamList(params);
       let bodyCode = this.emitFunctionBody(body, params, sideEffectOnly);
       let isAsync = this.containsAwait(body);
@@ -10628,8 +10931,7 @@ function _setDataSection() {
       let [params, body] = rest;
       if ((!params || Array.isArray(params) && params.length === 0) && this.containsIt(body))
         params = ["it"];
-      let sideEffectOnly = this.nextFunctionIsVoid || false;
-      this.nextFunctionIsVoid = false;
+      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 paramSyntax = isSingle ? paramList : `(${paramList})`;
@@ -11100,7 +11402,14 @@ ${this.indent()}}`;
         return this.emit(ops[0], "value");
       return `(${ops.map((o) => this.emit(o, "value")).join(" || ")})`;
     }
-    emitSymbol(head, rest) {
+    emitSymbol(head, rest, context, sexpr) {
+      if (sexpr && sexpr.loc && typeof rest[0] === "string") {
+        sexpr._anchors = (sexpr._anchors || []).concat([{
+          name: "Symbol",
+          origLine: sexpr.loc.r,
+          origCol: sexpr.loc.c + 1
+        }]);
+      }
       return `Symbol.for(${JSON.stringify(rest[0])})`;
     }
     emitArray(head, elements) {
@@ -11182,8 +11491,7 @@ ${this.indent()}}`;
           let [, mParams, mBody] = value;
           if ((!mParams || Array.isArray(mParams) && mParams.length === 0) && this.containsIt(mBody))
             mParams = ["it"];
-          let mSideEffect = this.nextFunctionIsVoid || false;
-          this.nextFunctionIsVoid = false;
+          let mSideEffect = value.isVoid || false;
           let mParamList = this.emitParamList(mParams);
           let mBodyCode = this.emitFunctionBody(mBody, mParams, mSideEffect);
           let mIsAsync = this.containsAwait(mBody);
@@ -11753,7 +12061,7 @@ ${this.indent()}}`;
     emitImport(head, rest, context, sexpr) {
       if (rest.length === 1) {
         let importExpr = `import(${this.emit(rest[0], "value")})`;
-        if (meta(sexpr[0], "await") === true)
+        if (meta(sexpr[0], "bang") === true)
           return `(await ${importExpr})`;
         return importExpr;
       }
@@ -11765,6 +12073,7 @@ ${this.indent()}}`;
         if (named[0] === "*" && named.length === 2)
           return `import ${def}, * as ${named[1]} from ${fixedSource2}`;
         let names = named.map((i) => Array.isArray(i) && i.length === 2 ? `${i[0]} as ${i[1]}` : i).join(", ");
+        this._attachImportSpecifierAnchors(sexpr, [def, ...named.flatMap((i) => Array.isArray(i) ? i : [i])]);
         return `import ${def}, { ${names} } from ${fixedSource2}`;
       }
       let [specifier, source] = rest;
@@ -11775,10 +12084,59 @@ ${this.indent()}}`;
         if (specifier[0] === "*" && specifier.length === 2)
           return `import * as ${specifier[1]} from ${fixedSource}`;
         let names = specifier.map((i) => Array.isArray(i) && i.length === 2 ? `${i[0]} as ${i[1]}` : i).join(", ");
+        this._attachImportSpecifierAnchors(sexpr, specifier.flatMap((i) => Array.isArray(i) ? i : [i]));
         return `import { ${names} } from ${fixedSource}`;
       }
       return `import ${this.emit(specifier, "value")} from ${fixedSource}`;
     }
+    _attachImportSpecifierAnchors(sexpr, names) {
+      if (!sexpr || !sexpr.loc)
+        return;
+      const source = this.options && this.options.source;
+      if (!source || !names || !names.length)
+        return;
+      const lines = this._sourceLinesCache || (this._sourceLinesCache = source.split(`
+`));
+      let row = sexpr.loc.r;
+      let col = sexpr.loc.c;
+      const anchors = [];
+      for (const name of names) {
+        if (typeof name !== "string" || !/^[A-Za-z_$][\w$]*$/.test(name))
+          continue;
+        const re = new RegExp("\\b" + name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") + "\\b");
+        let found = false;
+        while (row < lines.length) {
+          const line = lines[row] || "";
+          const codePart = line.replace(/#.*$/, "");
+          re.lastIndex = 0;
+          const slice = codePart.slice(col);
+          const m = re.exec(slice);
+          if (m) {
+            const c = col + m.index;
+            anchors.push({ name, origLine: row, origCol: c });
+            col = c + name.length;
+            found = true;
+            break;
+          }
+          row++;
+          col = 0;
+        }
+        if (!found)
+          break;
+      }
+      if (anchors.length)
+        sexpr._anchors = (sexpr._anchors || []).concat(anchors);
+    }
+    applyVoidMarker(target, value, sexpr) {
+      let isFnValue = this.is(value, "->") || this.is(value, "=>") || this.is(value, "def");
+      if (target instanceof String && meta(target, "bang") !== undefined && !isFnValue) {
+        let sigil = meta(target, "bang") === true ? "!" : "&";
+        this.error(`Cannot use ${sigil} sigil in variable declaration '${str(target)}'`, sexpr);
+      }
+      if (target instanceof String && meta(target, "bang") === true && isFnValue) {
+        value.isVoid = true;
+      }
+    }
     emitExport(head, rest) {
       let [decl] = rest;
       if (this.options.skipExports) {
@@ -11792,6 +12150,7 @@ ${this.indent()}}`;
           }
           if (this.is(decl[2], "schema"))
             this._schemaName = str(decl[1]);
+          this.applyVoidMarker(decl[1], decl[2], decl);
           const result = `const ${decl[1]} = ${this.emit(decl[2], "value")}`;
           this._componentName = prev;
           this._componentTypeParams = prevTP;
@@ -11812,6 +12171,7 @@ ${this.indent()}}`;
         }
         if (this.is(decl[2], "schema"))
           this._schemaName = str(decl[1]);
+        this.applyVoidMarker(decl[1], decl[2], decl);
         const result = `export const ${decl[1]} = ${this.emit(decl[2], "value")}`;
         this._componentName = prev;
         this._componentTypeParams = prevTP;
@@ -11825,11 +12185,14 @@ ${this.indent()}}`;
     emitExportDefault(head, rest) {
       let [expr] = rest;
       if (this.options.skipExports) {
-        if (this.is(expr, "="))
+        if (this.is(expr, "=")) {
+          this.applyVoidMarker(expr[1], expr[2], expr);
           return `const ${expr[1]} = ${this.emit(expr[2], "value")}`;
+        }
         return this.emit(expr, "statement");
       }
       if (this.is(expr, "=")) {
+        this.applyVoidMarker(expr[1], expr[2], expr);
         return `const ${expr[1]} = ${this.emit(expr[2], "value")};
 export default ${expr[1]}`;
       }
@@ -11957,10 +12320,19 @@ export default ${expr[1]}`;
     formatParam(param) {
       if (typeof param === "string")
         return param;
-      if (param instanceof String)
+      if (param instanceof String) {
+        if (this.options.inlineTypes && param.type) {
+          return `${param.valueOf()}: ${param.type.replace(/::/g, ":")}`;
+        }
         return param.valueOf();
-      if (this.is(param, "rest"))
-        return `...${param[1]}`;
+      }
+      if (this.is(param, "rest")) {
+        let restName = param[1];
+        if (this.options.inlineTypes && restName instanceof String && restName.type) {
+          return `...${restName.valueOf()}: ${restName.type.replace(/::/g, ":")}`;
+        }
+        return `...${restName}`;
+      }
       if (this.is(param, "default")) {
         return `${this.formatParam(param[1])} = ${this.emit(param[2], "value")}`;
       }
@@ -12005,15 +12377,15 @@ export default ${expr[1]}`;
       this.sideEffectOnly = sideEffectOnly;
       let paramNames = new Set;
       let extractPN = (p) => {
-        if (typeof p === "string")
-          paramNames.add(p);
+        if (typeof p === "string" || p instanceof String)
+          paramNames.add(str(p));
         else if (Array.isArray(p)) {
           if (p[0] === "rest" || p[0] === "...") {
-            if (typeof p[1] === "string")
-              paramNames.add(p[1]);
+            if (typeof p[1] === "string" || p[1] instanceof String)
+              paramNames.add(str(p[1]));
           } else if (p[0] === "default") {
-            if (typeof p[1] === "string")
-              paramNames.add(p[1]);
+            if (typeof p[1] === "string" || p[1] instanceof String)
+              paramNames.add(str(p[1]));
           } else if (p[0] === "array" || p[0] === "object")
             this.collectVarsFromArray(p, paramNames);
         }
@@ -12051,9 +12423,15 @@ export default ${expr[1]}`;
         this.indentLevel++;
         let code = `{
 `;
-        if (newVars.size > 0)
-          code += this.indent() + `let ${Array.from(newVars).sort().join(", ")};
+        if (newVars.size > 0) {
+          let typedLocals = this.options.inlineTypes ? this.collectTypedLocals(body) : null;
+          let names = Array.from(newVars).sort().map((n) => {
+            let t = typedLocals?.get(n);
+            return t ? `${n}: ${t}` : n;
+          });
+          code += this.indent() + `let ${names.join(", ")};
 `;
+        }
         let firstIsSuper = autoAssignments.length > 0 && statements.length > 0 && Array.isArray(statements[0]) && statements[0][0] === "super";
         let genStatements = (stmts) => {
           stmts.forEach((stmt, index) => {
@@ -12998,7 +13376,7 @@ ${this.indent()}}`;
     containsAwait(sexpr) {
       if (!sexpr)
         return false;
-      if (sexpr instanceof String && meta(sexpr, "await") === true)
+      if (sexpr instanceof String && meta(sexpr, "bang") === true)
         return true;
       if (typeof sexpr !== "object")
         return false;
@@ -13438,7 +13816,7 @@ if (typeof globalThis !== 'undefined') {
         typeTokens = [...tokens];
       }
       tokens = tokens.filter((t) => t[0] !== "TYPE_DECL");
-      if (lexer.typeRefNames?.size > 0) {
+      if (lexer.typeRefNames?.size > 0 && !this.options.inlineTypes) {
         let usedNames = new Set;
         let inImport = false;
         for (let t of tokens) {
@@ -13665,6 +14043,7 @@ if (typeof globalThis !== 'undefined') {
         skipDataPart: this.options.skipDataPart,
         stubComponents: this.options.stubComponents,
         reactiveVars: this.options.reactiveVars,
+        inlineTypes: this.options.inlineTypes,
         schemaMode: this.options.schemaMode,
         sourceMap
       });
@@ -13737,8 +14116,8 @@ if (typeof globalThis !== 'undefined') {
     return new CodeEmitter({}).getComponentRuntime();
   }
   // src/browser.js
-  var VERSION = "3.16.0";
-  var BUILD_DATE = "2026-05-22@08:07:44GMT";
+  var VERSION = "3.16.1";
+  var BUILD_DATE = "2026-06-05@18:16:05GMT";
   if (typeof globalThis !== "undefined") {
     if (!globalThis.__rip)
       new Function(getReactiveRuntime())();
@@ -13751,6 +14130,36 @@ if (typeof globalThis !== 'undefined') {
     return s.replace(RegExp(`^[ 	]{${i}}`, "gm"), "").trim();
   };
   var sanitizeSourceURL = (url) => String(url).replace(/[\r\n]/g, "").replace(/\s+$/g, "");
+  function rewriteRipPkgImports(js) {
+    const re = /^(\s*)import\s+([^'"]+?)\s+from\s+['"](@rip-lang\/[^'"]+)['"];?\s*$/gm;
+    return js.replace(re, (full, indent, clause, spec) => {
+      const trimmed = clause.trim();
+      if (trimmed.startsWith("type "))
+        return `${indent}// type-only import erased: ${spec}`;
+      const open = trimmed.indexOf("{");
+      const close = trimmed.lastIndexOf("}");
+      if (open < 0 || close <= open) {
+        console.warn(`[Rip] Skipping non-named import from ${spec}; only \`import { … } from '@rip-lang/*'\` is supported in browser bundles.`);
+        return full;
+      }
+      const inside = trimmed.slice(open + 1, close);
+      const parts = [];
+      for (let raw of inside.split(",")) {
+        let name = raw.trim().replace(/^type\s+/, "");
+        if (!name)
+          continue;
+        if (/\s+as\s+/.test(name)) {
+          const [orig, alias] = name.split(/\s+as\s+/).map((s) => s.trim());
+          parts.push(`${orig}: ${alias}`);
+        } else {
+          parts.push(name);
+        }
+      }
+      if (parts.length === 0)
+        return `${indent}// import erased: ${spec}`;
+      return `${indent}const { ${parts.join(", ")} } = globalThis;`;
+    });
+  }
   function addSourceURL(js, generatedName) {
     const safe = sanitizeSourceURL(generatedName);
     const pragma = `//# sourceURL=${safe}`;
@@ -13816,8 +14225,8 @@ ${tagged}
         if (url)
           sources.push({ url });
       }
-    } else if (runtimeTag) {
-      sources.push({ url: "/app" });
+    } else if (runtimeTag && /^https?:$/.test(location.protocol)) {
+      sources.push({ url: "/app", optional: true });
     }
     for (const script of document.querySelectorAll('script[type="text/rip"]')) {
       if (script.src) {
@@ -13842,9 +14251,11 @@ ${tagged}
           s.bundle = bundle;
         }
       }));
-      for (const r of results) {
-        if (r.status === "rejected")
+      for (let i = 0;i < results.length; i++) {
+        const r = results[i];
+        if (r.status === "rejected" && !sources[i].optional) {
           console.warn("Rip: fetch failed:", r.reason.message);
+        }
       }
       const bundles = [];
       const individual = [];
@@ -13875,7 +14286,7 @@ ${tagged}
           const opts = debug ? { ...baseOpts, sourceMap: "inline", filename: ripName } : baseOpts;
           let js;
           try {
-            js = compileToJS(s.code, opts);
+            js = rewriteRipPkgImports(compileToJS(s.code, opts));
           } catch (e) {
             console.error(formatError(e, { source: s.code, file: ripName, color: false }));
             continue;
@@ -13899,7 +14310,8 @@ ${js}
       } else {
         const expanded = [];
         for (const b of bundles) {
-          for (const [name, code] of Object.entries(b.components || {})) {
+          const mods = b.modules || b.components || {};
+          for (const [name, code] of Object.entries(mods)) {
             expanded.push({ code, url: name });
           }
           if (b.data) {
@@ -13918,8 +14330,9 @@ ${js}
         if (bundles.length > 0 && typeof globalThis.createComponents === "function") {
           const sourceStore = globalThis.createComponents();
           for (const b of bundles) {
-            if (b.components)
-              sourceStore.load(b.components);
+            const mods = b.modules || b.components;
+            if (mods)
+              sourceStore.load(mods);
           }
           if (typeof window !== "undefined") {
             if (!window.__RIP__)
@@ -13939,14 +14352,14 @@ ${js}
           const ripName = s.url || `inline-${++inlineCounter}.rip`;
           const opts = debug ? { ...baseOpts, sourceMap: "inline", filename: ripName } : baseOpts;
           try {
-            const js = compileToJS(s.code, opts);
+            const js = rewriteRipPkgImports(compileToJS(s.code, opts));
             compiled.push({ js, url: ripName });
           } catch (e) {
             console.error(formatError(e, { source: s.code, file: ripName, color: false }));
           }
         }
         if (!globalThis.__ripApp && runtimeTag) {
-          const stashFn = globalThis.stash;
+          const stashFn = globalThis.createStash;
           if (stashFn) {
             let initial = {};
             const stateAttr = runtimeTag.getAttribute("data-state");
@@ -14043,7 +14456,7 @@ ${wrapped}
         throw new Error(`importRip: ${url} (${r.status})`);
       return r.text();
     });
-    const js = compileToJS(source);
+    const js = rewriteRipPkgImports(compileToJS(source));
     const header = `// ${url}
 `;
     const blob = new Blob([header + js], { type: "application/javascript" });
@@ -14093,18 +14506,17 @@ ${indented}`);
   // docs/dist/_app.js
   var exports__app = {};
   __export(exports__app, {
+    unwrapStash: () => unwrapStash,
     throttle: () => throttle,
-    stash: () => stash,
     setContext: () => setContext,
-    raw: () => raw,
     persistStash: () => persistStash,
     launch: () => launch,
-    isStash: () => isStash,
     hold: () => hold,
     hasContext: () => hasContext,
     getContext: () => getContext,
     delay: () => delay,
     debounce: () => debounce,
+    createStash: () => createStash,
     createRouter: () => createRouter,
     createResource: () => createResource,
     createRenderer: () => createRenderer,
@@ -14118,6 +14530,7 @@ ${indented}`);
   var __batch;
   var __computed;
   var __effect;
+  var __ripCtx;
   var __state;
   var _ariaAnchorChecked;
   var _ariaAnchorSupported;
@@ -14155,10 +14568,8 @@ ${indented}`);
   var fileToPattern;
   var findAllComponents;
   var findComponent;
-  var getContext;
   var getLayoutChain;
   var getSignal;
-  var hasContext;
   var isNum;
   var isPathKey;
   var keysSignal;
@@ -14167,7 +14578,6 @@ ${indented}`);
   var patternToRegex;
   var resolveIndex;
   var resolveStorePath;
-  var setContext;
   var stashGet;
   var stashMethodFn;
   var stashSet;
@@ -14260,7 +14670,16 @@ ${indented}`);
   globalThis.warn ??= console.warn;
   globalThis.zip ??= (...a) => a[0].map((_, i) => a.map((b) => b[i]));
   ({ __state, __computed, __effect, __batch } = globalThis.__rip);
-  ({ setContext, getContext, hasContext } = globalThis.__ripComponent || {});
+  __ripCtx = globalThis.__ripComponent || {};
+  var setContext = function(key, value) {
+    return __ripCtx.setContext(key, value);
+  };
+  var getContext = function(key) {
+    return __ripCtx.getContext(key);
+  };
+  var hasContext = function(key) {
+    return __ripCtx.hasContext(key);
+  };
   assertBrowser = function(where) {
     if (typeof window === "undefined" || typeof document === "undefined") {
       throw new Error(`Rip App: '${where}' requires a browser environment`);
@@ -14334,7 +14753,7 @@ ${indented}`);
         return val;
       },
       set(target2, prop, value) {
-        let i, newLen, old, oldLen, r, sig;
+        let newLen, old, oldLen, r, sig;
         if (!_depth && isPathKey(prop)) {
           stashSet(proxy, prop, value);
           return true;
@@ -14345,10 +14764,10 @@ ${indented}`);
           target2.length = newLen;
           if (newLen !== oldLen) {
             if (target2[Symbol.for("signals")]) {
-              for (let i2 of ((s, e) => Array.from({ length: Math.max(0, Math.abs(e - s)) }, (_, i3) => s + i3 * (s <= e ? 1 : -1)))(Math.min(oldLen, newLen), Math.max(oldLen, newLen))) {
-                sig = target2[Symbol.for("signals")].get(String(i2));
+              for (let i of ((s, e) => Array.from({ length: Math.max(0, Math.abs(e - s)) }, (_, i2) => s + i2 * (s <= e ? 1 : -1)))(Math.min(oldLen, newLen), Math.max(oldLen, newLen))) {
+                sig = target2[Symbol.for("signals")].get(String(i));
                 if (sig != null)
-                  sig.value = target2[i2];
+                  sig.value = target2[i];
               }
             }
             keysSignal(target2).value = ++_keysVersion;
@@ -14415,23 +14834,23 @@ ${indented}`);
   resolveIndex = function(seg, obj) {
     let t;
     if (typeof seg === "number" && seg < 0) {
-      t = raw(obj);
+      t = unwrapStash(obj);
       if (Array.isArray(t))
         return t.length + seg;
     }
     return seg;
   };
   stashGet = function(proxy, path) {
-    let obj, seg, segs;
+    let obj, segs;
     segs = walk(path);
     obj = proxy;
     _depth++;
     return (() => {
       try {
-        for (let seg2 of segs) {
+        for (let seg of segs) {
           if (!(obj != null))
             return;
-          obj = obj[resolveIndex(seg2, obj)];
+          obj = obj[resolveIndex(seg, obj)];
         }
         return obj;
       } finally {
@@ -14440,20 +14859,20 @@ ${indented}`);
     })();
   };
   stashSet = function(proxy, path, value) {
-    let i, key, nextSeg, obj, seg, segs;
+    let key, nextSeg, obj, segs;
     segs = walk(path);
     obj = proxy;
     _depth++;
     return (() => {
       try {
-        for (let i2 = 0;i2 < segs.length; i2++) {
-          let seg2 = segs[i2];
-          key = resolveIndex(seg2, obj);
-          if (i2 === segs.length - 1) {
+        for (let i = 0;i < segs.length; i++) {
+          let seg = segs[i];
+          key = resolveIndex(seg, obj);
+          if (i === segs.length - 1) {
             obj[key] = value;
           } else {
             if (!(obj[key] != null)) {
-              nextSeg = segs[i2 + 1];
+              nextSeg = segs[i + 1];
               obj[key] = typeof nextSeg === "number" || isNum(nextSeg) ? [] : {};
             }
             obj = obj[key];
@@ -14500,7 +14919,7 @@ ${indented}`);
         case "join":
           return function(path, obj) {
             return __batch(function() {
-              let k, target, v;
+              let target;
               target = stashGet(proxy, path);
               if (!(target != null && typeof target === "object")) {
                 stashSet(proxy, path, {});
@@ -14511,9 +14930,9 @@ ${indented}`);
                 try {
                   return (() => {
                     const result = [];
-                    for (let k2 in obj) {
-                      let v2 = obj[k2];
-                      result.push(target[k2] = v2);
+                    for (let k in obj) {
+                      let v = obj[k];
+                      result.push(target[k] = v);
                     }
                     return result;
                   })();
@@ -14525,20 +14944,20 @@ ${indented}`);
           };
         case "keys":
           return function(path) {
-            let obj, seg, segs, t;
+            let obj, segs, t;
             _depth++;
             return (() => {
               try {
                 segs = walk(path);
                 obj = proxy;
-                for (let seg2 of segs) {
+                for (let seg of segs) {
                   if (!(obj != null))
                     return [];
-                  obj = obj[resolveIndex(seg2, obj)];
+                  obj = obj[resolveIndex(seg, obj)];
                 }
                 if (!(obj != null && typeof obj === "object"))
                   return [];
-                t = raw(obj);
+                t = unwrapStash(obj);
                 keysSignal(t).value;
                 return Object.keys(t);
               } finally {
@@ -14548,7 +14967,7 @@ ${indented}`);
           };
         case "has":
           return function(path) {
-            let i, key, obj, seg, segs, t;
+            let key, obj, segs, t;
             _depth++;
             return (() => {
               try {
@@ -14556,11 +14975,11 @@ ${indented}`);
                 if (!(segs.length > 0))
                   return false;
                 obj = proxy;
-                for (let i2 = 0;i2 < segs.length; i2++) {
-                  let seg2 = segs[i2];
-                  key = resolveIndex(seg2, obj);
-                  if (i2 === segs.length - 1) {
-                    t = raw(obj);
+                for (let i = 0;i < segs.length; i++) {
+                  let seg = segs[i];
+                  key = resolveIndex(seg, obj);
+                  if (i === segs.length - 1) {
+                    t = unwrapStash(obj);
                     keysSignal(t).value;
                     return Object.prototype.hasOwnProperty.call(t, key);
                   }
@@ -14576,7 +14995,7 @@ ${indented}`);
           };
         case "del":
           return function(path) {
-            let i, key, obj, seg, segs;
+            let key, obj, segs;
             _depth++;
             return (() => {
               try {
@@ -14586,10 +15005,10 @@ ${indented}`);
                 obj = proxy;
                 return (() => {
                   const result = [];
-                  for (let i2 = 0;i2 < segs.length; i2++) {
-                    let seg2 = segs[i2];
-                    key = resolveIndex(seg2, obj);
-                    if (i2 === segs.length - 1) {
+                  for (let i = 0;i < segs.length; i++) {
+                    let seg = segs[i];
+                    key = resolveIndex(seg, obj);
+                    if (i === segs.length - 1) {
                       delete obj[key];
                       return;
                     }
@@ -14609,19 +15028,16 @@ ${indented}`);
     cache[prop] = fn;
     return fn;
   };
-  var stash = function(data = {}) {
+  function createStash(data = {}) {
     return makeProxy(data);
-  };
-  var raw = function(proxy) {
+  }
+  function unwrapStash(proxy) {
     return proxy?.[Symbol.for("raw")] ? proxy[Symbol.for("raw")] : proxy;
-  };
-  var isStash = function(obj) {
-    return obj?.[Symbol.for("stash")] === true;
-  };
-  var persistStash = function(app, opts = {}) {
-    let _save, disposed, effectDisposer, k, saved, savedData, storage, storageKey, target, v;
+  }
+  function persistStash(app, opts = {}) {
+    let _save, disposed, effectDisposer, saved, savedData, storage, storageKey, target;
     assertBrowser("persistStash");
-    target = raw(app) || app;
+    target = unwrapStash(app) || app;
     return function() {
       return target[Symbol.for("persisted")] ? null : undefined;
     };
@@ -14632,16 +15048,16 @@ ${indented}`);
       saved = storage.getItem(storageKey);
       if (saved) {
         savedData = JSON.parse(saved);
-        for (let k2 in savedData) {
-          let v2 = savedData[k2];
-          app.data[k2] = v2;
+        for (let k in savedData) {
+          let v = savedData[k];
+          app.data[k] = v;
         }
       }
     } catch {}
     _save = function() {
       return (() => {
         try {
-          return storage.setItem(storageKey, JSON.stringify(raw(app.data)));
+          return storage.setItem(storageKey, JSON.stringify(unwrapStash(app.data)));
         } catch {
           return null;
         }
@@ -14666,8 +15082,8 @@ ${indented}`);
       _save();
       return target[Symbol.for("persisted")] = false;
     };
-  };
-  var createResource = function(fn, opts = {}) {
+  }
+  function createResource(fn, opts = {}) {
     let _data, _error, _loading, controller, dispose, generation, load, resource;
     _data = __state(opts.initial ?? null);
     _loading = __state(false);
@@ -14723,7 +15139,7 @@ ${indented}`);
         return null;
       });
     return resource;
-  };
+  }
   _toFn = function(source) {
     return typeof source === "function" ? source : function() {
       return source.value;
@@ -14833,18 +15249,17 @@ ${indented}`);
     });
     return typeof source !== "function" ? _proxy(out, source, eff) : _attachDispose(out, eff);
   };
-  var createComponents = function() {
+  function createComponents() {
     let compiled, files, notify, watchers;
     files = new Map;
     watchers = new Set;
     compiled = new Map;
     notify = function(event, path) {
-      let watcher;
       const _result = [];
-      for (let watcher2 of Array.from(watchers)) {
+      for (let watcher of Array.from(watchers)) {
         _result.push((() => {
           try {
-            return watcher2(event, path);
+            return watcher(event, path);
           } catch (e) {
             return console.error("[Rip] watcher error:", e);
           }
@@ -14875,36 +15290,35 @@ ${indented}`);
         return files.size;
       },
       list(dir = "") {
-        let path, prefix, rest, result;
+        let prefix, rest, result;
         result = [];
         prefix = dir ? dir + "/" : "";
-        for (let [path2] of files) {
-          if (path2.startsWith(prefix)) {
-            rest = path2.slice(prefix.length);
+        for (let [path] of files) {
+          if (path.startsWith(prefix)) {
+            rest = path.slice(prefix.length);
             if (rest.includes("/"))
               continue;
-            result.push(path2);
+            result.push(path);
           }
         }
         return result;
       },
       listAll(dir = "") {
-        let path, prefix, result;
+        let prefix, result;
         result = [];
         prefix = dir ? dir + "/" : "";
-        for (let [path2] of files) {
-          if (path2.startsWith(prefix))
-            result.push(path2);
+        for (let [path] of files) {
+          if (path.startsWith(prefix))
+            result.push(path);
         }
         return result;
       },
       load(obj) {
-        let content, key;
         const _result = [];
-        for (let key2 in obj) {
-          let content2 = obj[key2];
-          files.set(key2, content2);
-          _result.push(compiled.delete(key2));
+        for (let key in obj) {
+          let content = obj[key];
+          files.set(key, content);
+          _result.push(compiled.delete(key));
         }
         return _result;
       },
@@ -14926,7 +15340,7 @@ ${indented}`);
         return compiled.set(path, result);
       }
     };
-  };
+  }
   fileToPattern = function(rel) {
     let pattern;
     pattern = rel.replace(/\.rip$/, "");
@@ -14951,33 +15365,33 @@ ${indented}`);
     return { regex: new RegExp("^" + str2 + "$"), names };
   };
   matchRoute = function(path, routes) {
-    let i, match, name, params, route;
-    for (let route2 of routes) {
-      match = path.match(route2.regex.regex);
+    let match, params;
+    for (let route of routes) {
+      match = path.match(route.regex.regex);
       if (match) {
         params = {};
-        for (let i2 = 0;i2 < route2.regex.names.length; i2++) {
-          let name2 = route2.regex.names[i2];
-          params[name2] = decodeURIComponent(match[i2 + 1]);
+        for (let i = 0;i < route.regex.names.length; i++) {
+          let name = route.regex.names[i];
+          params[name] = decodeURIComponent(match[i + 1]);
         }
-        return { route: route2, params };
+        return { route, params };
       }
     }
     return null;
   };
-  buildRoutes = function(components, root = "components") {
-    let allFiles, dir, filePath, layouts, name, regex, rel, routes, segs, urlPattern;
+  buildRoutes = function(components, root = "_route") {
+    let allFiles, dir, layouts, name, regex, rel, routes, segs, urlPattern;
     routes = [];
     layouts = new Map;
     allFiles = components.listAll(root);
-    for (let filePath2 of allFiles) {
-      rel = filePath2.slice(root.length + 1);
+    for (let filePath of allFiles) {
+      rel = filePath.slice(root.length + 1);
       if (!rel.endsWith(".rip"))
         continue;
       name = rel.split("/").pop();
       if (name === "_layout.rip") {
         dir = rel === "_layout.rip" ? "" : rel.slice(0, -"/_layout.rip".length);
-        layouts.set(dir, filePath2);
+        layouts.set(dir, filePath);
         continue;
       }
       if (name.startsWith("_"))
@@ -14989,7 +15403,7 @@ ${indented}`);
         continue;
       urlPattern = fileToPattern(rel);
       regex = patternToRegex(urlPattern);
-      routes.push({ pattern: urlPattern, regex, file: filePath2, rel });
+      routes.push({ pattern: urlPattern, regex, file: filePath, rel });
     }
     routes.sort(function(a, b) {
       let aCatch, aDyn, bCatch, bDyn;
@@ -15006,27 +15420,27 @@ ${indented}`);
     return { routes, layouts };
   };
   getLayoutChain = function(routeFile, root, layouts) {
-    let chain, dir, i, rel, seg, segments;
+    let chain, dir, rel, segments;
     chain = [];
     rel = routeFile.slice(root.length + 1);
     segments = rel.split("/");
     dir = "";
     if (layouts.has(""))
       chain.push(layouts.get(""));
-    for (let i2 = 0;i2 < segments.length; i2++) {
-      let seg2 = segments[i2];
-      if (i2 === segments.length - 1)
+    for (let i = 0;i < segments.length; i++) {
+      let seg = segments[i];
+      if (i === segments.length - 1)
         break;
-      dir = dir ? dir + "/" + seg2 : seg2;
+      dir = dir ? dir + "/" + seg : seg;
       if (layouts.has(dir))
         chain.push(layouts.get(dir));
     }
     return chain;
   };
-  var createRouter = function(components, opts = {}) {
-    let _current, _hash, _layouts, _navigating, _normalizedUrl, _params, _path, _query, _route, addBase, base, hashMode, navCallbacks, onClick, onError, onPopState, readUrl, resolve, root, router, stripBase, tree, unwatchComponents, writeUrl;
+  function createRouter(components, opts = {}) {
+    let _current, _hash, _layouts, _navigating, _normalizedUrl, _params, _path, _query, _route, addBase, applyAria, applyScroll, ariaEffect, ariaObserver, ariaScheduled, base, currentNorm, hashMode, navCallbacks, normalizeHref, onClick, onError, onPopState, onScroll, ownedAnchors, prevScrollRestoration, raf, readUrl, resolve, root, router, scheduleAria, scrollSaveTimer, shouldIgnoreAnchor, stripBase, tree, unwatchComponents, writeUrl;
     assertBrowser("createRouter");
-    root = opts.root || "components";
+    root = opts.root || "_route";
     base = opts.base || "";
     hashMode = opts.hash || false;
     onError = opts.onError || null;
@@ -15072,7 +15486,7 @@ ${indented}`);
       return tree = buildRoutes(components, root);
     });
     resolve = function(url) {
-      let cb, full, hash, path, queryStr, rawPath, result, snapshot;
+      let full, hash, path, queryStr, rawPath, result, snapshot;
       rawPath = url.split("?")[0].split("#")[0];
       path = stripBase(rawPath);
       path = path[0] === "/" ? path : "/" + path;
@@ -15095,9 +15509,9 @@ ${indented}`);
           return _normalizedUrl.value = full;
         });
         snapshot = Array.from(navCallbacks);
-        for (let cb2 of snapshot) {
+        for (let cb of snapshot) {
           try {
-            cb2(router.current);
+            cb(router.current);
           } catch (err) {
             console.error("[Rip] router onNavigate callback error:", err);
           }
@@ -15108,13 +15522,80 @@ ${indented}`);
         onError({ status: 404, path });
       return false;
     };
-    onPopState = function() {
-      return resolve(readUrl());
+    prevScrollRestoration = null;
+    if (typeof history !== "undefined" && "scrollRestoration" in history) {
+      prevScrollRestoration = history.scrollRestoration;
+      history.scrollRestoration = "manual";
+    }
+    raf = function(cb) {
+      return typeof window !== "undefined" && window.requestAnimationFrame ? window.requestAnimationFrame(cb) : setTimeout(cb, 16);
+    };
+    applyScroll = function(y) {
+      let attempts, step;
+      if (typeof window === "undefined")
+        return;
+      attempts = 0;
+      step = function() {
+        let maxY;
+        maxY = Math.max(0, (document?.documentElement?.scrollHeight || 0) - window.innerHeight);
+        window.scrollTo(0, Math.min(y, maxY));
+        attempts += 1;
+        return y > maxY && attempts < 20 ? raf(step) : undefined;
+      };
+      return raf(step);
+    };
+    scrollSaveTimer = null;
+    onScroll = function() {
+      if (scrollSaveTimer || typeof window === "undefined")
+        return;
+      return scrollSaveTimer = setTimeout(function() {
+        scrollSaveTimer = null;
+        return (() => {
+          try {
+            return history.replaceState({ ...history.state || {}, _ripScroll: window.scrollY }, "", location.href);
+          } catch {}
+        })();
+      }, 100);
+    };
+    if (typeof window !== "undefined")
+      window.addEventListener("scroll", onScroll, { passive: true });
+    onPopState = function(e) {
+      let saved;
+      saved = e?.state?._ripScroll;
+      resolve(readUrl());
+      return typeof saved === "number" ? applyScroll(saved) : undefined;
     };
     if (typeof window !== "undefined")
       window.addEventListener("popstate", onPopState);
+    shouldIgnoreAnchor = function(target) {
+      let url;
+      if (!target?.href)
+        return true;
+      url = (() => {
+        try {
+          return new URL(target.href, location.origin);
+        } catch {
+          return null;
+        }
+      })();
+      if (!url)
+        return true;
+      if (url.origin !== location.origin)
+        return true;
+      if (target.target === "_blank")
+        return true;
+      if (target.hasAttribute("download"))
+        return true;
+      if (target.hasAttribute("data-router-ignore"))
+        return true;
+      if (base && !hashMode) {
+        if (!(url.pathname === base || url.pathname.startsWith(base + "/")))
+          return true;
+      }
+      return false;
+    };
     onClick = function(e) {
-      let dest, target, url;
+      let dest, noScroll, target, url;
       if (e.defaultPrevented)
         return;
       if (e.button !== 0 || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey)
@@ -15123,33 +15604,122 @@ ${indented}`);
       while (target && target.tagName !== "A") {
         target = target.parentElement;
       }
-      if (!target?.href)
+      if (!target)
         return;
-      url = new URL(target.href, location.origin);
-      if (url.origin !== location.origin)
-        return;
-      if (target.target === "_blank" || target.hasAttribute("data-external"))
-        return;
-      if (target.hasAttribute("download"))
+      if (shouldIgnoreAnchor(target))
         return;
-      if (target.hasAttribute("data-router-ignore"))
-        return;
-      if (base && !hashMode) {
-        if (!(url.pathname === base || url.pathname.startsWith(base + "/")))
-          return;
-      }
+      url = new URL(target.href, location.origin);
       e.preventDefault();
       dest = hashMode && url.hash ? url.hash.slice(1) || "/" : url.pathname + url.search + url.hash;
-      return router.push(dest);
+      noScroll = target.hasAttribute("data-router-noscroll");
+      return router.push(dest, { noScroll });
     };
     if (typeof document !== "undefined")
       document.addEventListener("click", onClick);
+    ownedAnchors = new WeakSet;
+    normalizeHref = function(rawPath) {
+      let p;
+      p = rawPath.split("?")[0].split("#")[0];
+      p = decodeURIComponent(p);
+      p = stripBase(p);
+      if (!(p[0] === "/"))
+        p = "/" + p;
+      if (p.length > 1 && p.endsWith("/"))
+        p = p.slice(0, -1);
+      return p;
+    };
+    currentNorm = function() {
+      let p;
+      p = hashMode ? stripBase(readUrl()).split("?")[0].split("#")[0] : _path.value.split("?")[0].split("#")[0];
+      if (!(p[0] === "/"))
+        p = "/" + p;
+      if (p.length > 1 && p.endsWith("/"))
+        p = p.slice(0, -1);
+      return p;
+    };
+    applyAria = function() {
+      let anchors, cur, desired, existing, linkPath, url;
+      if (typeof document === "undefined")
+        return;
+      cur = currentNorm();
+      anchors = document.querySelectorAll("a[href]");
+      for (let a of anchors) {
+        if (shouldIgnoreAnchor(a))
+          continue;
+        url = (() => {
+          try {
+            return new URL(a.href, location.origin);
+          } catch {
+            return null;
+          }
+        })();
+        if (!url)
+          continue;
+        linkPath = normalizeHref(url.pathname + url.search + url.hash);
+        desired = null;
+        if (linkPath === cur)
+          desired = "page";
+        if (!desired && cur !== "/" && cur.startsWith(linkPath + "/") && linkPath !== "")
+          desired = "true";
+        existing = a.getAttribute("aria-current");
+        if (desired) {
+          if (existing && !ownedAnchors.has(a)) {
+            continue;
+          }
+          a.setAttribute("aria-current", desired);
+          ownedAnchors.add(a);
+        } else if (ownedAnchors.has(a)) {
+          a.removeAttribute("aria-current");
+          ownedAnchors.delete(a);
+        }
+      }
+      return;
+    };
+    ariaObserver = null;
+    ariaScheduled = false;
+    scheduleAria = function() {
+      let cb;
+      if (ariaScheduled)
+        return;
+      ariaScheduled = true;
+      cb = function() {
+        ariaScheduled = false;
+        return applyAria();
+      };
+      return typeof window !== "undefined" && window.requestAnimationFrame ? window.requestAnimationFrame(cb) : setTimeout(cb, 0);
+    };
+    ariaEffect = __effect(function() {
+      let target;
+      if (typeof document === "undefined")
+        return;
+      currentNorm();
+      scheduleAria();
+      if (!ariaObserver) {
+        ariaObserver = new MutationObserver(function() {
+          return scheduleAria();
+        });
+        target = document.body || document.documentElement;
+        ariaObserver.observe(target, { childList: true, subtree: true });
+      }
+      return;
+    });
     router = {
-      push(url) {
-        return resolve(url) ? history.pushState(null, "", writeUrl(_normalizedUrl.read())) : undefined;
+      push(url, opts2) {
+        let prevY;
+        prevY = typeof window !== "undefined" ? window.scrollY : 0;
+        if (resolve(url)) {
+          try {
+            history.replaceState({ ...history.state || {}, _ripScroll: prevY }, "", location.href);
+          } catch {}
+          history.pushState({ _ripScroll: 0 }, "", writeUrl(_normalizedUrl.read()));
+          return !opts2?.noScroll && typeof window !== "undefined" ? window.scrollTo(0, 0) : undefined;
+        }
       },
-      replace(url) {
-        return resolve(url) ? history.replaceState(null, "", writeUrl(_normalizedUrl.read())) : undefined;
+      replace(url, opts2) {
+        if (resolve(url)) {
+          history.replaceState({ _ripScroll: 0 }, "", writeUrl(_normalizedUrl.read()));
+          return !opts2?.noScroll && typeof window !== "undefined" ? window.scrollTo(0, 0) : undefined;
+        }
       },
       back() {
         return history.back();
@@ -15182,8 +15752,16 @@ ${indented}`);
       destroy() {
         if (typeof window !== "undefined")
           window.removeEventListener("popstate", onPopState);
+        if (typeof window !== "undefined")
+          window.removeEventListener("scroll", onScroll);
         if (typeof document !== "undefined")
           document.removeEventListener("click", onClick);
+        if (prevScrollRestoration !== null && typeof history !== "undefined") {
+          history.scrollRestoration = prevScrollRestoration;
+        }
+        ariaObserver?.disconnect();
+        ariaObserver = null;
+        ariaEffect?.();
         unwatchComponents?.();
         unwatchComponents = null;
         _navigating?.dispose?.();
@@ -15226,37 +15804,35 @@ ${indented}`);
       return tree.routes;
     } });
     return router;
-  };
+  }
   arraysEqual = function(a, b) {
-    let i, item;
     if (a.length !== b.length)
       return false;
-    for (let i2 = 0;i2 < a.length; i2++) {
-      let item2 = a[i2];
-      if (item2 !== b[i2])
+    for (let i = 0;i < a.length; i++) {
+      let item = a[i];
+      if (item !== b[i])
         return false;
     }
     return true;
   };
   findComponent = function(mod) {
-    let key, val;
     if (typeof mod.default === "function" && (mod.default.prototype?.mount || mod.default.prototype?._create)) {
       return mod.default;
     }
-    for (let key2 in mod) {
-      let val2 = mod[key2];
-      if (typeof val2 === "function" && (val2.prototype?.mount || val2.prototype?._create))
-        return val2;
+    for (let key in mod) {
+      let val = mod[key];
+      if (typeof val === "function" && (val.prototype?.mount || val.prototype?._create))
+        return val;
     }
     return typeof mod.default === "function" ? mod.default : undefined;
   };
   findAllComponents = function(mod) {
-    let key, result, val;
+    let result;
     result = {};
-    for (let key2 in mod) {
-      let val2 = mod[key2];
-      if (typeof val2 === "function" && (val2.prototype?.mount || val2.prototype?._create)) {
-        result[key2] = val2;
+    for (let key in mod) {
+      let val = mod[key];
+      if (typeof val === "function" && (val.prototype?.mount || val.prototype?._create)) {
+        result[key] = val;
       }
     }
     return result;
@@ -15268,35 +15844,42 @@ ${indented}`);
       return ch.toUpperCase();
     });
   };
-  buildComponentMap = function(components, root = "components") {
-    let fileName, map, name, path;
+  buildComponentMap = function(components, roots = ["_app", "_lib", "_pkg", "_route"]) {
+    let fileName, map, name, paths, rootList;
     map = {};
-    for (let path2 of components.listAll(root)) {
-      if (!path2.endsWith(".rip"))
+    rootList = Array.isArray(roots) ? roots : [roots];
+    paths = [];
+    for (let r of rootList) {
+      for (let p of components.listAll(r)) {
+        paths.push(p);
+      }
+    }
+    for (let path of paths) {
+      if (!path.endsWith(".rip"))
         continue;
-      fileName = path2.split("/").pop();
+      fileName = path.split("/").pop();
       if (fileName.startsWith("_"))
         continue;
-      name = fileToComponentName(path2);
+      name = fileToComponentName(path);
       if (map[name]) {
-        console.warn(`[Rip] Component name collision: ${name} (${map[name]} vs ${path2})`);
+        console.warn(`[Rip] Component name collision: ${name} (${map[name]} vs ${path})`);
       }
-      map[name] = path2;
+      map[name] = path;
     }
     return map;
   };
   resolveStorePath = function(specifier, currentPath, components) {
-    let candidate, clean, parts, seg;
+    let candidate, clean, parts, storeKey;
     clean = specifier.replace(/^(\.\.\/|\.\/)+/, "");
     if (currentPath) {
       parts = currentPath.split("/");
       parts.pop();
-      for (let seg2 of specifier.split("/")) {
-        if (seg2 === "..") {
+      for (let seg of specifier.split("/")) {
+        if (seg === "..") {
           parts.pop();
         } else {
-          if (!(seg2 === ".")) {
-            parts.push(seg2);
+          if (!(seg === ".")) {
+            parts.push(seg);
           }
         }
       }
@@ -15304,14 +15887,17 @@ ${indented}`);
       if (components.exists(candidate))
         return candidate;
     }
-    if (components.exists(`components/_lib/${clean}`))
-      return `components/_lib/${clean}`;
-    if (components.exists(`components/${clean}`))
-      return `components/${clean}`;
+    if (components.exists(clean))
+      return clean;
+    for (let prefix of ["_pkg", "_lib", "_app", "_route"]) {
+      storeKey = `${prefix}/${clean}`;
+      if (components.exists(storeKey))
+        return storeKey;
+    }
     return null;
   };
   extractImportedNames = function(clause) {
-    let braceIdx, closing, inside, n, names, p, part, rest, t;
+    let braceIdx, closing, inside, names, p, rest, t;
     if (!clause)
       return [];
     rest = clause.trim();
@@ -15324,16 +15910,16 @@ ${indented}`);
       if (closing < 0)
         return names;
       inside = rest.slice(braceIdx + 1, closing);
-      for (let n2 of inside.split(",")) {
-        t = n2.trim();
+      for (let n of inside.split(",")) {
+        t = n.trim();
         if (!t)
           continue;
         names.push(t.split(/\s+as\s+/).pop().trim());
       }
       rest = rest.slice(0, braceIdx).replace(/,\s*$/, "").trim();
     }
-    for (let part2 of rest.split(",")) {
-      p = part2.trim();
+    for (let part of rest.split(",")) {
+      p = part.trim();
       if (!p)
         continue;
       if (/^\*\s+as\s+/.test(p)) {
@@ -15345,7 +15931,7 @@ ${indented}`);
     return names;
   };
   compileAndImport = async function(source, compile2, components = null, path = null, resolver = null) {
-    let anyImportRe, bindingClause, blob, blobUrl, cached, committed, debug, depMod, depPath, depSource, finalJs, found, full, header, importedNames, js, k, keyLiteral, m, matches, mod, msg, n, name, names, needed, offset, post, pre, preamble, prefixLines, previousUrl, replacement, ripImportRe, specifier, storePath, url, v;
+    let anyImportRe, bareImportRe, bindingClause, blob, blobUrl, cached, committed, debug, depMod, depSource, finalJs, found, full, header, importedNames, js, keyLiteral, matches, mod, msg, names, needed, offset, pkgMap, post, pre, preamble, prefixLines, previousUrl, replacement, ripImportRe, specifier, storePath, url;
     if (components && path) {
       cached = components.getCompiled(path);
       if (cached)
@@ -15362,12 +15948,24 @@ ${indented}`);
         js = debug ? compile2(source, { sourceMap: "inline", filename: path }) : compile2(source);
         if (resolver) {
           importedNames = new Set;
+          pkgMap = resolver.packages || {};
+          if (Object.keys(pkgMap).length > 0) {
+            bareImportRe = /^(\s*import\s+(?:.*?\s+from\s+)?['"])(@rip-lang\/[^\/'"]+)((?:\/[^'"]*)?)(['"];?\s*)$/gm;
+            js = js.replace(bareImportRe, function(full2, pre2, pkgKey, sub, post2) {
+              let info, target;
+              info = pkgMap[pkgKey];
+              if (!info)
+                return full2;
+              target = !sub ? `_pkg/${info.short}/${info.entry}` : sub.endsWith(".rip") ? `_pkg/${info.short}${sub}` : `_pkg/${info.short}${sub}.rip`;
+              return `${pre2}${target}${post2}`;
+            });
+          }
           if (components) {
             ripImportRe = /^(\s*import\s+(?:(.*?)\s+from\s+)?['"])([^'"]*\.rip)(['"];?\s*)$/gm;
             matches = Array.from(js.matchAll(ripImportRe));
             for (let _i = matches.length - 1;_i >= 0; _i--) {
-              let m2 = matches[_i];
-              [full, pre, bindingClause, specifier, post] = m2;
+              let m = matches[_i];
+              [full, pre, bindingClause, specifier, post] = m;
               storePath = resolveStorePath(specifier, path, components);
               if (storePath === path)
                 continue;
@@ -15389,38 +15987,38 @@ ${indented}`);
               blobUrl = resolver.blobUrls?.[storePath];
               if (blobUrl) {
                 replacement = `${pre}${blobUrl}${post}`;
-                js = js.slice(0, m2.index) + replacement + js.slice(m2.index + full.length);
-                for (let n2 of extractImportedNames(bindingClause)) {
-                  importedNames.add(n2);
+                js = js.slice(0, m.index) + replacement + js.slice(m.index + full.length);
+                for (let n of extractImportedNames(bindingClause)) {
+                  importedNames.add(n);
                 }
               }
             }
           }
           anyImportRe = /^\s*import\s+(?:(.*?)\s+from\s+)?['"][^'"]*['"];?\s*$/gm;
-          for (let m2 of js.matchAll(anyImportRe)) {
-            for (let n2 of extractImportedNames(m2[1])) {
-              importedNames.add(n2);
+          for (let m of js.matchAll(anyImportRe)) {
+            for (let n of extractImportedNames(m[1])) {
+              importedNames.add(n);
             }
           }
           needed = {};
-          for (let name2 in resolver.map) {
-            let depPath2 = resolver.map[name2];
-            if (importedNames.has(name2))
+          for (let name in resolver.map) {
+            let depPath = resolver.map[name];
+            if (importedNames.has(name))
               continue;
-            if (depPath2 !== path && js.includes(`new ${name2}(`)) {
-              if (!resolver.classes[name2]) {
-                depSource = components.read(depPath2);
+            if (depPath !== path && js.includes(`new ${name}(`)) {
+              if (!resolver.classes[name]) {
+                depSource = components.read(depPath);
                 if (depSource) {
-                  depMod = await compileAndImport(depSource, compile2, components, depPath2, resolver);
+                  depMod = await compileAndImport(depSource, compile2, components, depPath, resolver);
                   found = findAllComponents(depMod);
-                  for (let k2 in found) {
-                    let v2 = found[k2];
-                    resolver.classes[k2] = v2;
+                  for (let k in found) {
+                    let v = found[k];
+                    resolver.classes[k] = v;
                   }
                 }
               }
-              if (resolver.classes[name2])
-                needed[name2] = true;
+              if (resolver.classes[name])
+                needed[name] = true;
             }
           }
           names = Object.keys(needed);
@@ -15459,9 +16057,9 @@ ${indented}`);
         committed = true;
         if (resolver) {
           found = findAllComponents(mod);
-          for (let k2 in found) {
-            let v2 = found[k2];
-            resolver.classes[k2] = v2;
+          for (let k in found) {
+            let v = found[k];
+            resolver.classes[k] = v;
           }
         }
         if (components && path)
@@ -15483,7 +16081,7 @@ ${indented}`);
       }
     })();
   };
-  var createRenderer = function(opts = {}) {
+  function createRenderer(opts) {
     let app, compile2, components, container, currentComponent, currentLayouts, currentParams, currentQuery, currentRoute, disposeEffect, generation, invalidateResolver, layoutInstances, mountPoint, mountRoute, onError, renderer, resolver, router, sameKeys, started, target, unmount, unmountCurrent, unwatchSources;
     assertBrowser("createRenderer");
     ({ router, app, components, resolver, compile: compile2, target, onError } = opts);
@@ -15504,7 +16102,6 @@ ${indented}`);
     disposeEffect = null;
     unwatchSources = null;
     invalidateResolver = function(path) {
-      let depPath, name;
       if (!resolver)
         return;
       if (resolver.blobUrls?.[path]) {
@@ -15515,9 +16112,9 @@ ${indented}`);
       }
       return resolver.classes && resolver.map ? (() => {
         const result = [];
-        for (let name2 in resolver.map) {
-          let depPath2 = resolver.map[name2];
-          result.push(depPath2 === path ? delete resolver.classes[name2] : undefined);
+        for (let name in resolver.map) {
+          let depPath = resolver.map[name];
+          result.push(depPath === path ? delete resolver.classes[name] : undefined);
         }
         return result;
       })() : undefined;
@@ -15534,12 +16131,11 @@ ${indented}`);
       }
     };
     unmount = function() {
-      let inst;
       unmountCurrent();
       for (let _i = layoutInstances.length - 1;_i >= 0; _i--) {
-        let inst2 = layoutInstances[_i];
+        let inst = layoutInstances[_i];
         try {
-          inst2.unmount?.({ removeDOM: true });
+          inst.unmount?.({ removeDOM: true });
         } catch (e) {
           console.error("[Rip] layout unmount error:", e);
         }
@@ -15551,20 +16147,19 @@ ${indented}`);
       return currentLayouts = [];
     };
     sameKeys = function(a, b) {
-      let k, v;
       if (!(a && b))
         return false;
       if (Object.keys(a).length !== Object.keys(b).length)
         return false;
-      for (let k2 in a) {
-        let v2 = a[k2];
-        if (!(b[k2] === v2))
+      for (let k in a) {
+        let v = a[k];
+        if (!(b[k] === v))
           return false;
       }
       return true;
     };
     mountRoute = async function(info, force = false) {
-      let Component, LayoutClass, __innerPrev, __pop, __prev, __push, gen2, handled, inst, instance, layoutFile, layoutFiles, layoutMod, layoutSource, layoutsChanged, mod, mp, oldTarget, outerScope, pageParent, pagePrev, pageWrapper, params, pre, prevScope, query, route, sameRoute, slot, source, wrapper;
+      let Component, LayoutClass, __innerPrev, __pop, __prev, __push, gen2, handled, inst, instance, layoutFiles, layoutMod, layoutSource, layoutsChanged, mod, mp, oldTarget, outerScope, pageParent, pagePrev, pageWrapper, params, pre, prevScope, query, route, sameRoute, slot, source, wrapper;
       ({ route, params, layouts: layoutFiles, query } = info);
       if (!route)
         return;
@@ -15623,11 +16218,11 @@ ${indented}`);
             __push = globalThis.__ripComponent?.__pushComponent;
             __pop = globalThis.__ripComponent?.__popComponent;
             outerScope = null;
-            for (let layoutFile2 of layoutFiles) {
-              layoutSource = components.read(layoutFile2);
+            for (let layoutFile of layoutFiles) {
+              layoutSource = components.read(layoutFile);
               if (!layoutSource)
                 continue;
-              layoutMod = await compileAndImport(layoutSource, compile2, components, layoutFile2, resolver);
+              layoutMod = await compileAndImport(layoutSource, compile2, components, layoutFile, resolver);
               if (gen2 !== generation) {
                 router.navigating = false;
                 return;
@@ -15650,7 +16245,7 @@ ${indented}`);
                 }
               }
               wrapper = document.createElement("div");
-              wrapper.setAttribute("data-layout", layoutFile2);
+              wrapper.setAttribute("data-layout", layoutFile);
               mp.appendChild(wrapper);
               inst.mount(wrapper);
               layoutInstances.push(inst);
@@ -15741,7 +16336,6 @@ ${indented}`);
         return renderer;
       },
       stop() {
-        let _, url;
         if (!started)
           return;
         started = false;
@@ -15753,12 +16347,12 @@ ${indented}`);
         unwatchSources?.();
         unwatchSources = null;
         if (resolver?.blobUrls) {
-          for (let _2 in resolver.blobUrls) {
-            if (!Object.hasOwn(resolver.blobUrls, _2))
+          for (let _ in resolver.blobUrls) {
+            if (!Object.hasOwn(resolver.blobUrls, _))
               continue;
-            let url2 = resolver.blobUrls[_2];
+            let url = resolver.blobUrls[_];
             try {
-              URL.revokeObjectURL(url2);
+              URL.revokeObjectURL(url);
             } catch {}
           }
           resolver.blobUrls = {};
@@ -15773,7 +16367,7 @@ ${indented}`);
       }
     };
     return renderer;
-  };
+  }
   connectWatch = function(url) {
     let closed, connect, es, maxDelay, retryDelay, retryTimer;
     assertBrowser("connectWatch");
@@ -15795,12 +16389,13 @@ ${indented}`);
         return location.reload();
       });
       es.addEventListener("css", function() {
-        let cssUrl, link;
+        let cssUrl, sheets;
+        sheets = document.querySelectorAll('link[rel="stylesheet"]');
         const _result = [];
-        for (let link2 of document.querySelectorAll('link[rel="stylesheet"]')) {
-          cssUrl = new URL(link2.href);
+        for (let link of sheets) {
+          cssUrl = new URL(link.href);
           cssUrl.searchParams.set("_t", Date.now());
-          link2.href = cssUrl.toString();
+          link.href = cssUrl.toString();
         }
         return _result;
       });
@@ -15826,8 +16421,8 @@ ${indented}`);
       return es = null;
     };
   };
-  var launch = async function(opts = {}) {
-    let app, appBase, appComponents, bundle, cached, classesKey, compile2, destroy, destroyed, el, etag, etagKey, hash, headers, k, persist, persistDisposer, renderer, res, resolver, router, seedData, stashMod, stashPath, stashRaw, stashSource, target, v, watchDisposer;
+  async function launch(opts = {}) {
+    let app, appBase, appComponents, bundle, cached, classesKey, compile2, destroy, destroyed, el, etag, etagKey, hash, headers, persist, persistDisposer, renderer, res, resolver, router, seedData, stashMod, stashPath, stashRaw, stashSource, target, watchDisposer, win;
     assertBrowser("launch");
     appBase = (opts.base || "").replace(/\/+$/, "");
     target = opts.target || "#app";
@@ -15866,16 +16461,16 @@ ${indented}`);
     } else {
       throw new Error("launch: no bundle or bundleUrl provided");
     }
-    app = stash({ components: {}, routes: {}, data: {} });
+    app = createStash({ components: {}, routes: {}, data: {} });
     globalThis.__ripApp = app;
     appComponents = createComponents();
-    if (bundle.components)
-      appComponents.load(bundle.components);
+    if (bundle.modules)
+      appComponents.load(bundle.modules);
     classesKey = `__rip_${appBase.replace(/\//g, "_") || "app"}`;
-    resolver = { map: buildComponentMap(appComponents), classes: {}, key: classesKey };
+    resolver = { map: buildComponentMap(appComponents), classes: {}, key: classesKey, packages: bundle.packages || {} };
     globalThis[classesKey] = resolver.classes;
     stashRaw = null;
-    stashPath = "components/_lib/stash.rip";
+    stashPath = "_app/stash.rip";
     if (appComponents.exists(stashPath)) {
       stashSource = appComponents.read(stashPath);
       if (stashSource) {
@@ -15889,9 +16484,9 @@ ${indented}`);
       }
     }
     if (stashRaw && bundle.data) {
-      for (let k2 in bundle.data) {
-        let v2 = bundle.data[k2];
-        stashRaw[k2] = v2;
+      for (let k in bundle.data) {
+        let v = bundle.data[k];
+        stashRaw[k] = v;
       }
     }
     seedData = stashRaw ?? bundle.data;
@@ -15907,7 +16502,7 @@ ${indented}`);
     if (app.data.title)
       document.title = app.data.title;
     router = createRouter(appComponents, {
-      root: "components",
+      root: "_route",
       base: appBase,
       hash,
       onError(err) {
@@ -15930,6 +16525,7 @@ ${indented}`);
     if (bundle.data?.watch) {
       watchDisposer = connectWatch(`${appBase}/watch`);
     }
+    win = window;
     destroyed = false;
     destroy = function() {
       if (destroyed)
@@ -15942,16 +16538,16 @@ ${indented}`);
       delete globalThis[classesKey];
       delete globalThis.__ripApp;
       delete globalThis.__ripLaunched;
-      if (window.app === app) {
-        delete window.app;
+      if (win.app === app) {
+        delete win.app;
       }
-      return window.__RIP__?.app === app ? delete window.__RIP__ : undefined;
+      return win.__RIP__?.app === app ? delete win.__RIP__ : undefined;
     };
-    window.app = app;
-    window.__RIP__ = { app, components: appComponents, router, renderer, resolver, destroy, version: "0.3.0" };
+    win.app = app;
+    win.__RIP__ = { app, components: appComponents, router, renderer, resolver, destroy, version: "0.3.0" };
     globalThis.__ripLaunched = true;
     return { app, components: appComponents, router, renderer, destroy };
-  };
+  }
   _ariaNAV = function(e, fn) {
     if (!fn)
       return;
@@ -16283,10 +16879,11 @@ ${indented}`);
   _ariaTrapFocus = function(panel) {
     let handler;
     handler = function(e) {
-      let first, last, list;
+      let first, last, list, nodes;
       if (!(e.key === "Tab"))
         return;
-      list = Array.from(panel.querySelectorAll(_FOCUSABLE)).filter(function(f) {
+      nodes = panel.querySelectorAll(_FOCUSABLE);
+      list = Array.from(nodes).filter(function(f) {
         return f.offsetParent !== null;
       });
       if (!list.length)
@@ -16371,10 +16968,9 @@ ${indented}`);
   };
   _ARIA_POSITION_OWNED = ["position", "inset", "top", "right", "bottom", "left", "margin", "marginTop", "marginRight", "marginBottom", "marginLeft", "transform", "minWidth", "positionAnchor", "positionArea", "positionTry", "positionVisibility"];
   _ariaResetPositionStyles = function(el) {
-    let prop;
     const _result = [];
-    for (let prop2 of _ARIA_POSITION_OWNED) {
-      _result.push(el.style[prop2] = "");
+    for (let prop of _ARIA_POSITION_OWNED) {
+      _result.push(el.style[prop] = "");
     }
     return _result;
   };
@@ -16472,12 +17068,11 @@ ${indented}`);
   };
   _ariaCombine = function(...disposers) {
     return function() {
-      let d;
       const _result = [];
-      for (let d2 of disposers) {
+      for (let d of disposers) {
         _result.push((() => {
           try {
-            return d2?.();
+            return d?.();
           } catch {
             return null;
           }