astro 5.1.8 → 5.1.9

package/astro-jsx.d.ts

@@ -21,11 +21,11 @@ declare namespace astroHTML.JSX {
 		children?: Children;
 	}
 
-	type AstroComponentDirectives =
-		import('./dist/types/public/elements.js').AstroComponentDirectives;
+	// biome-ignore format: bug
+	type AstroComponentDirectives = import('./dist/types/public/elements.js').AstroComponentDirectives;
 	type AstroBuiltinAttributes = import('./dist/types/public/elements.js').AstroBuiltinAttributes;
-	type AstroDefineVarsAttribute =
-		import('./dist/types/public/elements.js').AstroDefineVarsAttribute;
+	// biome-ignore format: bug
+	type AstroDefineVarsAttribute = import('./dist/types/public/elements.js').AstroDefineVarsAttribute;
 	type AstroScriptAttributes = import('./dist/types/public/elements.js').AstroScriptAttributes &
 		AstroDefineVarsAttribute;
 	type AstroStyleAttributes = import('./dist/types/public/elements.js').AstroStyleAttributes &
@@ -174,15 +174,15 @@ declare namespace astroHTML.JSX {
 		onfullscreenerror?: string | undefined | null;
 	}
 
-	// All the WAI-ARIA 1.1 attributes from https://www.w3.org/TR/wai-aria-1.1/
+	// All the WAI-ARIA 1.2 attributes from https://www.w3.org/TR/wai-aria-1.2/#state_prop_def
 	interface AriaAttributes {
-		/** Identifies the currently active element when DOM focus is on a composite widget, textbox, group, or application. */
+		/** Identifies the currently active element when DOM focus is on a composite widget, combobox, textbox, group, or application. */
 		'aria-activedescendant'?: string | undefined | null;
 		/** Indicates whether assistive technologies will present all, or only parts of, the changed region based on the change notifications defined by the aria-relevant attribute. */
 		'aria-atomic'?: boolean | 'false' | 'true' | undefined | null;
 		/**
-		 * Indicates whether inputting text could trigger display of one or more predictions of the user's intended value for an input and specifies how predictions would be
-		 * presented if they are made.
+		 * Indicates whether inputting text could trigger display of one or more predictions of the user's intended value for a combobox, searchbox, or textbox and specifies
+		 * how predictions would be presented if they were made.
 		 */
 		'aria-autocomplete'?: 'none' | 'inline' | 'list' | 'both' | undefined | null;
 		/** Indicates an element is being modified and that assistive technologies MAY want to wait until the modifications are complete before exposing them to the user. */
@@ -245,11 +245,11 @@ declare namespace astroHTML.JSX {
 		 */
 		'aria-dropeffect'?: 'none' | 'copy' | 'execute' | 'link' | 'move' | 'popup' | undefined | null;
 		/**
-		 * Identifies the element that provides an error message for the object.
+		 * Identifies the element that provides an error message for an object.
 		 * @see aria-invalid @see aria-describedby.
 		 */
 		'aria-errormessage'?: string | undefined | null;
-		/** Indicates whether the element, or another grouping element it controls, is currently expanded or collapsed. */
+		/** Indicates whether a grouping element owned or controlled by this element is expanded or collapsed. */
 		'aria-expanded'?: boolean | 'false' | 'true' | undefined | null;
 		/**
 		 * Identifies the next element (or elements) in an alternate reading order of content which, at the user's discretion,
@@ -394,32 +394,43 @@ declare namespace astroHTML.JSX {
 		'aria-valuetext'?: string | undefined | null;
 	}
 
-	// All the WAI-ARIA 1.1 role attribute values from https://www.w3.org/TR/wai-aria-1.1/#role_definitions
+	// All the WAI-ARIA 1.2 role attribute values from https://www.w3.org/TR/wai-aria-1.2/#role_definitions
 	type AriaRole =
 		| 'alert'
 		| 'alertdialog'
 		| 'application'
 		| 'article'
 		| 'banner'
+		| 'blockquote'
 		| 'button'
+		| 'caption'
 		| 'cell'
 		| 'checkbox'
+		| 'code'
 		| 'columnheader'
 		| 'combobox'
+		| 'command'
 		| 'complementary'
+		| 'composite'
 		| 'contentinfo'
 		| 'definition'
+		| 'deletion'
 		| 'dialog'
 		| 'directory'
 		| 'document'
+		| 'emphasis'
 		| 'feed'
 		| 'figure'
 		| 'form'
+		| 'generic'
 		| 'grid'
 		| 'gridcell'
 		| 'group'
 		| 'heading'
 		| 'img'
+		| 'input'
+		| 'insertion'
+		| 'landmark'
 		| 'link'
 		| 'list'
 		| 'listbox'
@@ -428,6 +439,7 @@ declare namespace astroHTML.JSX {
 		| 'main'
 		| 'marquee'
 		| 'math'
+		| 'meter'
 		| 'menu'
 		| 'menubar'
 		| 'menuitem'
@@ -437,21 +449,31 @@ declare namespace astroHTML.JSX {
 		| 'none'
 		| 'note'
 		| 'option'
+		| 'paragraph'
 		| 'presentation'
 		| 'progressbar'
 		| 'radio'
 		| 'radiogroup'
+		| 'range'
 		| 'region'
+		| 'roletype'
 		| 'row'
 		| 'rowgroup'
 		| 'rowheader'
 		| 'scrollbar'
 		| 'search'
 		| 'searchbox'
+		| 'section'
+		| 'sectionhead'
+		| 'select'
 		| 'separator'
 		| 'slider'
 		| 'spinbutton'
 		| 'status'
+		| 'strong'
+		| 'structure'
+		| 'subscript'
+		| 'superscript'
 		| 'switch'
 		| 'tab'
 		| 'table'
@@ -459,12 +481,15 @@ declare namespace astroHTML.JSX {
 		| 'tabpanel'
 		| 'term'
 		| 'textbox'
+		| 'time'
 		| 'timer'
 		| 'toolbar'
 		| 'tooltip'
 		| 'tree'
 		| 'treegrid'
-		| 'treeitem';
+		| 'treeitem'
+		| 'widget'
+		| 'window';
 
 	type CssProperty = keyof Omit<
 		CSSStyleDeclaration,

package/client.d.ts

@@ -152,8 +152,8 @@ declare module 'astro:transitions/client' {
 
 	export type Fallback = import('./dist/virtual-modules/transitions-types.js').Fallback;
 	export type Direction = import('./dist/virtual-modules/transitions-types.ts').Direction;
-	export type NavigationTypeString =
-		import('./dist/virtual-modules/transitions-types.js').NavigationTypeString;
+	// biome-ignore format: bug
+	export type NavigationTypeString = import('./dist/virtual-modules/transitions-types.js').NavigationTypeString;
 	export type Options = import('./dist/virtual-modules/transitions-types.js').Options;
 
 	type EventModule = typeof import('./dist/virtual-modules/transitions-events.js');
@@ -162,14 +162,15 @@ declare module 'astro:transitions/client' {
 	export const TRANSITION_BEFORE_SWAP: EventModule['TRANSITION_BEFORE_SWAP'];
 	export const TRANSITION_AFTER_SWAP: EventModule['TRANSITION_AFTER_SWAP'];
 	export const TRANSITION_PAGE_LOAD: EventModule['TRANSITION_PAGE_LOAD'];
-	export type TransitionBeforePreparationEvent =
-		import('./dist/virtual-modules/transitions-events.js').TransitionBeforePreparationEvent;
-	export type TransitionBeforeSwapEvent =
-		import('./dist/virtual-modules/transitions-events.js').TransitionBeforeSwapEvent;
+	// biome-ignore format: bug
+	export type TransitionBeforePreparationEvent = import('./dist/virtual-modules/transitions-events.js').TransitionBeforePreparationEvent;
+	// biome-ignore format: bug
+	export type TransitionBeforeSwapEvent = import('./dist/virtual-modules/transitions-events.js').TransitionBeforeSwapEvent;
 	export const isTransitionBeforePreparationEvent: EventModule['isTransitionBeforePreparationEvent'];
 	export const isTransitionBeforeSwapEvent: EventModule['isTransitionBeforeSwapEvent'];
-	type TransitionSwapFunctionModule =
-		typeof import('./dist/virtual-modules/transitions-swap-functions.js');
+	type TransitionSwapFunctionModule = typeof import(
+		'./dist/virtual-modules/transitions-swap-functions.js',
+	);
 	export const swapFunctions: TransitionSwapFunctionModule['swapFunctions'];
 }
 

package/dist/content/content-layer.d.ts

@@ -10,6 +10,7 @@ export interface ContentLayerOptions {
     logger: Logger;
     watcher?: FSWatcher;
 }
+type CollectionLoader<TData> = () => Array<TData> | Promise<Array<TData>> | Record<string, Record<string, unknown>> | Promise<Record<string, Record<string, unknown>>>;
 export declare class ContentLayer {
     #private;
     constructor({ settings, logger, store, watcher }: ContentLayerOptions);
@@ -34,7 +35,7 @@ export declare class ContentLayer {
 }
 export declare function simpleLoader<TData extends {
     id: string;
-}>(handler: () => Array<TData> | Promise<Array<TData>> | Record<string, Record<string, unknown>> | Promise<Record<string, Record<string, unknown>>>, context: LoaderContext): Promise<void>;
+}>(handler: CollectionLoader<TData>, context: LoaderContext): Promise<void>;
 /**
  * Get the path to the data store file.
  * During development, this is in the `.astro` directory so that the Vite watcher can see it.
@@ -46,3 +47,4 @@ export declare const globalContentLayer: {
     get: () => ContentLayer | null;
     dispose: () => void;
 };
+export {};

package/dist/content/content-layer.js

@@ -13,6 +13,7 @@ import {
   getEntryConfigByExtMap,
   getEntryDataAndImages,
   globalContentConfigObserver,
+  loaderReturnSchema,
   safeStringify
 } from "./utils.js";
 import { createWatcherWrapper } from "./watcher.js";
@@ -152,7 +153,7 @@ ${contentConfig.error.message}`);
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "5.1.8") {
+    if (previousAstroVersion && previousAstroVersion !== "5.1.9") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -160,8 +161,8 @@ ${contentConfig.error.message}`);
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("5.1.8") {
-      await this.#store.metaStore().set("astro-version", "5.1.8");
+    if ("5.1.9") {
+      await this.#store.metaStore().set("astro-version", "5.1.9");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("content-config-digest", currentConfigDigest);
@@ -265,7 +266,20 @@ ${contentConfig.error.message}`);
   }
 }
 async function simpleLoader(handler, context) {
-  const data = await handler();
+  const unsafeData = await handler();
+  const parsedData = loaderReturnSchema.safeParse(unsafeData);
+  if (!parsedData.success) {
+    const issue = parsedData.error.issues[0];
+    const parseIssue = Array.isArray(unsafeData) ? issue.unionErrors[0] : issue.unionErrors[1];
+    const error = parseIssue.errors[0];
+    const firstPathItem = error.path[0];
+    const entry = Array.isArray(unsafeData) ? unsafeData[firstPathItem] : unsafeData[firstPathItem];
+    throw new AstroError({
+      ...AstroErrorData.ContentLoaderReturnsInvalidId,
+      message: AstroErrorData.ContentLoaderReturnsInvalidId.message(context.collection, entry)
+    });
+  }
+  const data = parsedData.data;
   context.store.clear();
   if (Array.isArray(data)) {
     for (const raw of data) {

package/dist/content/utils.d.ts

@@ -8,7 +8,7 @@ import type { AstroConfig } from '../types/public/config.js';
 import type { ContentEntryType, DataEntryType } from '../types/public/content.js';
 import { CONTENT_FLAGS } from './consts.js';
 /**
- * Amap from a collection + slug to the local file path.
+ * A map from a collection + slug to the local file path.
  * This is used internally to resolve entry imports when using `getEntry()`.
  * @see `templates/content/module.mjs`
  */
@@ -20,6 +20,19 @@ export type ContentLookupMap = {
         };
     };
 };
+export declare const loaderReturnSchema: z.ZodUnion<[z.ZodArray<z.ZodObject<{
+    id: z.ZodString;
+}, "passthrough", z.ZodTypeAny, z.objectOutputType<{
+    id: z.ZodString;
+}, z.ZodTypeAny, "passthrough">, z.objectInputType<{
+    id: z.ZodString;
+}, z.ZodTypeAny, "passthrough">>, "many">, z.ZodRecord<z.ZodString, z.ZodObject<{
+    id: z.ZodOptional<z.ZodString>;
+}, "passthrough", z.ZodTypeAny, z.objectOutputType<{
+    id: z.ZodOptional<z.ZodString>;
+}, z.ZodTypeAny, "passthrough">, z.objectInputType<{
+    id: z.ZodOptional<z.ZodString>;
+}, z.ZodTypeAny, "passthrough">>>]>;
 declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
     type: z.ZodDefault<z.ZodOptional<z.ZodLiteral<"content">>>;
     schema: z.ZodOptional<z.ZodAny>;
@@ -41,31 +54,7 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
 }>, z.ZodObject<{
     type: z.ZodLiteral<"content_layer">;
     schema: z.ZodOptional<z.ZodAny>;
-    loader: z.ZodUnion<[z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnion<[z.ZodArray<z.ZodObject<{
-        id: z.ZodCatch<z.ZodString>;
-    }, "strip", z.ZodUnknown, z.objectOutputType<{
-        id: z.ZodCatch<z.ZodString>;
-    }, z.ZodUnknown, "strip">, z.objectInputType<{
-        id: z.ZodCatch<z.ZodString>;
-    }, z.ZodUnknown, "strip">>, "many">, z.ZodPromise<z.ZodArray<z.ZodObject<{
-        id: z.ZodCatch<z.ZodString>;
-    }, "strip", z.ZodUnknown, z.objectOutputType<{
-        id: z.ZodCatch<z.ZodString>;
-    }, z.ZodUnknown, "strip">, z.objectInputType<{
-        id: z.ZodCatch<z.ZodString>;
-    }, z.ZodUnknown, "strip">>, "many">>, z.ZodRecord<z.ZodString, z.ZodObject<{
-        id: z.ZodOptional<z.ZodString>;
-    }, "strip", z.ZodUnknown, z.objectOutputType<{
-        id: z.ZodOptional<z.ZodString>;
-    }, z.ZodUnknown, "strip">, z.objectInputType<{
-        id: z.ZodOptional<z.ZodString>;
-    }, z.ZodUnknown, "strip">>>, z.ZodPromise<z.ZodRecord<z.ZodString, z.ZodObject<{
-        id: z.ZodOptional<z.ZodString>;
-    }, "strip", z.ZodUnknown, z.objectOutputType<{
-        id: z.ZodOptional<z.ZodString>;
-    }, z.ZodUnknown, "strip">, z.objectInputType<{
-        id: z.ZodOptional<z.ZodString>;
-    }, z.ZodUnknown, "strip">>>>]>>, z.ZodObject<{
+    loader: z.ZodUnion<[z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnknown>, z.ZodObject<{
         name: z.ZodString;
         load: z.ZodFunction<z.ZodTuple<[z.ZodObject<{
             collection: z.ZodString;
@@ -140,15 +129,7 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
     _legacy: z.ZodOptional<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
     type: "content_layer";
-    loader: ((...args: unknown[]) => z.objectOutputType<{
-        id: z.ZodCatch<z.ZodString>;
-    }, z.ZodUnknown, "strip">[] | Promise<z.objectOutputType<{
-        id: z.ZodCatch<z.ZodString>;
-    }, z.ZodUnknown, "strip">[]> | Record<string, z.objectOutputType<{
-        id: z.ZodOptional<z.ZodString>;
-    }, z.ZodUnknown, "strip">> | Promise<Record<string, z.objectOutputType<{
-        id: z.ZodOptional<z.ZodString>;
-    }, z.ZodUnknown, "strip">>>) | {
+    loader: ((...args: unknown[]) => unknown) | {
         load: (args_0: {
             collection: string;
             generateDigest: (args_0: any) => unknown;
@@ -169,15 +150,7 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
     _legacy?: boolean | undefined;
 }, {
     type: "content_layer";
-    loader: ((...args: unknown[]) => z.objectInputType<{
-        id: z.ZodCatch<z.ZodString>;
-    }, z.ZodUnknown, "strip">[] | Promise<z.objectInputType<{
-        id: z.ZodCatch<z.ZodString>;
-    }, z.ZodUnknown, "strip">[]> | Record<string, z.objectInputType<{
-        id: z.ZodOptional<z.ZodString>;
-    }, z.ZodUnknown, "strip">> | Promise<Record<string, z.objectInputType<{
-        id: z.ZodOptional<z.ZodString>;
-    }, z.ZodUnknown, "strip">>>) | {
+    loader: ((...args: unknown[]) => unknown) | {
         load: (args_0: {
             collection: string;
             generateDigest: (args_0: any) => unknown;
@@ -219,31 +192,7 @@ declare const contentConfigParser: z.ZodObject<{
     }>, z.ZodObject<{
         type: z.ZodLiteral<"content_layer">;
         schema: z.ZodOptional<z.ZodAny>;
-        loader: z.ZodUnion<[z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnion<[z.ZodArray<z.ZodObject<{
-            id: z.ZodCatch<z.ZodString>;
-        }, "strip", z.ZodUnknown, z.objectOutputType<{
-            id: z.ZodCatch<z.ZodString>;
-        }, z.ZodUnknown, "strip">, z.objectInputType<{
-            id: z.ZodCatch<z.ZodString>;
-        }, z.ZodUnknown, "strip">>, "many">, z.ZodPromise<z.ZodArray<z.ZodObject<{
-            id: z.ZodCatch<z.ZodString>;
-        }, "strip", z.ZodUnknown, z.objectOutputType<{
-            id: z.ZodCatch<z.ZodString>;
-        }, z.ZodUnknown, "strip">, z.objectInputType<{
-            id: z.ZodCatch<z.ZodString>;
-        }, z.ZodUnknown, "strip">>, "many">>, z.ZodRecord<z.ZodString, z.ZodObject<{
-            id: z.ZodOptional<z.ZodString>;
-        }, "strip", z.ZodUnknown, z.objectOutputType<{
-            id: z.ZodOptional<z.ZodString>;
-        }, z.ZodUnknown, "strip">, z.objectInputType<{
-            id: z.ZodOptional<z.ZodString>;
-        }, z.ZodUnknown, "strip">>>, z.ZodPromise<z.ZodRecord<z.ZodString, z.ZodObject<{
-            id: z.ZodOptional<z.ZodString>;
-        }, "strip", z.ZodUnknown, z.objectOutputType<{
-            id: z.ZodOptional<z.ZodString>;
-        }, z.ZodUnknown, "strip">, z.objectInputType<{
-            id: z.ZodOptional<z.ZodString>;
-        }, z.ZodUnknown, "strip">>>>]>>, z.ZodObject<{
+        loader: z.ZodUnion<[z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnknown>, z.ZodObject<{
             name: z.ZodString;
             load: z.ZodFunction<z.ZodTuple<[z.ZodObject<{
                 collection: z.ZodString;
@@ -318,15 +267,7 @@ declare const contentConfigParser: z.ZodObject<{
         _legacy: z.ZodOptional<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
         type: "content_layer";
-        loader: ((...args: unknown[]) => z.objectOutputType<{
-            id: z.ZodCatch<z.ZodString>;
-        }, z.ZodUnknown, "strip">[] | Promise<z.objectOutputType<{
-            id: z.ZodCatch<z.ZodString>;
-        }, z.ZodUnknown, "strip">[]> | Record<string, z.objectOutputType<{
-            id: z.ZodOptional<z.ZodString>;
-        }, z.ZodUnknown, "strip">> | Promise<Record<string, z.objectOutputType<{
-            id: z.ZodOptional<z.ZodString>;
-        }, z.ZodUnknown, "strip">>>) | {
+        loader: ((...args: unknown[]) => unknown) | {
             load: (args_0: {
                 collection: string;
                 generateDigest: (args_0: any) => unknown;
@@ -347,15 +288,7 @@ declare const contentConfigParser: z.ZodObject<{
         _legacy?: boolean | undefined;
     }, {
         type: "content_layer";
-        loader: ((...args: unknown[]) => z.objectInputType<{
-            id: z.ZodCatch<z.ZodString>;
-        }, z.ZodUnknown, "strip">[] | Promise<z.objectInputType<{
-            id: z.ZodCatch<z.ZodString>;
-        }, z.ZodUnknown, "strip">[]> | Record<string, z.objectInputType<{
-            id: z.ZodOptional<z.ZodString>;
-        }, z.ZodUnknown, "strip">> | Promise<Record<string, z.objectInputType<{
-            id: z.ZodOptional<z.ZodString>;
-        }, z.ZodUnknown, "strip">>>) | {
+        loader: ((...args: unknown[]) => unknown) | {
             load: (args_0: {
                 collection: string;
                 generateDigest: (args_0: any) => unknown;
@@ -384,15 +317,7 @@ declare const contentConfigParser: z.ZodObject<{
         schema?: any;
     } | {
         type: "content_layer";
-        loader: ((...args: unknown[]) => z.objectOutputType<{
-            id: z.ZodCatch<z.ZodString>;
-        }, z.ZodUnknown, "strip">[] | Promise<z.objectOutputType<{
-            id: z.ZodCatch<z.ZodString>;
-        }, z.ZodUnknown, "strip">[]> | Record<string, z.objectOutputType<{
-            id: z.ZodOptional<z.ZodString>;
-        }, z.ZodUnknown, "strip">> | Promise<Record<string, z.objectOutputType<{
-            id: z.ZodOptional<z.ZodString>;
-        }, z.ZodUnknown, "strip">>>) | {
+        loader: ((...args: unknown[]) => unknown) | {
             load: (args_0: {
                 collection: string;
                 generateDigest: (args_0: any) => unknown;
@@ -421,15 +346,7 @@ declare const contentConfigParser: z.ZodObject<{
         schema?: any;
     } | {
         type: "content_layer";
-        loader: ((...args: unknown[]) => z.objectInputType<{
-            id: z.ZodCatch<z.ZodString>;
-        }, z.ZodUnknown, "strip">[] | Promise<z.objectInputType<{
-            id: z.ZodCatch<z.ZodString>;
-        }, z.ZodUnknown, "strip">[]> | Record<string, z.objectInputType<{
-            id: z.ZodOptional<z.ZodString>;
-        }, z.ZodUnknown, "strip">> | Promise<Record<string, z.objectInputType<{
-            id: z.ZodOptional<z.ZodString>;
-        }, z.ZodUnknown, "strip">>>) | {
+        loader: ((...args: unknown[]) => unknown) | {
             load: (args_0: {
                 collection: string;
                 generateDigest: (args_0: any) => unknown;

package/dist/content/utils.js

@@ -24,8 +24,19 @@ const entryTypeSchema = z.object({
   id: z.string({
     invalid_type_error: "Content entry `id` must be a string"
     // Default to empty string so we can validate properly in the loader
-  }).catch("")
-}).catchall(z.unknown());
+  })
+}).passthrough();
+const loaderReturnSchema = z.union([
+  z.array(entryTypeSchema),
+  z.record(
+    z.string(),
+    z.object({
+      id: z.string({
+        invalid_type_error: "Content entry `id` must be a string"
+      }).optional()
+    }).passthrough()
+  )
+]);
 const collectionConfigParser = z.union([
   z.object({
     type: z.literal("content").optional().default("content"),
@@ -39,30 +50,7 @@ const collectionConfigParser = z.union([
     type: z.literal(CONTENT_LAYER_TYPE),
     schema: z.any().optional(),
     loader: z.union([
-      z.function().returns(
-        z.union([
-          z.array(entryTypeSchema),
-          z.promise(z.array(entryTypeSchema)),
-          z.record(
-            z.string(),
-            z.object({
-              id: z.string({
-                invalid_type_error: "Content entry `id` must be a string"
-              }).optional()
-            }).catchall(z.unknown())
-          ),
-          z.promise(
-            z.record(
-              z.string(),
-              z.object({
-                id: z.string({
-                  invalid_type_error: "Content entry `id` must be a string"
-                }).optional()
-              }).catchall(z.unknown())
-            )
-          )
-        ])
-      ),
+      z.function(),
       z.object({
         name: z.string(),
         load: z.function(
@@ -641,6 +629,7 @@ export {
   hasAssetPropagationFlag,
   hasContentFlag,
   isDeferredModule,
+  loaderReturnSchema,
   parseEntrySlug,
   posixRelative,
   posixifyPath,

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.1.8";
+const ASTRO_VERSION = "5.1.9";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

package/dist/core/dev/dev.js

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

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

@@ -1397,6 +1397,26 @@ export declare const InvalidContentEntryDataError: {
     message(collection: string, entryId: string, error: ZodError): string;
     hint: string;
 };
+/**
+ * @docs
+ * @message
+ * **Example error message:**<br/>
+ * The content loader for the collection **blog** returned an entry with an invalid `id`:<br/>
+ * &#123;<br/>
+ *   "id": 1,<br/>
+ *   "title": "Hello, World!"<br/>
+ * &#125;
+ * @description
+ * A content loader returned an invalid `id`.
+ * Make sure that the `id` of the entry is a string.
+ * See the [Content collections documentation](https://docs.astro.build/en/guides/content-collections/) for more information.
+ */
+export declare const ContentLoaderReturnsInvalidId: {
+    name: string;
+    title: string;
+    message(collection: string, entry: any): string;
+    hint: string;
+};
 /**
  * @docs
  * @message

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

@@ -526,6 +526,17 @@ const InvalidContentEntryDataError = {
   },
   hint: "See https://docs.astro.build/en/guides/content-collections/ for more information on content schemas."
 };
+const ContentLoaderReturnsInvalidId = {
+  name: "ContentLoaderReturnsInvalidId",
+  title: "Content loader returned an entry with an invalid `id`.",
+  message(collection, entry) {
+    return [
+      `The content loader for the collection **${String(collection)}** returned an entry with an invalid \`id\`:`,
+      JSON.stringify(entry, null, 2)
+    ].join("\n");
+  },
+  hint: "Make sure that the `id` of the entry is a string. See https://docs.astro.build/en/guides/content-collections/ for more information on content loaders."
+};
 const ContentEntryDataError = {
   name: "ContentEntryDataError",
   title: "Content entry data does not match schema.",
@@ -641,6 +652,7 @@ export {
   ContentCollectionTypeMismatchError,
   ContentEntryDataError,
   ContentLoaderInvalidDataError,
+  ContentLoaderReturnsInvalidId,
   ContentSchemaContainsSlugError,
   CouldNotTransformImage,
   DataCollectionEntryParseError,

package/dist/core/messages.js

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

package/dist/core/util.js

@@ -1,6 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
+import { hasSpecialQueries } from "../vite-plugin-utils/index.js";
 import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "./constants.js";
 import { removeQueryString, removeTrailingForwardSlash, slash } from "./path.js";
 function isObject(value) {
@@ -10,6 +11,9 @@ function isURL(value) {
   return Object.prototype.toString.call(value) === "[object URL]";
 }
 function isMarkdownFile(fileId, option) {
+  if (hasSpecialQueries(fileId)) {
+    return false;
+  }
   const id = removeQueryString(fileId);
   const _suffix = option?.suffix ?? "";
   for (let markdownFileExtension of SUPPORTED_MARKDOWN_FILE_EXTENSIONS) {

package/dist/runtime/client/dev-toolbar/apps/audit/rules/a11y.js

@@ -176,12 +176,12 @@ const input_type_to_implicit_role = /* @__PURE__ */ new Map([
   ["url", "textbox"]
 ]);
 const ariaAttributes = new Set(
-  "activedescendant atomic autocomplete busy checked colcount colindex colspan controls current describedby description details disabled dropeffect errormessage expanded flowto grabbed haspopup hidden invalid keyshortcuts label labelledby level live modal multiline multiselectable orientation owns placeholder posinset pressed readonly relevant required roledescription rowcount rowindex rowspan selected setsize sort valuemax valuemin valuenow valuetext".split(
+  "activedescendant atomic autocomplete busy checked colcount colindex colspan controls current describedby details disabled dropeffect errormessage expanded flowto grabbed haspopup hidden invalid keyshortcuts label labelledby level live modal multiline multiselectable orientation owns placeholder posinset pressed readonly relevant required roledescription rowcount rowindex rowspan selected setsize sort valuemax valuemin valuenow valuetext".split(
     " "
   )
 );
 const ariaRoles = new Set(
-  "alert alertdialog application article banner button cell checkbox columnheader combobox complementary contentinfo definition dialog directory document feed figure form grid gridcell group heading img link list listbox listitem log main marquee math menu menubar menuitem menuitemcheckbox menuitemradio navigation none note option presentation progressbar radio radiogroup region row rowgroup rowheader scrollbar search searchbox separator slider spinbutton status switch tab tablist tabpanel textbox timer toolbar tooltip tree treegrid treeitem".split(
+  "alert alertdialog application article banner blockquote button caption cell checkbox code columnheader combobox command complementary composite contentinfo definition deletion dialog directory document emphasis feed figure form generic grid gridcell group heading img input insertion landmark link list listbox listitem log main marquee math meter menu menubar menuitem menuitemcheckbox menuitemradio navigation none note option paragraph presentation progressbar radio radiogroup range region roletype row rowgroup rowheader scrollbar search searchbox section sectionhead select separator slider spinbutton status strong structure subscript superscript switch tab table tablist tabpanel term textbox time timer toolbar tooltip tree treegrid treeitem widget window".split(
     " "
   )
 );

package/dist/runtime/server/render/server-islands.js

@@ -10,8 +10,12 @@ const internalProps = /* @__PURE__ */ new Set([
 function containsServerDirective(props) {
   return "server:component-directive" in props;
 }
+const SCRIPT_RE = /<\/script/giu;
+const COMMENT_RE = /<!--/gu;
+const SCRIPT_REPLACER = "<\\/script";
+const COMMENT_REPLACER = "\\u003C!--";
 function safeJsonStringify(obj) {
-  return JSON.stringify(obj).replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029").replace(/</g, "\\u003c").replace(/>/g, "\\u003e").replace(/\//g, "\\u002f");
+  return JSON.stringify(obj).replace(SCRIPT_RE, SCRIPT_REPLACER).replace(COMMENT_RE, COMMENT_REPLACER);
 }
 function createSearchParams(componentExport, encryptedProps, slots) {
   const params = new URLSearchParams();

package/package.json

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