astro 5.0.0-beta.6 → 5.0.0-beta.8

package/components/Welcome.astro

@@ -0,0 +1,172 @@
+---
+interface Props {
+	title?: string;
+}
+
+const cards = [
+	{
+		href: 'https://docs.astro.build/',
+		title: 'Documentation',
+		body: 'Learn how Astro works and explore the official API docs.',
+	},
+	{
+		href: 'https://astro.build/integrations/',
+		title: 'Integrations',
+		body: 'Supercharge your project with new frameworks and libraries.',
+	},
+	{
+		href: 'https://astro.build/themes/',
+		title: 'Themes',
+		body: 'Explore a galaxy of community-built starter themes.',
+	},
+	{
+		href: 'https://astro.build/chat/',
+		title: 'Community',
+		body: 'Come say hi to our amazing Discord community. ❤️',
+	},
+];
+
+const { title = 'Welcome to Astro' } = Astro.props;
+---
+
+<main>
+	<svg
+		class="astro-a"
+		width="495"
+		height="623"
+		viewBox="0 0 495 623"
+		fill="none"
+		xmlns="http://www.w3.org/2000/svg"
+		aria-hidden="true"
+	>
+		<path
+			fill-rule="evenodd"
+			clip-rule="evenodd"
+			d="M167.19 364.254C83.4786 364.254 0 404.819 0 404.819C0 404.819 141.781 19.4876 142.087 18.7291C146.434 7.33701 153.027 0 162.289 0H332.441C341.703 0 348.574 7.33701 352.643 18.7291C352.92 19.5022 494.716 404.819 494.716 404.819C494.716 404.819 426.67 364.254 327.525 364.254L264.41 169.408C262.047 159.985 255.147 153.581 247.358 153.581C239.569 153.581 232.669 159.985 230.306 169.408L167.19 364.254ZM160.869 530.172C160.877 530.18 160.885 530.187 160.894 530.195L160.867 530.181C160.868 530.178 160.868 530.175 160.869 530.172ZM136.218 411.348C124.476 450.467 132.698 504.458 160.869 530.172C160.997 529.696 161.125 529.242 161.248 528.804C161.502 527.907 161.737 527.073 161.917 526.233C165.446 509.895 178.754 499.52 195.577 500.01C211.969 500.487 220.67 508.765 223.202 527.254C224.141 534.12 224.23 541.131 224.319 548.105C224.328 548.834 224.337 549.563 224.347 550.291C224.563 566.098 228.657 580.707 237.264 593.914C245.413 606.426 256.108 615.943 270.749 622.478C270.593 621.952 270.463 621.508 270.35 621.126C270.045 620.086 269.872 619.499 269.685 618.911C258.909 585.935 266.668 563.266 295.344 543.933C298.254 541.971 301.187 540.041 304.12 538.112C310.591 533.854 317.059 529.599 323.279 525.007C345.88 508.329 360.09 486.327 363.431 457.844C364.805 446.148 363.781 434.657 359.848 423.275C358.176 424.287 356.587 425.295 355.042 426.275C351.744 428.366 348.647 430.33 345.382 431.934C303.466 452.507 259.152 455.053 214.03 448.245C184.802 443.834 156.584 436.019 136.218 411.348Z"
+			fill="url(#paint0_linear_1805_24383)"></path>
+		<defs>
+			<linearGradient
+				id="paint0_linear_1805_24383"
+				x1="247.358"
+				y1="0"
+				x2="247.358"
+				y2="622.479"
+				gradientUnits="userSpaceOnUse"
+			>
+				<stop stop-opacity="0.9"></stop>
+				<stop offset="1" stop-opacity="0.2"></stop>
+			</linearGradient>
+		</defs>
+	</svg>
+	<h1>{title}</h1>
+	<p class="instructions">
+		To get started, open the directory <code>src/pages</code> in your project.<br />
+		<strong>Code Challenge:</strong> Tweak the "Welcome to Astro" message above.
+	</p>
+	<ul role="list" class="link-card-grid">
+		{
+			cards.map((card) => (
+				<li class="link-card">
+					<a href={card.href}>
+						<h2>
+							{card.title}
+							<span>&rarr;</span>
+						</h2>
+						<p>{card.body}</p>
+					</a>
+				</li>
+			))
+		}
+	</ul>
+</main>
+
+<style>
+	main {
+		margin: auto;
+		padding: 1rem;
+		width: 800px;
+		max-width: calc(100% - 2rem);
+		color: white;
+		font-size: 20px;
+		line-height: 1.6;
+	}
+	.astro-a {
+		position: absolute;
+		top: -32px;
+		left: 50%;
+		transform: translatex(-50%);
+		width: 220px;
+		height: auto;
+		z-index: -1;
+	}
+	h1 {
+		font-size: 4rem;
+		font-weight: 700;
+		line-height: 1;
+		text-align: center;
+		margin-bottom: 1em;
+	}
+	.instructions {
+		margin-bottom: 2rem;
+		border: 1px solid rgba(var(--accent-light), 25%);
+		background: linear-gradient(rgba(var(--accent-dark), 66%), rgba(var(--accent-dark), 33%));
+		padding: 1.5rem;
+		border-radius: 8px;
+	}
+	.instructions code {
+		font-size: 0.8em;
+		font-weight: bold;
+		background: rgba(var(--accent-light), 12%);
+		color: rgb(var(--accent-light));
+		border-radius: 4px;
+		padding: 0.3em 0.4em;
+	}
+	.instructions strong {
+		color: rgb(var(--accent-light));
+	}
+	.link-card-grid {
+		display: grid;
+		grid-template-columns: repeat(auto-fit, minmax(24ch, 1fr));
+		gap: 2rem;
+		padding: 0;
+	}
+
+	.link-card {
+		list-style: none;
+		display: flex;
+		padding: 1px;
+		background-color: #23262d;
+		background-image: none;
+		background-size: 400%;
+		border-radius: 7px;
+		background-position: 100%;
+		transition: background-position 0.6s cubic-bezier(0.22, 1, 0.36, 1);
+		box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
+	}
+	.link-card > a {
+		width: 100%;
+		text-decoration: none;
+		line-height: 1.4;
+		padding: calc(1.5rem - 1px);
+		border-radius: 8px;
+		color: white;
+		background-color: #23262d;
+		opacity: 0.8;
+	}
+	h2 {
+		margin: 0;
+		font-size: 1.25rem;
+		transition: color 0.6s cubic-bezier(0.22, 1, 0.36, 1);
+	}
+	p {
+		margin-top: 0.5rem;
+		margin-bottom: 0;
+	}
+	.link-card:is(:hover, :focus-within) {
+		background-position: 0;
+		background-image: var(--accent-gradient);
+	}
+	.link-card:is(:hover, :focus-within) h2 {
+		color: rgb(var(--accent-light));
+	}
+</style>

package/components/index.ts

@@ -1,6 +1,8 @@
 // The `ts-ignore` comments here are necessary because we're importing this file inside the `astro:components`
-// virtual module's types, which means that `tsc` will try to resolve these imports. Don't mind the editor errors.
+// virtual module's types, which means that `tsc` will try to resolve these imports.
 // @ts-ignore
 export { default as Code } from './Code.astro';
 // @ts-ignore
 export { default as Debug } from './Debug.astro';
+// @ts-ignore
+export { default as Welcome } from './Welcome.astro';

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
 }) {
@@ -10,7 +10,7 @@ function astroIntegrationActionsRouteHandler({
     hooks: {
       async "astro:config:setup"(params) {
         params.injectRoute({
-          pattern: "/_actions/[...path]",
+          pattern: ACTION_RPC_ROUTE_PATTERN,
           entrypoint: "astro/actions/runtime/route.js",
           prerender: false
         });

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,20 @@
 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 {
+  formContentTypes,
+  hasContentType
+} 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,
@@ -119,7 +132,74 @@ 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;
+        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, 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'];

package/dist/assets/types.d.ts

@@ -1,4 +1,4 @@
-import type { WithRequired } from '../type-utils.js';
+import type { OmitPreservingIndexSignature, Simplify, WithRequired } from '../type-utils.js';
 import type { VALID_INPUT_FORMATS, VALID_OUTPUT_FORMATS } from './consts.js';
 import type { ImageService } from './services/service.js';
 export type ImageQualityPreset = 'low' | 'mid' | 'high' | 'max' | (string & {});
@@ -48,12 +48,12 @@ export type SrcSetValue = UnresolvedSrcSetValue & {
 /**
  * A yet to be resolved image transform. Used by `getImage`
  */
-export type UnresolvedImageTransform = Omit<ImageTransform, 'src'> & {
+export type UnresolvedImageTransform = Simplify<OmitPreservingIndexSignature<ImageTransform, 'src'> & {
     src: ImageMetadata | string | Promise<{
         default: ImageMetadata;
     }>;
     inferSize?: boolean;
-} & {
+}> & {
     [isESMImport]?: never;
 };
 /**