astro 4.5.5 → 4.5.7

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

@@ -2478,6 +2478,10 @@ export type SSRComponentMetadata = {
     containsHead: boolean;
 };
 export interface SSRResult {
+    /**
+     * Whether the page has failed with a non-recoverable error, or the client disconnected.
+     */
+    cancelled: boolean;
     styles: Set<SSRElement>;
     scripts: Set<SSRElement>;
     links: Set<SSRElement>;

package/dist/content/types-generator.js

@@ -360,7 +360,7 @@ async function writeContentFiles({
 };
 `;
           if (settings.config.experimental.contentCollectionJsonSchema && collectionConfig?.schema) {
-            let zodSchemaForJson = collectionConfig.schema;
+            let zodSchemaForJson = typeof collectionConfig.schema === "function" ? collectionConfig.schema({ image: () => z.string() }) : collectionConfig.schema;
             if (zodSchemaForJson instanceof z.ZodObject) {
               zodSchemaForJson = zodSchemaForJson.extend({
                 $schema: z.string().optional()
@@ -382,7 +382,7 @@ async function writeContentFiles({
             } catch (err) {
               logger.warn(
                 "content",
-                `An error was encountered while creating the JSON schema. Proceeding without it. Error: ${err}`
+                `An error was encountered while creating the JSON schema for the ${entryKey} entry in ${collectionKey} collection. Proceeding without it. Error: ${err}`
               );
             }
           }

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.5.5";
+const ASTRO_VERSION = "4.5.7";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
 const DEFAULT_404_COMPONENT = "astro-default-404";

package/dist/core/dev/dev.js

@@ -23,7 +23,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "4.5.5";
+  const currentVersion = "4.5.7";
   if (currentVersion.includes("-")) {
     logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
   }

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

@@ -697,6 +697,28 @@ export declare const MiddlewareNotAResponse: {
     title: string;
     message: string;
 };
+/**
+ * @docs
+ * @description
+ * Thrown when an endpoint does not return anything or returns an object that is not a `Response` object.
+ *
+ * An endpoint must return either a `Response`, or a `Promise` that resolves with a `Response`. For example:
+ * ```ts
+ * import type { APIContext } from 'astro';
+ *
+ * export async function GET({ request, url, cookies }: APIContext): Promise<Response> {
+ *     return Response.json({
+ *         success: true,
+ *         result: 'Data from Astro Endpoint!'
+ *     })
+ * }
+ * ```
+ */
+export declare const EndpointDidNotReturnAResponse: {
+    name: string;
+    title: string;
+    message: string;
+};
 /**
  * @docs
  * @description

package/dist/core/errors/errors-data.js

@@ -250,6 +250,11 @@ const MiddlewareNotAResponse = {
   title: "The middleware returned something that is not a `Response` object.",
   message: "Any data returned from middleware must be a valid `Response` object."
 };
+const EndpointDidNotReturnAResponse = {
+  name: "EndpointDidNotReturnAResponse",
+  title: "The endpoint did not return a `Response`.",
+  message: "An endpoint must return either a `Response`, or a `Promise` that resolves with a `Response`."
+};
 const LocalsNotAnObject = {
   name: "LocalsNotAnObject",
   title: "Value assigned to `locals` is not accepted.",
@@ -501,6 +506,7 @@ export {
   CouldNotTransformImage,
   DataCollectionEntryParseError,
   DuplicateContentEntrySlugError,
+  EndpointDidNotReturnAResponse,
   ExpectedImage,
   ExpectedImageOptions,
   FailedToFetchRemoteImageDimensions,

package/dist/core/messages.js

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

package/dist/core/render-context.js

@@ -74,24 +74,38 @@ class RenderContext {
       serverLike
     });
     const apiContext = this.createAPIContext(props);
-    const { type } = routeData;
-    const lastNext = type === "endpoint" ? () => renderEndpoint(componentInstance, apiContext, serverLike, logger) : type === "redirect" ? () => renderRedirect(this) : type === "page" ? async () => {
-      const result = await this.createResult(componentInstance);
-      const response2 = await renderPage(
-        result,
-        componentInstance?.default,
-        props,
-        {},
-        streaming,
-        routeData
-      );
-      response2.headers.set(ROUTE_TYPE_HEADER, "page");
-      if (routeData.route === "/404" || routeData.route === "/500") {
-        response2.headers.set(REROUTE_DIRECTIVE_HEADER, "no");
+    const lastNext = async () => {
+      switch (routeData.type) {
+        case "endpoint":
+          return renderEndpoint(componentInstance, apiContext, serverLike, logger);
+        case "redirect":
+          return renderRedirect(this);
+        case "page": {
+          const result = await this.createResult(componentInstance);
+          let response2;
+          try {
+            response2 = await renderPage(
+              result,
+              componentInstance?.default,
+              props,
+              {},
+              streaming,
+              routeData
+            );
+          } catch (e) {
+            result.cancelled = true;
+            throw e;
+          }
+          response2.headers.set(ROUTE_TYPE_HEADER, "page");
+          if (routeData.route === "/404" || routeData.route === "/500") {
+            response2.headers.set(REROUTE_DIRECTIVE_HEADER, "no");
+          }
+          return response2;
+        }
+        case "fallback": {
+          return new Response(null, { status: 500, headers: { [ROUTE_TYPE_HEADER]: "fallback" } });
+        }
       }
-      return response2;
-    } : type === "fallback" ? () => new Response(null, { status: 500, headers: { [ROUTE_TYPE_HEADER]: "fallback" } }) : () => {
-      throw new Error("Unknown type of route: " + type);
     };
     const response = await callMiddleware(middleware, apiContext, lastNext);
     if (response.headers.get(ROUTE_TYPE_HEADER)) {
@@ -159,6 +173,7 @@ class RenderContext {
       }
     };
     const result = {
+      cancelled: false,
       clientDirectives,
       inlinedScripts,
       componentMetadata,

package/dist/runtime/server/endpoint.js

@@ -1,5 +1,7 @@
 import { bold } from "kleur/colors";
 import { REROUTABLE_STATUS_CODES, REROUTE_DIRECTIVE_HEADER } from "../../core/constants.js";
+import { EndpointDidNotReturnAResponse } from "../../core/errors/errors-data.js";
+import { AstroError } from "../../core/errors/errors.js";
 async function renderEndpoint(mod, context, ssr, logger) {
   const { request, url } = context;
   const method = request.method.toUpperCase();
@@ -30,6 +32,9 @@ Found handlers: ${Object.keys(mod).map((exp) => JSON.stringify(exp)).join(", ")}
     return new Response(null, { status: 500 });
   }
   const response = await handler.call(mod, context);
+  if (!response || response instanceof Response === false) {
+    throw new AstroError(EndpointDidNotReturnAResponse);
+  }
   if (REROUTABLE_STATUS_CODES.includes(response.status)) {
     response.headers.set(REROUTE_DIRECTIVE_HEADER, "no");
   }

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

@@ -80,6 +80,9 @@ async function renderToReadableStream(result, componentFactory, props, children,
           setTimeout(() => controller.error(e), 0);
         }
       })();
+    },
+    cancel() {
+      result.cancelled = true;
     }
   });
 }
@@ -127,11 +130,10 @@ async function renderToAsyncIterable(result, componentFactory, props, children,
   }
   let error = null;
   let next = promiseWithResolvers();
-  let cancelled = false;
   const buffer = [];
   const iterator = {
     async next() {
-      if (cancelled)
+      if (result.cancelled)
         return { done: true, value: void 0 };
       await next.promise;
       if (error) {
@@ -157,7 +159,7 @@ async function renderToAsyncIterable(result, componentFactory, props, children,
       return returnValue;
     },
     async return() {
-      cancelled = true;
+      result.cancelled = true;
       return { done: true, value: void 0 };
     }
   };

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

@@ -345,19 +345,27 @@ function renderAstroComponent(result, displayName, Component, props, slots = {})
 }
 async function renderComponent(result, displayName, Component, props, slots = {}) {
   if (isPromise(Component)) {
-    Component = await Component;
+    Component = await Component.catch(handleCancellation);
   }
   if (isFragmentComponent(Component)) {
-    return await renderFragmentComponent(result, slots);
+    return await renderFragmentComponent(result, slots).catch(handleCancellation);
   }
   props = normalizeProps(props);
   if (isHTMLComponent(Component)) {
-    return await renderHTMLComponent(result, Component, props, slots);
+    return await renderHTMLComponent(result, Component, props, slots).catch(handleCancellation);
   }
   if (isAstroComponentFactory(Component)) {
     return renderAstroComponent(result, displayName, Component, props, slots);
   }
-  return await renderFrameworkComponent(result, displayName, Component, props, slots);
+  return await renderFrameworkComponent(result, displayName, Component, props, slots).catch(
+    handleCancellation
+  );
+  function handleCancellation(e) {
+    if (result.cancelled)
+      return { render() {
+      } };
+    throw e;
+  }
 }
 function normalizeProps(props) {
   if (props["class:list"] !== void 0) {

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

@@ -99,7 +99,7 @@ function renderElement(name, { props: _props, children = "" }, shouldEscape = tr
     }
   }
   if ((children == null || children == "") && voidElementNames.test(name)) {
-    return `<${name}${internalSpreadAttributes(props, shouldEscape)} />`;
+    return `<${name}${internalSpreadAttributes(props, shouldEscape)}>`;
   }
   return `<${name}${internalSpreadAttributes(props, shouldEscape)}>${children}</${name}>`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.5.5",
+  "version": "4.5.7",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -162,8 +162,8 @@
     "zod": "^3.22.4",
     "zod-to-json-schema": "^3.22.4",
     "@astrojs/internal-helpers": "0.3.0",
-    "@astrojs/telemetry": "3.0.4",
-    "@astrojs/markdown-remark": "4.3.0"
+    "@astrojs/markdown-remark": "4.3.0",
+    "@astrojs/telemetry": "3.0.4"
   },
   "optionalDependencies": {
     "sharp": "^0.32.6"