astro 4.14.3 → 4.14.5

package/dist/@types/astro.d.ts

@@ -4,7 +4,8 @@ import type { MarkdownHeading, MarkdownVFile, RehypePlugins, RemarkPlugins, Rema
 import type * as babel from '@babel/core';
 import type * as rollup from 'rollup';
 import type * as vite from 'vite';
-import type { ActionAccept, ActionClient, ActionInputSchema, ActionReturnType } from '../actions/runtime/virtual/server.js';
+import type { z } from 'zod';
+import type { ActionAccept, ActionClient, ActionReturnType } from '../actions/runtime/virtual/server.js';
 import type { RemotePattern } from '../assets/utils/remotePattern.js';
 import type { DataEntry, RenderedContent } from '../content/data-store.js';
 import type { AssetsPrefix, SSRManifest, SerializedSSRManifest } from '../core/app/types.js';
@@ -2128,7 +2129,7 @@ export interface AstroUserConfig {
          * ```
          *
          * :::note
-         * Loaders will not automatically [exclude files prefaced with an `_`](/en/guides/routing/#excluding-pages). Use a regular expression such as `pattern: '**\/[^_]*.md` in your loader to ignore these files.
+         * Loaders will not automatically [exclude files prefaced with an `_`](/en/guides/routing/#excluding-pages). Use a regular expression such as `pattern: '**\/[^_]*.md'` in your loader to ignore these files.
          * :::
          *
          * #### Querying and rendering with the Content Layer API
@@ -2757,11 +2758,11 @@ interface AstroSharedContext<Props extends Record<string, any> = Record<string,
     /**
      * Get action result on the server when using a form POST.
      */
-    getActionResult: <TAccept extends ActionAccept, TInputSchema extends ActionInputSchema<TAccept>, TAction extends ActionClient<unknown, TAccept, TInputSchema>>(action: TAction) => ActionReturnType<TAction> | undefined;
+    getActionResult: <TAccept extends ActionAccept, TInputSchema extends z.ZodType, TAction extends ActionClient<unknown, TAccept, TInputSchema>>(action: TAction) => ActionReturnType<TAction> | undefined;
     /**
      * Call action handler from the server.
      */
-    callAction: <TAccept extends ActionAccept, TInputSchema extends ActionInputSchema<TAccept>, TOutput, TAction extends ActionClient<TOutput, TAccept, TInputSchema> | ActionClient<TOutput, TAccept, TInputSchema>['orThrow']>(action: TAction, input: Parameters<TAction>[0]) => Promise<ActionReturnType<TAction>>;
+    callAction: <TAccept extends ActionAccept, TInputSchema extends z.ZodType, TOutput, TAction extends ActionClient<TOutput, TAccept, TInputSchema> | ActionClient<TOutput, TAccept, TInputSchema>['orThrow']>(action: TAction, input: Parameters<TAction>[0]) => Promise<ActionReturnType<TAction>>;
     /**
      * Route parameters for this request if this is a dynamic route.
      */

package/dist/actions/runtime/middleware.js

@@ -9,8 +9,16 @@ import {
   serializeActionResult
 } from "./virtual/shared.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;
-  const { request } = context;
   if (locals._actionPayload) return next();
   const actionPayload = context.cookies.get(ACTION_QUERY_PARAMS.actionPayload)?.json();
   if (actionPayload) {
@@ -19,13 +27,6 @@ const onRequest = defineMiddleware(async (context, next) => {
     }
     return renderResult({ context, next, ...actionPayload });
   }
-  if (import.meta.env.DEV && request.method === "POST" && request.body === null) {
-    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 actionName = context.url.searchParams.get(ACTION_QUERY_PARAMS.actionName);
   if (context.request.method === "POST" && actionName) {
     return handlePost({ context, next, actionName });

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

@@ -4,16 +4,15 @@ import { type SafeResult } from './shared.js';
 export * from './shared.js';
 export { z } from 'zod';
 export type ActionAccept = 'form' | 'json';
-export type ActionInputSchema<T extends ActionAccept | undefined> = T extends 'form' ? z.AnyZodObject | z.ZodType<FormData> : z.ZodType;
 export type ActionHandler<TInputSchema, TOutput> = TInputSchema extends z.ZodType ? (input: z.infer<TInputSchema>, context: ActionAPIContext) => MaybePromise<TOutput> : (input: any, context: ActionAPIContext) => MaybePromise<TOutput>;
 export type ActionReturnType<T extends ActionHandler<any, any>> = Awaited<ReturnType<T>>;
-export type ActionClient<TOutput, TAccept extends ActionAccept | undefined, TInputSchema extends ActionInputSchema<TAccept> | undefined> = TInputSchema extends z.ZodType ? ((input: TAccept extends 'form' ? FormData : z.input<TInputSchema>) => Promise<SafeResult<z.input<TInputSchema> extends ErrorInferenceObject ? z.input<TInputSchema> : ErrorInferenceObject, Awaited<TOutput>>>) & {
+export type ActionClient<TOutput, TAccept extends ActionAccept | undefined, TInputSchema extends z.ZodType | undefined> = TInputSchema extends z.ZodType ? ((input: TAccept extends 'form' ? FormData : z.input<TInputSchema>) => Promise<SafeResult<z.input<TInputSchema> extends ErrorInferenceObject ? z.input<TInputSchema> : ErrorInferenceObject, Awaited<TOutput>>>) & {
     queryString: string;
     orThrow: (input: TAccept extends 'form' ? FormData : z.input<TInputSchema>) => Promise<Awaited<TOutput>>;
 } : ((input?: any) => Promise<SafeResult<never, Awaited<TOutput>>>) & {
     orThrow: (input?: any) => Promise<Awaited<TOutput>>;
 };
-export declare function defineAction<TOutput, TAccept extends ActionAccept | undefined = undefined, TInputSchema extends ActionInputSchema<ActionAccept> | undefined = TAccept extends 'form' ? z.ZodType<FormData> : undefined>({ accept, input: inputSchema, handler, }: {
+export declare function defineAction<TOutput, TAccept extends ActionAccept | undefined = undefined, TInputSchema extends z.ZodType | undefined = TAccept extends 'form' ? z.ZodType<FormData> : undefined>({ accept, input: inputSchema, handler, }: {
     input?: TInputSchema;
     accept?: TAccept;
     handler: ActionHandler<TInputSchema, TOutput>;

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

@@ -34,8 +34,11 @@ function getFormServerHandler(handler, inputSchema) {
         message: "This action only accepts FormData."
       });
     }
-    if (!(inputSchema instanceof z.ZodObject)) return await handler(unparsedInput, context);
-    const parsed = await inputSchema.safeParseAsync(formDataToObject(unparsedInput, inputSchema));
+    if (!inputSchema) return await handler(unparsedInput, context);
+    const baseSchema = unwrapSchemaEffects(inputSchema);
+    const parsed = await inputSchema.safeParseAsync(
+      baseSchema instanceof z.ZodObject ? formDataToObject(unparsedInput, baseSchema) : unparsedInput
+    );
     if (!parsed.success) {
       throw new ActionInputError(parsed.error.issues);
     }
@@ -59,7 +62,7 @@ function getJsonServerHandler(handler, inputSchema) {
   };
 }
 function formDataToObject(formData, schema) {
-  const obj = {};
+  const obj = schema._def.unknownKeys === "passthrough" ? Object.fromEntries(formData.entries()) : {};
   for (const [key, baseValidator] of Object.entries(schema.shape)) {
     let validator = baseValidator;
     while (validator instanceof z.ZodOptional || validator instanceof z.ZodNullable || validator instanceof z.ZodDefault) {
@@ -98,6 +101,17 @@ function handleFormDataGet(key, formData, validator, baseValidator) {
   }
   return validator instanceof z.ZodNumber ? Number(value) : value;
 }
+function unwrapSchemaEffects(schema) {
+  while (schema instanceof z.ZodEffects || schema instanceof z.ZodPipeline) {
+    if (schema instanceof z.ZodEffects) {
+      schema = schema._def.schema;
+    }
+    if (schema instanceof z.ZodPipeline) {
+      schema = schema._def.in;
+    }
+  }
+  return schema;
+}
 export {
   defineAction,
   formDataToObject,

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

@@ -1,5 +1,6 @@
 import type { z } from 'zod';
-import type { ErrorInferenceObject, MaybePromise } from '../utils.js';
+import type { ErrorInferenceObject, MaybePromise, ActionAPIContext as _ActionAPIContext } from '../utils.js';
+export type ActionAPIContext = _ActionAPIContext;
 export declare const ACTION_QUERY_PARAMS: {
     actionName: string;
     actionPayload: string;

package/dist/content/loaders/file.js

@@ -15,6 +15,7 @@ function file(fileName) {
       logger.debug(error.message);
       return;
     }
+    const normalizedFilePath = posixRelative(fileURLToPath(settings.config.root), filePath);
     if (Array.isArray(json)) {
       if (json.length === 0) {
         logger.warn(`No items found in ${fileName}`);
@@ -28,11 +29,7 @@ function file(fileName) {
           continue;
         }
         const data = await parseData({ id, data: rawItem, filePath });
-        store.set({
-          id,
-          data,
-          filePath: posixRelative(fileURLToPath(settings.config.root), filePath)
-        });
+        store.set({ id, data, filePath: normalizedFilePath });
       }
     } else if (typeof json === "object") {
       const entries = Object.entries(json);
@@ -40,7 +37,7 @@ function file(fileName) {
       store.clear();
       for (const [id, rawItem] of entries) {
         const data = await parseData({ id, data: rawItem, filePath });
-        store.set({ id, data });
+        store.set({ id, data, filePath: normalizedFilePath });
       }
     } else {
       logger.error(`Invalid data in ${fileName}. Must be an array or object.`);

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.14.3";
+const ASTRO_VERSION = "4.14.5";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

package/dist/core/dev/dev.js

@@ -23,7 +23,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "4.14.3";
+  const currentVersion = "4.14.5";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/errors/errors-data.d.ts

@@ -1485,6 +1485,7 @@ export declare const ActionsWithoutServerOutputError: {
  * - [Actions RFC](https://github.com/withastro/roadmap/blob/actions/proposals/0046-actions.md)
  * @description
  * Action was called from a form using a GET request, but only POST requests are supported. This often occurs if `method="POST"` is missing on the form.
+ * @deprecated Deprecated since version 4.13.2.
  */
 export declare const ActionsUsedWithForGetError: {
     name: string;

package/dist/core/messages.js

@@ -38,7 +38,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.14.3";
+  const version = "4.14.5";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -270,7 +270,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.14.3"}`
+        `v${"4.14.5"}`
       )} ${headline}`
     );
   }

package/dist/core/render-context.d.ts

@@ -42,7 +42,7 @@ export declare class RenderContext {
      * - fallback
      */
     render(componentInstance: ComponentInstance | undefined, slots?: Record<string, any>): Promise<Response>;
-    createAPIContext(props: APIContext['props']): APIContext;
+    createAPIContext(props: APIContext['props'], isPrerendered: boolean): APIContext;
     createActionAPIContext(): ActionAPIContext;
     createResult(mod: ComponentInstance): Promise<SSRResult>;
     /**

package/dist/core/render-context.js

@@ -87,6 +87,7 @@ class RenderContext {
   async render(componentInstance, slots = {}) {
     const { cookies, middleware, pipeline } = this;
     const { logger, serverLike, streaming } = pipeline;
+    const isPrerendered = !serverLike || this.routeData.prerender;
     const props = Object.keys(this.props).length > 0 ? this.props : await getProps({
       mod: componentInstance,
       routeData: this.routeData,
@@ -95,7 +96,7 @@ class RenderContext {
       logger,
       serverLike
     });
-    const apiContext = this.createAPIContext(props);
+    const apiContext = this.createAPIContext(props, isPrerendered);
     this.counter++;
     if (this.counter === 4) {
       return new Response("Loop Detected", {
@@ -166,12 +167,17 @@ class RenderContext {
     attachCookiesToResponse(response, cookies);
     return response;
   }
-  createAPIContext(props) {
+  createAPIContext(props, isPrerendered) {
     const context = this.createActionAPIContext();
     return Object.assign(context, {
       props,
       getActionResult: createGetActionResult(context.locals),
-      callAction: createCallAction(context)
+      callAction: createCallAction(context),
+      // Used internally by Actions middleware.
+      // TODO: discuss exposing this information from APIContext.
+      // middleware runs on prerendered routes in the dev server,
+      // so this is useful information to have.
+      _isPrerendered: isPrerendered
     });
   }
   async #executeRewrite(reroutePayload) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.14.3",
+  "version": "4.14.5",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",

package/templates/actions.mjs

@@ -93,7 +93,9 @@ async function handleAction(param, path, context) {
 		body,
 		headers,
 	});
-	if (rawResult.status === 204) return;
+	if (rawResult.status === 204) {
+		return deserializeActionResult({ type: 'empty', status: 204 });
+	}
 
 	return deserializeActionResult({
 		type: rawResult.ok ? 'data' : 'error',