heliumts 0.10.2 → 0.11.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (159) hide show
  1. package/README.md +45 -46
  2. package/dist/bin/helium.js +117 -172
  3. package/dist/bin/helium.js.map +1 -1
  4. package/dist/bin/projectCommands.d.ts +59 -0
  5. package/dist/bin/projectCommands.d.ts.map +1 -0
  6. package/dist/bin/projectCommands.js +103 -0
  7. package/dist/bin/projectCommands.js.map +1 -0
  8. package/dist/bin/publicApi.d.ts +30 -0
  9. package/dist/bin/publicApi.d.ts.map +1 -0
  10. package/dist/bin/publicApi.js +155 -0
  11. package/dist/bin/publicApi.js.map +1 -0
  12. package/dist/client/Router.d.ts.map +1 -1
  13. package/dist/client/Router.js +5 -1
  14. package/dist/client/Router.js.map +1 -1
  15. package/dist/client/callMethod.d.ts +2 -2
  16. package/dist/client/callMethod.d.ts.map +1 -1
  17. package/dist/client/callMethod.js +3 -2
  18. package/dist/client/callMethod.js.map +1 -1
  19. package/dist/client/index.d.ts +3 -1
  20. package/dist/client/index.d.ts.map +1 -1
  21. package/dist/client/index.js +1 -2
  22. package/dist/client/index.js.map +1 -1
  23. package/dist/client/pageModules.d.ts +18 -0
  24. package/dist/client/pageModules.d.ts.map +1 -0
  25. package/dist/client/pageModules.js +3 -0
  26. package/dist/client/pageModules.js.map +1 -0
  27. package/dist/client/routerManifest.d.ts +2 -11
  28. package/dist/client/routerManifest.d.ts.map +1 -1
  29. package/dist/client/routerManifest.js +15 -187
  30. package/dist/client/routerManifest.js.map +1 -1
  31. package/dist/client/types.d.ts +12 -12
  32. package/dist/client/types.d.ts.map +1 -1
  33. package/dist/client/types.js +8 -1
  34. package/dist/client/types.js.map +1 -1
  35. package/dist/client/useCall.d.ts +20 -9
  36. package/dist/client/useCall.d.ts.map +1 -1
  37. package/dist/client/useCall.js +21 -6
  38. package/dist/client/useCall.js.map +1 -1
  39. package/dist/client/useFetch.d.ts +3 -3
  40. package/dist/client/useFetch.d.ts.map +1 -1
  41. package/dist/client/useFetch.js +8 -5
  42. package/dist/client/useFetch.js.map +1 -1
  43. package/dist/client/useStreaming.d.ts +3 -3
  44. package/dist/client/useStreaming.d.ts.map +1 -1
  45. package/dist/client/useStreaming.js +9 -7
  46. package/dist/client/useStreaming.js.map +1 -1
  47. package/dist/internal/index.d.ts +4 -0
  48. package/dist/internal/index.d.ts.map +1 -0
  49. package/dist/internal/index.js +4 -0
  50. package/dist/internal/index.js.map +1 -0
  51. package/dist/runtime/pageRoutes.d.ts +11 -0
  52. package/dist/runtime/pageRoutes.d.ts.map +1 -0
  53. package/dist/runtime/pageRoutes.js +50 -0
  54. package/dist/runtime/pageRoutes.js.map +1 -0
  55. package/dist/server/defineMethod.d.ts +16 -2
  56. package/dist/server/defineMethod.d.ts.map +1 -1
  57. package/dist/server/defineMethod.js +27 -3
  58. package/dist/server/defineMethod.js.map +1 -1
  59. package/dist/server/defineWorker.d.ts.map +1 -1
  60. package/dist/server/defineWorker.js +4 -6
  61. package/dist/server/defineWorker.js.map +1 -1
  62. package/dist/server/devServer.d.ts +2 -1
  63. package/dist/server/devServer.d.ts.map +1 -1
  64. package/dist/server/devServer.js +6 -9
  65. package/dist/server/devServer.js.map +1 -1
  66. package/dist/server/httpRouter.d.ts.map +1 -1
  67. package/dist/server/httpRouter.js +17 -2
  68. package/dist/server/httpRouter.js.map +1 -1
  69. package/dist/server/index.d.ts +16 -9
  70. package/dist/server/index.d.ts.map +1 -1
  71. package/dist/server/index.js +9 -12
  72. package/dist/server/index.js.map +1 -1
  73. package/dist/server/prodServer.d.ts +2 -0
  74. package/dist/server/prodServer.d.ts.map +1 -1
  75. package/dist/server/prodServer.js +7 -5
  76. package/dist/server/prodServer.js.map +1 -1
  77. package/dist/server/ssr.d.ts +4 -1
  78. package/dist/server/ssr.d.ts.map +1 -1
  79. package/dist/server/ssr.js +27 -61
  80. package/dist/server/ssr.js.map +1 -1
  81. package/dist/vite/heliumPlugin.d.ts +0 -14
  82. package/dist/vite/heliumPlugin.d.ts.map +1 -1
  83. package/dist/vite/heliumPlugin.js +68 -294
  84. package/dist/vite/heliumPlugin.js.map +1 -1
  85. package/dist/vite/paths.d.ts +0 -2
  86. package/dist/vite/paths.d.ts.map +1 -1
  87. package/dist/vite/paths.js +0 -2
  88. package/dist/vite/paths.js.map +1 -1
  89. package/dist/vite/rpcDiscovery.d.ts +10 -0
  90. package/dist/vite/rpcDiscovery.d.ts.map +1 -0
  91. package/dist/vite/rpcDiscovery.js +237 -0
  92. package/dist/vite/rpcDiscovery.js.map +1 -0
  93. package/dist/vite/rpcModule.d.ts +4 -0
  94. package/dist/vite/rpcModule.d.ts.map +1 -0
  95. package/dist/vite/rpcModule.js +64 -0
  96. package/dist/vite/rpcModule.js.map +1 -0
  97. package/dist/vite/scanner.d.ts +14 -4
  98. package/dist/vite/scanner.d.ts.map +1 -1
  99. package/dist/vite/scanner.js +130 -236
  100. package/dist/vite/scanner.js.map +1 -1
  101. package/dist/vite/serverClientAdapter.d.ts +103 -0
  102. package/dist/vite/serverClientAdapter.d.ts.map +1 -0
  103. package/dist/vite/serverClientAdapter.js +139 -0
  104. package/dist/vite/serverClientAdapter.js.map +1 -0
  105. package/dist/vite/ssg.d.ts +5 -8
  106. package/dist/vite/ssg.d.ts.map +1 -1
  107. package/dist/vite/ssg.js +32 -263
  108. package/dist/vite/ssg.js.map +1 -1
  109. package/dist/vite/virtualServerModule.d.ts +4 -4
  110. package/dist/vite/virtualServerModule.d.ts.map +1 -1
  111. package/dist/vite/virtualServerModule.js +18 -62
  112. package/dist/vite/virtualServerModule.js.map +1 -1
  113. package/docs/agent/api-reference.md +45 -0
  114. package/docs/agent/editable-forms.md +37 -0
  115. package/docs/agent/guide-get.md +13 -0
  116. package/docs/agent/guide-index.md +15 -0
  117. package/docs/agent/http-handlers.md +9 -0
  118. package/docs/agent/imports.md +16 -0
  119. package/docs/agent/index.md +48 -0
  120. package/docs/agent/input-validation.md +9 -0
  121. package/docs/agent/measuring.md +7 -0
  122. package/docs/agent/mutations.md +11 -0
  123. package/docs/agent/operations.md +9 -0
  124. package/docs/agent/query-params.md +28 -0
  125. package/docs/agent/rendering.md +9 -0
  126. package/docs/agent/request-context.md +13 -0
  127. package/docs/agent/routing.md +11 -0
  128. package/docs/agent/scaffold.md +15 -0
  129. package/docs/agent/security.md +9 -0
  130. package/docs/agent/server-files.md +9 -0
  131. package/docs/agent/streaming.md +9 -0
  132. package/docs/agent/validation-page.md +21 -0
  133. package/docs/agent/validation.md +33 -0
  134. package/docs/agent/verify.md +19 -0
  135. package/docs/agent/workflow.md +11 -0
  136. package/docs/agent-guide.md +266 -0
  137. package/docs/agent-start.md +87 -0
  138. package/docs/migration-0.11.md +15 -0
  139. package/package.json +20 -5
  140. package/dist/server/handlerLoader.d.ts +0 -1
  141. package/dist/server/handlerLoader.d.ts.map +0 -1
  142. package/dist/server/handlerLoader.js +0 -2
  143. package/dist/server/handlerLoader.js.map +0 -1
  144. package/dist/server/ipExtractor.d.ts +0 -48
  145. package/dist/server/ipExtractor.d.ts.map +0 -1
  146. package/dist/server/ipExtractor.js +0 -96
  147. package/dist/server/ipExtractor.js.map +0 -1
  148. package/dist/server/requestRouting.d.ts +0 -4
  149. package/dist/server/requestRouting.d.ts.map +0 -1
  150. package/dist/server/requestRouting.js +0 -67
  151. package/dist/server/requestRouting.js.map +0 -1
  152. package/dist/utils/deepEqual.d.ts +0 -1
  153. package/dist/utils/deepEqual.d.ts.map +0 -1
  154. package/dist/utils/deepEqual.js +0 -2
  155. package/dist/utils/deepEqual.js.map +0 -1
  156. package/dist/utils/formatError.d.ts +0 -2
  157. package/dist/utils/formatError.d.ts.map +0 -1
  158. package/dist/utils/formatError.js +0 -18
  159. package/dist/utils/formatError.js.map +0 -1
@@ -1,6 +1,8 @@
1
1
  import React from "react";
2
+ import { createMatcher as createPageMatcher, pathFromPageFile } from "../runtime/pageRoutes.js";
2
3
  import { compareRoutePatterns } from "../runtime/routeOrder.js";
3
4
  import { log } from "../utils/logger.js";
5
+ import { pageModules } from "./pageModules.js";
4
6
  /**
5
7
  * Convert a file path to a route pattern
6
8
  * Examples:
@@ -15,221 +17,47 @@ import { log } from "../utils/logger.js";
15
17
  * @internal Exported for testing
16
18
  */
17
19
  export function pathFromFile(file) {
18
- // Remove /src/pages prefix and file extension
19
- const withoutPrefix = file.replace("/src/pages", "").replace(/\.(tsx|jsx|ts|js)$/, "");
20
- // Handle special files
21
- if (withoutPrefix === "/404") {
22
- return "__404__";
23
- }
24
- // Remove route groups (folders in parentheses)
25
- // E.g., /(website)/contact → /contact
26
- let pattern = withoutPrefix.replace(/\/\([^)]+\)/g, "");
27
- // Convert /index to /
28
- pattern = pattern.replace(/\/index$/, "") || "/";
29
- // Convert [...param] to *param (catch-all)
30
- pattern = pattern.replace(/\[\.\.\.(.+?)\]/g, "*$1");
31
- // Convert [param] to :param (single dynamic segment)
32
- pattern = pattern.replace(/\[(.+?)\]/g, ":$1");
33
- return pattern;
20
+ return pathFromPageFile(file.replace("/src/pages", ""));
34
21
  }
35
- /**
36
- * Create a matcher function for a route pattern
37
- * Supports dynamic segments like :id, :slug, etc.
38
- * Supports catch-all segments like *slug for [...slug]
39
- * @internal Exported for testing
40
- */
41
22
  export function createMatcher(pattern) {
42
- const decodeSegment = (value) => {
43
- try {
44
- return decodeURIComponent(value);
45
- }
46
- catch {
47
- return value;
48
- }
49
- };
50
- const segments = pattern.split("/").filter(Boolean);
51
- return (path) => {
52
- // Remove query string and hash
53
- const cleanPath = path.split("?")[0].split("#")[0];
54
- const pathSegments = cleanPath.split("/").filter(Boolean);
55
- // For root path, handle specially
56
- if (pattern === "/" && cleanPath === "/") {
57
- return { params: {} };
58
- }
59
- const params = {};
60
- // Check for catch-all segment (must be last)
61
- const hasCatchAll = segments.some((seg) => seg.startsWith("*"));
62
- if (hasCatchAll) {
63
- const catchAllIndex = segments.findIndex((seg) => seg.startsWith("*"));
64
- // Catch-all must be the last segment
65
- if (catchAllIndex !== segments.length - 1) {
66
- log("warn", `Catch-all segment must be last: ${pattern}`);
67
- return null;
68
- }
69
- const catchAllParam = segments[catchAllIndex].slice(1); // Remove *
70
- // Match segments before catch-all
71
- for (let i = 0; i < catchAllIndex; i++) {
72
- const seg = segments[i];
73
- const value = pathSegments[i];
74
- if (!value) {
75
- return null;
76
- } // Not enough path segments
77
- if (seg.startsWith(":")) {
78
- params[seg.slice(1)] = decodeSegment(value);
79
- }
80
- else if (seg !== value) {
81
- return null; // Static segment must match
82
- }
83
- }
84
- // Collect remaining path segments into catch-all param as an array
85
- const remainingSegments = pathSegments.slice(catchAllIndex);
86
- params[catchAllParam] = remainingSegments.map(decodeSegment);
87
- return { params };
88
- }
89
- // Regular matching (no catch-all)
90
- // If segment counts don't match, no match
91
- if (segments.length !== pathSegments.length) {
92
- return null;
93
- }
94
- for (let i = 0; i < segments.length; i++) {
95
- const seg = segments[i];
96
- const value = pathSegments[i];
97
- if (seg.startsWith(":")) {
98
- // Dynamic segment
99
- params[seg.slice(1)] = decodeSegment(value);
100
- }
101
- else if (seg !== value) {
102
- // Static segment must match exactly
103
- return null;
104
- }
105
- }
106
- return { params };
107
- };
23
+ return createPageMatcher(pattern, () => log("warn", `Catch-all segment must be last: ${pattern}`));
108
24
  }
109
- /**
110
- * Get directory path from file path
111
- * /src/pages/tasks/[id].tsx → /tasks
112
- * /src/pages/(website)/contact.tsx → /(website)
113
- */
114
- function getDirectoryPath(file) {
115
- const withoutPrefix = file.replace("/src/pages", "").replace(/\.(tsx|jsx|ts|js)$/, "");
116
- const parts = withoutPrefix.split("/");
117
- parts.pop(); // Remove filename
118
- return parts.join("/") || "/";
119
- }
120
- /**
121
- * Build route manifest from pages directory
122
- * Uses import.meta.glob to discover all page files
123
- * Supports both eager and lazy loading for Suspense compatibility
124
- */
125
25
  export function buildRoutes() {
126
26
  // SSR check - return empty routes if running server-side
127
27
  if (typeof window === "undefined") {
128
28
  return { routes: [], NotFound: undefined, AppShell: undefined };
129
29
  }
130
- // Eagerly load all page components (for initial render and layouts)
131
- // Exclude .server.* sidecar files — they contain server-only code (e.g. DB access)
132
- // and must never be bundled into the client. App shells are loaded by the
133
- // generated entry and are not routable pages; declarations have no runtime.
134
- const eagerPages = import.meta.glob(["/src/pages/**/*.{tsx,jsx,ts,js}", "!**/*.server.*", "!**/*.d.ts", "!**/_app.*"], {
135
- eager: true,
136
- });
137
- // Lazy load all page components (for Suspense support)
138
- const lazyPages = import.meta.glob(["/src/pages/**/*.{tsx,jsx,ts,js}", "!**/*.server.*", "!**/*.d.ts", "!**/_app.*"]);
139
- // Debug mode: set localStorage.setItem('helium_debug_routes', 'true') to enable
140
30
  const debugRoutes = typeof localStorage !== "undefined" && localStorage.getItem("helium_debug_routes") === "true";
141
- if (debugRoutes) {
142
- console.group("[Helium Router] Discovered pages:");
143
- for (const file of Object.keys(eagerPages)) {
144
- console.log(` ${file} → ${pathFromFile(file)}`);
145
- }
146
- console.groupEnd();
147
- }
148
31
  const routes = [];
149
32
  let NotFound;
150
- let AppShell;
151
- // Build layout map: directory path -> layout component
152
- const layoutMap = new Map();
153
- // Track route patterns to detect collisions: pattern -> file path
154
- const routePatternMap = new Map();
155
- // First pass: collect all layouts
156
- for (const [file, mod] of Object.entries(eagerPages)) {
157
- if (file.includes("/_layout.")) {
158
- const Component = mod.default;
159
- if (Component) {
160
- const dirPath = getDirectoryPath(file);
161
- layoutMap.set(dirPath, Component);
162
- }
163
- }
164
- }
165
- // Second pass: build routes with their layouts
166
- for (const [file, mod] of Object.entries(eagerPages)) {
167
- // Skip layout files
168
- if (file.includes("/_layout.")) {
169
- continue;
170
- }
171
- const Component = mod.default;
33
+ for (const { file, page, pattern, render, layouts, preload } of pageModules) {
34
+ const Component = page.default;
172
35
  if (!Component) {
173
36
  log("warn", `No default export found in ${file}`);
174
37
  continue;
175
38
  }
176
- const pathPattern = pathFromFile(file);
177
- // Handle special pages
178
- if (pathPattern === "__404__") {
39
+ if (pattern === "__404__") {
179
40
  NotFound = Component;
180
41
  continue;
181
42
  }
182
- // Detect route collisions
183
- const existingFile = routePatternMap.get(pathPattern);
184
- if (existingFile) {
185
- log("error", `Route collision detected! Multiple files resolve to the same path "${pathPattern}":`);
186
- log("error", ` - ${existingFile}`);
187
- log("error", ` - ${file}`);
188
- log("error", `Only the first file will be used. Consider using different file names or paths.`);
189
- }
190
- else {
191
- routePatternMap.set(pathPattern, file);
192
- }
193
- // Find all layouts for this route (from root to leaf)
194
- const layouts = [];
195
- const dirPath = getDirectoryPath(file);
196
- const pathParts = dirPath.split("/").filter(Boolean);
197
- // Always check for root layout first (applies to all pages)
198
- const rootLayout = layoutMap.get("/");
199
- if (rootLayout) {
200
- layouts.push(rootLayout);
201
- }
202
- // Then check for layouts at each nested level
203
- // This will include route group layouts and any nested folder layouts
204
- for (let i = 1; i <= pathParts.length; i++) {
205
- const checkPath = "/" + pathParts.slice(0, i).join("/");
206
- const layout = layoutMap.get(checkPath);
207
- if (layout) {
208
- layouts.push(layout);
209
- }
210
- }
211
- // Get the lazy loader for this page
212
- const lazyLoader = lazyPages[file];
213
- const LazyComponent = React.lazy(lazyLoader);
214
- // Create route entry with both eager and lazy components
215
43
  routes.push({
216
- pathPattern,
217
- matcher: createMatcher(pathPattern),
44
+ pathPattern: pattern,
45
+ render,
46
+ matcher: createMatcher(pattern),
218
47
  Component,
219
- LazyComponent,
220
- layouts,
221
- preload: lazyLoader,
48
+ LazyComponent: React.lazy(preload),
49
+ layouts: layouts.flatMap((layout) => (layout.default ? [layout.default] : [])),
50
+ preload,
222
51
  });
223
52
  }
224
- // Compare specificity segment by segment so /users/:id beats /:section/edit.
225
53
  routes.sort((a, b) => compareRoutePatterns(a.pathPattern, b.pathPattern));
226
54
  if (debugRoutes) {
227
55
  console.group("[Helium Router] Final route order:");
228
56
  for (const route of routes) {
229
- console.log(` ${route.pathPattern}`);
57
+ console.log(` ${route.pathPattern} (${route.render})`);
230
58
  }
231
59
  console.groupEnd();
232
60
  }
233
- return { routes, NotFound, AppShell };
61
+ return { routes, NotFound };
234
62
  }
235
63
  //# sourceMappingURL=routerManifest.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"routerManifest.js","sourceRoot":"","sources":["../../src/client/routerManifest.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ComponentType, LazyExoticComponent } from \"react\";\nimport React from \"react\";\n\nimport { compareRoutePatterns } from \"../runtime/routeOrder.js\";\nimport { log } from \"../utils/logger.js\";\n\nexport type LayoutProps = {\n children: React.ReactNode;\n};\n\nexport type RouteEntry = {\n pathPattern: string; // \"/tasks/:id\"\n matcher: (path: string) => { params: Record<string, string | string[]> } | null;\n Component: ComponentType<unknown>;\n LazyComponent: LazyExoticComponent<ComponentType<unknown>>;\n layouts: ComponentType<LayoutProps>[]; // Array of layouts from root to leaf\n preload: () => Promise<{ default: ComponentType<unknown> }>; // Preload function for prefetching\n};\n\n/**\n * Convert a file path to a route pattern\n * Examples:\n * - /src/pages/index.tsx → /\n * - /src/pages/tasks/index.tsx → /tasks\n * - /src/pages/tasks/[id].tsx → /tasks/:id\n * - /src/pages/settings/profile.tsx → /settings/profile\n * - /src/pages/blog/[...slug].tsx → /blog/*slug\n * - /src/pages/404.tsx → __404__\n * - /src/pages/(website)/contact.tsx → /contact\n * - /src/pages/(portal)/dashboard.tsx → /dashboard\n * @internal Exported for testing\n */\nexport function pathFromFile(file: string): string {\n // Remove /src/pages prefix and file extension\n const withoutPrefix = file.replace(\"/src/pages\", \"\").replace(/\\.(tsx|jsx|ts|js)$/, \"\");\n\n // Handle special files\n if (withoutPrefix === \"/404\") {\n return \"__404__\";\n }\n\n // Remove route groups (folders in parentheses)\n // E.g., /(website)/contact → /contact\n let pattern = withoutPrefix.replace(/\\/\\([^)]+\\)/g, \"\");\n\n // Convert /index to /\n pattern = pattern.replace(/\\/index$/, \"\") || \"/\";\n // Convert [...param] to *param (catch-all)\n pattern = pattern.replace(/\\[\\.\\.\\.(.+?)\\]/g, \"*$1\");\n // Convert [param] to :param (single dynamic segment)\n pattern = pattern.replace(/\\[(.+?)\\]/g, \":$1\");\n\n return pattern;\n}\n\n/**\n * Create a matcher function for a route pattern\n * Supports dynamic segments like :id, :slug, etc.\n * Supports catch-all segments like *slug for [...slug]\n * @internal Exported for testing\n */\nexport function createMatcher(pattern: string) {\n const decodeSegment = (value: string) => {\n try {\n return decodeURIComponent(value);\n } catch {\n return value;\n }\n };\n const segments = pattern.split(\"/\").filter(Boolean);\n\n return (path: string) => {\n // Remove query string and hash\n const cleanPath = path.split(\"?\")[0].split(\"#\")[0];\n const pathSegments = cleanPath.split(\"/\").filter(Boolean);\n\n // For root path, handle specially\n if (pattern === \"/\" && cleanPath === \"/\") {\n return { params: {} };\n }\n\n const params: Record<string, string | string[]> = {};\n\n // Check for catch-all segment (must be last)\n const hasCatchAll = segments.some((seg) => seg.startsWith(\"*\"));\n if (hasCatchAll) {\n const catchAllIndex = segments.findIndex((seg) => seg.startsWith(\"*\"));\n\n // Catch-all must be the last segment\n if (catchAllIndex !== segments.length - 1) {\n log(\"warn\", `Catch-all segment must be last: ${pattern}`);\n return null;\n }\n\n const catchAllParam = segments[catchAllIndex].slice(1); // Remove *\n\n // Match segments before catch-all\n for (let i = 0; i < catchAllIndex; i++) {\n const seg = segments[i];\n const value = pathSegments[i];\n\n if (!value) {\n return null;\n } // Not enough path segments\n\n if (seg.startsWith(\":\")) {\n params[seg.slice(1)] = decodeSegment(value);\n } else if (seg !== value) {\n return null; // Static segment must match\n }\n }\n\n // Collect remaining path segments into catch-all param as an array\n const remainingSegments = pathSegments.slice(catchAllIndex);\n params[catchAllParam] = remainingSegments.map(decodeSegment);\n\n return { params };\n }\n\n // Regular matching (no catch-all)\n // If segment counts don't match, no match\n if (segments.length !== pathSegments.length) {\n return null;\n }\n\n for (let i = 0; i < segments.length; i++) {\n const seg = segments[i];\n const value = pathSegments[i];\n\n if (seg.startsWith(\":\")) {\n // Dynamic segment\n params[seg.slice(1)] = decodeSegment(value);\n } else if (seg !== value) {\n // Static segment must match exactly\n return null;\n }\n }\n\n return { params };\n };\n}\n\n/**\n * Get directory path from file path\n * /src/pages/tasks/[id].tsx → /tasks\n * /src/pages/(website)/contact.tsx → /(website)\n */\nfunction getDirectoryPath(file: string): string {\n const withoutPrefix = file.replace(\"/src/pages\", \"\").replace(/\\.(tsx|jsx|ts|js)$/, \"\");\n const parts = withoutPrefix.split(\"/\");\n parts.pop(); // Remove filename\n return parts.join(\"/\") || \"/\";\n}\n\n/**\n * Build route manifest from pages directory\n * Uses import.meta.glob to discover all page files\n * Supports both eager and lazy loading for Suspense compatibility\n */\nexport function buildRoutes(): {\n routes: RouteEntry[];\n NotFound?: ComponentType<unknown>;\n AppShell?: ComponentType<unknown>;\n} {\n // SSR check - return empty routes if running server-side\n if (typeof window === \"undefined\") {\n return { routes: [], NotFound: undefined, AppShell: undefined };\n }\n\n // Eagerly load all page components (for initial render and layouts)\n // Exclude .server.* sidecar files — they contain server-only code (e.g. DB access)\n // and must never be bundled into the client. App shells are loaded by the\n // generated entry and are not routable pages; declarations have no runtime.\n const eagerPages = import.meta.glob([\"/src/pages/**/*.{tsx,jsx,ts,js}\", \"!**/*.server.*\", \"!**/*.d.ts\", \"!**/_app.*\"], {\n eager: true,\n }) as Record<string, { default: ComponentType<unknown> }>;\n\n // Lazy load all page components (for Suspense support)\n const lazyPages = import.meta.glob([\"/src/pages/**/*.{tsx,jsx,ts,js}\", \"!**/*.server.*\", \"!**/*.d.ts\", \"!**/_app.*\"]) as Record<\n string,\n () => Promise<{ default: ComponentType<unknown> }>\n >;\n\n // Debug mode: set localStorage.setItem('helium_debug_routes', 'true') to enable\n const debugRoutes = typeof localStorage !== \"undefined\" && localStorage.getItem(\"helium_debug_routes\") === \"true\";\n\n if (debugRoutes) {\n console.group(\"[Helium Router] Discovered pages:\");\n for (const file of Object.keys(eagerPages)) {\n console.log(` ${file} → ${pathFromFile(file)}`);\n }\n console.groupEnd();\n }\n\n const routes: RouteEntry[] = [];\n let NotFound: ComponentType<unknown> | undefined;\n let AppShell: ComponentType<unknown> | undefined;\n\n // Build layout map: directory path -> layout component\n const layoutMap = new Map<string, ComponentType<LayoutProps>>();\n\n // Track route patterns to detect collisions: pattern -> file path\n const routePatternMap = new Map<string, string>();\n\n // First pass: collect all layouts\n for (const [file, mod] of Object.entries(eagerPages)) {\n if (file.includes(\"/_layout.\")) {\n const Component = mod.default;\n if (Component) {\n const dirPath = getDirectoryPath(file);\n layoutMap.set(dirPath, Component as ComponentType<LayoutProps>);\n }\n }\n }\n\n // Second pass: build routes with their layouts\n for (const [file, mod] of Object.entries(eagerPages)) {\n // Skip layout files\n if (file.includes(\"/_layout.\")) {\n continue;\n }\n\n const Component = mod.default;\n if (!Component) {\n log(\"warn\", `No default export found in ${file}`);\n continue;\n }\n\n const pathPattern = pathFromFile(file);\n\n // Handle special pages\n if (pathPattern === \"__404__\") {\n NotFound = Component;\n continue;\n }\n\n // Detect route collisions\n const existingFile = routePatternMap.get(pathPattern);\n if (existingFile) {\n log(\"error\", `Route collision detected! Multiple files resolve to the same path \"${pathPattern}\":`);\n log(\"error\", ` - ${existingFile}`);\n log(\"error\", ` - ${file}`);\n log(\"error\", `Only the first file will be used. Consider using different file names or paths.`);\n } else {\n routePatternMap.set(pathPattern, file);\n }\n\n // Find all layouts for this route (from root to leaf)\n const layouts: ComponentType<LayoutProps>[] = [];\n const dirPath = getDirectoryPath(file);\n const pathParts = dirPath.split(\"/\").filter(Boolean);\n\n // Always check for root layout first (applies to all pages)\n const rootLayout = layoutMap.get(\"/\");\n if (rootLayout) {\n layouts.push(rootLayout);\n }\n\n // Then check for layouts at each nested level\n // This will include route group layouts and any nested folder layouts\n for (let i = 1; i <= pathParts.length; i++) {\n const checkPath = \"/\" + pathParts.slice(0, i).join(\"/\");\n const layout = layoutMap.get(checkPath);\n if (layout) {\n layouts.push(layout);\n }\n }\n\n // Get the lazy loader for this page\n const lazyLoader = lazyPages[file];\n const LazyComponent = React.lazy(lazyLoader);\n\n // Create route entry with both eager and lazy components\n routes.push({\n pathPattern,\n matcher: createMatcher(pathPattern),\n Component,\n LazyComponent,\n layouts,\n preload: lazyLoader,\n });\n }\n\n // Compare specificity segment by segment so /users/:id beats /:section/edit.\n routes.sort((a, b) => compareRoutePatterns(a.pathPattern, b.pathPattern));\n\n if (debugRoutes) {\n console.group(\"[Helium Router] Final route order:\");\n for (const route of routes) {\n console.log(` ${route.pathPattern}`);\n }\n console.groupEnd();\n }\n\n return { routes, NotFound, AppShell };\n}\n"]}
1
+ {"version":3,"file":"routerManifest.js","sourceRoot":"","sources":["../../src/client/routerManifest.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,aAAa,IAAI,iBAAiB,EAAkB,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAChH,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAgB/C;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,YAAY,CAAC,IAAY;IACrC,OAAO,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,OAAe;IACzC,OAAO,iBAAiB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,mCAAmC,OAAO,EAAE,CAAC,CAAC,CAAC;AACvG,CAAC;AAED,MAAM,UAAU,WAAW;IAKvB,yDAAyD;IACzD,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;QAChC,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IACpE,CAAC;IAED,MAAM,WAAW,GAAG,OAAO,YAAY,KAAK,WAAW,IAAI,YAAY,CAAC,OAAO,CAAC,qBAAqB,CAAC,KAAK,MAAM,CAAC;IAClH,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,IAAI,QAA4C,CAAC;IAEjD,KAAK,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,WAAW,EAAE,CAAC;QAC1E,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,GAAG,CAAC,MAAM,EAAE,8BAA8B,IAAI,EAAE,CAAC,CAAC;YAClD,SAAS;QACb,CAAC;QAED,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YACxB,QAAQ,GAAG,SAAS,CAAC;YACrB,SAAS;QACb,CAAC;QAED,MAAM,CAAC,IAAI,CAAC;YACR,WAAW,EAAE,OAAO;YACpB,MAAM;YACN,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC;YAC/B,SAAS;YACT,aAAa,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;YAClC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC9E,OAAO;SACV,CAAC,CAAC;IACP,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;IAE1E,IAAI,WAAW,EAAE,CAAC;QACd,OAAO,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACpD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YACzB,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,WAAW,KAAK,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;QAC5D,CAAC;QACD,OAAO,CAAC,QAAQ,EAAE,CAAC;IACvB,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;AAChC,CAAC","sourcesContent":["import type { ComponentType, LazyExoticComponent } from \"react\";\nimport React from \"react\";\n\nimport { createMatcher as createPageMatcher, type PageRoute, pathFromPageFile } from \"../runtime/pageRoutes.js\";\nimport { compareRoutePatterns } from \"../runtime/routeOrder.js\";\nimport { log } from \"../utils/logger.js\";\nimport { pageModules } from \"./pageModules.js\";\n\nexport type LayoutProps = {\n children: React.ReactNode;\n};\n\nexport type RouteEntry = {\n render: PageRoute[\"render\"];\n pathPattern: string; // \"/tasks/:id\"\n matcher: (path: string) => { params: Record<string, string | string[]> } | null;\n Component: ComponentType<unknown>;\n LazyComponent: LazyExoticComponent<ComponentType<unknown>>;\n layouts: ComponentType<LayoutProps>[]; // Array of layouts from root to leaf\n preload: () => Promise<{ default: ComponentType<unknown> }>; // Preload function for prefetching\n};\n\n/**\n * Convert a file path to a route pattern\n * Examples:\n * - /src/pages/index.tsx → /\n * - /src/pages/tasks/index.tsx → /tasks\n * - /src/pages/tasks/[id].tsx → /tasks/:id\n * - /src/pages/settings/profile.tsx → /settings/profile\n * - /src/pages/blog/[...slug].tsx → /blog/*slug\n * - /src/pages/404.tsx → __404__\n * - /src/pages/(website)/contact.tsx → /contact\n * - /src/pages/(portal)/dashboard.tsx → /dashboard\n * @internal Exported for testing\n */\nexport function pathFromFile(file: string): string {\n return pathFromPageFile(file.replace(\"/src/pages\", \"\"));\n}\n\nexport function createMatcher(pattern: string) {\n return createPageMatcher(pattern, () => log(\"warn\", `Catch-all segment must be last: ${pattern}`));\n}\n\nexport function buildRoutes(): {\n routes: RouteEntry[];\n NotFound?: ComponentType<unknown>;\n AppShell?: ComponentType<unknown>;\n} {\n // SSR check - return empty routes if running server-side\n if (typeof window === \"undefined\") {\n return { routes: [], NotFound: undefined, AppShell: undefined };\n }\n\n const debugRoutes = typeof localStorage !== \"undefined\" && localStorage.getItem(\"helium_debug_routes\") === \"true\";\n const routes: RouteEntry[] = [];\n let NotFound: ComponentType<unknown> | undefined;\n\n for (const { file, page, pattern, render, layouts, preload } of pageModules) {\n const Component = page.default;\n if (!Component) {\n log(\"warn\", `No default export found in ${file}`);\n continue;\n }\n\n if (pattern === \"__404__\") {\n NotFound = Component;\n continue;\n }\n\n routes.push({\n pathPattern: pattern,\n render,\n matcher: createMatcher(pattern),\n Component,\n LazyComponent: React.lazy(preload),\n layouts: layouts.flatMap((layout) => (layout.default ? [layout.default] : [])),\n preload,\n });\n }\n\n routes.sort((a, b) => compareRoutePatterns(a.pathPattern, b.pathPattern));\n\n if (debugRoutes) {\n console.group(\"[Helium Router] Final route order:\");\n for (const route of routes) {\n console.log(` ${route.pathPattern} (${route.render})`);\n }\n console.groupEnd();\n }\n\n return { routes, NotFound };\n}\n"]}
@@ -1,14 +1,14 @@
1
- /**
2
- * Represents a server method stub that can be passed to client hooks like useFetch/useCall.
3
- * This type is compatible with HeliumMethodDef so that methods defined with defineMethod
4
- * can be passed directly to client hooks with proper type inference.
5
- *
6
- * Note: Using method shorthand syntax for `handler` makes it bivariant,
7
- * allowing HeliumMethodDef (with HeliumContext) to be assignable to MethodStub.
8
- */
9
- export type MethodStub<TArgs = unknown, TResult = unknown> = {
10
- __kind: "method";
11
- __id: string;
12
- handler(args: TArgs, ctx: unknown): Promise<TResult> | TResult;
1
+ declare const methodSignature: unique symbol;
2
+ /** A generated RPC method reference carrying its argument and result types. */
3
+ export type MethodReference<TArgs = never, TResult = unknown> = {
4
+ readonly [methodSignature]: (args: TArgs) => TResult;
13
5
  };
6
+ /** Generated references expose no server implementation or callable handler. */
7
+ export declare function getMethodId(method: MethodReference): string;
8
+ /** Arguments are optional only when the method accepts undefined. */
9
+ export type MethodArgs<TArgs> = undefined extends TArgs ? [args?: TArgs] : [args: TArgs];
10
+ /** Streaming results must use useStreaming/streamRpc, never unary transport. */
11
+ type UnaryResult<TResult> = [Extract<TResult, AsyncIterable<unknown>>] extends [never] ? unknown : never;
12
+ export type UnaryMethod<TArgs, TResult> = MethodReference<TArgs, TResult> & UnaryResult<TResult>;
13
+ export {};
14
14
  //# sourceMappingURL=types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/client/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,MAAM,UAAU,CAAC,KAAK,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO,IAAI;IACzD,MAAM,EAAE,QAAQ,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;CAClE,CAAC"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/client/types.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,eAAe,EAAE,OAAO,MAAM,CAAC;AAE7C,+EAA+E;AAC/E,MAAM,MAAM,eAAe,CAAC,KAAK,GAAG,KAAK,EAAE,OAAO,GAAG,OAAO,IAAI;IAC5D,QAAQ,CAAC,CAAC,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,OAAO,CAAC;CACxD,CAAC;AAEF,gFAAgF;AAChF,wBAAgB,WAAW,CAAC,MAAM,EAAE,eAAe,GAAG,MAAM,CAM3D;AAED,qEAAqE;AACrE,MAAM,MAAM,UAAU,CAAC,KAAK,IAAI,SAAS,SAAS,KAAK,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAEzF,gFAAgF;AAChF,KAAK,WAAW,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,OAAO,GAAG,KAAK,CAAC;AAEzG,MAAM,MAAM,WAAW,CAAC,KAAK,EAAE,OAAO,IAAI,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC"}
@@ -1,2 +1,9 @@
1
- export {};
1
+ /** Generated references expose no server implementation or callable handler. */
2
+ export function getMethodId(method) {
3
+ const value = method;
4
+ if (!value || typeof value !== "object" || Object.keys(value).length !== 1 || typeof value.__id !== "string" || !value.__id) {
5
+ throw new Error("Expected a generated RPC reference from src/rpc.generated.ts.");
6
+ }
7
+ return value.__id;
8
+ }
2
9
  //# sourceMappingURL=types.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/client/types.ts"],"names":[],"mappings":"","sourcesContent":["/**\n * Represents a server method stub that can be passed to client hooks like useFetch/useCall.\n * This type is compatible with HeliumMethodDef so that methods defined with defineMethod\n * can be passed directly to client hooks with proper type inference.\n *\n * Note: Using method shorthand syntax for `handler` makes it bivariant,\n * allowing HeliumMethodDef (with HeliumContext) to be assignable to MethodStub.\n */\nexport type MethodStub<TArgs = unknown, TResult = unknown> = {\n __kind: \"method\";\n __id: string;\n handler(args: TArgs, ctx: unknown): Promise<TResult> | TResult;\n};\n"]}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/client/types.ts"],"names":[],"mappings":"AAOA,gFAAgF;AAChF,MAAM,UAAU,WAAW,CAAC,MAAuB;IAC/C,MAAM,KAAK,GAAG,MAAuC,CAAC;IACtD,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QAC1H,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;IACrF,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC;AACtB,CAAC","sourcesContent":["declare const methodSignature: unique symbol;\n\n/** A generated RPC method reference carrying its argument and result types. */\nexport type MethodReference<TArgs = never, TResult = unknown> = {\n readonly [methodSignature]: (args: TArgs) => TResult;\n};\n\n/** Generated references expose no server implementation or callable handler. */\nexport function getMethodId(method: MethodReference): string {\n const value = method as unknown as { __id?: unknown };\n if (!value || typeof value !== \"object\" || Object.keys(value).length !== 1 || typeof value.__id !== \"string\" || !value.__id) {\n throw new Error(\"Expected a generated RPC reference from src/rpc.generated.ts.\");\n }\n return value.__id;\n}\n\n/** Arguments are optional only when the method accepts undefined. */\nexport type MethodArgs<TArgs> = undefined extends TArgs ? [args?: TArgs] : [args: TArgs];\n\n/** Streaming results must use useStreaming/streamRpc, never unary transport. */\ntype UnaryResult<TResult> = [Extract<TResult, AsyncIterable<unknown>>] extends [never] ? unknown : never;\n\nexport type UnaryMethod<TArgs, TResult> = MethodReference<TArgs, TResult> & UnaryResult<TResult>;\n"]}
@@ -1,33 +1,44 @@
1
1
  import type { RpcStats } from "../runtime/protocol.js";
2
- import type { MethodStub } from "./types.js";
2
+ import { RpcError } from "./RpcError.js";
3
+ import { type MethodArgs, type MethodReference, type UnaryMethod } from "./types.js";
3
4
  /**
4
5
  * Options passed to `useCall`.
5
6
  *
6
- * - invalidate: array of MethodStubs whose cache entries will be invalidated
7
+ * - invalidate: array of methods whose cache entries will be invalidated
7
8
  * when this call completes successfully (useful to refresh related reads).
8
9
  * - onSuccess: optional callback that receives the result on success.
9
10
  * - onError: optional callback that receives the error message on failure.
10
11
  */
11
- type UseCallOptions = {
12
- invalidate?: MethodStub[];
13
- onSuccess?: (result: unknown) => void;
12
+ export type UseCallOptions<TResult = unknown> = {
13
+ invalidate?: MethodReference[];
14
+ onSuccess?: (result: TResult) => void;
14
15
  onError?: (error: string) => void;
15
16
  };
17
+ /** A handled submission outcome; failure does not imply a server write was rolled back. */
18
+ export type SubmitResult<TResult> = {
19
+ status: "success";
20
+ data: TResult;
21
+ } | {
22
+ status: "error";
23
+ error: RpcError;
24
+ } | {
25
+ status: "busy";
26
+ };
16
27
  /**
17
28
  * React hook for imperative RPC calls (commonly used for mutations).
18
29
  *
19
30
  * @template TArgs - argument type for the method
20
31
  * @template TResult - expected result type
21
- * @param method - MethodStub identifying the server method to call
32
+ * @param method - reference identifying the server method to call
22
33
  * @param options - UseCallOptions to control invalidation / callbacks
23
34
  * @returns { data, call, isCalling, error, stats } where `call(args)` triggers the RPC and returns the result
24
35
  */
25
- export declare function useCall<TArgs, TResult>(method: MethodStub<TArgs, TResult>, options?: UseCallOptions): {
36
+ export declare function useCall<TArgs, TResult>(method: UnaryMethod<TArgs, TResult>, options?: UseCallOptions<NoInfer<TResult>>): {
26
37
  data: TResult | undefined;
27
- call: (args: TArgs) => Promise<TResult | undefined>;
38
+ call: (...[args]: MethodArgs<TArgs>) => Promise<TResult>;
39
+ submit: (...args: MethodArgs<TArgs>) => Promise<SubmitResult<TResult>>;
28
40
  isCalling: boolean;
29
41
  error: string | null;
30
42
  stats: RpcStats | null;
31
43
  };
32
- export {};
33
44
  //# sourceMappingURL=useCall.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"useCall.d.ts","sourceRoot":"","sources":["../../src/client/useCall.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAIvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C;;;;;;;GAOG;AACH,KAAK,cAAc,GAAG;IAClB,UAAU,CAAC,EAAE,UAAU,EAAE,CAAC;IAC1B,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACtC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,OAAO,GAAE,cAAmB;;iBAgB9D,KAAK,KAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;;;;EAwB7E"}
1
+ {"version":3,"file":"useCall.d.ts","sourceRoot":"","sources":["../../src/client/useCall.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAGvD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAe,KAAK,UAAU,EAAE,KAAK,eAAe,EAAE,KAAK,WAAW,EAAE,MAAM,YAAY,CAAC;AAElG;;;;;;;GAOG;AACH,MAAM,MAAM,cAAc,CAAC,OAAO,GAAG,OAAO,IAAI;IAC5C,UAAU,CAAC,EAAE,eAAe,EAAE,CAAC;IAC/B,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACtC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC,CAAC;AAEF,2FAA2F;AAC3F,MAAM,MAAM,YAAY,CAAC,OAAO,IAAI;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAErI;;;;;;;;GAQG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,OAAO,GAAE,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAM;;sBAiB5E,UAAU,CAAC,KAAK,CAAC,KAAG,OAAO,CAAC,OAAO,CAAC;sBA0B3D,UAAU,CAAC,KAAK,CAAC,KAAG,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;;;;EAczE"}
@@ -2,12 +2,13 @@ import { useCallback, useRef, useState } from "react";
2
2
  import { invalidateByMethod } from "./cache.js";
3
3
  import { rpcCall } from "./rpcClient.js";
4
4
  import { RpcError } from "./RpcError.js";
5
+ import { getMethodId } from "./types.js";
5
6
  /**
6
7
  * React hook for imperative RPC calls (commonly used for mutations).
7
8
  *
8
9
  * @template TArgs - argument type for the method
9
10
  * @template TResult - expected result type
10
- * @param method - MethodStub identifying the server method to call
11
+ * @param method - reference identifying the server method to call
11
12
  * @param options - UseCallOptions to control invalidation / callbacks
12
13
  * @returns { data, call, isCalling, error, stats } where `call(args)` triggers the RPC and returns the result
13
14
  */
@@ -17,14 +18,15 @@ export function useCall(method, options = {}) {
17
18
  const [error, setError] = useState(null);
18
19
  const [stats, setStats] = useState(null);
19
20
  // Use refs to store latest values without causing callback recreation
20
- const methodIdRef = useRef(method.__id);
21
+ const methodId = getMethodId(method);
22
+ const methodIdRef = useRef(methodId);
21
23
  const optionsRef = useRef(options);
22
24
  const pendingCallsRef = useRef(0);
23
25
  // Update refs on each render
24
- methodIdRef.current = method.__id;
26
+ methodIdRef.current = methodId;
25
27
  optionsRef.current = options;
26
28
  // Memoized call function - stable reference across renders
27
- const call = useCallback(async (args) => {
29
+ const call = useCallback(async (...[args]) => {
28
30
  pendingCallsRef.current++;
29
31
  setCalling(true);
30
32
  setError(null);
@@ -32,7 +34,7 @@ export function useCall(method, options = {}) {
32
34
  const result = await rpcCall(methodIdRef.current, args);
33
35
  setData(result.data);
34
36
  setStats(result.stats);
35
- optionsRef.current.invalidate?.forEach((m) => invalidateByMethod(m.__id));
37
+ optionsRef.current.invalidate?.forEach((m) => invalidateByMethod(getMethodId(m)));
36
38
  optionsRef.current.onSuccess?.(result.data);
37
39
  return result.data;
38
40
  }
@@ -48,6 +50,19 @@ export function useCall(method, options = {}) {
48
50
  setCalling(pendingCallsRef.current > 0);
49
51
  }
50
52
  }, []); // Empty deps - uses refs for latest values
51
- return { data, call, isCalling, error, stats };
53
+ // call() remains the concurrent/rejecting primitive. submit() is a handled,
54
+ // per-hook form path: pendingCallsRef changes synchronously inside call().
55
+ const submit = useCallback(async (...args) => {
56
+ if (pendingCallsRef.current > 0) {
57
+ return { status: "busy" };
58
+ }
59
+ try {
60
+ return { status: "success", data: await call(...args) };
61
+ }
62
+ catch (err) {
63
+ return { status: "error", error: err instanceof RpcError ? err : new RpcError(err instanceof Error ? err.message : "Unknown error") };
64
+ }
65
+ }, [call]);
66
+ return { data, call, submit, isCalling, error, stats };
52
67
  }
53
68
  //# sourceMappingURL=useCall.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useCall.js","sourceRoot":"","sources":["../../src/client/useCall.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAGtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAiBzC;;;;;;;;GAQG;AACH,MAAM,UAAU,OAAO,CAAiB,MAAkC,EAAE,UAA0B,EAAE;IACpG,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAsB,SAAS,CAAC,CAAC;IACjE,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAgB,IAAI,CAAC,CAAC;IACxD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAkB,IAAI,CAAC,CAAC;IAE1D,sEAAsE;IACtE,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACxC,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IACnC,MAAM,eAAe,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAElC,6BAA6B;IAC7B,WAAW,CAAC,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC;IAClC,UAAU,CAAC,OAAO,GAAG,OAAO,CAAC;IAE7B,2DAA2D;IAC3D,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,EAAE,IAAW,EAAgC,EAAE;QACzE,eAAe,CAAC,OAAO,EAAE,CAAC;QAC1B,UAAU,CAAC,IAAI,CAAC,CAAC;QACjB,QAAQ,CAAC,IAAI,CAAC,CAAC;QACf,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAiB,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACxE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACrB,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvB,UAAU,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YAC1E,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC5C,OAAO,MAAM,CAAC,IAAI,CAAC;QACvB,CAAC;QAAC,OAAO,GAAY,EAAE,CAAC;YACpB,MAAM,QAAQ,GAAG,GAAG,YAAY,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;YACpH,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC3B,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACzB,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC/C,MAAM,QAAQ,CAAC;QACnB,CAAC;gBAAS,CAAC;YACP,eAAe,CAAC,OAAO,EAAE,CAAC;YAC1B,UAAU,CAAC,eAAe,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;QAC5C,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,2CAA2C;IAEnD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;AACnD,CAAC","sourcesContent":["import { useCallback, useRef, useState } from \"react\";\n\nimport type { RpcStats } from \"../runtime/protocol.js\";\nimport { invalidateByMethod } from \"./cache.js\";\nimport { rpcCall } from \"./rpcClient.js\";\nimport { RpcError } from \"./RpcError.js\";\nimport type { MethodStub } from \"./types.js\";\n\n/**\n * Options passed to `useCall`.\n *\n * - invalidate: array of MethodStubs whose cache entries will be invalidated\n * when this call completes successfully (useful to refresh related reads).\n * - onSuccess: optional callback that receives the result on success.\n * - onError: optional callback that receives the error message on failure.\n */\ntype UseCallOptions = {\n invalidate?: MethodStub[];\n onSuccess?: (result: unknown) => void;\n onError?: (error: string) => void;\n};\n\n/**\n * React hook for imperative RPC calls (commonly used for mutations).\n *\n * @template TArgs - argument type for the method\n * @template TResult - expected result type\n * @param method - MethodStub identifying the server method to call\n * @param options - UseCallOptions to control invalidation / callbacks\n * @returns { data, call, isCalling, error, stats } where `call(args)` triggers the RPC and returns the result\n */\nexport function useCall<TArgs, TResult>(method: MethodStub<TArgs, TResult>, options: UseCallOptions = {}) {\n const [data, setData] = useState<TResult | undefined>(undefined);\n const [isCalling, setCalling] = useState(false);\n const [error, setError] = useState<string | null>(null);\n const [stats, setStats] = useState<RpcStats | null>(null);\n\n // Use refs to store latest values without causing callback recreation\n const methodIdRef = useRef(method.__id);\n const optionsRef = useRef(options);\n const pendingCallsRef = useRef(0);\n\n // Update refs on each render\n methodIdRef.current = method.__id;\n optionsRef.current = options;\n\n // Memoized call function - stable reference across renders\n const call = useCallback(async (args: TArgs): Promise<TResult | undefined> => {\n pendingCallsRef.current++;\n setCalling(true);\n setError(null);\n try {\n const result = await rpcCall<TResult, TArgs>(methodIdRef.current, args);\n setData(result.data);\n setStats(result.stats);\n optionsRef.current.invalidate?.forEach((m) => invalidateByMethod(m.__id));\n optionsRef.current.onSuccess?.(result.data);\n return result.data;\n } catch (err: unknown) {\n const rpcError = err instanceof RpcError ? err : new RpcError(err instanceof Error ? err.message : \"Unknown error\");\n setError(rpcError.message);\n setStats(rpcError.stats);\n optionsRef.current.onError?.(rpcError.message);\n throw rpcError;\n } finally {\n pendingCallsRef.current--;\n setCalling(pendingCallsRef.current > 0);\n }\n }, []); // Empty deps - uses refs for latest values\n\n return { data, call, isCalling, error, stats };\n}\n"]}
1
+ {"version":3,"file":"useCall.js","sourceRoot":"","sources":["../../src/client/useCall.ts"],"names":[],"mappings":"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","sourcesContent":["import { useCallback, useRef, useState } from \"react\";\n\nimport type { RpcStats } from \"../runtime/protocol.js\";\nimport { invalidateByMethod } from \"./cache.js\";\nimport { rpcCall } from \"./rpcClient.js\";\nimport { RpcError } from \"./RpcError.js\";\nimport { getMethodId, type MethodArgs, type MethodReference, type UnaryMethod } from \"./types.js\";\n\n/**\n * Options passed to `useCall`.\n *\n * - invalidate: array of methods whose cache entries will be invalidated\n * when this call completes successfully (useful to refresh related reads).\n * - onSuccess: optional callback that receives the result on success.\n * - onError: optional callback that receives the error message on failure.\n */\nexport type UseCallOptions<TResult = unknown> = {\n invalidate?: MethodReference[];\n onSuccess?: (result: TResult) => void;\n onError?: (error: string) => void;\n};\n\n/** A handled submission outcome; failure does not imply a server write was rolled back. */\nexport type SubmitResult<TResult> = { status: \"success\"; data: TResult } | { status: \"error\"; error: RpcError } | { status: \"busy\" };\n\n/**\n * React hook for imperative RPC calls (commonly used for mutations).\n *\n * @template TArgs - argument type for the method\n * @template TResult - expected result type\n * @param method - reference identifying the server method to call\n * @param options - UseCallOptions to control invalidation / callbacks\n * @returns { data, call, isCalling, error, stats } where `call(args)` triggers the RPC and returns the result\n */\nexport function useCall<TArgs, TResult>(method: UnaryMethod<TArgs, TResult>, options: UseCallOptions<NoInfer<TResult>> = {}) {\n const [data, setData] = useState<TResult | undefined>(undefined);\n const [isCalling, setCalling] = useState(false);\n const [error, setError] = useState<string | null>(null);\n const [stats, setStats] = useState<RpcStats | null>(null);\n\n // Use refs to store latest values without causing callback recreation\n const methodId = getMethodId(method);\n const methodIdRef = useRef(methodId);\n const optionsRef = useRef(options);\n const pendingCallsRef = useRef(0);\n\n // Update refs on each render\n methodIdRef.current = methodId;\n optionsRef.current = options;\n\n // Memoized call function - stable reference across renders\n const call = useCallback(async (...[args]: MethodArgs<TArgs>): Promise<TResult> => {\n pendingCallsRef.current++;\n setCalling(true);\n setError(null);\n try {\n const result = await rpcCall<TResult, TArgs>(methodIdRef.current, args as TArgs);\n setData(result.data);\n setStats(result.stats);\n optionsRef.current.invalidate?.forEach((m) => invalidateByMethod(getMethodId(m)));\n optionsRef.current.onSuccess?.(result.data);\n return result.data;\n } catch (err: unknown) {\n const rpcError = err instanceof RpcError ? err : new RpcError(err instanceof Error ? err.message : \"Unknown error\");\n setError(rpcError.message);\n setStats(rpcError.stats);\n optionsRef.current.onError?.(rpcError.message);\n throw rpcError;\n } finally {\n pendingCallsRef.current--;\n setCalling(pendingCallsRef.current > 0);\n }\n }, []); // Empty deps - uses refs for latest values\n\n // call() remains the concurrent/rejecting primitive. submit() is a handled,\n // per-hook form path: pendingCallsRef changes synchronously inside call().\n const submit = useCallback(\n async (...args: MethodArgs<TArgs>): Promise<SubmitResult<TResult>> => {\n if (pendingCallsRef.current > 0) {\n return { status: \"busy\" };\n }\n try {\n return { status: \"success\", data: await call(...args) };\n } catch (err: unknown) {\n return { status: \"error\", error: err instanceof RpcError ? err : new RpcError(err instanceof Error ? err.message : \"Unknown error\") };\n }\n },\n [call]\n );\n\n return { data, call, submit, isCalling, error, stats };\n}\n"]}
@@ -1,5 +1,5 @@
1
1
  import type { RpcStats } from "../runtime/protocol.js";
2
- import type { MethodStub } from "./types.js";
2
+ import { type UnaryMethod } from "./types.js";
3
3
  /**
4
4
  * Options controlling `useFetch` behaviour.
5
5
  *
@@ -25,12 +25,12 @@ export interface UseFetchOptions {
25
25
  *
26
26
  * @template TArgs - method argument type
27
27
  * @template TResult - expected return type
28
- * @param method - a MethodStub representing the server method to call
28
+ * @param method - reference identifying the server method to call
29
29
  * @param args - optional argument object passed to the server method
30
30
  * @param options - controls caching and refetch behavior (see UseFetchOptions)
31
31
  * @returns { data, isLoading, error, stats, refetch } — `data` is the cached or latest value; `refetch` triggers an immediate request
32
32
  */
33
- export declare function useFetch<TArgs, TResult>(method: MethodStub<TArgs, TResult>, args?: TArgs, options?: UseFetchOptions): {
33
+ export declare function useFetch<TArgs, TResult>(method: UnaryMethod<TArgs, TResult>, ...params: undefined extends TArgs ? [args?: NoInfer<TArgs>, options?: UseFetchOptions] : [args: NoInfer<TArgs>, options?: UseFetchOptions]): {
34
34
  data: TResult | undefined;
35
35
  isLoading: boolean;
36
36
  error: string | null;
@@ -1 +1 @@
1
- {"version":3,"file":"useFetch.d.ts","sourceRoot":"","sources":["../../src/client/useFetch.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAIvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,eAAe;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAsED;;;;;;;;;GASG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,eAAe;;;;;2BAyOvE,OAAO;EAGnD"}
1
+ {"version":3,"file":"useFetch.d.ts","sourceRoot":"","sources":["../../src/client/useFetch.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAIvD,OAAO,EAAe,KAAK,WAAW,EAAE,MAAM,YAAY,CAAC;AAE3D;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,eAAe;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAsED;;;;;;;;;GASG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,EACnC,MAAM,EAAE,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,EACnC,GAAG,MAAM,EAAE,SAAS,SAAS,KAAK,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,EAAE,eAAe,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,EAAE,eAAe,CAAC;;;;;2BA4OlG,OAAO;EAGnD"}
@@ -2,6 +2,7 @@ import { useCallback, useEffect, useRef, useState } from "react";
2
2
  import { cacheKey, clearPendingFetch, get, getPendingFetch, has, isPending, set, setPendingFetch, subscribeInvalidations } from "./cache.js";
3
3
  import { rpcCall } from "./rpcClient.js";
4
4
  import { RpcError } from "./RpcError.js";
5
+ import { getMethodId } from "./types.js";
5
6
  function getFocusCallbacksSet() {
6
7
  if (typeof window === "undefined") {
7
8
  return new Set();
@@ -61,17 +62,19 @@ function setupFocusListeners() {
61
62
  *
62
63
  * @template TArgs - method argument type
63
64
  * @template TResult - expected return type
64
- * @param method - a MethodStub representing the server method to call
65
+ * @param method - reference identifying the server method to call
65
66
  * @param args - optional argument object passed to the server method
66
67
  * @param options - controls caching and refetch behavior (see UseFetchOptions)
67
68
  * @returns { data, isLoading, error, stats, refetch } — `data` is the cached or latest value; `refetch` triggers an immediate request
68
69
  */
69
- export function useFetch(method, args, options) {
70
+ export function useFetch(method, ...params) {
71
+ const [args, options] = params;
70
72
  // Compute cache key
71
- const key = cacheKey(method.__id, args);
73
+ const methodId = getMethodId(method);
74
+ const key = cacheKey(methodId, args);
72
75
  const { ttl, refetchOnWindowFocus = true, showLoaderOnRefocus = false, showLoaderOnInvalidate = false, enabled = true } = options ?? {};
73
76
  // Use refs to store latest values without causing effect re-runs
74
- const methodIdRef = useRef(method.__id);
77
+ const methodIdRef = useRef(methodId);
75
78
  const argsRef = useRef(args);
76
79
  const keyRef = useRef(key);
77
80
  const ttlRef = useRef(ttl);
@@ -81,7 +84,7 @@ export function useFetch(method, args, options) {
81
84
  const queuedRefetchRef = useRef(false);
82
85
  const queuedRefetchShowLoaderRef = useRef(false);
83
86
  // Update refs on each render
84
- methodIdRef.current = method.__id;
87
+ methodIdRef.current = methodId;
85
88
  argsRef.current = args;
86
89
  keyRef.current = key;
87
90
  ttlRef.current = ttl;