astro 4.10.0 → 4.10.2

package/dist/env/schema.js

@@ -3,19 +3,56 @@ import { PUBLIC_PREFIX } from "./constants.js";
 const StringSchema = z.object({
   type: z.literal("string"),
   optional: z.boolean().optional(),
-  default: z.string().optional()
+  default: z.string().optional(),
+  max: z.number().optional(),
+  min: z.number().min(0).optional(),
+  length: z.number().optional(),
+  url: z.boolean().optional(),
+  includes: z.string().optional(),
+  startsWith: z.string().optional(),
+  endsWith: z.string().optional()
 });
 const NumberSchema = z.object({
   type: z.literal("number"),
   optional: z.boolean().optional(),
-  default: z.number().optional()
+  default: z.number().optional(),
+  gt: z.number().optional(),
+  min: z.number().optional(),
+  lt: z.number().optional(),
+  max: z.number().optional(),
+  int: z.boolean().optional()
 });
 const BooleanSchema = z.object({
   type: z.literal("boolean"),
   optional: z.boolean().optional(),
   default: z.boolean().optional()
 });
-const EnvFieldType = z.discriminatedUnion("type", [StringSchema, NumberSchema, BooleanSchema]);
+const EnumSchema = z.object({
+  type: z.literal("enum"),
+  values: z.array(
+    // We use "'" for codegen so it can't be passed here
+    z.string().refine((v) => !v.includes("'"), {
+      message: `The "'" character can't be used as an enum value`
+    })
+  ),
+  optional: z.boolean().optional(),
+  default: z.string().optional()
+});
+const EnvFieldType = z.union([
+  StringSchema,
+  NumberSchema,
+  BooleanSchema,
+  EnumSchema.superRefine((schema, ctx) => {
+    if (schema.default) {
+      if (!schema.values.includes(schema.default)) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: `The default value "${schema.default}" must be one of the specified values: ${schema.values.join(", ")}.`
+        });
+      }
+    }
+  })
+]);
 const PublicClientEnvFieldMetadata = z.object({
   context: z.literal("client"),
   access: z.literal("public")
@@ -28,19 +65,17 @@ const SecretServerEnvFieldMetadata = z.object({
   context: z.literal("server"),
   access: z.literal("secret")
 });
+const EnvFieldMetadata = z.union([
+  PublicClientEnvFieldMetadata,
+  PublicServerEnvFieldMetadata,
+  SecretServerEnvFieldMetadata
+]);
 const KEY_REGEX = /^[A-Z_]+$/;
 const EnvSchema = z.record(
   z.string().regex(KEY_REGEX, {
     message: "A valid variable name can only contain uppercase letters and underscores."
   }),
-  z.intersection(
-    z.union([
-      PublicClientEnvFieldMetadata,
-      PublicServerEnvFieldMetadata,
-      SecretServerEnvFieldMetadata
-    ]),
-    EnvFieldType
-  )
+  z.intersection(EnvFieldMetadata, EnvFieldType)
 ).superRefine((schema, ctx) => {
   for (const [key, value] of Object.entries(schema)) {
     if (key.startsWith(PUBLIC_PREFIX) && value.access !== "public") {
@@ -57,57 +92,6 @@ const EnvSchema = z.record(
     }
   }
 });
-const StringField = z.intersection(
-  z.union([
-    PublicClientEnvFieldMetadata,
-    PublicServerEnvFieldMetadata,
-    SecretServerEnvFieldMetadata
-  ]),
-  StringSchema
-);
-const StringFieldInput = z.intersection(
-  z.union([
-    PublicClientEnvFieldMetadata,
-    PublicServerEnvFieldMetadata,
-    SecretServerEnvFieldMetadata
-  ]),
-  StringSchema.omit({ type: true })
-);
-const NumberField = z.intersection(
-  z.union([
-    PublicClientEnvFieldMetadata,
-    PublicServerEnvFieldMetadata,
-    SecretServerEnvFieldMetadata
-  ]),
-  NumberSchema
-);
-const NumberFieldInput = z.intersection(
-  z.union([
-    PublicClientEnvFieldMetadata,
-    PublicServerEnvFieldMetadata,
-    SecretServerEnvFieldMetadata
-  ]),
-  NumberSchema.omit({ type: true })
-);
-const BooleanField = z.intersection(
-  z.union([
-    PublicClientEnvFieldMetadata,
-    PublicServerEnvFieldMetadata,
-    SecretServerEnvFieldMetadata
-  ]),
-  BooleanSchema
-);
-const BooleanFieldInput = z.intersection(
-  z.union([
-    PublicClientEnvFieldMetadata,
-    PublicServerEnvFieldMetadata,
-    SecretServerEnvFieldMetadata
-  ]),
-  BooleanSchema.omit({ type: true })
-);
 export {
-  BooleanFieldInput,
-  EnvSchema,
-  NumberFieldInput,
-  StringFieldInput
+  EnvSchema
 };

package/dist/env/setup.d.ts

@@ -0,0 +1 @@
+export { setGetEnv, type GetEnv } from './runtime.js';

package/dist/env/setup.js

@@ -0,0 +1,4 @@
+import { setGetEnv } from "./runtime.js";
+export {
+  setGetEnv
+};

package/dist/env/validators.js

@@ -1,17 +1,66 @@
 function getEnvFieldType(options) {
   const optional = options.optional ? options.default !== void 0 ? false : true : false;
-  return `${options.type}${optional ? " | undefined" : ""}`;
+  let type;
+  if (options.type === "enum") {
+    type = options.values.map((v) => `'${v}'`).join(" | ");
+  } else {
+    type = options.type;
+  }
+  return `${type}${optional ? " | undefined" : ""}`;
 }
-const stringValidator = (input) => {
+const stringValidator = ({ max, min, length, url, includes, startsWith, endsWith }) => (input) => {
+  let valid = typeof input === "string";
+  if (valid && max !== void 0) {
+    valid = input.length <= max;
+  }
+  if (valid && min !== void 0) {
+    valid = input.length >= min;
+  }
+  if (valid && length !== void 0) {
+    valid = input.length === length;
+  }
+  if (valid && url !== void 0) {
+    try {
+      new URL(input);
+    } catch (_) {
+      valid = false;
+    }
+  }
+  if (valid && includes !== void 0) {
+    valid = input.includes(includes);
+  }
+  if (valid && startsWith !== void 0) {
+    valid = input.startsWith(startsWith);
+  }
+  if (valid && endsWith !== void 0) {
+    valid = input.endsWith(endsWith);
+  }
   return {
-    valid: typeof input === "string",
+    valid,
     parsed: input
   };
 };
-const numberValidator = (input) => {
+const numberValidator = ({ gt, min, lt, max, int }) => (input) => {
   const num = parseFloat(input ?? "");
+  let valid = !isNaN(num);
+  if (valid && gt !== void 0) {
+    valid = num > gt;
+  }
+  if (valid && min !== void 0) {
+    valid = num >= min;
+  }
+  if (valid && lt !== void 0) {
+    valid = num < lt;
+  }
+  if (valid && max !== void 0) {
+    valid = num <= max;
+  }
+  if (valid && int !== void 0) {
+    const isInt = Number.isInteger(num);
+    valid = int ? isInt : !isInt;
+  }
   return {
-    valid: !isNaN(num),
+    valid,
     parsed: num
   };
 };
@@ -22,12 +71,26 @@ const booleanValidator = (input) => {
     parsed: bool
   };
 };
+const enumValidator = ({ values }) => (input) => {
+  return {
+    valid: typeof input === "string" ? values.includes(input) : false,
+    parsed: input
+  };
+};
+function selectValidator(options) {
+  switch (options.type) {
+    case "string":
+      return stringValidator(options);
+    case "number":
+      return numberValidator(options);
+    case "boolean":
+      return booleanValidator;
+    case "enum":
+      return enumValidator(options);
+  }
+}
 function validateEnvVariable(value, options) {
-  const validator = {
-    string: stringValidator,
-    number: numberValidator,
-    boolean: booleanValidator
-  }[options.type];
+  const validator = selectValidator(options);
   const type = getEnvFieldType(options);
   if (options.optional || options.default !== void 0) {
     if (value === void 0) {

package/dist/env/vite-plugin-env.js

@@ -6,8 +6,7 @@ import {
   MODULE_TEMPLATE_URL,
   TYPES_TEMPLATE_URL,
   VIRTUAL_MODULES_IDS,
-  VIRTUAL_MODULES_IDS_VALUES,
-  VIRTUAL_MODULE_SETUP_ID
+  VIRTUAL_MODULES_IDS_VALUES
 } from "./constants.js";
 import { getEnvFieldType, validateEnvVariable } from "./validators.js";
 function astroEnv({
@@ -29,6 +28,11 @@ function astroEnv({
         fileURLToPath(settings.config.root),
         ""
       );
+      for (const [key, value] of Object.entries(loadedEnv)) {
+        if (value !== void 0) {
+          process.env[key] = value;
+        }
+      }
       const validatedVariables = validatePublicVariables({ schema, loadedEnv });
       const clientTemplates = getClientTemplates({ validatedVariables });
       const serverTemplates = getServerTemplates({ validatedVariables, schema, fs });
@@ -55,9 +59,6 @@ function astroEnv({
       if (VIRTUAL_MODULES_IDS_VALUES.has(id)) {
         return resolveVirtualModuleId(id);
       }
-      if (id === VIRTUAL_MODULE_SETUP_ID) {
-        return this.resolve("astro/virtual-modules/env-setup.js");
-      }
     },
     load(id, options) {
       if (id === resolveVirtualModuleId(VIRTUAL_MODULES_IDS.client)) {

package/dist/i18n/index.d.ts

@@ -60,7 +60,7 @@ export declare function getLocaleAbsoluteUrlList(params: GetLocalesAbsoluteUrlLi
  */
 export declare function getPathByLocale(locale: string, locales: Locales): string;
 /**
- * An utility function that retrieves the preferred locale that correspond to a path.
+ * A utility function that retrieves the preferred locale that correspond to a path.
  *
  * @param path
  * @param locales

package/dist/i18n/index.js

@@ -1,7 +1,7 @@
 import { appendForwardSlash, joinPaths } from "@astrojs/internal-helpers/path";
 import { shouldAppendForwardSlash } from "../core/build/util.js";
 import { REROUTE_DIRECTIVE_HEADER } from "../core/constants.js";
-import { MissingLocale } from "../core/errors/errors-data.js";
+import { MissingLocale, i18nNoLocaleFoundInPath } from "../core/errors/errors-data.js";
 import { AstroError } from "../core/errors/index.js";
 import { createI18nMiddleware } from "./middleware.js";
 function requestHasLocale(locales) {
@@ -110,21 +110,21 @@ function getPathByLocale(locale, locales) {
       }
     }
   }
-  throw new Unreachable();
+  throw new AstroError(i18nNoLocaleFoundInPath);
 }
 function getLocaleByPath(path, locales) {
   for (const locale of locales) {
     if (typeof locale !== "string") {
       if (locale.path === path) {
         const code = locale.codes.at(0);
-        if (code === void 0) throw new Unreachable();
+        if (code === void 0) throw new AstroError(i18nNoLocaleFoundInPath);
         return code;
       }
     } else if (locale === path) {
       return locale;
     }
   }
-  throw new Unreachable();
+  throw new AstroError(i18nNoLocaleFoundInPath);
 }
 function normalizeTheLocale(locale) {
   return locale.replaceAll("_", "-").toLowerCase();
@@ -163,13 +163,6 @@ function peekCodePathToUse(locales, locale) {
   }
   return void 0;
 }
-class Unreachable extends Error {
-  constructor() {
-    super(
-      "Astro encountered an unexpected line of code.\nIn most cases, this is not your fault, but a bug in astro code.\nIf there isn't one already, please create an issue.\nhttps://astro.build/issues"
-    );
-  }
-}
 function redirectToDefaultLocale({
   trailingSlash,
   format,

package/dist/runtime/server/render/astro/render.js

@@ -150,6 +150,9 @@ async function renderToAsyncIterable(result, componentFactory, props, children,
       if (result.cancelled) return { done: true, value: void 0 };
       if (next !== null) {
         await next.promise;
+      } else if (!renderingComplete && !buffer.length) {
+        next = promiseWithResolvers();
+        await next.promise;
       }
       if (!renderingComplete) {
         next = promiseWithResolvers();
@@ -170,8 +173,9 @@ async function renderToAsyncIterable(result, componentFactory, props, children,
       }
       buffer.length = 0;
       const returnValue = {
-        // The iterator is done if there are no chunks to return.
-        done: length === 0,
+        // The iterator is done when rendering has finished
+        // and there are no more chunks to return.
+        done: length === 0 && renderingComplete,
         value: mergedArray
       };
       return returnValue;
@@ -197,6 +201,8 @@ async function renderToAsyncIterable(result, componentFactory, props, children,
       if (bytes.length > 0) {
         buffer.push(bytes);
         next?.resolve();
+      } else if (buffer.length > 0) {
+        next?.resolve();
       }
     }
   };

package/dist/vite-plugin-astro-server/pipeline.d.ts

@@ -19,7 +19,7 @@ export declare class DevPipeline extends Pipeline {
     preload(routeData: RouteData, filePath: URL): Promise<ComponentInstance>;
     clearRouteCache(): void;
     getComponentByRoute(routeData: RouteData): Promise<ComponentInstance>;
-    tryRewrite(payload: RewritePayload, request: Request, sourceRoute: RouteData): Promise<[RouteData, ComponentInstance]>;
+    tryRewrite(payload: RewritePayload, request: Request, sourceRoute: RouteData): Promise<[RouteData, ComponentInstance, URL]>;
     setManifestData(manifestData: ManifestData): void;
     rewriteKnownRoute(route: string, sourceRoute: RouteData): ComponentInstance;
 }

package/dist/vite-plugin-astro-server/pipeline.js

@@ -138,8 +138,8 @@ class DevPipeline extends Pipeline {
     if (!this.manifestData) {
       throw new Error("Missing manifest data. This is an internal error, please file an issue.");
     }
+    let finalUrl = void 0;
     for (const route of this.manifestData.routes) {
-      let finalUrl = void 0;
       if (payload instanceof URL) {
         finalUrl = payload;
       } else if (payload instanceof Request) {
@@ -155,13 +155,13 @@ class DevPipeline extends Pipeline {
         break;
       }
     }
-    if (foundRoute) {
+    if (foundRoute && finalUrl) {
       if (foundRoute.pathname === "/404") {
         const componentInstance = this.rewriteKnownRoute(foundRoute.pathname, sourceRoute);
-        return [foundRoute, componentInstance];
+        return [foundRoute, componentInstance, finalUrl];
       } else {
         const componentInstance = await this.getComponentByRoute(foundRoute);
-        return [foundRoute, componentInstance];
+        return [foundRoute, componentInstance, finalUrl];
       }
     } else {
       throw new AstroError({

package/dist/vite-plugin-astro-server/request.js

@@ -1,4 +1,4 @@
-import { collapseDuplicateSlashes, removeTrailingForwardSlash } from "../core/path.js";
+import { removeTrailingForwardSlash } from "../core/path.js";
 import { runWithErrorHandling } from "./controller.js";
 import { recordServerError } from "./error.js";
 import { handle500Response } from "./response.js";
@@ -12,7 +12,7 @@ async function handleRequest({
 }) {
   const { config, loader } = pipeline;
   const origin = `${loader.isHttps() ? "https" : "http"}://${incomingRequest.headers.host}`;
-  const url = new URL(collapseDuplicateSlashes(origin + incomingRequest.url));
+  const url = new URL(origin + incomingRequest.url);
   let pathname;
   if (config.trailingSlash === "never" && !incomingRequest.url) {
     pathname = "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.10.0",
+  "version": "4.10.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -33,6 +33,7 @@
     },
     "./env": "./env.d.ts",
     "./env/runtime": "./dist/env/runtime.js",
+    "./env/setup": "./dist/env/setup.js",
     "./types": "./types.d.ts",
     "./client": "./client.d.ts",
     "./astro-jsx": "./astro-jsx.d.ts",
@@ -109,12 +110,12 @@
   ],
   "dependencies": {
     "@astrojs/compiler": "^2.8.0",
-    "@babel/core": "^7.24.6",
-    "@babel/generator": "^7.24.6",
-    "@babel/parser": "^7.24.6",
-    "@babel/plugin-transform-react-jsx": "^7.24.6",
-    "@babel/traverse": "^7.24.6",
-    "@babel/types": "^7.24.6",
+    "@babel/core": "^7.24.7",
+    "@babel/generator": "^7.24.7",
+    "@babel/parser": "^7.24.7",
+    "@babel/plugin-transform-react-jsx": "^7.24.7",
+    "@babel/traverse": "^7.24.7",
+    "@babel/types": "^7.24.7",
     "@types/babel__core": "^7.20.5",
     "@types/cookie": "^0.6.0",
     "acorn": "^8.11.3",
@@ -127,14 +128,14 @@
     "common-ancestor-path": "^1.0.1",
     "cookie": "^0.6.0",
     "cssesc": "^3.0.0",
-    "debug": "^4.3.4",
+    "debug": "^4.3.5",
     "deterministic-object-hash": "^2.0.2",
     "devalue": "^5.0.0",
     "diff": "^5.2.0",
     "dlv": "^1.1.3",
     "dset": "^3.1.3",
     "es-module-lexer": "^1.5.3",
-    "esbuild": "^0.21.4",
+    "esbuild": "^0.21.5",
     "estree-walker": "^3.0.3",
     "execa": "^8.0.1",
     "fast-glob": "^3.3.2",
@@ -156,13 +157,13 @@
     "rehype": "^13.0.1",
     "resolve": "^1.22.8",
     "semver": "^7.6.2",
-    "shiki": "^1.6.1",
+    "shiki": "^1.6.3",
     "string-width": "^7.1.0",
     "strip-ansi": "^7.1.0",
     "tsconfck": "^3.1.0",
     "unist-util-visit": "^5.0.0",
     "vfile": "^6.0.1",
-    "vite": "^5.2.12",
+    "vite": "^5.2.13",
     "vitefu": "^0.2.5",
     "which-pm": "^2.2.0",
     "yargs-parser": "^21.1.1",
@@ -211,7 +212,7 @@
     "rehype-toc": "^3.0.2",
     "remark-code-titles": "^0.1.2",
     "rollup": "^4.18.0",
-    "sass": "^1.77.3",
+    "sass": "^1.77.4",
     "srcset-parse": "^1.1.0",
     "unified": "^11.0.4",
     "astro-scripts": "0.0.14"

package/dist/virtual-modules/env-setup.d.ts

@@ -1 +0,0 @@
-export { setGetEnv, type GetEnv } from '../env/runtime.js';

package/dist/virtual-modules/env-setup.js

@@ -1,4 +0,0 @@
-import { setGetEnv } from "../env/runtime.js";
-export {
-  setGetEnv
-};