astro 4.7.0 → 4.8.0

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

@@ -0,0 +1,98 @@
+import { z } from "zod";
+import { getApiContext } from "../store.js";
+import { hasContentType } from "../utils.js";
+import {
+  ActionError,
+  ActionInputError,
+  callSafely
+} from "./shared.js";
+export * from "./shared.js";
+import { z as z2 } from "zod";
+import { getApiContext as getApiContext2 } from "../store.js";
+function defineAction({
+  accept,
+  input: inputSchema,
+  handler
+}) {
+  const serverHandler = accept === "form" ? getFormServerHandler(handler, inputSchema) : getJsonServerHandler(handler, inputSchema);
+  Object.assign(serverHandler, {
+    safe: async (unparsedInput) => {
+      return callSafely(() => serverHandler(unparsedInput));
+    }
+  });
+  return serverHandler;
+}
+function getFormServerHandler(handler, inputSchema) {
+  return async (unparsedInput) => {
+    if (!(unparsedInput instanceof FormData)) {
+      throw new ActionError({
+        code: "UNSUPPORTED_MEDIA_TYPE",
+        message: "This action only accepts FormData."
+      });
+    }
+    if (!(inputSchema instanceof z.ZodObject)) return await handler(unparsedInput);
+    const parsed = await inputSchema.safeParseAsync(formDataToObject(unparsedInput, inputSchema));
+    if (!parsed.success) {
+      throw new ActionInputError(parsed.error.issues);
+    }
+    return await handler(parsed.data);
+  };
+}
+function getJsonServerHandler(handler, inputSchema) {
+  return async (unparsedInput) => {
+    const context = getApiContext();
+    const contentType = context.request.headers.get("content-type");
+    if (!contentType || !hasContentType(contentType, ["application/json"])) {
+      throw new ActionError({
+        code: "UNSUPPORTED_MEDIA_TYPE",
+        message: "This action only accepts JSON."
+      });
+    }
+    if (!inputSchema) return await handler(unparsedInput);
+    const parsed = await inputSchema.safeParseAsync(unparsedInput);
+    if (!parsed.success) {
+      throw new ActionInputError(parsed.error.issues);
+    }
+    return await handler(parsed.data);
+  };
+}
+function formDataToObject(formData, schema) {
+  const obj = {};
+  for (const [key, baseValidator] of Object.entries(schema.shape)) {
+    let validator = baseValidator;
+    if (baseValidator instanceof z.ZodOptional || baseValidator instanceof z.ZodNullable) {
+      validator = baseValidator._def.innerType;
+    }
+    if (validator instanceof z.ZodBoolean) {
+      obj[key] = formData.has(key);
+    } else if (validator instanceof z.ZodArray) {
+      obj[key] = handleFormDataGetAll(key, formData, validator);
+    } else {
+      obj[key] = handleFormDataGet(key, formData, validator, baseValidator);
+    }
+  }
+  return obj;
+}
+function handleFormDataGetAll(key, formData, validator) {
+  const entries = Array.from(formData.getAll(key));
+  const elementValidator = validator._def.type;
+  if (elementValidator instanceof z.ZodNumber) {
+    return entries.map(Number);
+  } else if (elementValidator instanceof z.ZodBoolean) {
+    return entries.map(Boolean);
+  }
+  return entries;
+}
+function handleFormDataGet(key, formData, validator, baseValidator) {
+  const value = formData.get(key);
+  if (!value) {
+    return baseValidator instanceof z.ZodOptional ? void 0 : null;
+  }
+  return validator instanceof z.ZodNumber ? Number(value) : value;
+}
+export {
+  defineAction,
+  formDataToObject,
+  getApiContext2 as getApiContext,
+  z2 as z
+};

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

@@ -0,0 +1,37 @@
+import type { z } from 'zod';
+import type { MaybePromise } from '../utils.js';
+type ActionErrorCode = '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 ErrorInferenceObject = Record<string, any>;
+export declare class ActionError<T extends ErrorInferenceObject = ErrorInferenceObject> extends Error {
+    type: string;
+    code: ActionErrorCode;
+    status: number;
+    constructor(params: {
+        message?: string;
+        code: ActionErrorCode;
+    });
+    static codeToStatus(code: ActionErrorCode): number;
+    static statusToCode(status: number): ActionErrorCode;
+    static fromResponse(res: Response): Promise<ActionError<ErrorInferenceObject>>;
+}
+export declare function isInputError<T extends ErrorInferenceObject>(error?: ActionError<T>): error is ActionInputError<T>;
+export type SafeResult<TInput extends ErrorInferenceObject, TOutput> = {
+    data: TOutput;
+    error: undefined;
+} | {
+    data: undefined;
+    error: ActionError<TInput>;
+};
+export declare class ActionInputError<T extends ErrorInferenceObject> extends ActionError {
+    type: string;
+    issues: z.ZodIssue[];
+    fields: z.ZodError<T>['formErrors']['fieldErrors'];
+    constructor(issues: z.ZodIssue[]);
+}
+export declare function callSafely<TOutput>(handler: () => MaybePromise<TOutput>): Promise<SafeResult<z.ZodType, TOutput>>;
+export declare function getActionProps<T extends (args: FormData) => MaybePromise<unknown>>(action: T): {
+    readonly type: "hidden";
+    readonly name: "_astroAction";
+    readonly value: string;
+};
+export {};

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

@@ -0,0 +1,104 @@
+const codeToStatusMap = {
+  // Implemented from tRPC error code table
+  // https://trpc.io/docs/server/error-handling#error-codes
+  BAD_REQUEST: 400,
+  UNAUTHORIZED: 401,
+  FORBIDDEN: 403,
+  NOT_FOUND: 404,
+  TIMEOUT: 405,
+  CONFLICT: 409,
+  PRECONDITION_FAILED: 412,
+  PAYLOAD_TOO_LARGE: 413,
+  UNSUPPORTED_MEDIA_TYPE: 415,
+  UNPROCESSABLE_CONTENT: 422,
+  TOO_MANY_REQUESTS: 429,
+  CLIENT_CLOSED_REQUEST: 499,
+  INTERNAL_SERVER_ERROR: 500
+};
+const statusToCodeMap = Object.entries(codeToStatusMap).reduce(
+  // reverse the key-value pairs
+  (acc, [key, value]) => ({ ...acc, [value]: key }),
+  {}
+);
+class ActionError extends Error {
+  type = "AstroActionError";
+  code = "INTERNAL_SERVER_ERROR";
+  status = 500;
+  constructor(params) {
+    super(params.message);
+    this.code = params.code;
+    this.status = ActionError.codeToStatus(params.code);
+  }
+  static codeToStatus(code) {
+    return codeToStatusMap[code];
+  }
+  static statusToCode(status) {
+    return statusToCodeMap[status] ?? "INTERNAL_SERVER_ERROR";
+  }
+  static async fromResponse(res) {
+    if (res.status === 400 && res.headers.get("Content-Type")?.toLowerCase().startsWith("application/json")) {
+      const body = await res.json();
+      if (typeof body === "object" && body?.type === "AstroActionInputError" && Array.isArray(body.issues)) {
+        return new ActionInputError(body.issues);
+      }
+    }
+    return new ActionError({
+      message: res.statusText,
+      code: this.statusToCode(res.status)
+    });
+  }
+}
+function isInputError(error) {
+  return error instanceof ActionInputError;
+}
+class ActionInputError extends ActionError {
+  type = "AstroActionInputError";
+  // We don't expose all ZodError properties.
+  // Not all properties will serialize from server to client,
+  // and we don't want to import the full ZodError object into the client.
+  issues;
+  fields;
+  constructor(issues) {
+    super({ message: "Failed to validate", code: "BAD_REQUEST" });
+    this.issues = issues;
+    this.fields = {};
+    for (const issue of issues) {
+      if (issue.path.length > 0) {
+        const key = issue.path[0].toString();
+        this.fields[key] ??= [];
+        this.fields[key]?.push(issue.message);
+      }
+    }
+  }
+}
+async function callSafely(handler) {
+  try {
+    const data = await handler();
+    return { data, error: void 0 };
+  } catch (e) {
+    if (e instanceof ActionError) {
+      return { data: void 0, error: e };
+    }
+    return {
+      data: void 0,
+      error: new ActionError({
+        message: e instanceof Error ? e.message : "Unknown error",
+        code: "INTERNAL_SERVER_ERROR"
+      })
+    };
+  }
+}
+function getActionProps(action) {
+  return {
+    type: "hidden",
+    name: "_astroAction",
+    value: action.toString()
+  };
+}
+export {
+  ActionError,
+  ActionInputError,
+  callSafely,
+  getActionProps,
+  isInputError
+};

package/dist/actions/utils.d.ts

@@ -0,0 +1,2 @@
+import type { APIContext } from '../@types/astro.js';
+export declare function createGetActionResult(locals: APIContext['locals']): APIContext['getActionResult'];

package/dist/actions/utils.js

@@ -0,0 +1,18 @@
+import { AstroError } from "../core/errors/errors.js";
+function hasActionsInternal(locals) {
+  return "_actionsInternal" in locals;
+}
+function createGetActionResult(locals) {
+  return (actionFn) => {
+    if (!hasActionsInternal(locals))
+      throw new AstroError({
+        name: "AstroActionError",
+        message: "Experimental actions are not enabled in your project.",
+        hint: "See https://docs.astro.build/en/reference/configuration-reference/#experimental-flags"
+      });
+    return locals._actionsInternal.getActionResult(actionFn);
+  };
+}
+export {
+  createGetActionResult
+};

package/dist/assets/build/generate.js

@@ -6,7 +6,7 @@ import { getTimeStat } from "../../core/build/util.js";
 import { AstroError } from "../../core/errors/errors.js";
 import { AstroErrorData } from "../../core/errors/index.js";
 import { isRemotePath, removeLeadingForwardSlash } from "../../core/path.js";
-import { isServerLikeOutput } from "../../prerender/utils.js";
+import { isServerLikeOutput } from "../../core/util.js";
 import { getConfiguredImageService } from "../internal.js";
 import { isESMImportedImage } from "../utils/imageKind.js";
 import { loadRemoteImage } from "./remote.js";

package/dist/assets/internal.js

@@ -13,8 +13,7 @@ async function getConfiguredImageService() {
       error.cause = e;
       throw error;
     });
-    if (!globalThis.astroAsset)
-      globalThis.astroAsset = {};
+    if (!globalThis.astroAsset) globalThis.astroAsset = {};
     globalThis.astroAsset.imageService = service;
     return service;
   }

package/dist/assets/services/service.js

@@ -74,10 +74,8 @@ const baseService = {
     if (!options.format) {
       options.format = DEFAULT_OUTPUT_FORMAT;
     }
-    if (options.width)
-      options.width = Math.round(options.width);
-    if (options.height)
-      options.height = Math.round(options.height);
+    if (options.width) options.width = Math.round(options.width);
+    if (options.height) options.height = Math.round(options.height);
     return options;
   },
   getHTMLAttributes(options) {

package/dist/assets/services/sharp.js

@@ -27,11 +27,9 @@ const sharpService = {
   getHTMLAttributes: baseService.getHTMLAttributes,
   getSrcSet: baseService.getSrcSet,
   async transform(inputBuffer, transformOptions, config) {
-    if (!sharp)
-      sharp = await loadSharp();
+    if (!sharp) sharp = await loadSharp();
     const transform = transformOptions;
-    if (transform.format === "svg")
-      return { data: inputBuffer, format: "svg" };
+    if (transform.format === "svg") return { data: inputBuffer, format: "svg" };
     const result = sharp(inputBuffer, {
       failOnError: false,
       pages: -1,

package/dist/assets/services/squoosh.js

@@ -20,8 +20,7 @@ const qualityTable = {
 };
 async function getRotationForEXIF(inputBuffer, src) {
   const meta = await imageMetadata(inputBuffer, src);
-  if (!meta)
-    return void 0;
+  if (!meta) return void 0;
   switch (meta.orientation) {
     case 3:
     case 4:
@@ -45,8 +44,7 @@ const service = {
   async transform(inputBuffer, transformOptions) {
     const transform = transformOptions;
     let format = transform.format;
-    if (format === "svg")
-      return { data: inputBuffer, format: "svg" };
+    if (format === "svg") return { data: inputBuffer, format: "svg" };
     const operations = [];
     const rotation = await getRotationForEXIF(inputBuffer, transform.src);
     if (rotation) {

package/dist/assets/services/vendor/squoosh/avif/avif_node_dec.js

@@ -42,10 +42,8 @@ var Module = /* @__PURE__ */ function() {
         scriptDirectory = dirname(getModuleURL(import.meta.url)) + "/";
       }
       read_ = function shell_read(filename, binary) {
-        if (!nodeFS)
-          nodeFS = require2("node:fs");
-        if (!nodePath)
-          nodePath = require2("node:path");
+        if (!nodeFS) nodeFS = require2("node:fs");
+        if (!nodePath) nodePath = require2("node:path");
         filename = nodePath["normalize"](filename);
         return nodeFS["readFileSync"](filename, binary ? null : "utf8");
       };
@@ -77,12 +75,9 @@ var Module = /* @__PURE__ */ function() {
       }
     }
     moduleOverrides = null;
-    if (Module2["arguments"])
-      arguments_ = Module2["arguments"];
-    if (Module2["thisProgram"])
-      thisProgram = Module2["thisProgram"];
-    if (Module2["quit"])
-      quit_ = Module2["quit"];
+    if (Module2["arguments"]) arguments_ = Module2["arguments"];
+    if (Module2["thisProgram"]) thisProgram = Module2["thisProgram"];
+    if (Module2["quit"]) quit_ = Module2["quit"];
     var tempRet0 = 0;
     var setTempRet0 = function(value) {
       tempRet0 = value;
@@ -91,8 +86,7 @@ var Module = /* @__PURE__ */ function() {
       return tempRet0;
     };
     var wasmBinary;
-    if (Module2["wasmBinary"])
-      wasmBinary = Module2["wasmBinary"];
+    if (Module2["wasmBinary"]) wasmBinary = Module2["wasmBinary"];
     var noExitRuntime = Module2["noExitRuntime"] || true;
     if (typeof WebAssembly !== "object") {
       abort("no native wasm support detected");
@@ -109,23 +103,19 @@ var Module = /* @__PURE__ */ function() {
     function UTF8ArrayToString(heap, idx, maxBytesToRead) {
       var endIdx = idx + maxBytesToRead;
       var endPtr = idx;
-      while (heap[endPtr] && !(endPtr >= endIdx))
-        ++endPtr;
+      while (heap[endPtr] && !(endPtr >= endIdx)) ++endPtr;
       return UTF8Decoder.decode(
         heap.subarray ? heap.subarray(idx, endPtr) : new Uint8Array(heap.slice(idx, endPtr))
       );
     }
     function UTF8ToString(ptr, maxBytesToRead) {
-      if (!ptr)
-        return "";
+      if (!ptr) return "";
       var maxPtr = ptr + maxBytesToRead;
-      for (var end = ptr; !(end >= maxPtr) && HEAPU8[end]; )
-        ++end;
+      for (var end = ptr; !(end >= maxPtr) && HEAPU8[end]; ) ++end;
       return UTF8Decoder.decode(HEAPU8.subarray(ptr, end));
     }
     function stringToUTF8Array(str, heap, outIdx, maxBytesToWrite) {
-      if (!(maxBytesToWrite > 0))
-        return 0;
+      if (!(maxBytesToWrite > 0)) return 0;
       var startIdx = outIdx;
       var endIdx = outIdx + maxBytesToWrite - 1;
       for (var i = 0; i < str.length; ++i) {
@@ -135,23 +125,19 @@ var Module = /* @__PURE__ */ function() {
           u = 65536 + ((u & 1023) << 10) | u1 & 1023;
         }
         if (u <= 127) {
-          if (outIdx >= endIdx)
-            break;
+          if (outIdx >= endIdx) break;
           heap[outIdx++] = u;
         } else if (u <= 2047) {
-          if (outIdx + 1 >= endIdx)
-            break;
+          if (outIdx + 1 >= endIdx) break;
           heap[outIdx++] = 192 | u >> 6;
           heap[outIdx++] = 128 | u & 63;
         } else if (u <= 65535) {
-          if (outIdx + 2 >= endIdx)
-            break;
+          if (outIdx + 2 >= endIdx) break;
           heap[outIdx++] = 224 | u >> 12;
           heap[outIdx++] = 128 | u >> 6 & 63;
           heap[outIdx++] = 128 | u & 63;
         } else {
-          if (outIdx + 3 >= endIdx)
-            break;
+          if (outIdx + 3 >= endIdx) break;
           heap[outIdx++] = 240 | u >> 18;
           heap[outIdx++] = 128 | u >> 12 & 63;
           heap[outIdx++] = 128 | u >> 6 & 63;
@@ -170,14 +156,10 @@ var Module = /* @__PURE__ */ function() {
         var u = str.charCodeAt(i);
         if (u >= 55296 && u <= 57343)
           u = 65536 + ((u & 1023) << 10) | str.charCodeAt(++i) & 1023;
-        if (u <= 127)
-          ++len;
-        else if (u <= 2047)
-          len += 2;
-        else if (u <= 65535)
-          len += 3;
-        else
-          len += 4;
+        if (u <= 127) ++len;
+        else if (u <= 2047) len += 2;
+        else if (u <= 65535) len += 3;
+        else len += 4;
       }
       return len;
     }
@@ -186,15 +168,13 @@ var Module = /* @__PURE__ */ function() {
       var endPtr = ptr;
       var idx = endPtr >> 1;
       var maxIdx = idx + maxBytesToRead / 2;
-      while (!(idx >= maxIdx) && HEAPU16[idx])
-        ++idx;
+      while (!(idx >= maxIdx) && HEAPU16[idx]) ++idx;
       endPtr = idx << 1;
       return UTF16Decoder.decode(HEAPU8.subarray(ptr, endPtr));
       var str = "";
       for (var i = 0; !(i >= maxBytesToRead / 2); ++i) {
         var codeUnit = HEAP16[ptr + i * 2 >> 1];
-        if (codeUnit == 0)
-          break;
+        if (codeUnit == 0) break;
         str += String.fromCharCode(codeUnit);
       }
       return str;
@@ -203,8 +183,7 @@ var Module = /* @__PURE__ */ function() {
       if (maxBytesToWrite === void 0) {
         maxBytesToWrite = 2147483647;
       }
-      if (maxBytesToWrite < 2)
-        return 0;
+      if (maxBytesToWrite < 2) return 0;
       maxBytesToWrite -= 2;
       var startPtr = outPtr;
       var numCharsToWrite = maxBytesToWrite < str.length * 2 ? maxBytesToWrite / 2 : str.length;
@@ -224,8 +203,7 @@ var Module = /* @__PURE__ */ function() {
       var str = "";
       while (!(i >= maxBytesToRead / 4)) {
         var utf32 = HEAP32[ptr + i * 4 >> 2];
-        if (utf32 == 0)
-          break;
+        if (utf32 == 0) break;
         ++i;
         if (utf32 >= 65536) {
           var ch = utf32 - 65536;
@@ -240,8 +218,7 @@ var Module = /* @__PURE__ */ function() {
       if (maxBytesToWrite === void 0) {
         maxBytesToWrite = 2147483647;
       }
-      if (maxBytesToWrite < 4)
-        return 0;
+      if (maxBytesToWrite < 4) return 0;
       var startPtr = outPtr;
       var endPtr = startPtr + maxBytesToWrite - 4;
       for (var i = 0; i < str.length; ++i) {
@@ -252,8 +229,7 @@ var Module = /* @__PURE__ */ function() {
         }
         HEAP32[outPtr >> 2] = codeUnit;
         outPtr += 4;
-        if (outPtr + 4 > endPtr)
-          break;
+        if (outPtr + 4 > endPtr) break;
       }
       HEAP32[outPtr >> 2] = 0;
       return outPtr - startPtr;
@@ -262,8 +238,7 @@ var Module = /* @__PURE__ */ function() {
       var len = 0;
       for (var i = 0; i < str.length; ++i) {
         var codeUnit = str.charCodeAt(i);
-        if (codeUnit >= 55296 && codeUnit <= 57343)
-          ++i;
+        if (codeUnit >= 55296 && codeUnit <= 57343) ++i;
         len += 4;
       }
       return len;
@@ -1531,8 +1506,7 @@ var Module = /* @__PURE__ */ function() {
         wasmTable.get(index)(a1, a2, a3, a4, a5, a6, a7);
       } catch (e) {
         stackRestore(sp);
-        if (e !== e + 0 && e !== "longjmp")
-          throw e;
+        if (e !== e + 0 && e !== "longjmp") throw e;
         _setThrew(1, 0);
       }
     }
@@ -1542,8 +1516,7 @@ var Module = /* @__PURE__ */ function() {
         wasmTable.get(index)(a1, a2, a3, a4);
       } catch (e) {
         stackRestore(sp);
-        if (e !== e + 0 && e !== "longjmp")
-          throw e;
+        if (e !== e + 0 && e !== "longjmp") throw e;
         _setThrew(1, 0);
       }
     }
@@ -1553,8 +1526,7 @@ var Module = /* @__PURE__ */ function() {
         return wasmTable.get(index)(a1, a2);
       } catch (e) {
         stackRestore(sp);
-        if (e !== e + 0 && e !== "longjmp")
-          throw e;
+        if (e !== e + 0 && e !== "longjmp") throw e;
         _setThrew(1, 0);
       }
     }
@@ -1564,17 +1536,14 @@ var Module = /* @__PURE__ */ function() {
         return wasmTable.get(index)(a1, a2, a3, a4);
       } catch (e) {
         stackRestore(sp);
-        if (e !== e + 0 && e !== "longjmp")
-          throw e;
+        if (e !== e + 0 && e !== "longjmp") throw e;
         _setThrew(1, 0);
       }
     }
     var calledRun;
     dependenciesFulfilled = function runCaller() {
-      if (!calledRun)
-        run();
-      if (!calledRun)
-        dependenciesFulfilled = runCaller;
+      if (!calledRun) run();
+      if (!calledRun) dependenciesFulfilled = runCaller;
     };
     function run(args) {
       args = args || arguments_;
@@ -1586,16 +1555,13 @@ var Module = /* @__PURE__ */ function() {
         return;
       }
       function doRun() {
-        if (calledRun)
-          return;
+        if (calledRun) return;
         calledRun = true;
         Module2["calledRun"] = true;
-        if (ABORT)
-          return;
+        if (ABORT) return;
         initRuntime();
         readyPromiseResolve(Module2);
-        if (Module2["onRuntimeInitialized"])
-          Module2["onRuntimeInitialized"]();
+        if (Module2["onRuntimeInitialized"]) Module2["onRuntimeInitialized"]();
         postRun();
       }
       if (Module2["setStatus"]) {