astro 5.0.0-beta.7 → 5.0.0-beta.9

package/client.d.ts

@@ -47,7 +47,9 @@ declare module 'astro:assets' {
 		getImage: (
 			options: import('./dist/assets/types.js').UnresolvedImageTransform,
 		) => Promise<import('./dist/assets/types.js').GetImageResult>;
-		imageConfig: import('./dist/types/public/config.js').AstroConfig['image'];
+		imageConfig: import('./dist/types/public/config.js').AstroConfig['image'] & {
+			experimentalResponsiveImages: boolean;
+		};
 		getConfiguredImageService: typeof import('./dist/assets/index.js').getConfiguredImageService;
 		inferRemoteSize: typeof import('./dist/assets/utils/index.js').inferRemoteSize;
 		Image: typeof import('./components/Image.astro').default;
@@ -101,14 +103,31 @@ declare module '*.webp' {
 	const metadata: ImageMetadata;
 	export default metadata;
 }
-declare module '*.svg' {
-	const metadata: ImageMetadata;
-	export default metadata;
-}
 declare module '*.avif' {
 	const metadata: ImageMetadata;
 	export default metadata;
 }
+declare module '*.svg' {
+	type Props = {
+		/**
+		 * Accesible, short-text description
+		 *
+		 *  {@link https://developer.mozilla.org/en-US/docs/Web/SVG/Element/title|MDN Reference}
+		 */
+		title?: string;
+		/**
+		 * Shorthand for setting the `height` and `width` properties
+		 */
+		size?: number | string;
+		/**
+		 * Override the default rendering mode for SVGs
+		 */
+		mode?: import('./dist/assets/utils/svg.js').SvgRenderMode;
+	} & astroHTML.JSX.SVGAttributes;
+
+	const Component: ((_props: Props) => any) & ImageMetadata;
+	export default Component;
+}
 
 declare module 'astro:transitions' {
 	type TransitionModule = typeof import('./dist/virtual-modules/transitions.js');

package/components/Image.astro

@@ -1,7 +1,10 @@
 ---
-import { type LocalImageProps, type RemoteImageProps, getImage } from 'astro:assets';
+import { type LocalImageProps, type RemoteImageProps, getImage, imageConfig } from 'astro:assets';
+import type { UnresolvedImageTransform } from '../dist/assets/types';
+import { applyResponsiveAttributes } from '../dist/assets/utils/imageAttributes.js';
 import { AstroError, AstroErrorData } from '../dist/core/errors/index.js';
 import type { HTMLAttributes } from '../types';
+import './image.css';
 
 // The TypeScript diagnostic for JSX props uses the last member of the union to suggest props, so it would be better for
 // LocalImageProps to be last. Unfortunately, when we do this the error messages that remote images get are complete nonsense
@@ -23,7 +26,17 @@ if (typeof props.height === 'string') {
 	props.height = parseInt(props.height);
 }
 
-const image = await getImage(props);
+const layout = props.layout ?? imageConfig.experimentalLayout ?? 'none';
+const useResponsive = imageConfig.experimentalResponsiveImages && layout !== 'none';
+
+if (useResponsive) {
+	// Apply defaults from imageConfig if not provided
+	props.layout ??= imageConfig.experimentalLayout;
+	props.fit ??= imageConfig.experimentalObjectFit ?? 'cover';
+	props.position ??= imageConfig.experimentalObjectPosition ?? 'center';
+}
+
+const image = await getImage(props as UnresolvedImageTransform);
 
 const additionalAttributes: HTMLAttributes<'img'> = {};
 if (image.srcSet.values.length > 0) {
@@ -33,6 +46,16 @@ if (image.srcSet.values.length > 0) {
 if (import.meta.env.DEV) {
 	additionalAttributes['data-image-component'] = 'true';
 }
+
+const attributes = useResponsive
+	? applyResponsiveAttributes({
+			layout,
+			image,
+			props,
+			additionalAttributes,
+		})
+	: { ...additionalAttributes, ...image.attributes };
 ---
 
-<img src={image.src} {...additionalAttributes} {...image.attributes} />
+{/* Applying class outside of the spread prevents it from applying unnecessary astro-* classes */}
+<img src={image.src} {...attributes} class={attributes.class} />

package/components/Picture.astro

@@ -1,10 +1,16 @@
 ---
-import { type LocalImageProps, type RemoteImageProps, getImage } from 'astro:assets';
+import { type LocalImageProps, type RemoteImageProps, getImage, imageConfig } from 'astro:assets';
 import * as mime from 'mrmime';
+import { applyResponsiveAttributes } from '../dist/assets/utils/imageAttributes';
 import { isESMImportedImage, resolveSrc } from '../dist/assets/utils/imageKind';
 import { AstroError, AstroErrorData } from '../dist/core/errors/index.js';
-import type { GetImageResult, ImageOutputFormat } from '../dist/types/public/index.js';
+import type {
+	GetImageResult,
+	ImageOutputFormat,
+	UnresolvedImageTransform,
+} from '../dist/types/public/index.js';
 import type { HTMLAttributes } from '../types';
+import './image.css';
 
 type Props = (LocalImageProps | RemoteImageProps) & {
 	formats?: ImageOutputFormat[];
@@ -37,6 +43,17 @@ if (scopedStyleClass) {
 		pictureAttributes.class = scopedStyleClass;
 	}
 }
+
+const layout = props.layout ?? imageConfig.experimentalLayout ?? 'none';
+const useResponsive = imageConfig.experimentalResponsiveImages && layout !== 'none';
+
+if (useResponsive) {
+	// Apply defaults from imageConfig if not provided
+	props.layout ??= imageConfig.experimentalLayout;
+	props.fit ??= imageConfig.experimentalObjectFit ?? 'cover';
+	props.position ??= imageConfig.experimentalObjectPosition ?? 'center';
+}
+
 for (const key in props) {
 	if (key.startsWith('data-astro-cid')) {
 		pictureAttributes[key] = props[key];
@@ -53,7 +70,7 @@ const optimizedImages: GetImageResult[] = await Promise.all(
 				format: format,
 				widths: props.widths,
 				densities: props.densities,
-			}),
+			} as UnresolvedImageTransform),
 	),
 );
 
@@ -71,7 +88,7 @@ const fallbackImage = await getImage({
 	format: resultFallbackFormat,
 	widths: props.widths,
 	densities: props.densities,
-});
+} as UnresolvedImageTransform);
 
 const imgAdditionalAttributes: HTMLAttributes<'img'> = {};
 const sourceAdditionalAttributes: HTMLAttributes<'source'> = {};
@@ -85,6 +102,15 @@ if (fallbackImage.srcSet.values.length > 0) {
 	imgAdditionalAttributes.srcset = fallbackImage.srcSet.attribute;
 }
 
+const attributes = useResponsive
+	? applyResponsiveAttributes({
+			layout,
+			image: fallbackImage,
+			props,
+			additionalAttributes: imgAdditionalAttributes,
+		})
+	: { ...imgAdditionalAttributes, ...fallbackImage.attributes };
+
 if (import.meta.env.DEV) {
 	imgAdditionalAttributes['data-image-component'] = 'true';
 }
@@ -94,7 +120,7 @@ if (import.meta.env.DEV) {
 	{
 		Object.entries(optimizedImages).map(([_, image]) => {
 			const srcsetAttribute =
-				props.densities || (!props.densities && !props.widths)
+				props.densities || (!props.densities && !props.widths && !useResponsive)
 					? `${image.src}${image.srcSet.values.length > 0 ? ', ' + image.srcSet.attribute : ''}`
 					: image.srcSet.attribute;
 			return (
@@ -106,5 +132,6 @@ if (import.meta.env.DEV) {
 			);
 		})
 	}
-	<img src={fallbackImage.src} {...imgAdditionalAttributes} {...fallbackImage.attributes} />
+	{/* Applying class outside of the spread prevents it from applying unnecessary astro-* classes */}
+	<img src={fallbackImage.src} {...attributes} class={attributes.class} />
 </picture>

package/components/image.css

@@ -0,0 +1,17 @@
+[data-astro-image] {
+	width: 100%;
+	height: auto;
+	object-fit: var(--fit);
+	object-position: var(--pos);
+	aspect-ratio: var(--w) / var(--h);
+}
+/* Styles for responsive layout */
+[data-astro-image='responsive'] {
+	max-width: calc(var(--w) * 1px);
+	max-height: calc(var(--h) * 1px);
+}
+/* Styles for fixed layout */
+[data-astro-image='fixed'] {
+	width: calc(var(--w) * 1px);
+	height: calc(var(--h) * 1px);
+}

package/dist/actions/consts.d.ts

@@ -7,5 +7,5 @@ export declare const NOOP_ACTIONS = "\0noop-actions";
 export declare const ACTION_QUERY_PARAMS: {
     actionName: string;
     actionPayload: string;
-    actionRedirect: string;
 };
+export declare const ACTION_RPC_ROUTE_PATTERN = "/_actions/[...path]";

package/dist/actions/consts.js

@@ -6,12 +6,13 @@ const RESOLVED_VIRTUAL_INTERNAL_MODULE_ID = "\0astro:internal-actions";
 const NOOP_ACTIONS = "\0noop-actions";
 const ACTION_QUERY_PARAMS = {
   actionName: "_astroAction",
-  actionPayload: "_astroActionPayload",
-  actionRedirect: "_astroActionRedirect"
+  actionPayload: "_astroActionPayload"
 };
+const ACTION_RPC_ROUTE_PATTERN = "/_actions/[...path]";
 export {
   ACTIONS_TYPES_FILE,
   ACTION_QUERY_PARAMS,
+  ACTION_RPC_ROUTE_PATTERN,
   NOOP_ACTIONS,
   RESOLVED_VIRTUAL_INTERNAL_MODULE_ID,
   RESOLVED_VIRTUAL_MODULE_ID,

package/dist/actions/integration.js

@@ -1,7 +1,7 @@
 import { ActionsWithoutServerOutputError } from "../core/errors/errors-data.js";
 import { AstroError } from "../core/errors/errors.js";
 import { viteID } from "../core/util.js";
-import { ACTIONS_TYPES_FILE, VIRTUAL_MODULE_ID } from "./consts.js";
+import { ACTIONS_TYPES_FILE, ACTION_RPC_ROUTE_PATTERN, VIRTUAL_MODULE_ID } from "./consts.js";
 function astroIntegrationActionsRouteHandler({
   settings
 }) {
@@ -9,10 +9,11 @@ function astroIntegrationActionsRouteHandler({
     name: VIRTUAL_MODULE_ID,
     hooks: {
       async "astro:config:setup"(params) {
-        params.injectRoute({
-          pattern: "/_actions/[...path]",
+        settings.injectedRoutes.push({
+          pattern: ACTION_RPC_ROUTE_PATTERN,
           entrypoint: "astro/actions/runtime/route.js",
-          prerender: false
+          prerender: false,
+          origin: "internal"
         });
         params.addMiddleware({
           entrypoint: "astro/actions/runtime/middleware.js",

package/dist/actions/runtime/middleware.d.ts

@@ -1,9 +1 @@
-import { type SerializedActionResult } from './virtual/shared.js';
-export type ActionPayload = {
-    actionResult: SerializedActionResult;
-    actionName: string;
-};
-export type Locals = {
-    _actionPayload: ActionPayload;
-};
 export declare const onRequest: import("../../types/public/common.js").MiddlewareHandler;

package/dist/actions/runtime/middleware.js

@@ -1,118 +1,14 @@
-import { decodeBase64, encodeBase64 } from "@oslojs/encoding";
-import { yellow } from "kleur/colors";
-import { defineMiddleware } from "../../core/middleware/index.js";
-import { getOriginPathname } from "../../core/routing/rewrite.js";
-import { ACTION_QUERY_PARAMS } from "../consts.js";
-import { formContentTypes, hasContentType } from "./utils.js";
-import { getAction } from "./virtual/get-action.js";
-import {
-  serializeActionResult
-} from "./virtual/shared.js";
-const decoder = new TextDecoder();
-const encoder = new TextEncoder();
+import { defineMiddleware } from "../../virtual-modules/middleware.js";
+import { getActionContext } from "./virtual/server.js";
 const onRequest = defineMiddleware(async (context, next) => {
-  if (context.isPrerendered) {
-    if (context.request.method === "POST") {
-      console.warn(
-        yellow("[astro:actions]"),
-        "POST requests should not be sent to prerendered pages. If you're using Actions, disable prerendering with `export const prerender = false`."
-      );
-    }
-    return next();
-  }
-  const locals = context.locals;
-  if (locals._actionPayload) return next();
-  const actionPayloadCookie = context.cookies.get(ACTION_QUERY_PARAMS.actionPayload)?.value;
-  if (actionPayloadCookie) {
-    const actionPayload = JSON.parse(decoder.decode(decodeBase64(actionPayloadCookie)));
-    if (!isActionPayload(actionPayload)) {
-      throw new Error("Internal: Invalid action payload in cookie.");
-    }
-    return renderResult({ context, next, ...actionPayload });
-  }
-  const actionName = context.url.searchParams.get(ACTION_QUERY_PARAMS.actionName);
-  if (context.request.method === "POST" && actionName) {
-    return handlePost({ context, next, actionName });
+  if (context.isPrerendered) return next();
+  const { action, setActionResult, serializeActionResult } = getActionContext(context);
+  if (action?.calledFrom === "form") {
+    const actionResult = await action.handler();
+    setActionResult(action.name, serializeActionResult(actionResult));
   }
   return next();
 });
-async function renderResult({
-  context,
-  next,
-  actionResult,
-  actionName
-}) {
-  const locals = context.locals;
-  locals._actionPayload = { actionResult, actionName };
-  const response = await next();
-  context.cookies.delete(ACTION_QUERY_PARAMS.actionPayload);
-  if (actionResult.type === "error") {
-    return new Response(response.body, {
-      status: actionResult.status,
-      statusText: actionResult.type,
-      headers: response.headers
-    });
-  }
-  return response;
-}
-async function handlePost({
-  context,
-  next,
-  actionName
-}) {
-  const { request } = context;
-  const baseAction = await getAction(actionName);
-  const contentType = request.headers.get("content-type");
-  let formData;
-  if (contentType && hasContentType(contentType, formContentTypes)) {
-    formData = await request.clone().formData();
-  }
-  const { getActionResult, callAction, props, redirect, ...actionAPIContext } = context;
-  const action = baseAction.bind(actionAPIContext);
-  const actionResult = await action(formData);
-  if (context.url.searchParams.get(ACTION_QUERY_PARAMS.actionRedirect) === "false") {
-    return renderResult({
-      context,
-      next,
-      actionName,
-      actionResult: serializeActionResult(actionResult)
-    });
-  }
-  return redirectWithResult({ context, actionName, actionResult });
-}
-async function redirectWithResult({
-  context,
-  actionName,
-  actionResult
-}) {
-  const cookieValue = encodeBase64(
-    encoder.encode(
-      JSON.stringify({
-        actionName,
-        actionResult: serializeActionResult(actionResult)
-      })
-    )
-  );
-  context.cookies.set(ACTION_QUERY_PARAMS.actionPayload, cookieValue);
-  if (actionResult.error) {
-    const referer2 = context.request.headers.get("Referer");
-    if (!referer2) {
-      throw new Error("Internal: Referer unexpectedly missing from Action POST request.");
-    }
-    return context.redirect(referer2);
-  }
-  const referer = getOriginPathname(context.request);
-  if (referer) {
-    return context.redirect(referer);
-  }
-  return context.redirect(context.url.pathname);
-}
-function isActionPayload(json) {
-  if (typeof json !== "object" || json == null) return false;
-  if (!("actionResult" in json) || typeof json.actionResult !== "object") return false;
-  if (!("actionName" in json) || typeof json.actionName !== "string") return false;
-  return true;
-}
 export {
   onRequest
 };

package/dist/actions/runtime/route.js

@@ -1,31 +1,10 @@
-import { formContentTypes, hasContentType } from "./utils.js";
-import { getAction } from "./virtual/get-action.js";
-import { serializeActionResult } from "./virtual/shared.js";
+import { getActionContext } from "./virtual/server.js";
 const POST = async (context) => {
-  const { request, url } = context;
-  let baseAction;
-  try {
-    baseAction = await getAction(url.pathname);
-  } catch (e) {
-    if (import.meta.env.DEV) throw e;
-    console.error(e);
-    return new Response(e instanceof Error ? e.message : null, { status: 404 });
+  const { action, serializeActionResult } = getActionContext(context);
+  if (action?.calledFrom !== "rpc") {
+    return new Response("Not found", { status: 404 });
   }
-  const contentType = request.headers.get("Content-Type");
-  const contentLength = request.headers.get("Content-Length");
-  let args;
-  if (!contentType || contentLength === "0") {
-    args = void 0;
-  } else if (contentType && hasContentType(contentType, formContentTypes)) {
-    args = await request.clone().formData();
-  } else if (contentType && hasContentType(contentType, ["application/json"])) {
-    args = await request.clone().json();
-  } else {
-    return new Response(null, { status: 415 });
-  }
-  const { getActionResult, callAction, props, redirect, ...actionAPIContext } = context;
-  const action = baseAction.bind(actionAPIContext);
-  const result = await action(args);
+  const result = await action.handler();
   const serialized = serializeActionResult(result);
   if (serialized.type === "empty") {
     return new Response(null, {

package/dist/actions/runtime/utils.d.ts

@@ -1,4 +1,13 @@
 import type { APIContext } from '../../types/public/context.js';
+import type { SerializedActionResult } from './virtual/shared.js';
+export type ActionPayload = {
+    actionResult: SerializedActionResult;
+    actionName: string;
+};
+export type Locals = {
+    _actionPayload: ActionPayload;
+};
+export declare const ACTION_API_CONTEXT_SYMBOL: unique symbol;
 export declare const formContentTypes: string[];
 export declare function hasContentType(contentType: string, expected: string[]): boolean;
 export type ActionAPIContext = Omit<APIContext, 'getActionResult' | 'callAction' | 'props' | 'redirect'>;
@@ -13,3 +22,4 @@ export type MaybePromise<T> = T | Promise<T>;
  * `result.error.fields` will be typed with the `name` field.
  */
 export type ErrorInferenceObject = Record<string, any>;
+export declare function isActionAPIContext(ctx: ActionAPIContext): boolean;

package/dist/actions/runtime/utils.js

@@ -1,9 +1,16 @@
+const ACTION_API_CONTEXT_SYMBOL = Symbol.for("astro.actionAPIContext");
 const formContentTypes = ["application/x-www-form-urlencoded", "multipart/form-data"];
 function hasContentType(contentType, expected) {
   const type = contentType.split(";")[0].toLowerCase();
   return expected.some((t) => type === t);
 }
+function isActionAPIContext(ctx) {
+  const symbol = Reflect.get(ctx, ACTION_API_CONTEXT_SYMBOL);
+  return symbol === true;
+}
 export {
+  ACTION_API_CONTEXT_SYMBOL,
   formContentTypes,
-  hasContentType
+  hasContentType,
+  isActionAPIContext
 };

package/dist/actions/runtime/virtual/client.d.ts

@@ -1,2 +1,3 @@
 export * from './shared.js';
 export declare function defineAction(): void;
+export declare function getActionContext(): void;

package/dist/actions/runtime/virtual/client.js

@@ -2,6 +2,10 @@ export * from "./shared.js";
 function defineAction() {
   throw new Error("[astro:action] `defineAction()` unexpectedly used on the client.");
 }
+function getActionContext() {
+  throw new Error("[astro:action] `getActionContext()` unexpectedly used on the client.");
+}
 export {
-  defineAction
+  defineAction,
+  getActionContext
 };

package/dist/actions/runtime/virtual/get-action.js

@@ -1,7 +1,7 @@
 import { ActionNotFoundError } from "../../../core/errors/errors-data.js";
 import { AstroError } from "../../../core/errors/errors.js";
 async function getAction(path) {
-  const pathKeys = path.replace(/^.*\/_actions\//, "").split(".").map((key) => decodeURIComponent(key));
+  const pathKeys = path.split(".").map((key) => decodeURIComponent(key));
   let { server: actionLookup } = await import("astro:internal-actions");
   if (actionLookup == null || !(typeof actionLookup === "object")) {
     throw new TypeError(

package/dist/actions/runtime/virtual/server.d.ts

@@ -1,6 +1,7 @@
 import { z } from 'zod';
-import type { ActionAPIContext, ErrorInferenceObject, MaybePromise } from '../utils.js';
-import { type SafeResult } from './shared.js';
+import type { APIContext } from '../../../types/public/index.js';
+import { type ActionAPIContext, type ErrorInferenceObject, type MaybePromise } from '../utils.js';
+import { type SafeResult, type SerializedActionResult, deserializeActionResult, serializeActionResult } from './shared.js';
 export * from './shared.js';
 export type ActionAccept = 'form' | 'json';
 export type ActionHandler<TInputSchema, TOutput> = TInputSchema extends z.ZodType ? (input: z.infer<TInputSchema>, context: ActionAPIContext) => MaybePromise<TOutput> : (input: any, context: ActionAPIContext) => MaybePromise<TOutput>;
@@ -18,3 +19,32 @@ export declare function defineAction<TOutput, TAccept extends ActionAccept | und
 }): ActionClient<TOutput, TAccept, TInputSchema> & string;
 /** Transform form data to an object based on a Zod schema. */
 export declare function formDataToObject<T extends z.AnyZodObject>(formData: FormData, schema: T): Record<string, unknown>;
+export type ActionMiddlewareContext = {
+    /** Information about an incoming action request. */
+    action?: {
+        /** Whether an action was called using an RPC function or by using an HTML form action. */
+        calledFrom: 'rpc' | 'form';
+        /** The name of the action. Useful to track the source of an action result during a redirect. */
+        name: string;
+        /** Programatically call the action to get the result. */
+        handler: () => Promise<SafeResult<any, any>>;
+    };
+    /**
+     * Manually set the action result accessed via `getActionResult()`.
+     * Calling this function from middleware will disable Astro's own action result handling.
+     */
+    setActionResult(actionName: string, actionResult: SerializedActionResult): void;
+    /**
+     * Serialize an action result to stored in a cookie or session.
+     * Also used to pass a result to Astro templates via `setActionResult()`.
+     */
+    serializeActionResult: typeof serializeActionResult;
+    /**
+     * Deserialize an action result to access data and error objects.
+     */
+    deserializeActionResult: typeof deserializeActionResult;
+};
+/**
+ * Access information about Action requests from middleware.
+ */
+export declare function getActionContext(context: APIContext): ActionMiddlewareContext;

package/dist/actions/runtime/virtual/server.js

@@ -1,7 +1,22 @@
 import { z } from "zod";
 import { ActionCalledFromServerError } from "../../../core/errors/errors-data.js";
 import { AstroError } from "../../../core/errors/errors.js";
-import { ActionError, ActionInputError, callSafely } from "./shared.js";
+import { ACTION_RPC_ROUTE_PATTERN } from "../../consts.js";
+import {
+  ACTION_API_CONTEXT_SYMBOL,
+  formContentTypes,
+  hasContentType,
+  isActionAPIContext
+} from "../utils.js";
+import { getAction } from "./get-action.js";
+import {
+  ACTION_QUERY_PARAMS,
+  ActionError,
+  ActionInputError,
+  callSafely,
+  deserializeActionResult,
+  serializeActionResult
+} from "./shared.js";
 export * from "./shared.js";
 function defineAction({
   accept,
@@ -10,7 +25,7 @@ function defineAction({
 }) {
   const serverHandler = accept === "form" ? getFormServerHandler(handler, inputSchema) : getJsonServerHandler(handler, inputSchema);
   async function safeServerHandler(unparsedInput) {
-    if (typeof this === "function") {
+    if (typeof this === "function" || !isActionAPIContext(this)) {
       throw new AstroError(ActionCalledFromServerError);
     }
     return callSafely(() => serverHandler(unparsedInput, this));
@@ -119,7 +134,75 @@ function unwrapBaseObjectSchema(schema, unparsedInput) {
   }
   return schema;
 }
+function getActionContext(context) {
+  const callerInfo = getCallerInfo(context);
+  const actionResultAlreadySet = Boolean(context.locals._actionPayload);
+  let action = void 0;
+  if (callerInfo && context.request.method === "POST" && !actionResultAlreadySet) {
+    action = {
+      calledFrom: callerInfo.from,
+      name: callerInfo.name,
+      handler: async () => {
+        const baseAction = await getAction(callerInfo.name);
+        let input;
+        try {
+          input = await parseRequestBody(context.request);
+        } catch (e) {
+          if (e instanceof TypeError) {
+            return { data: void 0, error: new ActionError({ code: "UNSUPPORTED_MEDIA_TYPE" }) };
+          }
+          throw e;
+        }
+        const {
+          props: _props,
+          getActionResult: _getActionResult,
+          callAction: _callAction,
+          redirect: _redirect,
+          ...actionAPIContext
+        } = context;
+        Reflect.set(actionAPIContext, ACTION_API_CONTEXT_SYMBOL, true);
+        const handler = baseAction.bind(actionAPIContext);
+        return handler(input);
+      }
+    };
+  }
+  function setActionResult(actionName, actionResult) {
+    context.locals._actionPayload = {
+      actionResult,
+      actionName
+    };
+  }
+  return {
+    action,
+    setActionResult,
+    serializeActionResult,
+    deserializeActionResult
+  };
+}
+function getCallerInfo(ctx) {
+  if (ctx.routePattern === ACTION_RPC_ROUTE_PATTERN) {
+    return { from: "rpc", name: ctx.url.pathname.replace(/^.*\/_actions\//, "") };
+  }
+  const queryParam = ctx.url.searchParams.get(ACTION_QUERY_PARAMS.actionName);
+  if (queryParam) {
+    return { from: "form", name: queryParam };
+  }
+  return void 0;
+}
+async function parseRequestBody(request) {
+  const contentType = request.headers.get("content-type");
+  const contentLength = request.headers.get("Content-Length");
+  if (!contentType) return void 0;
+  if (hasContentType(contentType, formContentTypes)) {
+    return await request.clone().formData();
+  }
+  if (hasContentType(contentType, ["application/json"])) {
+    return contentLength === "0" ? void 0 : await request.clone().json();
+  }
+  throw new TypeError("Unsupported content type");
+}
 export {
   defineAction,
-  formDataToObject
+  formDataToObject,
+  getActionContext
 };

package/dist/actions/runtime/virtual/shared.d.ts

@@ -4,7 +4,6 @@ export type ActionAPIContext = _ActionAPIContext;
 export declare const ACTION_QUERY_PARAMS: {
     actionName: string;
     actionPayload: string;
-    actionRedirect: string;
 };
 export declare const ACTION_ERROR_CODES: readonly ["BAD_REQUEST", "UNAUTHORIZED", "FORBIDDEN", "NOT_FOUND", "TIMEOUT", "CONFLICT", "PRECONDITION_FAILED", "PAYLOAD_TOO_LARGE", "UNSUPPORTED_MEDIA_TYPE", "UNPROCESSABLE_CONTENT", "TOO_MANY_REQUESTS", "CLIENT_CLOSED_REQUEST", "INTERNAL_SERVER_ERROR"];
 export type ActionErrorCode = (typeof ACTION_ERROR_CODES)[number];

package/dist/actions/utils.d.ts

@@ -1,7 +1,6 @@
 import type fsMod from 'node:fs';
 import type { APIContext } from '../types/public/context.js';
-import type { Locals } from './runtime/middleware.js';
-import type { ActionAPIContext } from './runtime/utils.js';
+import { type ActionAPIContext, type Locals } from './runtime/utils.js';
 export declare function hasActionPayload(locals: APIContext['locals']): locals is Locals;
 export declare function createGetActionResult(locals: APIContext['locals']): APIContext['getActionResult'];
 export declare function createCallAction(context: ActionAPIContext): APIContext['callAction'];