@rivetjs/typescript-plugin 0.1.0-alpha.0 → 0.1.0-alpha.1

package/dist/index.cjs

@@ -24,15 +24,15 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 var import_node_fs5 = require("node:fs");
-var import_node_path6 = require("node:path");
+var import_node_path7 = require("node:path");
 
 // libs/language-core/index.ts
-var import_node_path5 = require("node:path");
+var import_node_path6 = require("node:path");
 
 // libs/compiler/codes.json
 var codes_default = {
   $comment: "Rivet diagnostic code registry. Compiler codes are assigned in rust/src/diagnostics.rs (tests/codes.test.ts keeps both in sync); language-service codes (RV2101, RV3101, RV7101, RV7102) in libs/language-core. Codes are never reused; retired codes stay listed. `docs` per code = the docs base + code (placeholder origin until the docs site is published).",
-  docs: "https://rivetjs.dev/errors/",
+  docs: "https://rivetjs.severyn.pro/errors/",
   ranges: {
     RV1: "syntax / JSX / attributes",
     RV2: "resume",
@@ -63,418 +63,460 @@ var codes_default = {
       code: "RV1000",
       severity: "error",
       title: "Parse error",
-      docs: "https://rivetjs.dev/errors/RV1000"
+      docs: "https://rivetjs.severyn.pro/errors/RV1000"
     },
     {
       code: "RV1001",
       severity: "error",
       title: "Spread attributes (retired: spreads compile)",
       retired: true,
-      docs: "https://rivetjs.dev/errors/RV1001"
+      docs: "https://rivetjs.severyn.pro/errors/RV1001"
     },
     {
       code: "RV1002",
       severity: "error",
       title: "Spread children are not supported",
-      docs: "https://rivetjs.dev/errors/RV1002"
+      docs: "https://rivetjs.severyn.pro/errors/RV1002"
     },
     {
       code: "RV1003",
       severity: "error",
       title: "Unsupported namespaced tag",
-      docs: "https://rivetjs.dev/errors/RV1003"
+      docs: "https://rivetjs.severyn.pro/errors/RV1003"
     },
     {
       code: "RV1004",
       severity: "error",
       title: "Unsupported native tag",
-      docs: "https://rivetjs.dev/errors/RV1004"
+      docs: "https://rivetjs.severyn.pro/errors/RV1004"
     },
     {
       code: "RV1005",
       severity: "error",
       title: "Parser-repaired native nesting",
-      docs: "https://rivetjs.dev/errors/RV1005"
+      docs: "https://rivetjs.severyn.pro/errors/RV1005"
     },
     {
       code: "RV1006",
       severity: "error",
       title: "Text directly in table structure",
-      docs: "https://rivetjs.dev/errors/RV1006"
+      docs: "https://rivetjs.severyn.pro/errors/RV1006"
     },
     {
       code: "RV1007",
       severity: "error",
       title: "<script> / <style> JSX content",
-      docs: "https://rivetjs.dev/errors/RV1007"
+      docs: "https://rivetjs.severyn.pro/errors/RV1007"
     },
     {
       code: "RV1008",
       severity: "error",
       title: "Void element with children",
-      docs: "https://rivetjs.dev/errors/RV1008"
+      docs: "https://rivetjs.severyn.pro/errors/RV1008"
     },
     {
       code: "RV1009",
       severity: "error",
       title: "Textarea model with children",
-      docs: "https://rivetjs.dev/errors/RV1009"
+      docs: "https://rivetjs.severyn.pro/errors/RV1009"
     },
     {
       code: "RV1010",
       severity: "error",
       title: "Textarea / title children must be scalar text",
-      docs: "https://rivetjs.dev/errors/RV1010"
+      docs: "https://rivetjs.severyn.pro/errors/RV1010"
     },
     {
       code: "RV1011",
       severity: "error",
       title: "Unsupported model binding",
-      docs: "https://rivetjs.dev/errors/RV1011"
+      docs: "https://rivetjs.severyn.pro/errors/RV1011"
     },
     {
       code: "RV1012",
       severity: "error",
       title: "Unknown native event",
-      docs: "https://rivetjs.dev/errors/RV1012"
+      docs: "https://rivetjs.severyn.pro/errors/RV1012"
     },
     {
       code: "RV1013",
       severity: "error",
       title: "Unsupported global event attribute",
-      docs: "https://rivetjs.dev/errors/RV1013"
+      docs: "https://rivetjs.severyn.pro/errors/RV1013"
     },
     {
       code: "RV1014",
       severity: "error",
       title: "Structural prop passes a value instead of an accessor (retired: component props are live, each={xs()} / when={on()} update)",
       retired: true,
-      docs: "https://rivetjs.dev/errors/RV1014"
+      docs: "https://rivetjs.severyn.pro/errors/RV1014"
     },
     {
       code: "RV1015",
       severity: "error",
       title: "Event handler is a literal (string / number / boolean), not a function",
-      docs: "https://rivetjs.dev/errors/RV1015"
+      docs: "https://rivetjs.severyn.pro/errors/RV1015"
     },
     {
       code: "RV1016",
       severity: "error",
       title: "Event handler reads state when it binds (handlers bind once; wrap it in an arrow)",
-      docs: "https://rivetjs.dev/errors/RV1016"
+      docs: "https://rivetjs.severyn.pro/errors/RV1016"
     },
     {
       code: "RV1101",
       severity: "error",
       title: "Unsafe or unsupported native attribute / URL",
-      docs: "https://rivetjs.dev/errors/RV1101"
+      docs: "https://rivetjs.severyn.pro/errors/RV1101"
     },
     {
       code: "RV1102",
       severity: "error",
       title: "Invalid preload directive value",
-      docs: "https://rivetjs.dev/errors/RV1102"
+      docs: "https://rivetjs.severyn.pro/errors/RV1102"
     },
     {
       code: "RV1103",
       severity: "error",
       title: "Invalid clientEvent target",
-      docs: "https://rivetjs.dev/errors/RV1103"
+      docs: "https://rivetjs.severyn.pro/errors/RV1103"
     },
     {
       code: "RV2001",
       severity: "error",
       title: "Browser global read during server rendering (resume)",
-      docs: "https://rivetjs.dev/errors/RV2001"
+      docs: "https://rivetjs.severyn.pro/errors/RV2001"
     },
     {
       code: "RV2002",
       severity: "error",
       title: "Resumable ref callback must assign a local",
-      docs: "https://rivetjs.dev/errors/RV2002"
+      docs: "https://rivetjs.severyn.pro/errors/RV2002"
     },
     {
       code: "RV2003",
       severity: "error",
       title: "Captured class instance is not serializable",
-      docs: "https://rivetjs.dev/errors/RV2003"
+      docs: "https://rivetjs.severyn.pro/errors/RV2003"
     },
     {
       code: "RV2004",
       severity: "error",
       title: "Capture-phase handlers are not resumable (retired: onXCapture resumes)",
       retired: true,
-      docs: "https://rivetjs.dev/errors/RV2004"
+      docs: "https://rivetjs.severyn.pro/errors/RV2004"
     },
     {
       code: "RV2005",
       severity: "error",
       title: "Ref-bound local assigned outside ref callbacks",
-      docs: "https://rivetjs.dev/errors/RV2005"
+      docs: "https://rivetjs.severyn.pro/errors/RV2005"
     },
     {
       code: "RV2006",
       severity: "error",
       title: "JSX inside handlers, effects and computeds",
-      docs: "https://rivetjs.dev/errors/RV2006"
+      docs: "https://rivetjs.severyn.pro/errors/RV2006"
     },
     {
       code: "RV2007",
       severity: "error",
       title: "Resumable code captures `this`",
-      docs: "https://rivetjs.dev/errors/RV2007"
+      docs: "https://rivetjs.severyn.pro/errors/RV2007"
     },
     {
       code: "RV2008",
       severity: "error",
       title: "Resumed module exports a different binding under a captured name",
-      docs: "https://rivetjs.dev/errors/RV2008"
+      docs: "https://rivetjs.severyn.pro/errors/RV2008"
     },
     {
       code: "RV2009",
       severity: "error",
       title: "Two module references share a browser name",
-      docs: "https://rivetjs.dev/errors/RV2009"
+      docs: "https://rivetjs.severyn.pro/errors/RV2009"
     },
     {
       code: "RV2010",
       severity: "error",
       title: "One module reference id resolves to two installed copies (Vite build)",
-      docs: "https://rivetjs.dev/errors/RV2010"
+      docs: "https://rivetjs.severyn.pro/errors/RV2010"
     },
     {
       code: "RV2011",
       severity: "error",
       title: "Mutually recursive functions separated by an early exit (resume)",
-      docs: "https://rivetjs.dev/errors/RV2011"
+      docs: "https://rivetjs.severyn.pro/errors/RV2011"
     },
     {
       code: "RV2012",
       severity: "error",
       title: "`.bind` with a spread first argument (resume; a warning when the receiver may be an object with its own `bind`)",
-      docs: "https://rivetjs.dev/errors/RV2012"
+      docs: "https://rivetjs.severyn.pro/errors/RV2012"
     },
     {
       code: "RV2013",
       severity: "warning",
       title: "`.bind` of a value Rivet cannot resume (resume; an error when it is provably a function)",
-      docs: "https://rivetjs.dev/errors/RV2013"
+      docs: "https://rivetjs.severyn.pro/errors/RV2013"
     },
     {
       code: "RV2014",
       severity: "warning",
       title: "`.bind(\u2026)` inside an object literal a resumable closure reaches (resume)",
-      docs: "https://rivetjs.dev/errors/RV2014"
+      docs: "https://rivetjs.severyn.pro/errors/RV2014"
     },
     {
       code: "RV2015",
       severity: "warning",
       title: "Component returns a function that cannot resume: anonymous default export or wrapper call (resume)",
-      docs: "https://rivetjs.dev/errors/RV2015"
+      docs: "https://rivetjs.severyn.pro/errors/RV2015"
+    },
+    {
+      code: "RV2016",
+      severity: "warning",
+      title: "`resource()` in a form that cannot resume: destructured, a `let`, not a `const` initializer, or inside a hook (resume)",
+      docs: "https://rivetjs.severyn.pro/errors/RV2016"
     },
     {
       code: "RV2101",
       severity: "warning",
       title: "Captured value not serializable (type-aware, language service)",
-      docs: "https://rivetjs.dev/errors/RV2101"
+      docs: "https://rivetjs.severyn.pro/errors/RV2101"
     },
     {
       code: "RV2102",
       severity: "error",
       title: "Captured class instance cannot resume as data (private field, decorator, non-data base or resource); at render: [serialize] without static [revive]",
-      docs: "https://rivetjs.dev/errors/RV2102"
+      docs: "https://rivetjs.severyn.pro/errors/RV2102"
+    },
+    {
+      code: "RV2103",
+      severity: "error",
+      title: "Render is not deterministic under the derived resume model (Date.now / Math.random / performance.now / crypto.randomUUID / new Date() while rendering a boundary)",
+      docs: "https://rivetjs.severyn.pro/errors/RV2103"
+    },
+    {
+      code: "RV2104",
+      severity: "warning",
+      title: "Keyed state (signal / createStore) created in a loop under the derived resume model",
+      docs: "https://rivetjs.severyn.pro/errors/RV2104"
+    },
+    {
+      code: "RV2105",
+      severity: "warning",
+      title: "Keyed `For` row renders non-deterministically (Date.now / Math.random / performance.now / crypto.randomUUID / getRandomValues / Date() / new Date()): its rows stay recorded instead of lazy (resume)",
+      docs: "https://rivetjs.severyn.pro/errors/RV2105"
+    },
+    {
+      code: "RV2106",
+      severity: "warning",
+      title: "Keyed `For` row holds a site a lazy row cannot replay (clientOnly / Async / Portal / a ref into a local outside the row): its rows stay recorded (resume)",
+      docs: "https://rivetjs.severyn.pro/errors/RV2106"
     },
     {
       code: "RV2145",
       severity: "error",
       title: "A module is claimed by both the Rivet compiler and a framework bridge, or by two bridges (Vite build)",
-      docs: "https://rivetjs.dev/errors/RV2145"
+      docs: "https://rivetjs.severyn.pro/errors/RV2145"
     },
     {
       code: "RV2146",
       severity: "warning",
       title: "Non-component export of a framework module used in browser code of a Rivet module (Vite build)",
-      docs: "https://rivetjs.dev/errors/RV2146"
+      docs: "https://rivetjs.severyn.pro/errors/RV2146"
     },
     {
       code: "RV2148",
       severity: "error",
       title: "A module owned by a framework bridge uses the Rivet runtime (Vite build)",
-      docs: "https://rivetjs.dev/errors/RV2148"
+      docs: "https://rivetjs.severyn.pro/errors/RV2148"
     },
     {
       code: "RV2149",
       severity: "warning",
       title: "A framework island recovered from a hydration error by rendering on the client (browser)",
-      docs: "https://rivetjs.dev/errors/RV2149"
+      docs: "https://rivetjs.severyn.pro/errors/RV2149"
     },
     {
       code: "RV2150",
       severity: "error",
       title: "The installed Preact no longer reads the island useId mask: Preact island ids would not be unique (server)",
-      docs: "https://rivetjs.dev/errors/RV2150"
+      docs: "https://rivetjs.severyn.pro/errors/RV2150"
     },
     {
       code: "RV3001",
       severity: "error",
       title: "Target helper re-exports",
-      docs: "https://rivetjs.dev/errors/RV3001"
+      docs: "https://rivetjs.severyn.pro/errors/RV3001"
     },
     {
       code: "RV3002",
       severity: "error",
       title: "Target helper / runtime namespace imports",
-      docs: "https://rivetjs.dev/errors/RV3002"
+      docs: "https://rivetjs.severyn.pro/errors/RV3002"
     },
     {
       code: "RV3003",
       severity: "error",
       title: "Structural helper namespace imports",
-      docs: "https://rivetjs.dev/errors/RV3003"
+      docs: "https://rivetjs.severyn.pro/errors/RV3003"
     },
     {
       code: "RV3004",
       severity: "error",
       title: "Structural helper aliases",
-      docs: "https://rivetjs.dev/errors/RV3004"
+      docs: "https://rivetjs.severyn.pro/errors/RV3004"
     },
     {
       code: "RV3005",
       severity: "error",
       title: "Server clientOnly must be called directly",
-      docs: "https://rivetjs.dev/errors/RV3005"
+      docs: "https://rivetjs.severyn.pro/errors/RV3005"
     },
     {
       code: "RV3006",
       severity: "error",
       title: "Server clientOnly erasure shape",
-      docs: "https://rivetjs.dev/errors/RV3006"
+      docs: "https://rivetjs.severyn.pro/errors/RV3006"
     },
     {
       code: "RV3007",
       severity: "error",
-      title: "Route module server export shape",
-      docs: "https://rivetjs.dev/errors/RV3007"
+      title: "Route module server export shape (own statement, wrapper position, duplicate kind, export *)",
+      docs: "https://rivetjs.severyn.pro/errors/RV3007"
     },
     {
       code: "RV3008",
       severity: "error",
       title: "Server-only code referenced by browser code",
-      docs: "https://rivetjs.dev/errors/RV3008"
+      docs: "https://rivetjs.severyn.pro/errors/RV3008"
     },
     {
       code: "RV3009",
       severity: "error",
       title: "Server-only code renders JSX in a resumed route module",
-      docs: "https://rivetjs.dev/errors/RV3009"
+      docs: "https://rivetjs.severyn.pro/errors/RV3009"
+    },
+    {
+      code: "RV3010",
+      severity: "error",
+      title: "Untagged server export: a former magic export name without its wrapper call",
+      docs: "https://rivetjs.severyn.pro/errors/RV3010"
+    },
+    {
+      code: "RV3011",
+      severity: "error",
+      title: "Server-only module reached from client-rendered code (router build)",
+      docs: "https://rivetjs.severyn.pro/errors/RV3011"
     },
     {
       code: "RV3101",
       severity: "warning",
       title: "Link matches no route (language service)",
-      docs: "https://rivetjs.dev/errors/RV3101"
+      docs: "https://rivetjs.severyn.pro/errors/RV3101"
     },
     {
       code: "RV4001",
       severity: "error",
       title: "Unknown message key / prefix",
-      docs: "https://rivetjs.dev/errors/RV4001"
+      docs: "https://rivetjs.severyn.pro/errors/RV4001"
     },
     {
       code: "RV4002",
       severity: "error",
       title: "Unknown or missing message param",
-      docs: "https://rivetjs.dev/errors/RV4002"
+      docs: "https://rivetjs.severyn.pro/errors/RV4002"
     },
     {
       code: "RV4003",
       severity: "error",
       title: "Static call arguments",
-      docs: "https://rivetjs.dev/errors/RV4003"
+      docs: "https://rivetjs.severyn.pro/errors/RV4003"
     },
     {
       code: "RV4004",
       severity: "error",
       title: "Message tags",
-      docs: "https://rivetjs.dev/errors/RV4004"
+      docs: "https://rivetjs.severyn.pro/errors/RV4004"
     },
     {
       code: "RV4005",
       severity: "error",
       title: "Static call configuration",
-      docs: "https://rivetjs.dev/errors/RV4005"
+      docs: "https://rivetjs.severyn.pro/errors/RV4005"
     },
     {
       code: "RV5001",
       severity: "error",
       title: "css`` syntax",
-      docs: "https://rivetjs.dev/errors/RV5001"
+      docs: "https://rivetjs.severyn.pro/errors/RV5001"
     },
     {
       code: "RV5002",
       severity: "error",
       title: "css`` usage (declaration, interpolation, unknown or written class)",
-      docs: "https://rivetjs.dev/errors/RV5002"
+      docs: "https://rivetjs.severyn.pro/errors/RV5002"
     },
     {
       code: "RV5003",
       severity: "error",
       title: "Invalid or unsafe class / style attribute value",
-      docs: "https://rivetjs.dev/errors/RV5003"
+      docs: "https://rivetjs.severyn.pro/errors/RV5003"
     },
     {
       code: "RV6001",
       severity: "error",
       title: "<slot> outside a component or without its props parameter",
-      docs: "https://rivetjs.dev/errors/RV6001"
+      docs: "https://rivetjs.severyn.pro/errors/RV6001"
     },
     {
       code: "RV6002",
       severity: "error",
       title: "Invalid r:name / r:args",
-      docs: "https://rivetjs.dev/errors/RV6002"
+      docs: "https://rivetjs.severyn.pro/errors/RV6002"
     },
     {
       code: "RV6003",
       severity: "error",
       title: "Invalid r:slot usage",
-      docs: "https://rivetjs.dev/errors/RV6003"
+      docs: "https://rivetjs.severyn.pro/errors/RV6003"
     },
     {
       code: "RV6004",
       severity: "error",
       title: "Slot content passed twice",
-      docs: "https://rivetjs.dev/errors/RV6004"
+      docs: "https://rivetjs.severyn.pro/errors/RV6004"
     },
     {
       code: "RV7001",
       severity: "error",
       title: "Invalid compiler option",
-      docs: "https://rivetjs.dev/errors/RV7001"
+      docs: "https://rivetjs.severyn.pro/errors/RV7001"
     },
     {
       code: "RV7101",
       severity: "error",
       title: "Editor manifest (.rivet/editor.json) missing (rivet check)",
-      docs: "https://rivetjs.dev/errors/RV7101"
+      docs: "https://rivetjs.severyn.pro/errors/RV7101"
     },
     {
       code: "RV7102",
       severity: "warning",
       title: "Editor manifest (.rivet/editor.json) stale (rivet check)",
-      docs: "https://rivetjs.dev/errors/RV7102"
+      docs: "https://rivetjs.severyn.pro/errors/RV7102"
     },
     {
       code: "RV9000",
       severity: "error",
       title: "Unclassified compiler error",
-      docs: "https://rivetjs.dev/errors/RV9000"
+      docs: "https://rivetjs.severyn.pro/errors/RV9000"
     },
     {
       code: "RV9001",
       severity: "error",
       title: "Internal compiler error (incl. compiler panic)",
-      docs: "https://rivetjs.dev/errors/RV9001"
+      docs: "https://rivetjs.severyn.pro/errors/RV9001"
     }
   ]
 };
@@ -530,7 +572,7 @@ function routeCompletion(route) {
 }
 
 // libs/language-core/links.ts
-var LINK_MODULES = ["@rivetjs/router", "@rivetjs/router/client"];
+var LINK_MODULES = ["@rivetjs/router", "@rivetjs/router/client", "@rivetjs/router/link"];
 function narrowed(ts, type) {
   if (!type) return false;
   const members = type.isUnion() ? type.types : [type];
@@ -659,8 +701,88 @@ function manifestStatus(root) {
   return { status: "ok" };
 }
 
+// libs/language-core/server-exports.ts
+var import_node_path2 = require("node:path");
+var ROUTER = "@rivetjs/router";
+var MAGIC_SERVER_EXPORTS = {
+  serverLoad: { wrapper: "load", name: "loader", argument: "(event) => \u2026" },
+  serverGuard: { wrapper: "guard", name: "access", argument: "(event) => \u2026" },
+  serverActions: { wrapper: "actions", name: "forms", argument: "{ name: (event) => \u2026 }" },
+  serverEntries: { wrapper: "entries", name: "paths", argument: "() => [\u2026]" },
+  serverHeaders: { wrapper: "headers", name: "responseHeaders", argument: "(event) => ({ \u2026 })" },
+  onRequest: { wrapper: "onRequest", name: "middleware", argument: "(event) => \u2026" },
+  onGet: { wrapper: "onGet", name: "GET", argument: "(event) => \u2026" },
+  onPost: { wrapper: "onPost", name: "POST", argument: "(event) => \u2026" },
+  onPut: { wrapper: "onPut", name: "PUT", argument: "(event) => \u2026" },
+  onPatch: { wrapper: "onPatch", name: "PATCH", argument: "(event) => \u2026" },
+  onDelete: { wrapper: "onDelete", name: "DELETE", argument: "(event) => \u2026" },
+  onOptions: { wrapper: "onOptions", name: "OPTIONS", argument: "(event) => \u2026" }
+};
+function untaggedMessage(name) {
+  const magic = MAGIC_SERVER_EXPORTS[name];
+  if (!magic) return void 0;
+  return `Untagged server export \`${name}\`: route server code is a wrapper call \u2014 \`export const ${magic.name} = ${magic.wrapper}(${magic.argument})\` with \`import { ${magic.wrapper} } from "${ROUTER}"\``;
+}
+function isRouteModule(root, routesDir, fileName) {
+  if (!routesDir || !/\.[cm]?[jt]sx?$/.test(fileName) || /\.d\.[cm]?ts$/.test(fileName)) return false;
+  const path = (0, import_node_path2.relative)((0, import_node_path2.join)(root, routesDir), fileName);
+  return path !== "" && !path.startsWith("..") && !(0, import_node_path2.isAbsolute)(path);
+}
+function wrapperBindings(ts, file) {
+  const named = /* @__PURE__ */ new Set();
+  const namespaces = /* @__PURE__ */ new Set();
+  const wrappers = new Set(Object.values(MAGIC_SERVER_EXPORTS).map((m) => m.wrapper));
+  for (const statement of file.statements) {
+    if (!ts.isImportDeclaration(statement) || !ts.isStringLiteral(statement.moduleSpecifier) || statement.moduleSpecifier.text !== ROUTER) continue;
+    const clause = statement.importClause;
+    if (!clause || clause.isTypeOnly || !clause.namedBindings) continue;
+    if (ts.isNamespaceImport(clause.namedBindings)) namespaces.add(clause.namedBindings.name.text);
+    else
+      for (const element of clause.namedBindings.elements)
+        if (!element.isTypeOnly && wrappers.has((element.propertyName ?? element.name).text)) named.add(element.name.text);
+  }
+  return { named, namespaces };
+}
+function isWrapperCall(ts, init2, bindings) {
+  while (init2 && ts.isParenthesizedExpression(init2)) init2 = init2.expression;
+  if (!init2 || !ts.isCallExpression(init2)) return false;
+  const callee = init2.expression;
+  if (ts.isIdentifier(callee)) return bindings.named.has(callee.text);
+  return ts.isPropertyAccessExpression(callee) && ts.isIdentifier(callee.expression) && bindings.namespaces.has(callee.expression.text);
+}
+var exported = (ts, node) => ts.canHaveModifiers(node) && (ts.getModifiers(node) ?? []).some((m) => m.kind === ts.SyntaxKind.ExportKeyword);
+function untaggedServerExports(ts, file) {
+  if (!/\b(server(Load|Guard|Actions|Entries|Headers)|on(Request|Get|Post|Put|Patch|Delete|Options))\b/.test(file.text)) return [];
+  const bindings = wrapperBindings(ts, file);
+  const out = [];
+  const report = (name) => {
+    const message = untaggedMessage(name.text);
+    if (!message) return;
+    const start = name.getStart(file);
+    const { line, character } = file.getLineAndCharacterOfPosition(start);
+    out.push({ code: "RV3010", severity: "error", message, filename: file.fileName, start, end: name.end, line: line + 1, column: character + 1, targets: [] });
+  };
+  for (const statement of file.statements) {
+    if (ts.isVariableStatement(statement) && exported(ts, statement)) {
+      const isConst = Boolean(statement.declarationList.flags & ts.NodeFlags.Const);
+      for (const d of statement.declarationList.declarations)
+        if (ts.isIdentifier(d.name) && !(isConst && isWrapperCall(ts, d.initializer, bindings))) report(d.name);
+    } else if ((ts.isFunctionDeclaration(statement) || ts.isClassDeclaration(statement)) && statement.name && exported(ts, statement)) report(statement.name);
+    else if (ts.isExportDeclaration(statement) && !statement.isTypeOnly && !statement.moduleSpecifier && statement.exportClause && ts.isNamedExports(statement.exportClause))
+      for (const element of statement.exportClause.elements) {
+        if (element.isTypeOnly || !MAGIC_SERVER_EXPORTS[element.name.text]) continue;
+        const local = (element.propertyName ?? element.name).text;
+        const declared = file.statements.some(
+          (s) => ts.isVariableStatement(s) && s.declarationList.flags & ts.NodeFlags.Const && s.declarationList.declarations.some((d) => ts.isIdentifier(d.name) && d.name.text === local && isWrapperCall(ts, d.initializer, bindings))
+        );
+        if (!declared) report(element.name);
+      }
+  }
+  return out;
+}
+
 // libs/language-core/fixes.ts
-var FIXABLE_CODES = ["RV1008", "RV1009", "RV1016", "RV1102", "RV2001", "RV2002", "RV2003", "RV2102", "RV3002"];
+var FIXABLE_CODES = ["RV1008", "RV1009", "RV1016", "RV1102", "RV2001", "RV2002", "RV2003", "RV2016", "RV2102", "RV3002", "RV3010"];
 var PRELOAD = ["eager", "idle", "visible", "intent", "interaction"];
 function distance(a, b) {
   const row = Array.from({ length: b.length + 1 }, (_, i) => i);
@@ -819,10 +941,212 @@ function importedAs(ts, file, modules, name) {
   }
   return void 0;
 }
+function usesFunctionScope(ts, body) {
+  let found = false;
+  const visit = (n) => {
+    if (found) return;
+    if (n.kind === ts.SyntaxKind.ThisKeyword || n.kind === ts.SyntaxKind.SuperKeyword || ts.isIdentifier(n) && n.text === "arguments") found = true;
+    else if (!(ts.isFunctionLike(n) && !ts.isArrowFunction(n)) && !ts.isClassLike(n)) ts.forEachChild(n, visit);
+  };
+  ts.forEachChild(body, visit);
+  return found;
+}
+function moduleNames(ts, file) {
+  const names = /* @__PURE__ */ new Set();
+  const bind = (name) => {
+    if (ts.isIdentifier(name)) names.add(name.text);
+    else for (const element of name.elements) if (!ts.isOmittedExpression(element)) bind(element.name);
+  };
+  for (const statement of file.statements) {
+    if (ts.isVariableStatement(statement)) for (const d of statement.declarationList.declarations) bind(d.name);
+    else if ((ts.isFunctionDeclaration(statement) || ts.isClassDeclaration(statement) || ts.isEnumDeclaration(statement)) && statement.name) names.add(statement.name.text);
+    else if (ts.isImportDeclaration(statement) && statement.importClause) {
+      const clause = statement.importClause;
+      if (clause.name) names.add(clause.name.text);
+      if (clause.namedBindings && ts.isNamespaceImport(clause.namedBindings)) names.add(clause.namedBindings.name.text);
+      else if (clause.namedBindings) for (const element of clause.namedBindings.elements) names.add(element.name.text);
+    }
+  }
+  return names;
+}
+function wrapServerExport(ts, file, node) {
+  if (!ts.isIdentifier(node)) return [];
+  const old = node.text;
+  const magic = MAGIC_SERVER_EXPORTS[old];
+  if (!magic) return [];
+  const statement = ts.findAncestor(node, (n) => n.parent === file);
+  if (!statement) return [];
+  const local = importedAs(ts, file, [ROUTER], magic.wrapper);
+  const names = moduleNames(ts, file);
+  const declared = (name) => name !== old && names.has(name);
+  if (!local && declared(magic.wrapper)) return [];
+  const call = local ?? magic.wrapper;
+  const next = !declared(magic.name) ? magic.name : !declared(magic.name + "Export") ? magic.name + "Export" : void 0;
+  if (!next) return [];
+  const edits = [];
+  const text = file.text;
+  if (ts.isVariableStatement(statement)) {
+    const [d, ...rest] = statement.declarationList.declarations;
+    if (!d || rest.length || d.name !== node || !d.initializer) return [];
+    const init2 = d.initializer;
+    const type = d.type ? text.slice(d.type.getStart(file), d.type.end) : void 0;
+    edits.push({ start: statement.getStart(file), end: init2.getStart(file), newText: `export const ${next} = ${call}(${type ? "(" : ""}` });
+    edits.push({ start: init2.end, end: init2.end, newText: type ? `) satisfies ${type})` : ")" });
+  } else if (ts.isFunctionDeclaration(statement) && statement.name === node && statement.body) {
+    const async = (ts.getModifiers(statement) ?? []).some((m) => m.kind === ts.SyntaxKind.AsyncKeyword);
+    const open = statement.parameters.pos - 1;
+    if (statement.asteriskToken || statement.typeParameters || usesFunctionScope(ts, statement.body)) {
+      const from = statement.typeParameters ? statement.typeParameters.pos - 1 : open;
+      edits.push({ start: statement.getStart(file), end: from, newText: `export const ${next} = ${call}(${async ? "async " : ""}function${statement.asteriskToken ? "*" : ""} ${next}` });
+    } else {
+      edits.push({ start: statement.getStart(file), end: open, newText: `export const ${next} = ${call}(${async ? "async " : ""}` });
+      const head = statement.type ? statement.type.end : statement.parameters.end + 1;
+      edits.push({ start: head, end: statement.body.getStart(file), newText: " => " });
+    }
+    edits.push({ start: statement.body.end, end: statement.body.end, newText: ");" });
+  } else return [];
+  const { copy, checker } = fileChecker(ts, file);
+  const own = nodeAt(ts, copy, node.getStart(file), node.end);
+  const target = own && checker.getSymbolAtLocation(own);
+  if (target) {
+    const visit = (n) => {
+      if (ts.isIdentifier(n) && n.text === old && n !== own) {
+        if (ts.isShorthandPropertyAssignment(n.parent) && n.parent.name === n) {
+          if (checker.getShorthandAssignmentValueSymbol(n.parent) === target) edits.push({ start: n.getStart(copy), end: n.end, newText: `${old}: ${next}` });
+        } else if (checker.getSymbolAtLocation(n) === target) edits.push({ start: n.getStart(copy), end: n.end, newText: next });
+        return;
+      }
+      ts.forEachChild(n, visit);
+    };
+    visit(copy);
+  }
+  if (!local) edits.push(...addNamedImport(ts, file, ROUTER, magic.wrapper));
+  return [{ fixName: "rivetWrapServerExport", description: `Wrap in \`${magic.wrapper}(\u2026)\`: export const ${next} = ${magic.wrapper}(\u2026)`, edits }];
+}
+function handleName(file, ts, call) {
+  for (const arg of call.arguments) {
+    const m = ts.isIdentifier(arg) ? /^(?:load|fetch|get)([A-Z][\w$]*)$/.exec(arg.text) : null;
+    if (m) return uniqueName(file, m[1][0].toLowerCase() + m[1].slice(1));
+  }
+  return uniqueName(file, "res");
+}
+function replaceReads(ts, file, bindings) {
+  const { copy, checker } = fileChecker(ts, file);
+  const targets = /* @__PURE__ */ new Map();
+  for (const [identifier, replacement] of bindings) {
+    const own = nodeAt(ts, copy, identifier.getStart(file), identifier.end);
+    const symbol = own && checker.getSymbolAtLocation(own);
+    if (!symbol) return void 0;
+    targets.set(symbol, [replacement, own]);
+  }
+  const edits = [];
+  let refused = false;
+  const visit = (n) => {
+    if (ts.isIdentifier(n)) {
+      const parent = n.parent;
+      if (ts.isShorthandPropertyAssignment(parent) && parent.name === n) {
+        const hit2 = targets.get(checker.getShorthandAssignmentValueSymbol(parent));
+        if (hit2) edits.push({ start: n.end, end: n.end, newText: `: ${hit2[0]}` });
+        return;
+      }
+      const symbol = checker.getSymbolAtLocation(n);
+      const hit = symbol && targets.get(symbol);
+      if (!hit || hit[1] === n) return;
+      if (ts.isExportSpecifier(parent) || (ts.isPrefixUnaryExpression(parent) || ts.isPostfixUnaryExpression(parent)) && (parent.operator === ts.SyntaxKind.PlusPlusToken || parent.operator === ts.SyntaxKind.MinusMinusToken) || ts.isBinaryExpression(parent) && parent.left === n && parent.operatorToken.kind >= ts.SyntaxKind.FirstAssignment && parent.operatorToken.kind <= ts.SyntaxKind.LastAssignment)
+        refused = true;
+      else edits.push({ start: n.getStart(copy), end: n.end, newText: hit[0] });
+      return;
+    }
+    ts.forEachChild(n, visit);
+  };
+  visit(copy);
+  return refused ? void 0 : edits;
+}
+function resourceFixes(ts, file, node) {
+  const call = ts.findAncestor(node, ts.isCallExpression);
+  if (!call) return [];
+  let at = call;
+  while (ts.isParenthesizedExpression(at.parent) || ts.isAsExpression(at.parent) || ts.isSatisfiesExpression(at.parent) || ts.isNonNullExpression(at.parent))
+    at = at.parent;
+  const callText = file.text.slice(call.getStart(file), call.end);
+  const declaration = at.parent;
+  if (ts.isVariableDeclaration(declaration) && declaration.initializer === at) {
+    const list = declaration.parent;
+    if (!ts.isVariableDeclarationList(list) || list.declarations.length !== 1) return [];
+    const pattern = declaration.name;
+    if (ts.isIdentifier(pattern)) {
+      if (list.flags & ts.NodeFlags.Const) return [];
+      if (!replaceReads(ts, file, [[pattern, pattern.text]])) return [];
+      const keyword = list.getStart(file);
+      return [
+        {
+          fixName: "rivetResourceConst",
+          description: `Declare it with const: const ${pattern.text} = resource(\u2026)`,
+          edits: [{ start: keyword, end: keyword + 3, newText: "const" }]
+        }
+      ];
+    }
+    const name2 = handleName(file, ts, call);
+    const bindings = [];
+    const members = (object, base) => object.elements.every((element) => {
+      if (element.dotDotDotToken || element.initializer || !ts.isIdentifier(element.name)) return false;
+      const key = element.propertyName ?? element.name;
+      if (!ts.isIdentifier(key)) return false;
+      bindings.push([element.name, `${base}.${key.text}`]);
+      return true;
+    });
+    if (ts.isObjectBindingPattern(pattern)) {
+      if (!members(pattern, name2)) return [];
+    } else {
+      if (pattern.elements.length > 2) return [];
+      for (const element of pattern.elements) {
+        if (ts.isOmittedExpression(element)) continue;
+        if (element.dotDotDotToken || element.initializer) return [];
+        if (ts.isIdentifier(element.name)) bindings.push([element.name, name2]);
+        else if (ts.isObjectBindingPattern(element.name) && element === pattern.elements[1]) {
+          if (!members(element.name, name2)) return [];
+        } else return [];
+      }
+    }
+    const reads = replaceReads(ts, file, bindings);
+    if (!reads) return [];
+    const end = declaration.type ? declaration.type.end : pattern.end;
+    return [
+      {
+        fixName: "rivetResourceConst",
+        description: `Keep the handle: const ${name2} = resource(\u2026); use ${name2}.member`,
+        edits: [{ start: pattern.getStart(file), end, newText: name2 }, ...reads]
+      }
+    ];
+  }
+  if (ts.isVariableDeclaration(declaration)) return [];
+  const statement = bodyStatement(ts, call);
+  if (!statement || ts.findAncestor(call.parent, (n) => n === statement || ts.isFunctionLike(n) || ts.isClassLike(n)) !== statement) return [];
+  const fn = statement.parent.parent;
+  const fnName = fn.name ?? (ts.isVariableDeclaration(fn.parent) && ts.isIdentifier(fn.parent.name) ? fn.parent.name : void 0);
+  if (fnName && /^[a-z_$]/.test(fnName.text) && !(ts.getCombinedModifierFlags(fn) & ts.ModifierFlags.Default)) return [];
+  const name = handleName(file, ts, call);
+  const nl = newLineOf(file);
+  const start = statement.getStart(file);
+  return [
+    {
+      fixName: "rivetResourceConst",
+      description: `Create it in the component: const ${name} = resource(\u2026)`,
+      edits: [
+        { start, end: start, newText: `const ${name} = ${callText};${nl}${indentOf(file, start)}` },
+        { start: at.getStart(file), end: at.end, newText: name }
+      ]
+    }
+  ];
+}
 function codeFixes(ts, file, diagnostic) {
   const node = nodeAt(ts, file, diagnostic.start, diagnostic.end);
   if (!node) return [];
   switch (diagnostic.code) {
+    case "RV3010":
+      return wrapServerExport(ts, file, node);
+    case "RV2016":
+      return resourceFixes(ts, file, node);
     case "RV1102": {
       const attribute = ts.findAncestor(node, ts.isJsxAttribute);
       const value = attribute?.initializer;
@@ -1028,18 +1352,18 @@ function serializabilityDiagnostics(ts, checker, file, sites, verdict) {
 
 // libs/language-core/sources.ts
 var import_node_fs2 = require("node:fs");
-var import_node_path2 = require("node:path");
+var import_node_path3 = require("node:path");
 var cache = /* @__PURE__ */ new Map();
 function sourcePackagesOf(fileName, text) {
   const found = /* @__PURE__ */ new Set();
   for (const [, specifier = ""] of text.matchAll(/(?:\bfrom|\bimport)\s*\(?\s*["']([^"'./][^"']*)["']/g)) {
     const name = specifier.split("/").slice(0, specifier.startsWith("@") ? 2 : 1).join("/");
-    const key = (0, import_node_path2.dirname)(fileName) + "\0" + name;
+    const key = (0, import_node_path3.dirname)(fileName) + "\0" + name;
     let hit = cache.get(key);
     if (hit === void 0) {
       hit = null;
-      for (let dir = (0, import_node_path2.dirname)(fileName); ; dir = (0, import_node_path2.dirname)(dir)) {
-        const file = (0, import_node_path2.join)(dir, "node_modules", name, "package.json");
+      for (let dir = (0, import_node_path3.dirname)(fileName); ; dir = (0, import_node_path3.dirname)(dir)) {
+        const file = (0, import_node_path3.join)(dir, "node_modules", name, "package.json");
         if ((0, import_node_fs2.existsSync)(file)) {
           try {
             const pkg = JSON.parse((0, import_node_fs2.readFileSync)(file, "utf8"));
@@ -1048,7 +1372,7 @@ function sourcePackagesOf(fileName, text) {
           }
           break;
         }
-        if ((0, import_node_path2.dirname)(dir) === dir) break;
+        if ((0, import_node_path3.dirname)(dir) === dir) break;
       }
       cache.set(key, hit);
     }
@@ -1060,7 +1384,7 @@ function sourcePackagesOf(fileName, text) {
 // libs/language-core/compiler.ts
 var import_node_fs3 = require("node:fs");
 var import_node_module = require("node:module");
-var import_node_path3 = require("node:path");
+var import_node_path4 = require("node:path");
 function loadCompiler(wasm) {
   const module2 = new WebAssembly.Module((0, import_node_fs3.readFileSync)(wasm));
   let exports2 = new WebAssembly.Instance(module2, {}).exports;
@@ -1097,8 +1421,8 @@ function loadCompiler(wasm) {
 }
 function workspaceCompilerWasm(directory) {
   try {
-    const require2 = (0, import_node_module.createRequire)((0, import_node_path3.join)(directory, "noop.js"));
-    return (0, import_node_path3.join)((0, import_node_path3.dirname)(require2.resolve("@rivetjs/compiler")), "rivet_compiler.wasm");
+    const require2 = (0, import_node_module.createRequire)((0, import_node_path4.join)(directory, "noop.js"));
+    return (0, import_node_path4.join)((0, import_node_path4.dirname)(require2.resolve("@rivetjs/compiler")), "rivet_compiler.wasm");
   } catch {
     return null;
   }
@@ -1118,10 +1442,10 @@ function findCompiler(candidates, log) {
 // libs/language-core/doctor.ts
 var import_node_fs4 = require("node:fs");
 var import_node_module2 = require("node:module");
-var import_node_path4 = require("node:path");
+var import_node_path5 = require("node:path");
 function workspaceTypeScriptVersion(directory) {
   try {
-    const require2 = (0, import_node_module2.createRequire)((0, import_node_path4.join)(directory, "noop.js"));
+    const require2 = (0, import_node_module2.createRequire)((0, import_node_path5.join)(directory, "noop.js"));
     return JSON.parse((0, import_node_fs4.readFileSync)(require2.resolve("typescript/package.json"), "utf8")).version;
   } catch {
     return void 0;
@@ -1143,7 +1467,7 @@ function doctor(input) {
       message: `${input.configFile} compiles JSX with jsx=${input.jsx ?? "unset"}, jsxImportSource=${input.jsxImportSource ?? "unset"}; Rivet needs "preserve" and "@rivetjs/runtime".`,
       fix: `Extend tsconfig.base.json in ${input.configFile}.`
     });
-  const workspace = workspaceTypeScriptVersion((0, import_node_path4.dirname)(input.fileName));
+  const workspace = workspaceTypeScriptVersion((0, import_node_path5.dirname)(input.fileName));
   if (workspace && workspace !== input.tsVersion)
     findings.push({
       id: "typescript-version",
@@ -1175,14 +1499,14 @@ function doctor(input) {
       fix: "Run `rivet sync` (or restart `vite`) in the app."
     });
   const root = input.project?.root;
-  if (root && input.project.manifest.routesDir && !(0, import_node_fs4.existsSync)((0, import_node_path4.join)(root, ".rivet", "routes.d.ts")))
+  if (root && input.project.manifest.routesDir && !(0, import_node_fs4.existsSync)((0, import_node_path5.join)(root, ".rivet", "routes.d.ts")))
     findings.push({ id: "route-types", severity: "info", message: "Route types (.rivet/routes.d.ts) are missing.", fix: "Run `rivet sync` (or `vite` / `vite build`) in the app." });
   return findings;
 }
 
 // libs/language-core/explain.json
 var explain_default = {
-  $comment: "Fix texts per RV code (`explain.ts` `explainCode`): what the code means in practice and the mechanical fix, for AI assistants (MCP explain_diagnostic / check_code), rivet check and editors. Severity, title and docs URL stay in libs/compiler/codes.json; every code there has an entry here (tests/explain.test.ts). `messages` = the emitted texts ({x} = placeholder); `avoid` triggers the code, `prefer` compiles clean (verified 2026-10-08 against both targets); `quickFix` = the language-core code fix that applies, if any.",
+  $comment: "Fix texts per RV code (`explain.ts` `explainCode`): what the code means in practice and the mechanical fix, for AI assistants (MCP explain_diagnostic / check_code), rivet check and editors. Severity, title and docs URL stay in libs/compiler/codes.json; every code there has an entry here (tests/explain.test.ts). Also the prose of the docs pages /errors/RVxxxx (docs-kit tools/errors.ts \u2192 apps/docs/content/errors/, regenerate after edits). `messages` = the emitted texts ({x} = placeholder); `avoid` triggers the code, `prefer` compiles clean (verified 2026-10-08 against both targets); `quickFix` = the language-core code fix that applies, if any.",
   codes: [
     {
       code: "RV1000",
@@ -1411,9 +1735,7 @@ var explain_default = {
     },
     {
       code: "RV2009",
-      messages: [
-        "Cannot resume {module}: module references `{first}` and `{second}` share the browser name `{name}`; rename one import"
-      ],
+      messages: ["Cannot resume {module}: module references `{first}` and `{second}` share the browser name `{name}`; rename one import"],
       fix: "Import one of the two values under another exported name (re-export it from a small module) so their module reference names differ.",
       avoid: 'import { fmt } from "./a";\nimport { fmt as fmt2 } from "./b";\nexport function A() { return <List items={[fmt, fmt2]} />; }',
       prefer: 'import { fmt } from "./a";\nimport { fmtB } from "./b-reexport";\nexport function A() { return <List items={[fmt, fmtB]} />; }',
@@ -1481,6 +1803,17 @@ var explain_default = {
       prefer: "export function Count(props: { n: () => number }) {\n  return () => <b>{props.n()}</b>;\n}",
       note: "Resume mode (RESUME-ACCESSOR-ROW fixes 1\u20132). A warning: the module compiles, but the server traversal calls the accessor outside every resume site, so a resumed page never updates it. Resumable without a warning, in a PascalCase module-level function: `return () => \u2026`, `return c ? () => a : () => b` (also `&&` / `||` / `??`), `const view = () => \u2026; return view`, a hoisted parameterless `function view() {\u2026}` returned by name, concise `(props) => () => \u2026`. Reported for an anonymous default export, a function passed to a call whose result is a PascalCase `const` or the default export (`const Card = memo((props) => () => \u2026)`), and a returned `let` bound to an accessor (declare it with `const`)."
     },
+    {
+      code: "RV2016",
+      messages: [
+        "`resource()` cannot resume {form}: create it in the component as `const name = resource(\u2026)` and call its methods on the handle (`name.loading()`)"
+      ],
+      fix: "Create the resource in the component body as the whole initializer of one `const` (`const user = resource(() => id(), loadUser)`) and call its methods on that handle (`user.refetch()`, `user.loading()`); pass the handle, not a destructured method, to children and handlers. For a reusable helper, export the fetcher and call `resource(\u2026)` in each component.",
+      avoid: 'import { resource } from "@rivetjs/runtime/dom";\nasync function loadUser(_: true) {\n  return "Ada";\n}\nexport function User() {\n  const { refetch } = resource(loadUser);\n  return <button onClick={() => refetch()}>reload</button>;\n}',
+      prefer: 'import { resource } from "@rivetjs/runtime/dom";\nasync function loadUser(_: true) {\n  return "Ada";\n}\nexport function User() {\n  const user = resource(loadUser);\n  return <button onClick={() => user.refetch()}>{user()}</button>;\n}',
+      note: "Resume mode (RESOURCE-COMPILER). A warning: the module compiles, but the server encodes a resource only through the recipe of the `const` it is created in, so rendering one of these forms resumably throws `resource is not resumable here` once a resumable site captures it. Resumable without a warning: any `const r = resource(\u2026)` in a component (also in `For` rows and `Show` branches), whatever its arguments \u2014 inline arrows, module functions or imports by name (`resource(fetchUser)`, resumed by reference), local `const` fetchers, `initialValue` from props, `ssr: false`; aliased imports (`import { resource as res }`) too. Reported forms: destructuring (`const { loading } = resource(\u2026)` drops the handle its methods need; `const [data] = resource(\u2026)` \u2014 the handle is not iterable), a `let` / `var`, a call that is not a `const` initializer (JSX attribute, object value, argument, returned value, concise arrow body), and a `const` inside a named non-component function (`useUser`: its caller's `const` holds the result, not a recipe). Not reported: module scope, a discarded call, code that runs in the browser only (handlers, effects).",
+      quickFix: 'rivetResourceConst: "Keep the handle: const user = resource(\u2026); use user.member" \u2192 const user = resource(\u2026); destructured reads become user.loading, user.refetch or user (Solid-style [data, { refetch }] too). The same action is "Declare it with const" for a let / var never reassigned and "Create it in the component: const user = resource(\u2026)" for a call outside a const initializer (hoisted before its statement). The handle is named after a loadUser / fetchUser / getUser fetcher, else res; no fix in a hook, for rest / default / nested patterns or for a call inside a nested function'
+    },
     {
       code: "RV2101",
       messages: [
@@ -1508,6 +1841,48 @@ var explain_default = {
       note: "Resume mode (Function Bridge T24). A data class declared at module scope of a resume module registers (`_rClass`) and its captured instances resume without running the constructor. Not eligible: an instance `#private` element or `accessor` field (no private brand without the constructor), a class or member decorator (runs code while constructing), a field arrow reading `super` / `new.target` (cannot run outside the class), an `extends` other than a data class of the same module (built-ins, packages, Node `EventEmitter`), a resource read while constructing (`window`, `document`, `navigator`, `globalThis`, `localStorage`, `sessionStorage`, `WebSocket`, `EventSource`, `Worker`, `BroadcastChannel` in a field initializer or the constructor). Classes with an own or inherited `static [revive]` register as resource holders (T25): an instance with `[serialize]()` sends only that data and the browser rebuilds it with `static [revive](data)` on first use; package classes register the same hooks with `registerClass(cls, { id, serialize, revive })` from `@rivetjs/runtime/resume-format`. At render, `[serialize]` without `static [revive]` is `RV2102: {Class} has [serialize] but no static [revive]` (dev and production).",
       quickFix: 'rivetReconstruct: "Build it in the browser: reconstruct(() => \u2026)" \u2192 const x = reconstruct(() => new X(\u2026)); reads become x() (+ import from @rivetjs/runtime/dom)'
     },
+    {
+      code: "RV2103",
+      messages: [
+        "Render is not deterministic: `{call}` runs while rendering `{Component}`; move it into a keyed signal (its value is shipped) or a clientEffect"
+      ],
+      fix: "Compute the value once into state the page ships (`const seed = signal(Math.random())` \u2014 the browser adopts the server value) or read it in a `clientEffect` / handler; `Date.now()`, `Math.random()`, `performance.now()`, `crypto.randomUUID()` / `getRandomValues()` and `new Date()` without arguments are reported in a boundary's render path.",
+      avoid: 'import { signal } from "@rivetjs/reactivity";\nexport function Stamp() {\n  const n = signal(0);\n  const t = Date.now();\n  return <button onClick={() => n.set(t)}>{n()}</button>;\n}',
+      prefer: 'import { signal } from "@rivetjs/reactivity";\nexport function Stamp() {\n  const n = signal(0);\n  const t = signal(Date.now());\n  return <button onClick={() => n.set(t())}>{n()}</button>;\n}',
+      note: 'Derived resume model only (`resume: { model: "derived" }`, plan M2 C2). The browser derives an interactive component\'s structure by running its compiled DOM function over the server nodes (adopt run): the render must be a function of its props, keyed state and route data. A non-deterministic read outside keyed state would make the adopt run disagree with the markup. Handlers, effects, client events and other browser-only closures are not checked (they never run on the server). Error: the module does not compile under the derived model.'
+    },
+    {
+      code: "RV2104",
+      messages: [
+        "Keyed state `signal()` is created inside a loop: the browser pairs a site's repeated creations with the server's by order, so a loop that runs a different number of times in the adopt run adopts the wrong values; give each iteration its own component (a `<For>` row) or create the state once outside the loop",
+        "Keyed state `createStore()` is created inside a loop: the browser pairs a site's repeated creations with the server's by order, so a loop that runs a different number of times in the adopt run adopts the wrong values; give each iteration its own component (a `<For>` row) or create the state once outside the loop"
+      ],
+      fix: "Give each iteration its own component (render a `<For>` row / child component that creates its state) or create one `signal()` / `createStore()` outside the loop holding the list (`const picked = signal(props.items.map(() => false))`).",
+      avoid: 'import { signal } from "@rivetjs/reactivity";\nexport function Checks(props) {\n  const picked = [];\n  for (const item of props.items) picked.push(signal(false));\n  return <ul>{props.items.map((item, i) => <li onClick={() => picked[i].set(true)}>{item}</li>)}</ul>;\n}',
+      prefer: 'import { signal } from "@rivetjs/reactivity";\nexport function Checks(props) {\n  const picked = signal(props.items.map(() => false));\n  return <ul>{props.items.map((item, i) => <li onClick={() => picked.set(picked().with(i, true))}>{item}</li>)}</ul>;\n}',
+      note: 'Derived resume model only (`resume: { model: "derived" }`, plan M2 C2). Every `signal(x)` / `createStore(x)` call of a resume module compiles to a keyed registration (`_rSig(key, x)`: key = module prefix + source-order site ordinal); the server ships the values per boundary and the adopt run reads them by key. Keys are per site, so state created under an `if` / `?:` / `&&` / `switch` / `try` is fine (a render that skips it skips its key; M2-R5 2026-10-20 narrowed the warning to loops). A site that registers more than once in a boundary gets an occurrence suffix (`#2`, `#3`, \u2026): those pair by order, which a loop makes depend on the iteration count. Warning: the module compiles.'
+    },
+    {
+      code: "RV2105",
+      messages: [
+        "Keyed `For` row renders non-deterministically: `{call}` runs while rendering the row; a lazy row renders again in the browser, so read it outside the row (loader data, a prop, a signal) or in a handler / clientEffect (the For's rows stay recorded)"
+      ],
+      fix: "Compute the value outside the row (in the component body, loader data or a prop) and read that inside the row, or move the read into a handler / `clientEffect`; `Date.now()`, `Date()`, `new Date()` without arguments, `Math.random()`, `performance.now()`, `crypto.randomUUID()` and `crypto.getRandomValues()` are reported on a keyed `For` row's render path.",
+      avoid: 'import { For } from "@rivetjs/runtime/dom";\nexport function Feed(props: { items: { id: string; title: string }[] }) {\n  return (\n    <ul>\n      <For each={props.items} by={(item) => item.id}>\n        {(item) => <li data-seen={Date.now()}>{item().title}</li>}\n      </For>\n    </ul>\n  );\n}',
+      prefer: 'import { For } from "@rivetjs/runtime/dom";\nexport function Feed(props: { items: { id: string; title: string }[]; seen: number }) {\n  return (\n    <ul>\n      <For each={props.items} by={(item) => item.id}>\n        {(item) => <li data-seen={props.seen}>{item().title}</li>}\n      </For>\n    </ul>\n  );\n}',
+      note: "Resume mode (lazy collection rows, LAZY-ROWS T2). A warning: the module compiles and the `For` keeps today's per-row resume records. A lazy row (the `For`'s row function as a resumable symbol, materialised in the browser per row) must render the same markup in the browser as on the server; a time / random read in the row's render path would not. Handlers, effects, client events, refs and timer callbacks inside the row are not its render and are not checked. Reported once per `For`, on the server compile."
+    },
+    {
+      code: "RV2106",
+      messages: [
+        "Keyed `For` row holds {site}, which a lazy row cannot replay: move it out of the row or into a component the row renders lazily (the For's rows stay recorded)",
+        "Keyed `For` row holds a `ref` into `{name}`, declared outside the row, which a lazy row cannot replay: keep the ref local to the row or read the element through the event (the For's rows stay recorded)"
+      ],
+      fix: "Render the client-only / streaming / portal content outside the row (one instance next to the list), or keep it in a component the row renders; for a ref, declare it inside the row (`{(row) => { const el = ref(); \u2026 }}`) or read the element from the event (`event.currentTarget`).",
+      avoid: 'import { For, ref } from "@rivetjs/runtime/dom";\nexport function Menu(props: { items: { id: string; label: string }[] }) {\n  const last = ref<HTMLElement>();\n  return (\n    <ul onKeyDown={() => last.current?.focus()}>\n      <For each={props.items} by={(item) => item.id}>\n        {(item) => <li ref={last}>{item().label}</li>}\n      </For>\n    </ul>\n  );\n}',
+      prefer: 'import { For } from "@rivetjs/runtime/dom";\nexport function Menu(props: { items: { id: string; label: string }[] }) {\n  return (\n    <ul onKeyDown={(event) => (event.currentTarget.lastElementChild as HTMLElement | null)?.focus()}>\n      <For each={props.items} by={(item) => item.id}>\n        {(item) => <li tabIndex={-1}>{item().label}</li>}\n      </For>\n    </ul>\n  );\n}',
+      note: "Resume mode (lazy collection rows, LAZY-ROWS T2). A warning: the module compiles and the `For` keeps today's per-row resume records. A lazy row is re-run in the browser over its server markup (adopt mode); `clientOnly(\u2026)` / an element of a `clientOnly` component, `<Async>`, a `<Portal>` element and a `ref` into a local declared outside the row cannot be replayed that way, so the whole `For` stays recorded (one rule per `For`). Reported once per `For`, on the server compile."
+    },
     {
       code: "RV2145",
       messages: [
@@ -1531,7 +1906,7 @@ var explain_default = {
       code: "RV2148",
       messages: ["{file} is owned by {framework} but uses the Rivet runtime ({use}): Rivet code in a framework module is never compiled by Rivet"],
       fix: "Move the Rivet code (signals bound to Rivet JSX, `@rivetjs/runtime` helpers) into a Rivet module and import the island from it, or take the file out of the bridge's ownership: drop the framework suffix (`Chart.react.tsx` \u2192 `Chart.tsx`) or narrow the bridge's `include`.",
-      avoid: '// Chart.react.tsx (owned by react())\nimport { Show } from "@rivetjs/runtime";\nexport function Chart() { return <Show when={true}>x</Show>; }',
+      avoid: '// Chart.react.tsx (owned by react())\nimport { Show } from "@rivetjs/runtime/dom";\nexport function Chart() { return <Show when={true}>x</Show>; }',
       prefer: '// Chart.react.tsx: React only\nexport function Chart() { return <div>x</div>; }\n// page.tsx (Rivet): <Show when={ready()}><Chart client="visible" /></Show>',
       note: "Vite plugin (`rivet({ bridges })`). A module a bridge owns is compiled by that framework's plugins only: an `@rivetjs/runtime` import (or `@jsxImportSource @rivetjs/runtime`) there would run Rivet ABI code the Rivet compiler never produced. `@rivetjs/reactivity` signals are fine inside framework components (read them through the framework's own subscription)."
     },
@@ -1545,7 +1920,9 @@ var explain_default = {
     },
     {
       code: "RV2150",
-      messages: ["Preact useId mask not applied (probe rendered {html}): Preact island ids would not be unique. This Preact version is not supported by @rivetjs/bridge-preact; update it or pin preact to a supported version."],
+      messages: [
+        "Preact useId mask not applied (probe rendered {html}): Preact island ids would not be unique. This Preact version is not supported by @rivetjs/bridge-preact; update it or pin preact to a supported version."
+      ],
       fix: "Install a Preact version inside `@rivetjs/bridge-preact`'s peer range that the adapter supports (pin `preact` to the last working version), or update `@rivetjs/bridge-preact`.",
       avoid: `// package.json
 "preact": "^11"   // a minor that moved Preact's internal useId mask`,
@@ -1605,13 +1982,15 @@ var explain_default = {
     {
       code: "RV3007",
       messages: [
-        "Declare server exports (serverLoad, onGet, \u2026) in their own export statement",
-        "`export *` is not allowed in a route module: server exports must be named"
+        "Declare server exports (`load(\u2026)`, `onGet(\u2026)`, \u2026) in their own export statement",
+        "`export *` is not allowed in a route module: server exports must be named",
+        "Server export wrapper `{name}` must initialize a module-scope `const` (`export const {export} = {name}(\u2026)`)",
+        "Duplicate server export: `{first}` and `{name}` are both `{kind}(\u2026)`; keep one"
       ],
-      fix: "Give each server export (serverLoad, onGet, \u2026) its own export statement and replace `export *` with named exports.",
-      avoid: "export const serverLoad = () => 1, other = 2;\nexport default () => <p />;",
-      prefer: "export const serverLoad = () => 1;\nexport const other = 2;\nexport default () => <p />;",
-      note: "serverExports option (route modules)."
+      fix: "Give each server export its own `export const x = wrapper(\u2026)` statement at module scope (one per kind; request handlers one per method) and replace `export *` with named exports.",
+      avoid: 'import { load } from "@rivetjs/router";\nexport const loader = load(() => 1), other = 2;\nexport default () => <p />;',
+      prefer: 'import { load } from "@rivetjs/router";\nexport const loader = load(() => 1);\nexport const other = 2;\nexport default () => <p />;',
+      note: "serverExports option (route modules). Wrappers: load, guard, actions, entries, headers, onRequest, onGet \u2026 onOptions from @rivetjs/router (aliases and namespace imports tracked)."
     },
     {
       code: "RV3008",
@@ -1619,25 +1998,47 @@ var explain_default = {
         "`{name}` is server-only (removed from browser builds) but browser code references it at line {line}",
         '`{name}` (from "{source}") is used by browser code at line {line}; server-only modules cannot reach the browser \u2014 use it only inside server exports'
       ],
-      fix: "Use server exports and server-only imports only inside server exports; pass their results to the page as serverLoad data instead.",
-      avoid: 'import { readFileSync } from "node:fs";\nexport const serverLoad = () => 1;\nexport default () => <p>{String(readFileSync)}</p>;',
-      prefer: 'import { readFileSync } from "node:fs";\nexport const serverLoad = () => readFileSync("a.txt", "utf8");\nexport default () => <p />;',
+      fix: "Use server exports and server-only imports only inside server exports; pass their results to the page as loader data instead.",
+      avoid: 'import { readFileSync } from "node:fs";\nimport { load } from "@rivetjs/router";\nexport const loader = load(() => 1);\nexport default () => <p>{String(readFileSync)}</p>;',
+      prefer: 'import { readFileSync } from "node:fs";\nimport { load } from "@rivetjs/router";\nexport const loader = load(() => readFileSync("a.txt", "utf8"));\nexport default () => <p />;',
       note: "First variant lacks a fix hint."
     },
     {
       code: "RV3009",
       messages: ["Server-only code cannot render JSX in a resumed route module: return data and render it in the page"],
-      fix: "Return plain data from serverLoad/onGet and render the JSX in the page component.",
-      avoid: "export const serverLoad = () => ({ x: <p /> });\nexport default () => <p />;",
-      prefer: 'export const serverLoad = () => ({ x: "text" });\nexport default () => <p />;',
+      fix: "Return plain data from load(\u2026) / onGet(\u2026) exports and render the JSX in the page component.",
+      avoid: 'import { load } from "@rivetjs/router";\nexport const loader = load(() => ({ x: <p /> }));\nexport default () => <p />;',
+      prefer: 'import { load } from "@rivetjs/router";\nexport const loader = load(() => ({ x: "text" }));\nexport default () => <p />;',
       note: "serverExports + resume."
     },
+    {
+      code: "RV3010",
+      messages: [
+        'Untagged server export `{name}`: route server code is a wrapper call \u2014 `export const {export} = {wrapper}({argument})` with `import { {wrapper} } from "@rivetjs/router"`'
+      ],
+      fix: "Wrap the export in its @rivetjs/router wrapper call: serverLoad \u2192 export const loader = load(\u2026), serverGuard \u2192 access = guard(\u2026), serverActions \u2192 forms = actions({ \u2026 }), serverEntries \u2192 paths = entries(\u2026), serverHeaders \u2192 responseHeaders = headers(\u2026), onRequest \u2192 middleware = onRequest(\u2026), onGet \u2192 GET = onGet(\u2026) (same for onPost \u2026 onOptions). The export name is free; `rivet migrate server-exports` rewrites a whole app.",
+      avoid: "export const serverLoad = () => ({ n: 1 });\nexport default () => <p />;",
+      prefer: 'import { load } from "@rivetjs/router";\nexport const loader = load(() => ({ n: 1 }));\nexport default () => <p />;',
+      quickFix: "rivetWrapServerExport: Wrap in `load(\u2026)` (renames the export and its in-file references, adds the import).",
+      note: "serverExports option (route modules) and the language service (files under the manifest routesDir). Sibling *.server.ts names (load, GET \u2026) without wrappers fail at the first request instead (server/module.ts)."
+    },
+    {
+      code: "RV3011",
+      messages: [
+        "{chain} (server-only), rendered by {routes} (client-navigated page route[s])",
+        "{chain} (server-only), rendered by the layout of every page under {path} (client-rendered on navigation and resume)"
+      ],
+      fix: 'Pass the data to the component as props (inlined at build time, or read in the page\'s `load(\u2026)`), keep server-only modules out of components, or make the page a document route with `import "@rivetjs/router/server-only"` in the page module. Layouts and error pages cannot be document routes: read the data in their `load(\u2026)`. `rivetRouter({ serverOnly: { reach: "warn" } })` turns the page case into a warning (those pages render as document routes).',
+      avoid: '// src/components/Card.tsx\nimport { rows } from "../lib/rows.server.ts";\nexport const Card = () => <p>{rows.length}</p>;',
+      prefer: "// src/components/Card.tsx\nexport const Card = (props: { count: number }) => <p>{props.count}</p>;\n// src/routes/index.tsx: read rows.server.ts in load(\u2026), render <Card count={\u2026} />",
+      note: "Router build (`@rivetjs/router/vite`, configResolved graph scan); TS-side text (not Rust). Server-only = `@rivetjs/router/server-only` marker, `*.server.*` files, `rivetRouter({ serverOnly })` / `rivet({ serverOnly })` patterns, plugin-declared ids (`api.rivetServerOnly`). Dev: overlay + terminal on page load. Pages that reach one only through their own module / non-component helpers become document routes instead (no diagnostic)."
+    },
     {
       code: "RV3101",
       messages: ['No route matches "{path}" (routes from {routesDir ?? "the router"}).'],
       fix: "Point the Link at an existing route path (check src/routes), or add the missing route file.",
-      avoid: 'import { Link } from "@rivetjs/router";\nexport const A = () => <Link to="/abuot">About</Link>;',
-      prefer: 'import { Link } from "@rivetjs/router";\nexport const A = () => <Link to="/about">About</Link>;',
+      avoid: 'import { Link } from "@rivetjs/router/client";\nexport const A = () => <Link to="/abuot">About</Link>;',
+      prefer: 'import { Link } from "@rivetjs/router/client";\nexport const A = () => <Link to="/about">About</Link>;',
       note: "Language service only; warning; TS-side text (not Rust). Could suggest nearest route."
     },
     {
@@ -1792,9 +2193,11 @@ var explain_default = {
         "Invalid compiler option `styles.layer`: expected a string, null or false",
         "Invalid compiler option `resume.module`: expected a string",
         "Invalid compiler option `resume`: expected `{ module?: string }`, true or false",
+        'Invalid compiler option `resume.model`: expected "serialized" or "derived"',
+        "Invalid compiler option `resume.{key}`: expected an array of component names",
         'Invalid compiler option `targets`: unknown target "{bad}"'
       ],
-      fix: 'Pass the option in the documented shape (e.g. resume: { module: "src/a.tsx" } or true; styles: { scope: string }).',
+      fix: 'Pass the option in the documented shape (e.g. resume: { module: "src/a.tsx" } or true, resume.model: "serialized" or "derived", resume.boundaries / resume.independent: arrays of component names; styles: { scope: string }).',
       avoid: "check(src, { resume: 5 })",
       prefer: 'check(src, { resume: { module: "src/a.tsx" } })',
       note: "Integration error; no source range."
@@ -1873,7 +2276,7 @@ function createLanguageCore({ compiler, manifests = new ManifestCache() }) {
     },
     project: (fileName) => manifests.find(fileName),
     routes: (fileName) => manifests.find(fileName)?.manifest.routes ?? [],
-    routeFile: (project, route) => (0, import_node_path5.resolve)(project.root, route.file)
+    routeFile: (project, route) => (0, import_node_path6.resolve)(project.root, route.file)
   };
 }
 function analyzeFile(ts, core, program, file, options = {}) {
@@ -1893,6 +2296,7 @@ function analyzeFile(ts, core, program, file, options = {}) {
     diagnostics = [...diagnostics, ...serializabilityDiagnostics(ts, checker, file, result.sites, verdict)];
   }
   const manifest = result.project?.manifest;
+  if (manifest && isRouteModule(result.project.root, manifest.routesDir, file.fileName)) diagnostics = [...diagnostics, ...untaggedServerExports(ts, file)];
   if (manifest?.routes)
     diagnostics = [
       ...diagnostics,
@@ -1912,7 +2316,7 @@ function analyzeFile(ts, core, program, file, options = {}) {
 // libs/typescript-plugin/index.ts
 var CODE = (code) => 7e4 + Number(code.slice(2));
 var FIX_NUMBERS = new Set(FIXABLE_CODES.map(CODE));
-var bundledWasm = () => typeof __dirname === "string" ? (0, import_node_path6.join)(__dirname, "rivet_compiler.wasm") : null;
+var bundledWasm = () => typeof __dirname === "string" ? (0, import_node_path7.join)(__dirname, "rivet_compiler.wasm") : null;
 var cores = /* @__PURE__ */ new Map();
 function loadCore(wasm, log) {
   let mtime;
@@ -2180,20 +2584,20 @@ function init({ typescript: ts }) {
      * the `.rivet/` of each app (Vite root) the project's Rivet files belong to, and the tsconfig's own. */
     getExternalFiles(project) {
       if (project.getCompilerOptions().jsxImportSource !== "@rivetjs/runtime" || project.projectKind !== ts.server.ProjectKind.Configured) return [];
-      const roots = /* @__PURE__ */ new Set([(0, import_node_path6.dirname)(project.getProjectName())]);
+      const roots = /* @__PURE__ */ new Set([(0, import_node_path7.dirname)(project.getProjectName())]);
       const byDir = /* @__PURE__ */ new Map();
       for (const name of project.getRootFiles() ?? []) {
         if (!/\.[jt]sx$/.test(name) || /[/\\]node_modules[/\\]/.test(name)) continue;
-        const dir = (0, import_node_path6.dirname)(name);
+        const dir = (0, import_node_path7.dirname)(name);
         let root = byDir.get(dir);
         if (root === void 0) byDir.set(dir, root = viteRoot(name));
         if (root) roots.add(root);
       }
       return [...roots].flatMap((root) => {
-        const dir = (0, import_node_path6.join)(root, ".rivet");
+        const dir = (0, import_node_path7.join)(root, ".rivet");
         if (!(0, import_node_fs5.existsSync)(dir)) return [];
         try {
-          return (0, import_node_fs5.readdirSync)(dir).filter((name) => name.endsWith(".d.ts")).map((name) => (0, import_node_path6.join)(dir, name));
+          return (0, import_node_fs5.readdirSync)(dir).filter((name) => name.endsWith(".d.ts")).map((name) => (0, import_node_path7.join)(dir, name));
         } catch {
           return [];
         }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@rivetjs/typescript-plugin",
-  "version": "0.1.0-alpha.0",
+  "version": "0.1.0-alpha.1",
   "license": "MIT",
   "type": "module",
   "description": "TypeScript language service plugin: Rivet compiler diagnostics, quick fixes, resume hints and route links in TS editors.",
   "main": "./dist/index.cjs",
   "dependencies": {
-    "@rivetjs/language-core": "0.1.0-alpha.0"
+    "@rivetjs/language-core": "0.1.0-alpha.1"
   },
   "peerDependencies": {
     "typescript": ">=5.6"