@vesk/adapter 0.2.94 → 0.2.95

package/dist/client-bundle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-bundle.d.ts","sourceRoot":"","sources":["../src/client-bundle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client-bundle.d.ts","sourceRoot":"","sources":["../src/client-bundle.ts"],"names":[],"mappings":"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"}

package/dist/client-bundle.js

@@ -59,12 +59,24 @@ function fileUnchanged(filePath, cached) {
         return false;
     }
 }
-function buildRouterOpts(options) {
+function hasServerMiddleware(nodes) {
+    for (const node of nodes) {
+        if (node.hasMiddleware)
+            return true;
+        if (node.children?.length && hasServerMiddleware(node.children))
+            return true;
+    }
+    return false;
+}
+function buildRouterOpts(options, serverMiddleware) {
     const ttl = options?.routeDataCache;
+    const opts = [];
+    if (serverMiddleware)
+        opts.push('serverMiddleware: true');
     if (typeof ttl === 'number' && ttl > 0) {
-        return `, { routeDataCache: ${ttl} }`;
+        opts.push(`routeDataCache: ${ttl}`);
     }
-    return '';
+    return opts.length ? `, { ${opts.join(', ')} }` : '';
 }
 function findRuntimeSrc(appDir) {
     const monorepoRoot = resolve(__dirname, '..', '..', '..');
@@ -143,7 +155,7 @@ function isAnyImport(node) {
  * map (registrations would land on a detached object).
  */
 function isRuntimePreamble(node) {
-    if (node.type === 'FunctionDeclaration' && (node.id?.name === '__cleanup' || node.id?.name === '__place')) {
+    if (node.type === 'FunctionDeclaration' && (node.id?.name === '__cleanup' || node.id?.name === '__place' || node.id?.name === '__reconcileRegion')) {
         return true;
     }
     if (node.type === 'VariableDeclaration') {
@@ -1920,6 +1932,31 @@ async function buildMainBundle(routeTree, runtimeDir, codeSplit, mono, hmr, impo
         '\tfallback.appendChild(end);\n' +
         '\tfor (let i = 0; i < nodes.length; i++) fallback.insertBefore(nodes[i], end);\n' +
         '}\n';
+    const reconcileRegionFn = 'function __reconcileRegion(parent, id, branch, walker) {\n' +
+        '\tif (!parent) return;\n' +
+        '\tlet start = null;\n' +
+        '\tlet end = null;\n' +
+        '\tfor (let n = parent.firstChild; n; n = n.nextSibling) {\n' +
+        '\t\tif (n.nodeType !== 8) continue;\n' +
+        "\t\tconst text = n.textContent || '';\n" +
+        "\t\tif (text === 'vesk-r:' + id + ':0' || text === 'vesk-r:' + id + ':1') start = n;\n" +
+        "\t\telse if (text === 'vesk-r-end:' + id) end = n;\n" +
+        '\t\tif (start && end) break;\n' +
+        '\t}\n' +
+        '\tif (!start || !end) return;\n' +
+        "\tconst ssrBranch = (start.textContent || '').slice(-2) === ':1' ? 1 : 0;\n" +
+        '\tif (ssrBranch !== branch) {\n' +
+        '\t\tlet n = start.nextSibling;\n' +
+        '\t\twhile (n && n !== end) {\n' +
+        '\t\t\tconst next = n.nextSibling;\n' +
+        '\t\t\tn.remove();\n' +
+        '\t\t\tn = next;\n' +
+        '\t\t}\n' +
+        '\t\tif (walker && walker.retireDetached) walker.retireDetached();\n' +
+        '\t}\n' +
+        '\tstart.remove();\n' +
+        '\tend.remove();\n' +
+        '}\n';
     const updateComponentsFn = 'function __updateComponents(nodes) {\n' +
         '  for (const n of nodes) {\n' +
         "    if (n._pageName && __components[n._pageName]) n.page = __components[n._pageName];\n" +
@@ -1956,7 +1993,7 @@ async function buildMainBundle(routeTree, runtimeDir, codeSplit, mono, hmr, impo
             '    }\n' +
             '  }\n' +
             '}\n';
-        const routerOpts = buildRouterOpts({ routeDataCache });
+        const routerOpts = buildRouterOpts({ routeDataCache }, hasServerMiddleware(routeTree));
         const startRouterCode = 'const __startRouter = function() {\n' +
             '  __updateComponents(__routeTree);\n' +
             `  const __router = createFileRouter(__routeTree${routerOpts});\n` +
@@ -1989,7 +2026,8 @@ async function buildMainBundle(routeTree, runtimeDir, codeSplit, mono, hmr, impo
             .join('') +
             'globalThis.__runtime_comps = __runtime_comps;\n' +
             'globalThis.__cleanup = __cleanup;\n' +
-            'globalThis.__place = __place;\n\n';
+            'globalThis.__place = __place;\n' +
+            'globalThis.__reconcileRegion = __reconcileRegion;\n\n';
         const extraGlobals = [...(runtimeImportNames || [])]
             .filter(n => n && n !== 'default')
             .map(n => `globalThis.${n} = ${n};\n`)
@@ -2006,6 +2044,7 @@ async function buildMainBundle(routeTree, runtimeDir, codeSplit, mono, hmr, impo
             (sharedModuleBundle ? sharedModuleBundle + '\n' : '') +
             cleanupFn +
             placeFn +
+            reconcileRegionFn +
             'globalThis.__components = __components;\n' +
             resolveNamesFn +
             updateComponentsFn +
@@ -2021,7 +2060,7 @@ async function buildMainBundle(routeTree, runtimeDir, codeSplit, mono, hmr, impo
     const hydratorAliasLines = mono?.hydratorAliasLines || [];
     const aliasCode = aliasLines.length > 0 ? aliasLines.join('\n') + '\n' : '';
     const hydratorAliasCode = hydratorAliasLines.length > 0 ? hydratorAliasLines.join('\n') + '\n' : '';
-    const routerOpts = buildRouterOpts({ routeDataCache });
+    const routerOpts = buildRouterOpts({ routeDataCache }, hasServerMiddleware(routeTree));
     const code = preamble +
         'const __components = {};\n' +
         'const __hydrators = {};\n' +
@@ -2032,10 +2071,12 @@ async function buildMainBundle(routeTree, runtimeDir, codeSplit, mono, hmr, impo
         hydratorAliasCode +
         cleanupFn +
         placeFn +
+        reconcileRegionFn +
         'globalThis.__components = __components;\n' +
         'globalThis.__runtime_comps = __runtime_comps;\n' +
         'globalThis.__cleanup = __cleanup;\n' +
         'globalThis.__place = __place;\n' +
+        'globalThis.__reconcileRegion = __reconcileRegion;\n' +
         allRuntimeImports.map(n => `globalThis.${n} = ${n};\n`).join('') +
         'function __resolveNames(nodes) {\n' +
         '  for (const n of nodes) {\n' +

package/dist/dev-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../src/dev-server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,KAAK,MAAM,EAA6C,MAAM,WAAW,CAAC;AASjG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAO7C,OAAO,KAAK,EAAa,gBAAgB,EAAwB,MAAM,yBAAyB,CAAC;AAgBjG;;;;;GAKG;AACH,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,IAAI,GAAG,WAAW,GAAG,OAAO,GAAG,MAAM,CAAC;IAC9C,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,EAAE,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACxD,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB;+EAC2E;IAC3E,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,mEAAmE;AACnE,wBAAgB,kBAAkB,IAAI,WAAW,CAEhD;AAwDD,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,mHAAmH;IACnH,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC7B;;8BAE0B;IAC1B,MAAM,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,UAAU,GAAG,YAAY,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;IACrE,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,WAAW,CAAC;IAChC,8EAA8E;IAC9E,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3E;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,wBAAwB,GAAG;IACvE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;CAChH,CAUA;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAa3C;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQrD;AAUD,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA4sBvG"}
+{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../src/dev-server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,KAAK,MAAM,EAA6C,MAAM,WAAW,CAAC;AASjG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAO7C,OAAO,KAAK,EAAa,gBAAgB,EAAwB,MAAM,yBAAyB,CAAC;AAgBjG;;;;;GAKG;AACH,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,IAAI,GAAG,WAAW,GAAG,OAAO,GAAG,MAAM,CAAC;IAC9C,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,EAAE,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACxD,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB;+EAC2E;IAC3E,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,mEAAmE;AACnE,wBAAgB,kBAAkB,IAAI,WAAW,CAEhD;AAwDD,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,mHAAmH;IACnH,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC7B;;8BAE0B;IAC1B,MAAM,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,UAAU,GAAG,YAAY,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;IACrE,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,WAAW,CAAC;IAChC,8EAA8E;IAC9E,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3E;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,wBAAwB,GAAG;IACvE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;CAChH,CAUA;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAa3C;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAgBrD;AAUD,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA4sBvG"}

package/dist/dev-server.js

@@ -150,7 +150,14 @@ export function devBootstrapScript() {
 export function injectDevScripts(html) {
     if (!html.includes('</body>'))
         return html;
-    const scripts = '\t<script type="module" src="/_vesk/client.js"></script>\n' +
+    // SSR already emits its own client script (hmr.ts bakes
+    // `clientScriptUrl: "/_vesk/static/client.js"`). Injecting a second copy at
+    // `/_vesk/client.js` loads the runtime module twice, giving the page two
+    // routers and two sets of event listeners — every SPA click then runs
+    // navigate() twice and pushes a duplicate history entry. Only add the
+    // fallback client script for HTML that has none.
+    const hasClientScript = html.includes('/_vesk/static/client.js') || html.includes('/_vesk/client.js');
+    const scripts = (hasClientScript ? '' : '\t<script type="module" src="/_vesk/client.js"></script>\n') +
         '\t<script type="module" src="/_vesk/hmr.js"></script>\n' +
         devBootstrapScript() +
         '\n';

package/dist/middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAA2B,MAAM,yBAAyB,CAAC;AAS5F,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,mBAAmB,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAmFhG;AAED,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,IAAI,CAiF5E"}
+{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAA2B,MAAM,yBAAyB,CAAC;AAS5F,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,mBAAmB,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAuFhG;AAED,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,IAAI,CAqF5E"}

package/dist/middleware.js

@@ -4,18 +4,22 @@ function extractMiddlewareBody(src) {
     const parts = extractMiddlewareParts(src);
     if (!parts)
         return null;
-    return { params: parts.params, body: parts.body };
+    return { params: parts.params, body: parts.body, imports: parts.imports };
 }
 export function compileMiddleware(mwChain, _appDir) {
     if (mwChain.length === 0)
         return null;
     const parts = [];
+    const imports = [];
     for (let i = 0; i < mwChain.length; i++) {
         const { sourcePath } = mwChain[i];
         const src = readFileSync(sourcePath, 'utf-8');
         const extracted = extractMiddlewareBody(src);
         if (!extracted)
             continue;
+        for (const line of extracted.imports)
+            if (!imports.includes(line))
+                imports.push(line);
         parts.push(`async function mw_${i}(${extracted.params}) {\n${extracted.body}\n}`);
     }
     if (parts.length === 0)
@@ -23,6 +27,8 @@ export function compileMiddleware(mwChain, _appDir) {
     const code = [
         '// Auto-generated middleware chain — do not edit',
         '',
+        ...imports,
+        ...(imports.length ? [''] : []),
         parts.join('\n\n'),
         '',
         `const chain = [${parts.map((_, i) => `mw_${i}`).join(', ')}];`,
@@ -93,10 +99,14 @@ export function compileMiddlewareCode(mwSourceTexts) {
     if (!mwSourceTexts || mwSourceTexts.length === 0)
         return null;
     const parts = [];
+    const imports = [];
     for (let i = 0; i < mwSourceTexts.length; i++) {
         const extracted = extractMiddlewareBody(mwSourceTexts[i]);
         if (!extracted)
             continue;
+        for (const line of extracted.imports)
+            if (!imports.includes(line))
+                imports.push(line);
         parts.push(`async function mw_${i}(${extracted.params}) {\n${extracted.body}\n}`);
     }
     if (parts.length === 0)
@@ -104,6 +114,8 @@ export function compileMiddlewareCode(mwSourceTexts) {
     const code = [
         '// ── Middleware chain (inline) ──',
         '',
+        ...imports,
+        ...(imports.length ? [''] : []),
         parts.join('\n\n'),
         '',
         `const __mwChain = [${parts.map((_, i) => `mw_${i}`).join(', ')}];`,

package/dist/prod-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prod-server.d.ts","sourceRoot":"","sources":["../src/prod-server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,KAAK,eAAe,EAAuB,KAAK,MAAM,EAAE,MAAM,WAAW,CAAC;AAejG,OAAO,KAAK,EAAkB,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAIpG,YAAY,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,CAAC;AAuIrD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,GAAG,GAAG,CAY9F;AAED,wBAAsB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CAmpBlG"}
+{"version":3,"file":"prod-server.d.ts","sourceRoot":"","sources":["../src/prod-server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,KAAK,eAAe,EAAuB,KAAK,MAAM,EAAE,MAAM,WAAW,CAAC;AAejG,OAAO,KAAK,EAAkB,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAIpG,YAAY,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,CAAC;AAuIrD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,GAAG,GAAG,CAY9F;AAED,wBAAsB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CA6rBlG"}

package/dist/prod-server.js

@@ -480,6 +480,37 @@ export async function startProdServer(outDir, options) {
                 }
             }
         }
+        if (url.pathname === '/_vesk/middleware' && middlewareMod) {
+            const targetPath = url.searchParams.get('path') || '/';
+            const targetUrl = new URL(targetPath, url.origin);
+            const middlewareRequest = new Request(targetUrl.href, {
+                method: 'GET',
+                headers: req.headers,
+            });
+            const mwEndpointCtx = {
+                request: middlewareRequest,
+                params: {},
+                url: targetUrl,
+                locals: Object.assign({}, globalThis.__vesk_server_ctx || {}),
+                cookies: {},
+                set(key, value) { this.locals[key] = value; },
+                get(key) { return this.locals[key]; },
+            };
+            const mwResult = await middlewareMod.execute(mwEndpointCtx);
+            res.writeHead(200, {
+                'Content-Type': 'application/json; charset=utf-8',
+                'Cache-Control': 'no-store',
+            });
+            if (mwResult.response) {
+                const location = mwResult.response.headers.get('location') || mwResult.response.headers.get('Location');
+                if (location) {
+                    res.end(JSON.stringify({ redirect: location }));
+                    return;
+                }
+            }
+            res.end(JSON.stringify(mwResult.rewriteUrl ? { rewrite: mwResult.rewriteUrl } : { allow: true }));
+            return;
+        }
         let mwCtx;
         const serverStore = globalThis.__vesk_server_ctx;
         if (middlewareMod) {
@@ -526,221 +557,232 @@ export async function startProdServer(outDir, options) {
         }
         // Expose root middleware locals to API/SSR handlers (which seed their own
         // ctx.locals from this before running route-level middleware).
+        //
+        // Scoped to this request: an SSR render can `fetch()` its own API route,
+        // which re-enters this handler. Without restoring, that nested request's
+        // context (params: {}) stays installed and every later pass of the outer
+        // render reads the wrong params.
+        const __outerRequest = globalThis.__vesk_request;
         globalThis.__vesk_request = mwCtx;
-        if (url.pathname.startsWith('/_vesk/action/')) {
-            const actionId = url.pathname.replace('/_vesk/action/', '');
-            const actionEntry = buildConfig.actions && buildConfig.actions.find(a => a.id === actionId);
-            if (!actionEntry) {
-                res.writeHead(404, { 'Content-Type': 'application/json' });
-                res.end(JSON.stringify({ ok: false, error: 'Action not found' }));
-                return;
-            }
-            const mod = await loadFunction(actionEntry.function);
-            if (!mod || !mod.handleAction) {
-                res.writeHead(404, { 'Content-Type': 'application/json' });
-                res.end(JSON.stringify({ ok: false, error: 'Action not found' }));
+        try {
+            if (url.pathname.startsWith('/_vesk/action/')) {
+                const actionId = url.pathname.replace('/_vesk/action/', '');
+                const actionEntry = buildConfig.actions && buildConfig.actions.find(a => a.id === actionId);
+                if (!actionEntry) {
+                    res.writeHead(404, { 'Content-Type': 'application/json' });
+                    res.end(JSON.stringify({ ok: false, error: 'Action not found' }));
+                    return;
+                }
+                const mod = await loadFunction(actionEntry.function);
+                if (!mod || !mod.handleAction) {
+                    res.writeHead(404, { 'Content-Type': 'application/json' });
+                    res.end(JSON.stringify({ ok: false, error: 'Action not found' }));
+                    return;
+                }
+                try {
+                    const webRequest = makeWebRequest(req, url.href, maxBodyBytes);
+                    const handleAction = mod.handleAction.bind(mod);
+                    const response = await withSecurityScope(() => handleAction(webRequest, actionId));
+                    await deliverResponse(res, response);
+                }
+                catch (e) {
+                    const status = errorStatus(e, 500);
+                    const message = status === 500 && process.env.NODE_ENV === 'production'
+                        ? 'Internal Server Error'
+                        : e instanceof Error ? e.message : String(e);
+                    res.writeHead(status, { 'Content-Type': 'application/json' });
+                    res.end(JSON.stringify({ ok: false, error: message }));
+                }
                 return;
             }
-            try {
-                const webRequest = makeWebRequest(req, url.href, maxBodyBytes);
-                const handleAction = mod.handleAction.bind(mod);
-                const response = await withSecurityScope(() => handleAction(webRequest, actionId));
-                await deliverResponse(res, response);
-            }
-            catch (e) {
-                const status = errorStatus(e, 500);
-                const message = status === 500 && process.env.NODE_ENV === 'production'
-                    ? 'Internal Server Error'
-                    : e instanceof Error ? e.message : String(e);
-                res.writeHead(status, { 'Content-Type': 'application/json' });
-                res.end(JSON.stringify({ ok: false, error: message }));
-            }
-            return;
-        }
-        if (url.pathname.startsWith('/api')) {
-            for (const route of buildConfig.routes) {
-                if (route.type === 'api') {
-                    const params = matchPath(route.path, url.pathname);
-                    if (params) {
-                        const mod = await loadFunction(route.function);
-                        if (!mod) {
-                            // The route matched, so a 404 would be a lie: the handler is
-                            // there and could not be loaded.
-                            if (functionFailure(route.function)) {
-                                res.writeHead(500, { 'Content-Type': 'application/json' });
-                                res.end(JSON.stringify({ error: 'Internal Server Error' }));
+            if (url.pathname.startsWith('/api')) {
+                for (const route of buildConfig.routes) {
+                    if (route.type === 'api') {
+                        const params = matchPath(route.path, url.pathname);
+                        if (params) {
+                            const mod = await loadFunction(route.function);
+                            if (!mod) {
+                                // The route matched, so a 404 would be a lie: the handler is
+                                // there and could not be loaded.
+                                if (functionFailure(route.function)) {
+                                    res.writeHead(500, { 'Content-Type': 'application/json' });
+                                    res.end(JSON.stringify({ error: 'Internal Server Error' }));
+                                    return;
+                                }
+                                continue;
+                            }
+                            try {
+                                const webRequest = makeWebRequest(req, url.href, maxBodyBytes);
+                                const response = await withSecurityScope(() => mod.handle(webRequest));
+                                await deliverResponse(res, response);
+                                return;
+                            }
+                            catch (e) {
+                                const status = errorStatus(e, 500);
+                                res.writeHead(status, { 'Content-Type': 'application/json' });
+                                res.end(JSON.stringify({ error: status === 500 ? 'Internal Server Error' : e instanceof Error ? e.message : String(e) }));
                                 return;
                             }
-                            continue;
-                        }
-                        try {
-                            const webRequest = makeWebRequest(req, url.href, maxBodyBytes);
-                            const response = await withSecurityScope(() => mod.handle(webRequest));
-                            await deliverResponse(res, response);
-                            return;
-                        }
-                        catch (e) {
-                            const status = errorStatus(e, 500);
-                            res.writeHead(status, { 'Content-Type': 'application/json' });
-                            res.end(JSON.stringify({ error: status === 500 ? 'Internal Server Error' : e instanceof Error ? e.message : String(e) }));
-                            return;
                         }
                     }
                 }
             }
-        }
-        const appDir = resolve(projectDir, 'app');
-        const pageCssUrls = resolveCssUrls({
-            enabled: hasBuiltGlobalCss(outDir),
-        });
-        /**
-         * Render the boundary that owns `url.pathname`.
-         *
-         * Deepest-match over the URL's directories, not a hard read of the root
-         * file: `app/admin/not-found.vsk` is the boundary for `/admin/*`, and the
-         * root one is the fallback. The generated SSR function does the same walk at
-         * build time (`resolveNotFoundFile`) and renders the boundary itself inside
-         * the layout stack; this path is what remains for an unmatched URL, for a
-         * route with no layout (which streams, so its status is already committed),
-         * and for an error thrown outside a page's own try block.
-         */
-        const boundaryCache = new Map();
-        async function renderBoundaryFile(file, pathname, props) {
-            const boundaryPath = resolveBoundaryFileForUrl(pathname, appDir, file);
-            if (!boundaryPath)
-                return null;
-            const key = `${file}:${boundaryPath}`;
-            let html = boundaryCache.has(key) ? boundaryCache.get(key) : null;
-            if (html === null) {
-                try {
-                    const runtimePath = resolve(outDir, 'server', 'runtime.js');
-                    const { renderFullPage, storeDataScriptGlobal } = await import(runtimePath);
-                    const src = readFileSync(boundaryPath, 'utf-8');
-                    const compName = resolveComponentName(src) || (file === 'error.vsk' ? 'Error' : 'NotFound');
-                    html = await renderFullPage(src, compName, props, new Map(), { hydrate: true, cssUrls: pageCssUrls, clientScriptUrl: buildConfig?.assets?.client?.url || '/_vesk/static/client.js', clientScriptIntegrity: buildConfig?.assets?.client?.integrity, security: securityConfig?.security || {}, externalDataScript: storeDataScriptGlobal, sourcePath: boundaryPath, headExtra: bakedHeadExtra });
-                }
-                catch {
+            const appDir = resolve(projectDir, 'app');
+            const pageCssUrls = resolveCssUrls({
+                enabled: hasBuiltGlobalCss(outDir),
+            });
+            /**
+             * Render the boundary that owns `url.pathname`.
+             *
+             * Deepest-match over the URL's directories, not a hard read of the root
+             * file: `app/admin/not-found.vsk` is the boundary for `/admin/*`, and the
+             * root one is the fallback. The generated SSR function does the same walk at
+             * build time (`resolveNotFoundFile`) and renders the boundary itself inside
+             * the layout stack; this path is what remains for an unmatched URL, for a
+             * route with no layout (which streams, so its status is already committed),
+             * and for an error thrown outside a page's own try block.
+             */
+            const boundaryCache = new Map();
+            async function renderBoundaryFile(file, pathname, props) {
+                const boundaryPath = resolveBoundaryFileForUrl(pathname, appDir, file);
+                if (!boundaryPath)
                     return null;
+                const key = `${file}:${boundaryPath}`;
+                let html = boundaryCache.has(key) ? boundaryCache.get(key) : null;
+                if (html === null) {
+                    try {
+                        const runtimePath = resolve(outDir, 'server', 'runtime.js');
+                        const { renderFullPage, storeDataScriptGlobal } = await import(runtimePath);
+                        const src = readFileSync(boundaryPath, 'utf-8');
+                        const compName = resolveComponentName(src) || (file === 'error.vsk' ? 'Error' : 'NotFound');
+                        html = await renderFullPage(src, compName, props, new Map(), { hydrate: true, cssUrls: pageCssUrls, clientScriptUrl: buildConfig?.assets?.client?.url || '/_vesk/static/client.js', clientScriptIntegrity: buildConfig?.assets?.client?.integrity, security: securityConfig?.security || {}, externalDataScript: storeDataScriptGlobal, sourcePath: boundaryPath, headExtra: bakedHeadExtra });
+                    }
+                    catch {
+                        return null;
+                    }
                 }
+                return html;
             }
-            return html;
-        }
-        let notFoundHtml = null;
-        {
-            const rendered = await renderBoundaryFile('not-found.vsk', url.pathname, { params: {}, url: url.pathname });
-            notFoundHtml = rendered;
-        }
-        for (const route of buildConfig.routes) {
-            if (route.type === 'ssr') {
-                const params = matchPath(route.path, url.pathname);
-                if (params) {
-                    const mod = await loadFunction(route.function);
-                    if (mod) {
-                        const webRequest = makeWebRequest(req, url.href, maxBodyBytes);
-                        // During SSR, fetch() with a relative URL (e.g. '/api/student') throws
-                        // because undici requires an absolute URL and there is no browser
-                        // origin to resolve against. Wrap globalThis.fetch for the duration
-                        // of the SSR render so relative API calls resolve against the
-                        // request's origin — matching what the client does automatically.
-                        const origin = new URL(url.href).origin;
-                        const origFetch = globalThis.fetch;
-                        globalThis.fetch = async (input, init) => {
-                            if (typeof input === 'string' && input.startsWith('/')) {
-                                input = origin + input;
-                            }
-                            return origFetch(input, init);
-                        };
-                        try {
-                            let cachedResult = null;
-                            if (route.revalidate && route.revalidate > 0) {
-                                const { pageIsr } = await import('@vesk/runtime/src/index-server');
-                                cachedResult = await pageIsr(url.pathname, async () => {
-                                    const response = await withSecurityScope(() => mod.handle(webRequest));
-                                    return { html: await response.text(), headers: Object.fromEntries(response.headers) };
-                                }, { revalidate: route.revalidate, tags: route.tags || [] });
-                            }
-                            if (cachedResult) {
-                                res.writeHead(200, cachedResult.headers || { 'Content-Type': 'text/html' });
-                                res.end(cachedResult.html);
-                                return;
-                            }
-                            const response = await withSecurityScope(() => mod.handle(webRequest));
-                            const headers = Object.fromEntries(response.headers);
-                            if (!headers['content-type'] && !headers['Content-Type'])
-                                headers['Content-Type'] = 'text/html';
-                            if (response.body && typeof response.body.getReader === 'function') {
-                                res.writeHead(response.status, headers);
-                                const reader = response.body.getReader();
-                                const pump = () => {
-                                    reader.read().then(({ done, value }) => {
-                                        if (done) {
-                                            res.end();
-                                            return;
-                                        }
-                                        res.write(value);
-                                        pump();
-                                    }).catch(() => res.end());
-                                };
-                                pump();
-                            }
-                            else {
-                                const body = await response.text();
-                                res.writeHead(response.status, headers);
-                                res.end(body);
-                            }
-                            return;
-                        }
-                        catch (e) {
-                            const err = e instanceof Error ? e : new Error(String(e));
-                            if (err.name === 'Redirect') {
-                                const redirect = err;
-                                res.writeHead(Number(redirect.status) || 302, { Location: typeof redirect.url === 'string' ? redirect.url : '/' });
-                                res.end();
+            let notFoundHtml = null;
+            {
+                const rendered = await renderBoundaryFile('not-found.vsk', url.pathname, { params: {}, url: url.pathname });
+                notFoundHtml = rendered;
+            }
+            for (const route of buildConfig.routes) {
+                if (route.type === 'ssr') {
+                    const params = matchPath(route.path, url.pathname);
+                    if (params) {
+                        const mod = await loadFunction(route.function);
+                        if (mod) {
+                            const webRequest = makeWebRequest(req, url.href, maxBodyBytes);
+                            // During SSR, fetch() with a relative URL (e.g. '/api/student') throws
+                            // because undici requires an absolute URL and there is no browser
+                            // origin to resolve against. Wrap globalThis.fetch for the duration
+                            // of the SSR render so relative API calls resolve against the
+                            // request's origin — matching what the client does automatically.
+                            const origin = new URL(url.href).origin;
+                            const origFetch = globalThis.fetch;
+                            globalThis.fetch = async (input, init) => {
+                                if (typeof input === 'string' && input.startsWith('/')) {
+                                    input = origin + input;
+                                }
+                                return origFetch(input, init);
+                            };
+                            try {
+                                let cachedResult = null;
+                                if (route.revalidate && route.revalidate > 0) {
+                                    const { pageIsr } = await import('@vesk/runtime/src/index-server');
+                                    cachedResult = await pageIsr(url.pathname, async () => {
+                                        const response = await withSecurityScope(() => mod.handle(webRequest));
+                                        return { html: await response.text(), headers: Object.fromEntries(response.headers) };
+                                    }, { revalidate: route.revalidate, tags: route.tags || [] });
+                                }
+                                if (cachedResult) {
+                                    res.writeHead(200, cachedResult.headers || { 'Content-Type': 'text/html' });
+                                    res.end(cachedResult.html);
+                                    return;
+                                }
+                                const response = await withSecurityScope(() => mod.handle(webRequest));
+                                const headers = Object.fromEntries(response.headers);
+                                if (!headers['content-type'] && !headers['Content-Type'])
+                                    headers['Content-Type'] = 'text/html';
+                                if (response.body && typeof response.body.getReader === 'function') {
+                                    res.writeHead(response.status, headers);
+                                    const reader = response.body.getReader();
+                                    const pump = () => {
+                                        reader.read().then(({ done, value }) => {
+                                            if (done) {
+                                                res.end();
+                                                return;
+                                            }
+                                            res.write(value);
+                                            pump();
+                                        }).catch(() => res.end());
+                                    };
+                                    pump();
+                                }
+                                else {
+                                    const body = await response.text();
+                                    res.writeHead(response.status, headers);
+                                    res.end(body);
+                                }
                                 return;
                             }
-                            if (err.name === 'NotFoundError') {
-                                res.writeHead(404, { 'Content-Type': 'text/html' });
-                                res.end(notFoundHtml || renderDefaultNotFoundPage({ url: url.pathname, headExtra: bakedHeadExtra }));
+                            catch (e) {
+                                const err = e instanceof Error ? e : new Error(String(e));
+                                if (err.name === 'Redirect') {
+                                    const redirect = err;
+                                    res.writeHead(Number(redirect.status) || 302, { Location: typeof redirect.url === 'string' ? redirect.url : '/' });
+                                    res.end();
+                                    return;
+                                }
+                                if (err.name === 'NotFoundError') {
+                                    res.writeHead(404, { 'Content-Type': 'text/html' });
+                                    res.end(notFoundHtml || renderDefaultNotFoundPage({ url: url.pathname, headExtra: bakedHeadExtra }));
+                                    return;
+                                }
+                                console.error('vesk ssr error:', err.message);
+                                // Two seams, both best-effort: a plugin's `onError` (dev-style
+                                // plugin objects don't exist here) and `_events.ts`'s, which IS
+                                // baked into the production build.
+                                await reportServerError(err, {
+                                    url: url.pathname + url.search,
+                                    routePath: route.path,
+                                    target: 'node',
+                                    status: 500,
+                                    buildConfig,
+                                });
+                                if (eventsMod) {
+                                    await executeError(err, { url: url.href, routePath: route.path, target: 'node', status: 500 }, eventsMod);
+                                }
+                                // Same nearest-boundary walk as not-found above. This is the last resort for a
+                                // throw the generated function could not absorb — a layout render
+                                // failure, or the error boundary itself failing — and it must pick
+                                // the boundary that owns the URL, not the root one.
+                                const expose = process.env.NODE_ENV !== 'production';
+                                const errorHtml = await renderBoundaryFile('error.vsk', url.pathname, {
+                                    error: expose ? err.message : 'Internal Server Error',
+                                    stack: expose ? err.stack : '',
+                                    statusCode: 500,
+                                    url: url.pathname,
+                                });
+                                res.writeHead(500, { 'Content-Type': 'text/html' });
+                                res.end(errorHtml || renderDefaultErrorPage({ message: process.env.NODE_ENV !== 'production' ? err.message : undefined, url: url.pathname, headExtra: bakedHeadExtra }));
                                 return;
                             }
-                            console.error('vesk ssr error:', err.message);
-                            // Two seams, both best-effort: a plugin's `onError` (dev-style
-                            // plugin objects don't exist here) and `_events.ts`'s, which IS
-                            // baked into the production build.
-                            await reportServerError(err, {
-                                url: url.pathname + url.search,
-                                routePath: route.path,
-                                target: 'node',
-                                status: 500,
-                                buildConfig,
-                            });
-                            if (eventsMod) {
-                                await executeError(err, { url: url.href, routePath: route.path, target: 'node', status: 500 }, eventsMod);
+                            finally {
+                                globalThis.fetch = origFetch;
                             }
-                            // Same nearest-boundary walk as not-found above. This is the last resort for a
-                            // throw the generated function could not absorb — a layout render
-                            // failure, or the error boundary itself failing — and it must pick
-                            // the boundary that owns the URL, not the root one.
-                            const expose = process.env.NODE_ENV !== 'production';
-                            const errorHtml = await renderBoundaryFile('error.vsk', url.pathname, {
-                                error: expose ? err.message : 'Internal Server Error',
-                                stack: expose ? err.stack : '',
-                                statusCode: 500,
-                                url: url.pathname,
-                            });
-                            res.writeHead(500, { 'Content-Type': 'text/html' });
-                            res.end(errorHtml || renderDefaultErrorPage({ message: process.env.NODE_ENV !== 'production' ? err.message : undefined, url: url.pathname, headExtra: bakedHeadExtra }));
-                            return;
-                        }
-                        finally {
-                            globalThis.fetch = origFetch;
                         }
                     }
                 }
             }
+            res.writeHead(404, { 'Content-Type': 'text/html' });
+            res.end(notFoundHtml || renderDefaultNotFoundPage({ url: url.pathname, headExtra: bakedHeadExtra }));
+        }
+        finally {
+            globalThis.__vesk_request = __outerRequest;
         }
-        res.writeHead(404, { 'Content-Type': 'text/html' });
-        res.end(notFoundHtml || renderDefaultNotFoundPage({ url: url.pathname, headExtra: bakedHeadExtra }));
     });
     try {
         await eventsMod?.executeStart?.({ server, port, host });

package/dist/ssr-function.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssr-function.d.ts","sourceRoot":"","sources":["../src/ssr-function.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAkB,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7F;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQlG;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAEjF;AAED,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAEpF;AAED;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQvG;AAgED;;;2EAG2E;AAC3E,wBAAgB,qBAAqB,IAAI,MAAM,CA4C9C;AAED,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAClC,OAAO,CAAC,EAAE,kBAAkB,EAC5B,QAAQ,CAAC,EAAE,cAAc,GACxB;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAuftD"}
+{"version":3,"file":"ssr-function.d.ts","sourceRoot":"","sources":["../src/ssr-function.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAkB,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7F;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQlG;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAEjF;AAED,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAEpF;AAED;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQvG;AAgED;;;2EAG2E;AAC3E,wBAAgB,qBAAqB,IAAI,MAAM,CA4C9C;AAED,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAClC,OAAO,CAAC,EAAE,kBAAkB,EAC5B,QAAQ,CAAC,EAAE,cAAc,GACxB;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAsgBtD"}

package/dist/ssr-function.js

@@ -428,7 +428,10 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
     // its own request scope — otherwise its renderPage mints a token that is
     // still live when the full-page render starts and the two share a data slot.
     const dataNavWrap = (body) => [
-        '  return withSsrStore(async () => {',
+        // Awaited for the same reason as the main render below: the caller restores
+        // `__vesk_request` in a finally, and that must happen only after the async
+        // data render (which reads params through useParams) has fully resolved.
+        '  return await withSsrStore(async () => {',
         ...body.map((l) => (l ? '  ' + l : l)),
         '  });',
     ];
@@ -456,7 +459,13 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
                 ...dataNavCleanup,
             ]),
             '  }',
-            '  return __renderHtml(params, url.href);',
+            // Awaited so the surrounding try/finally keeps `__vesk_request` installed
+            // for the whole async render. Without the await the finally restores the
+            // previous context synchronously, while the async page body is still
+            // suspended on its SSR fetches; every render pass after the first `await`
+            // then reads an empty params object and `useParams()`-derived keys/URLs
+            // collapse (e.g. a verify page rendering its not-found branch).
+            '  return await __renderHtml(params, url.href);',
         ].join('\n');
     }
     else {
@@ -478,7 +487,13 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
                 ...dataNavCleanup,
             ]),
             '  }',
-            '  return __renderHtml(params, url.href);',
+            // Awaited so the surrounding try/finally keeps `__vesk_request` installed
+            // for the whole async render. Without the await the finally restores the
+            // previous context synchronously, while the async page body is still
+            // suspended on its SSR fetches; every render pass after the first `await`
+            // then reads an empty params object and `useParams()`-derived keys/URLs
+            // collapse (e.g. a verify page rendering its not-found branch).
+            '  return await __renderHtml(params, url.href);',
         ].join('\n');
     }
     const hasMiddleware = !!middlewareCode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/adapter",
-  "version": "0.2.94",
+  "version": "0.2.95",
   "type": "module",
   "description": "Vesk adapter — builds deployable .vesk/ output for Deno and Node serverless",
   "main": "./dist/index.js",
@@ -23,9 +23,9 @@
     "sharp": "^0.35.3"
   },
   "dependencies": {
-    "@vesk/compiler": "^0.2.94",
-    "@vesk/runtime": "^0.2.94",
-    "@vesk/types": "^0.2.94"
+    "@vesk/compiler": "^0.2.95",
+    "@vesk/runtime": "^0.2.95",
+    "@vesk/types": "^0.2.95"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",