astro 7.0.0-alpha.0 → 7.0.0-alpha.2

package/dist/core/app/base.d.ts

@@ -1,9 +1,10 @@
 import type { RoutesList } from '../../types/astro.js';
 import type { RemotePattern, RouteData } from '../../types/public/index.js';
-import type { Pipeline } from '../base-pipeline.js';
+import { type Pipeline } from '../base-pipeline.js';
 import { getSetCookiesFromResponse } from '../cookies/index.js';
 import { AstroIntegrationLogger, type AstroLogger } from '../logger/core.js';
-import { type CreateRenderContext, RenderContext } from '../render-context.js';
+import type { FetchHandler } from '../fetch/types.js';
+import type { ErrorHandler } from '../errors/handler.js';
 import type { WaitUntilHook } from '../wait-until.js';
 import type { AppPipeline } from './pipeline.js';
 import type { SSRManifest } from './types.js';
@@ -60,7 +61,7 @@ export interface RenderOptions {
     routeData?: RouteData;
 }
 type RequiredRenderOptions = Required<RenderOptions>;
-interface ResolvedRenderOptions {
+export interface ResolvedRenderOptions {
     addCookieHeader: RequiredRenderOptions['addCookieHeader'];
     clientAddress: RequiredRenderOptions['clientAddress'] | undefined;
     prerenderedErrorPageFetch: RequiredRenderOptions['prerenderedErrorPageFetch'] | undefined;
@@ -79,20 +80,38 @@ export interface RenderErrorOptions extends ResolvedRenderOptions {
      * Allows passing an error to 500.astro. It will be available through `Astro.props.error`.
      */
     error?: unknown;
+    /**
+     * The pathname to use for the error page render context. If omitted, the
+     * error handler computes it from `request` via a short-lived `FetchState`.
+     */
+    pathname?: string;
 }
 type ErrorPagePath = `${string}/404` | `${string}/500` | `${string}/404/` | `${string}/500/` | `${string}404.html` | `${string}500.html`;
 export declare abstract class BaseApp<P extends Pipeline = AppPipeline> {
     #private;
     manifest: SSRManifest;
-    manifestData: RoutesList;
+    manifestData: {
+        routes: RouteData[];
+    };
     pipeline: P;
     baseWithoutTrailingSlash: string;
     get logger(): AstroLogger;
     get adapterLogger(): AstroIntegrationLogger;
     constructor(manifest: SSRManifest, streaming?: boolean, ...args: any[]);
+    /**
+     * Override the fetch handler used to dispatch requests. Entrypoints
+     * call this with the default export of `virtual:astro:fetchable` to
+     * plug in a user-authored handler from `src/app.ts`.
+     */
+    setFetchHandler(handler: {
+        fetch: FetchHandler;
+    }): void;
+    /**
+     * Returns the error handler strategy used by this app. Override to
+     * provide environment-specific behavior (dev overlay, build-time throws, etc.).
+     */
+    protected createErrorHandler(): ErrorHandler;
     abstract isDev(): boolean;
-    createRenderContext(payload: CreateRenderContext): Promise<RenderContext>;
-    getAdapterLogger(): AstroIntegrationLogger;
     /**
      * Resets the cached adapter logger so it picks up a new logger instance.
      * Used by BuildApp when the logger is replaced via setOptions().
@@ -113,10 +132,17 @@ export declare abstract class BaseApp<P extends Pipeline = AppPipeline> {
     set setManifestData(newManifestData: RoutesList);
     removeBase(pathname: string): string;
     /**
-     * It removes the base from the request URL, prepends it with a forward slash and attempts to decoded it.
-     *
-     * If the decoding fails, it logs the error and return the pathname as is.
-     * @param request
+     * Decodes a pathname with `decodeURI`, falling back to the raw pathname when it
+     * contains an invalid percent-sequence (e.g. `%C0%AF`, an overlong-UTF-8 encoding of
+     * `/` commonly sent by path-traversal scanners). A raw `decodeURI()` would throw
+     * `URIError: URI malformed`, and because `match()` runs before `render()` that error
+     * escapes the adapter's request handler as an uncaught exception (HTTP 500) that user
+     * middleware can't catch.
+     */
+    private safeDecodeURI;
+    /**
+     * Extracts the base-stripped, decoded pathname from a request.
+     * Used by adapters to compute the pathname for dev-mode route matching.
      */
     getPathnameFromRequest(request: Request): string;
     /**
@@ -128,7 +154,6 @@ export declare abstract class BaseApp<P extends Pipeline = AppPipeline> {
      * @param allowPrerenderedRoutes
      */
     match(request: Request, allowPrerenderedRoutes?: boolean): RouteData | undefined;
-    private createRouter;
     /**
      * A matching route function to use in the development server.
      * Contrary to the `.match` function, this function resolves props and params, returning the correct
@@ -137,7 +162,6 @@ export declare abstract class BaseApp<P extends Pipeline = AppPipeline> {
      */
     devMatch(pathname?: string): Promise<DevMatch | undefined> | undefined;
     private computePathnameFromDomain;
-    private redirectTrailingSlash;
     render(request: Request, { addCookieHeader, clientAddress, locals, prerenderedErrorPageFetch, routeData, waitUntil, }?: RenderOptions): Promise<Response>;
     setCookieHeaders(response: Response): Generator<string, string[], any>;
     /**
@@ -154,10 +178,13 @@ export declare abstract class BaseApp<P extends Pipeline = AppPipeline> {
     static getSetCookieFromResponse: typeof getSetCookiesFromResponse;
     /**
      * If it is a known error code, try sending the according page (e.g. 404.astro / 500.astro).
-     * This also handles pre-rendered /404 or /500 routes
+     * This also handles pre-rendered /404 or /500 routes.
+     *
+     * Delegates to the app's configured `ErrorHandler`. To customize behavior
+     * for a specific environment, override `createErrorHandler()` rather than
+     * this method.
      */
-    renderError(request: Request, { status, response: originalResponse, skipMiddleware, error, ...resolvedRenderOptions }: RenderErrorOptions): Promise<Response>;
-    private mergeResponses;
+    renderError(request: Request, options: RenderErrorOptions): Promise<Response>;
     getDefaultStatusCode(routeData: RouteData, pathname: string): number;
     getManifest(): SSRManifest;
     logThisRequest({ pathname, method, statusCode, isRewrite, timeStart, }: {