@qwik.dev/router 2.0.0-beta.35 → 2.0.0-beta.37

package/lib/middleware/aws-lambda/index.mjs

@@ -1,4 +1,5 @@
 import { createQwikRouter as createQwikRouter$1 } from '@qwik.dev/router/middleware/node';
+import { e as ensureSlash } from '../../chunks/pathname.mjs';
 
 function createQwikRouter(opts) {
   try {
@@ -22,7 +23,7 @@ function createQwikRouter(opts) {
           return pathT;
         }
         if (!url.pathname.endsWith("/")) {
-          return url.pathname + "/" + url.search;
+          return ensureSlash(url.pathname) + url.search;
         }
       }
       return pathT;

package/lib/middleware/request-handler/index.d.ts

@@ -10,7 +10,6 @@ import type { RenderOptions } from '@qwik.dev/core/server';
 import { RequestEvent as RequestEvent_2 } from '@qwik.dev/router/middleware/request-handler';
 import type { RequestHandler as RequestHandler_2 } from '@qwik.dev/router/middleware/request-handler';
 import type { ResolveSyncValue as ResolveSyncValue_2 } from '@qwik.dev/router/middleware/request-handler';
-import { SerializationStrategy } from '@qwik.dev/core/internal';
 import type { ValueOrPromise } from '@qwik.dev/core';
 
 /** @public */
@@ -92,15 +91,35 @@ declare interface CacheControlOptions {
 declare type CacheControlTarget = 'Cache-Control' | 'CDN-Cache-Control' | 'Cloudflare-CDN-Cache-Control' | 'Vercel-CDN-Cache-Control' | '~ANY-OTHER-STRING' | (string & {});
 
 /**
- * The cacheKey export type. When exported from a page module alongside eTag, enables in-memory SSR
- * caching.
+ * Cache key function. Used by `routeConfig.cacheKey` (SSR HTML cache) and by `routeLoader$`'s
+ * `cacheKey` option (per-loader JSON cache).
  *
- * - `true`: use the default cache key `status|eTag|pathname`
- * - Function: receives status, eTag, and pathname; returns a cache key string or null (no cache)
+ * - `true`: use the surface's default key.
+ *
+ *   - SSR default: `${status}|${eTag}|${pathname}` when an eTag is set, otherwise
+ *       `${status}|${pathname}`.
+ *   - Loader default: `${pathname}|${filteredSearch}|${loaderId}|${eTag}` when an eTag is set,
+ *       otherwise `${pathname}|${filteredSearch}|${loaderId}`.
+ * - Function: receives the request event and the normalized, unquoted eTag (or an empty string when
+ *   none was provided). Return the cache key string, or `null` or `''` to skip caching for this
+ *   request. Loader callbacks receive the loader-scoped request event, with `url`, `query`, and
+ *   `request.url` filtered by the loader's `search` allowlist.
+ *
+ * Note: valid cacheKeys are non-empty strings.
  *
  * @public
  */
-declare type CacheKeyFn = true | ((status: number, eTag: string, pathname: string) => string | null);
+declare type CacheKeyFn = true | ((requestEv: RequestEvent_2, eTag: string) => string | null);
+
+/**
+ * Clear the in-memory loader cache. Call after deployments or data changes.
+ *
+ * When `cacheKey` is provided, only that single entry is removed; otherwise the entire cache is
+ * cleared.
+ *
+ * @public
+ */
+export declare function clearLoaderCache(cacheKey?: string): void;
 
 /**
  * Clear the in-memory SSR cache. Call after deployments or data changes.
@@ -141,7 +160,18 @@ declare interface ContentMenu {
 declare type ContentModule = PageModule | LayoutModule;
 
 /**
- * The eTag export type: a static string or a function receiving DocumentHeadProps.
+ * The eTag export type for routeConfig.
+ *
+ * - `string` — static ETag value.
+ * - `(props: DocumentHeadProps) => string | null` — compute the ETag from route context (params, URL,
+ *   loaded data via `resolveValue`, etc.). Return `null` to skip eTag for this request.
+ *
+ * Qwik normalizes eTag values by stripping weak-form `W/` prefixes, quotes, and forbidden chars,
+ * then sends a strong `ETag` header. Values that normalize to an empty string are treated as
+ * absent.
+ *
+ * When set (and a value is produced), the server includes an `ETag` header and returns `304` if
+ * `If-None-Match` matches.
  *
  * @public
  */
@@ -332,6 +362,13 @@ export declare function getNotFound(prefix: string): string;
  */
 declare type InformationalCode = 100 | 101 | 102 | 103;
 
+/**
+ * Internal JSON request kind handled by Qwik Router, or `false` for normal page requests.
+ *
+ * @public
+ */
+export declare type InternalRequest = false | 'loader' | 'action';
+
 /**
  * Decide whether a given request path is a static path, for optimizing file access.
  *
@@ -361,6 +398,10 @@ declare interface LoadedRoute {
     $notFound$?: boolean;
     /** The error module loader (nearest _E ancestor), for rendering ServerErrors */
     $errorLoader$?: ContentModuleLoader;
+    /** Merged array of routeLoader$ hashes from all matched nodes (layouts + page) */
+    $loaders$?: string[];
+    /** Runtime-only mapping of routeLoader$ hashes to the matched pathname used for q-loader fetches */
+    $loaderPaths$?: Record<string, string>;
 }
 
 /** @public */
@@ -464,6 +505,14 @@ export declare interface RequestEventBase<PLATFORM = QwikRouterPlatform> {
     readonly query: URLSearchParams;
     /** HTTP request URL. */
     readonly url: URL;
+    /**
+     * Identifies Qwik Router internal JSON requests, such as route loader fetches and fetch-based
+     * action submissions. Returns `false` for normal page requests.
+     *
+     * Check this before applying broad rewrite rules so internal JSON requests keep their routing
+     * behavior.
+     */
+    readonly internalRequest: InternalRequest;
     /**
      * The original HTTP request URL.
      *
@@ -582,8 +631,6 @@ export declare interface RequestEventCommon<PLATFORM = QwikRouterPlatform> exten
 }
 
 declare interface RequestEventInternal extends Readonly<RequestEvent>, Readonly<RequestEventLoader> {
-    readonly [RequestEvLoaders]: Record<string, ValueOrPromise<unknown> | undefined>;
-    readonly [RequestEvLoaderSerializationStrategyMap]: Map<string, SerializationStrategy>;
     readonly [RequestEvMode]: ServerRequestMode;
     readonly [RequestEvRoute]: LoadedRoute;
     /**
@@ -608,17 +655,10 @@ export declare interface RequestEventLoader<PLATFORM = QwikRouterPlatform> exten
     defer: <T>(returnData: Promise<T> | (() => Promise<T>)) => DeferReturn<T>;
 }
 
-declare const RequestEvLoaders: unique symbol;
-
-declare const RequestEvLoaderSerializationStrategyMap: unique symbol;
-
 declare const RequestEvMode: unique symbol;
 
 declare const RequestEvRoute: unique symbol;
 
-/** @internal */
-export declare const RequestEvShareQData = "qData";
-
 /** @public */
 export declare type RequestHandler<PLATFORM = QwikRouterPlatform> = (ev: RequestEvent<PLATFORM>) => Promise<void> | void;