astro 6.0.7 → 6.0.8

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

@@ -38,6 +38,8 @@ interface AstroActionContext {
 export declare function getActionContext(context: APIContext): AstroActionContext;
 export declare const ACTION_API_CONTEXT_SYMBOL: unique symbol;
 /** Transform form data to an object based on a Zod schema. */
-export declare function formDataToObject<T extends z.$ZodObject>(formData: FormData, schema: T): Record<string, unknown>;
+export declare function formDataToObject<T extends z.$ZodObject>(formData: FormData, schema: T, 
+/** @internal */
+prefix?: string): Record<string, unknown>;
 export declare function serializeActionResult(res: SafeResult<any, any>): SerializedActionResult;
 export {};

package/dist/actions/runtime/server.js

@@ -206,29 +206,60 @@ function isActionAPIContext(ctx) {
   const symbol = Reflect.get(ctx, ACTION_API_CONTEXT_SYMBOL);
   return symbol === true;
 }
-function formDataToObject(formData, schema) {
-  const obj = schema._zod.def.catchall ? Object.fromEntries(formData.entries()) : {};
+function formDataToObject(formData, schema, prefix = "") {
+  const formKeys = [...formData.keys()];
+  const obj = schema._zod.def.catchall ? Object.fromEntries(
+    [...formData.entries()].filter(([k]) => k.startsWith(prefix)).map(([k, v]) => [k.slice(prefix.length), v])
+  ) : {};
   for (const [key, baseValidator] of Object.entries(schema._zod.def.shape)) {
+    const prefixedKey = prefix + key;
     let validator = baseValidator;
     while (validator instanceof z.$ZodOptional || validator instanceof z.$ZodNullable || validator instanceof z.$ZodDefault) {
-      if (validator instanceof z.$ZodDefault && !formData.has(key)) {
+      if (validator instanceof z.$ZodDefault && !formDataHasKeyOrPrefix(formKeys, prefixedKey)) {
         obj[key] = validator._zod.def.defaultValue instanceof Function ? validator._zod.def.defaultValue() : validator._zod.def.defaultValue;
       }
       validator = validator._zod.def.innerType;
     }
-    if (!formData.has(key) && key in obj) {
+    while (validator instanceof z.$ZodPipe) {
+      validator = validator._zod.def.in;
+    }
+    if (validator instanceof z.$ZodDiscriminatedUnion) {
+      const typeKey = validator._zod.def.discriminator;
+      const typeValue = formData.get(prefixedKey + "." + typeKey);
+      if (typeof typeValue === "string") {
+        const match = validator._zod.def.options.find(
+          (option) => option.def.shape[typeKey].values.has(typeValue)
+        );
+        if (match) {
+          validator = match;
+        }
+      }
+    }
+    if (validator instanceof z.$ZodObject) {
+      const nestedPrefix = prefixedKey + ".";
+      const hasNestedKeys = formKeys.some((k) => k.startsWith(nestedPrefix));
+      if (hasNestedKeys) {
+        obj[key] = formDataToObject(formData, validator, nestedPrefix);
+      } else if (!(key in obj)) {
+        obj[key] = baseValidator instanceof z.$ZodNullable ? null : void 0;
+      }
+    } else if (!formData.has(prefixedKey) && key in obj) {
       continue;
     } else if (validator instanceof z.$ZodBoolean) {
-      const val = formData.get(key);
-      obj[key] = val === "true" ? true : val === "false" ? false : formData.has(key);
+      const val = formData.get(prefixedKey);
+      obj[key] = val === "true" ? true : val === "false" ? false : formData.has(prefixedKey);
     } else if (validator instanceof z.$ZodArray) {
-      obj[key] = handleFormDataGetAll(key, formData, validator);
+      obj[key] = handleFormDataGetAll(prefixedKey, formData, validator);
     } else {
-      obj[key] = handleFormDataGet(key, formData, validator, baseValidator);
+      obj[key] = handleFormDataGet(prefixedKey, formData, validator, baseValidator);
     }
   }
   return obj;
 }
+function formDataHasKeyOrPrefix(formKeys, key) {
+  const prefix = key + ".";
+  return formKeys.some((k) => k === key || k.startsWith(prefix));
+}
 function handleFormDataGetAll(key, formData, validator) {
   const entries = Array.from(formData.getAll(key));
   const elementValidator = validator._zod.def.element;

package/dist/cli/infra/build-time-astro-version-provider.js

@@ -1,6 +1,6 @@
 class BuildTimeAstroVersionProvider {
   // Injected during the build through esbuild define
-  version = "6.0.7";
+  version = "6.0.8";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/content/content-layer.js

@@ -192,7 +192,7 @@ ${contentConfig.error.message}`
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "6.0.7") {
+    if (previousAstroVersion && previousAstroVersion !== "6.0.8") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -200,8 +200,8 @@ ${contentConfig.error.message}`
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("6.0.7") {
-      this.#store.metaStore().set("astro-version", "6.0.7");
+    if ("6.0.8") {
+      this.#store.metaStore().set("astro-version", "6.0.8");
     }
     if (currentConfigDigest) {
       this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "6.0.7";
+const ASTRO_VERSION = "6.0.8";
 const ASTRO_GENERATOR = `Astro v${ASTRO_VERSION}`;
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";

package/dist/core/dev/dev.js

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

package/dist/core/messages/runtime.js

@@ -269,7 +269,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"6.0.7"}`
+        `v${"6.0.8"}`
       )} ${headline}`
     );
   }

package/dist/core/routing/rewrite.d.ts

@@ -34,4 +34,13 @@ export declare function findRouteToRewrite({ payload, routes, request, trailingS
 export declare function copyRequest(newUrl: URL, oldRequest: Request, isPrerendered: boolean, logger: Logger, routePattern: string): Request;
 export declare function setOriginPathname(request: Request, pathname: string, trailingSlash: AstroConfig['trailingSlash'], buildFormat: AstroConfig['build']['format']): void;
 export declare function getOriginPathname(request: Request): string;
+/**
+ * Pure function that normalizes a rewrite target pathname by stripping the base,
+ * handling trailing slashes, removing `.html` suffixes, and computing the final
+ * full URL pathname (with base re-prepended).
+ */
+export declare function normalizeRewritePathname(urlPathname: string, base: AstroConfig['base'], trailingSlash: AstroConfig['trailingSlash'], buildFormat: AstroConfig['build']['format']): {
+    pathname: string;
+    resolvedUrlPathname: string;
+};
 export {};

package/dist/core/routing/rewrite.js

@@ -1,3 +1,4 @@
+import { collapseDuplicateSlashes } from "@astrojs/internal-helpers/path";
 import { shouldAppendForwardSlash } from "../build/util.js";
 import { originPathnameSymbol } from "../constants.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
@@ -26,33 +27,15 @@ function findRouteToRewrite({
   } else if (payload instanceof Request) {
     newUrl = new URL(payload.url);
   } else {
-    newUrl = new URL(payload, new URL(request.url).origin);
-  }
-  let pathname = newUrl.pathname;
-  const shouldAppendSlash = shouldAppendForwardSlash(trailingSlash, buildFormat);
-  if (base !== "/") {
-    const isBasePathRequest = newUrl.pathname === base || newUrl.pathname === removeTrailingForwardSlash(base);
-    if (isBasePathRequest) {
-      pathname = shouldAppendSlash ? "/" : "";
-    } else if (newUrl.pathname.startsWith(base)) {
-      pathname = shouldAppendSlash ? appendForwardSlash(newUrl.pathname) : removeTrailingForwardSlash(newUrl.pathname);
-      pathname = pathname.slice(base.length);
-    }
-  }
-  if (!pathname.startsWith("/") && shouldAppendSlash && newUrl.pathname.endsWith("/")) {
-    pathname = prependForwardSlash(pathname);
-  }
-  if (pathname === "/" && base !== "/" && !shouldAppendSlash) {
-    pathname = "";
-  }
-  if (buildFormat === "file") {
-    pathname = pathname.replace(/\.html$/, "");
-  }
-  if (base !== "/" && (pathname === "" || pathname === "/") && !shouldAppendSlash) {
-    newUrl.pathname = removeTrailingForwardSlash(base);
-  } else {
-    newUrl.pathname = joinPaths(...[base, pathname].filter(Boolean));
+    newUrl = new URL(collapseDuplicateSlashes(payload), new URL(request.url).origin);
   }
+  const { pathname, resolvedUrlPathname } = normalizeRewritePathname(
+    newUrl.pathname,
+    base,
+    trailingSlash,
+    buildFormat
+  );
+  newUrl.pathname = resolvedUrlPathname;
   const decodedPathname = decodeURI(pathname);
   if (isRoute404(decodedPathname)) {
     const errorRoute = routes.find((route) => route.route === "/404");
@@ -145,9 +128,39 @@ function getOriginPathname(request) {
   }
   return new URL(request.url).pathname;
 }
+function normalizeRewritePathname(urlPathname, base, trailingSlash, buildFormat) {
+  let pathname = collapseDuplicateSlashes(urlPathname);
+  const shouldAppendSlash = shouldAppendForwardSlash(trailingSlash, buildFormat);
+  if (base !== "/") {
+    const isBasePathRequest = urlPathname === base || urlPathname === removeTrailingForwardSlash(base);
+    if (isBasePathRequest) {
+      pathname = shouldAppendSlash ? "/" : "";
+    } else if (urlPathname.startsWith(base)) {
+      pathname = shouldAppendSlash ? appendForwardSlash(urlPathname) : removeTrailingForwardSlash(urlPathname);
+      pathname = pathname.slice(base.length);
+    }
+  }
+  if (!pathname.startsWith("/") && shouldAppendSlash && urlPathname.endsWith("/")) {
+    pathname = prependForwardSlash(pathname);
+  }
+  if (pathname === "/" && base !== "/" && !shouldAppendSlash) {
+    pathname = "";
+  }
+  if (buildFormat === "file") {
+    pathname = pathname.replace(/\.html$/, "");
+  }
+  let resolvedUrlPathname;
+  if (base !== "/" && (pathname === "" || pathname === "/") && !shouldAppendSlash) {
+    resolvedUrlPathname = removeTrailingForwardSlash(base);
+  } else {
+    resolvedUrlPathname = joinPaths(...[base, pathname].filter(Boolean));
+  }
+  return { pathname, resolvedUrlPathname };
+}
 export {
   copyRequest,
   findRouteToRewrite,
   getOriginPathname,
+  normalizeRewritePathname,
   setOriginPathname
 };

package/dist/vite-plugin-css/index.js

@@ -26,6 +26,8 @@ async function ensureModulesLoaded(env, mod, seen = /* @__PURE__ */ new Set()) {
     if (!imp.id) continue;
     if (seen.has(imp.id)) continue;
     if (imp.id.includes(PROPAGATED_ASSET_QUERY_PARAM)) continue;
+    if (imp.id === RESOLVED_MODULE_DEV_CSS || imp.id === RESOLVED_MODULE_DEV_CSS_ALL || imp.id.startsWith(RESOLVED_MODULE_DEV_CSS_PREFIX))
+      continue;
     if (!imp.transformResult) {
       try {
         await env.fetchModule(imp.id);

package/package.json

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