refactor(qwik-router): lean the major — abort delivery, hang fix, envelope caching, value export move to follow-ups

Author: maiieul

e2e/qwik-e2e/apps/qwikrouter-test/src/routes/(common)/actions/abort/index.tsx

@@ -177,22 +177,3 @@ test.describe('actions', () => {
     });
   }
 });
-
-test.describe('action abort semantics (spa)', () => {
-  test.use({ javaScriptEnabled: true });
-  test.beforeEach(async ({ page }) => {
-    await page.goto('/qwikrouter-test/actions/abort/');
-  });
-
-  test('programmatic submit() rejects on thrown error() and records no state', async ({ page }) => {
-    await page.locator('#abort-run').click();
-    await expect(page.locator('#abort-caught')).toHaveText('caught:418');
-    await expect(page.locator('#abort-state')).toHaveText('false:undefined:undefined:false');
-  });
-
-  test('submitcompleted does not fire when the submission aborts', async ({ page }) => {
-    await page.locator('#abort-form-submit').click();
-    await expect(page.locator('#abort-state')).toHaveText('false:undefined:undefined:false');
-    await expect(page.locator('#abort-form-detail')).toHaveText('none');
-  });
-});

e2e/qwik-e2e/tests/qwikrouter/actions.e2e.ts

@@ -35,10 +35,8 @@ test.describe('loaders', () => {
         (r) => r.url().includes('/loaders/loader-fail/') && r.url().includes('q-loader')
       );
       await page.locator('#link-loader-fail-retry').click();
-      // Failure envelopes ship HTTP 200 and are never cacheable.
       const response = await loaderResponse;
       expect(response.status()).toBe(200);
-      expect(response.headers()['cache-control']).toBeUndefined();
       await expect(page.locator('#loader-fail-error')).toHaveText('429 Rate limited');
     });
 

e2e/qwik-e2e/tests/qwikrouter/loaders.e2e.ts

@@ -439,7 +439,7 @@ export const useDeletePost = routeAction$(
 );
 ```
 
-A thrown `error()` never lands on `action.error`: the action records no state, a programmatic `action.submit()` rejects with the error, and a `<Form>` submission resets without firing `submitcompleted` — use `fail()` for anything the UI should display. Plain (non-`error()`) throws behave like unexpected errors and result in a sanitized 500.
+A thrown `error()` never lands on `action.error` — use `fail()` for anything the UI should display. Plain (non-`error()`) throws behave like unexpected errors and result in a sanitized 500.
 
 ## Previous form state
 

packages/docs/src/routes/docs/(qwikrouter)/action/index.mdx

@@ -57,23 +57,21 @@ export function jsonRequestWrapper(): RequestHandler {
           throw err;
         }
       } else if (err instanceof ServerError) {
-        requestEv.headers.delete('Cache-Control');
         if (isLoader) {
           await sendJsonResponse(requestEv, { e: err, a: 1 });
         } else {
-          await sendActionResponse(requestEv, { aborted: err, s: err.status });
+          await sendActionResponse(requestEv, { e: err, s: err.status });
         }
       } else if (err instanceof Error) {
         console.error('JSON request error:', err);
-        requestEv.headers.delete('Cache-Control');
         const message = isDev
           ? `${err.message}\n(this is only visible in dev mode)`
           : 'Internal Server Error';
         const se = new ServerError(500, message);
         if (isLoader) {
           await sendJsonResponse(requestEv, { e: se, a: 1 });
         } else {
-          await sendActionResponse(requestEv, { aborted: se, s: 500 });
+          await sendActionResponse(requestEv, { e: se, s: 500 });
         }
       } else {
         throw err; // AbortMessage etc.

packages/qwik-router/src/middleware/request-handler/handlers/json-request-wrapper.ts

@@ -109,7 +109,7 @@ export function loaderHandler(
       return;
     }
 
-    await sendLoaderResponse(requestEv, data, loader, !responseData.r && !responseData.e);
+    await sendLoaderResponse(requestEv, data, loader);
   };
 }
 
@@ -139,12 +139,11 @@ function resolvePreETag(
 async function sendLoaderResponse(
   requestEv: RequestEventInternal,
   data: string,
-  loader?: LoaderInternal,
-  cacheable = true
+  loader?: LoaderInternal
 ) {
   requestEv.headers.set('Content-Type', 'application/json; charset=utf-8');
   addVaryHeader(requestEv, FULLPATH_HEADER);
-  if (cacheable && loader?.__expires && loader.__expires > 0) {
+  if (loader?.__expires && loader.__expires > 0) {
     requestEv.cacheControl({ maxAge: Math.ceil(loader.__expires / 1000) });
   }
   requestEv.send(200, data);

packages/qwik-router/src/middleware/request-handler/handlers/loader-handler.ts

@@ -6,7 +6,7 @@ import { useNavigate } from './use-functions';
 /** @public */
 export interface FormSubmitCompletedDetail<T, ERROR = unknown> {
   status: number;
-  /** The action's successful return value. `undefined` when the action failed or aborted. */
+  /** The action's successful return value. `undefined` when the action failed. */
   value: T | undefined;
   /** The `ServerError` from a returned `fail()` or a failed validator. */
   error: ServerError<ERROR> | undefined;

packages/qwik-router/src/runtime/src/form-component.tsx

@@ -90,7 +90,7 @@ export {
   zodQrl,
 } from './server-functions';
 export { routeLoader$, routeLoaderQrl } from './route-loaders';
-export { ServerError } from '../../middleware/request-handler/server-error';
+export type { ServerError } from '../../middleware/request-handler/server-error';
 export { ServiceWorkerRegister } from './sw-component';
 export {
   useContent,

packages/qwik-router/src/runtime/src/index.ts

@@ -560,36 +560,26 @@ export const useQwikRouter = (props?: QwikRouterProps) => {
           const result = await submitAction(action, trackUrl.pathname);
           if (!result) {
             // HTTP redirect happened — bail
-            routeLocation.isNavigating = false;
             routeInternal.untrackedValue = { type: navType, dest: trackUrl };
             return;
           }
 
-          if (!result.aborted) {
-            actionData = {
-              status: result.status,
-              action: action.id,
-              actionResult: result.error ?? result.result,
-            };
-          }
+          actionData = {
+            status: result.status,
+            action: action.id,
+            actionResult: result.error ?? result.result,
+          };
 
           // Resolve the action promise and free the closure
           if (action.resolve) {
             action.resolve({
               status: result.status,
               result: result.result,
               error: result.error,
-              aborted: result.aborted,
             });
             action.resolve = undefined;
           }
 
-          if (result.aborted) {
-            routeLocation.isNavigating = false;
-            routeInternal.untrackedValue = { type: navType, dest: trackUrl };
-            return;
-          }
-
           actionLoaderHashes = result.loaderHashes;
           shouldInvalidateActionLoaders = true;
         }

packages/qwik-router/src/runtime/src/qwik-router-component.tsx

@@ -116,15 +116,8 @@ Action.run() can only be called on the browser, for example when a user clicks a
           id,
           resolve: noSerialize(resolve),
         };
-      }).then(({ result, status, error, aborted }) => {
+      }).then(({ result, status, error }) => {
         state.isRunning = false;
-        if (aborted) {
-          if (form) {
-            // The submission aborted — submitcompleted does not fire.
-            return { status, value: undefined, error: undefined };
-          }
-          throw aborted;
-        }
         state.status = status;
         if (error) {
           state.error = error;