astro 2.4.5 → 2.5.0

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

@@ -9,6 +9,7 @@ import { preload, renderPage } from "../core/render/dev/index.js";
 import { getParamsAndProps, GetParamsAndPropsError } from "../core/render/index.js";
 import { createRequest } from "../core/request.js";
 import { matchAllRoutes } from "../core/routing/index.js";
+import { isHybridOutput } from "../prerender/utils.js";
 import { log404 } from "./common.js";
 import { handle404Response, writeSSRResult, writeWebResponse } from "./response.js";
 function getCustom404Route(manifest) {
@@ -28,7 +29,7 @@ async function matchRoute(pathname, env, manifest) {
       routeCache,
       pathname,
       logging,
-      ssr: settings.config.output === "server"
+      ssr: settings.config.output === "server" || isHybridOutput(settings.config)
     });
     if (paramsAndPropsRes !== GetParamsAndPropsError.NoMatchingStaticPath) {
       return {
@@ -80,7 +81,7 @@ async function handleRoute(matchedRoute, url, pathname, body, origin, env, manif
   const { config } = settings;
   const filePath = matchedRoute.filePath;
   const { route, preloadedComponent, mod } = matchedRoute;
-  const buildingToSSR = config.output === "server";
+  const buildingToSSR = config.output === "server" || isHybridOutput(config);
   const request = createRequest({
     url,
     headers: buildingToSSR ? req.headers : new Headers(),
@@ -100,7 +101,7 @@ async function handleRoute(matchedRoute, url, pathname, body, origin, env, manif
     routeCache: env.routeCache,
     pathname,
     logging,
-    ssr: config.output === "server"
+    ssr: config.output === "server" || isHybridOutput(config)
   });
   const options = {
     env,

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

@@ -159,7 +159,7 @@ function jsx({ settings, logging }) {
 Unable to resolve a renderer that handles this file! With more than one renderer enabled, you should include an import or use a pragma comment.
 Add ${colors.cyan(
             IMPORT_STATEMENTS[defaultRendererName] || `import '${defaultRendererName}';`
-          )} or ${colors.cyan(`/* jsxImportSource: ${defaultRendererName} */`)} to this file.
+          )} or ${colors.cyan(`/** @jsxImportSource: ${defaultRendererName} */`)} to this file.
 `
         );
         return null;

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

@@ -1,5 +1,6 @@
 import { normalizePath } from "vite";
 import { isEndpoint, isPage } from "../core/util.js";
+import { isHybridOutput } from "../prerender/utils.js";
 import { scan } from "./scan.js";
 function astroScannerPlugin({ settings }) {
   return {
@@ -19,7 +20,11 @@ function astroScannerPlugin({ settings }) {
       const fileIsEndpoint = isEndpoint(fileURL, settings);
       if (!(fileIsPage || fileIsEndpoint))
         return;
-      const pageOptions = await scan(code, id);
+      const hybridOutput = isHybridOutput(settings.config);
+      const pageOptions = await scan(code, id, hybridOutput);
+      if (typeof pageOptions.prerender === "undefined") {
+        pageOptions.prerender = hybridOutput ? true : false;
+      }
       const { meta = {} } = this.getModuleInfo(id) ?? {};
       return {
         code,

package/dist/vite-plugin-scanner/scan.d.ts

@@ -1,2 +1,2 @@
 import type { PageOptions } from '../vite-plugin-astro/types.js';
-export declare function scan(code: string, id: string): Promise<PageOptions>;
+export declare function scan(code: string, id: string, isHybridOutput?: boolean): Promise<PageOptions>;

package/dist/vite-plugin-scanner/scan.js

@@ -24,7 +24,7 @@ function isFalsy(value) {
   return value === "false" || value === "0";
 }
 let didInit = false;
-async function scan(code, id) {
+async function scan(code, id, isHybridOutput = false) {
   if (!includesExport(code))
     return {};
   if (!didInit) {
@@ -41,7 +41,7 @@ async function scan(code, id) {
       if (prefix !== "const" || !(isTruthy(suffix) || isFalsy(suffix))) {
         throw new AstroError({
           ...AstroErrorData.InvalidPrerenderExport,
-          message: AstroErrorData.InvalidPrerenderExport.message(prefix, suffix),
+          message: AstroErrorData.InvalidPrerenderExport.message(prefix, suffix, isHybridOutput),
           location: { file: id }
         });
       } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.4.5",
+  "version": "2.5.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -55,7 +55,6 @@
     "./assets/image-endpoint": "./dist/assets/image-endpoint.js",
     "./assets/services/sharp": "./dist/assets/services/sharp.js",
     "./assets/services/squoosh": "./dist/assets/services/squoosh.js",
-    "./content/internal": "./dist/content/internal.js",
     "./content/runtime": "./dist/content/runtime.js",
     "./content/runtime-assets": "./dist/content/runtime-assets.js",
     "./debug": "./components/Debug.astro",
@@ -102,7 +101,7 @@
   "dependencies": {
     "@astrojs/compiler": "^1.4.0",
     "@astrojs/language-server": "^1.0.0",
-    "@astrojs/markdown-remark": "^2.2.0",
+    "@astrojs/markdown-remark": "^2.2.1",
     "@astrojs/telemetry": "^2.1.1",
     "@astrojs/webapi": "^2.1.1",
     "@babel/core": "^7.18.2",
@@ -124,12 +123,14 @@
     "devalue": "^4.2.0",
     "diff": "^5.1.0",
     "es-module-lexer": "^1.1.0",
+    "esbuild": "^0.17.18",
     "estree-walker": "3.0.0",
     "execa": "^6.1.0",
     "fast-glob": "^3.2.11",
     "github-slugger": "^2.0.0",
     "gray-matter": "^4.0.3",
     "html-escaper": "^3.0.3",
+    "js-yaml": "^4.1.0",
     "kleur": "^4.1.4",
     "magic-string": "^0.27.0",
     "mime": "^3.0.0",
@@ -167,6 +168,7 @@
     "@types/estree": "^0.0.51",
     "@types/hast": "^2.3.4",
     "@types/html-escaper": "^3.0.0",
+    "@types/js-yaml": "^4.0.5",
     "@types/mime": "^2.0.3",
     "@types/mocha": "^9.1.1",
     "@types/prettier": "^2.6.3",

package/src/content/template/types.d.ts

@@ -10,8 +10,7 @@ declare module 'astro:content' {
 
 declare module 'astro:content' {
 	export { z } from 'astro/zod';
-	export type CollectionEntry<C extends keyof typeof entryMap> =
-		(typeof entryMap)[C][keyof (typeof entryMap)[C]];
+	export type CollectionEntry<C extends keyof AnyEntryMap> = AnyEntryMap[C][keyof AnyEntryMap[C]];
 
 	// TODO: Remove this when having this fallback is no longer relevant. 2.3? 3.0? - erika, 2023-04-04
 	/**
@@ -65,44 +64,138 @@ declare module 'astro:content' {
 
 	export type SchemaContext = { image: ImageFunction };
 
-	type BaseCollectionConfig<S extends BaseSchema> = {
+	type DataCollectionConfig<S extends BaseSchema> = {
+		type: 'data';
 		schema?: S | ((context: SchemaContext) => S);
 	};
+
+	type ContentCollectionConfig<S extends BaseSchema> = {
+		type?: 'content';
+		schema?: S | ((context: SchemaContext) => S);
+	};
+
+	type CollectionConfig<S> = ContentCollectionConfig<S> | DataCollectionConfig<S>;
+
 	export function defineCollection<S extends BaseSchema>(
-		input: BaseCollectionConfig<S>
-	): BaseCollectionConfig<S>;
+		input: CollectionConfig<S>
+	): CollectionConfig<S>;
 
-	type EntryMapKeys = keyof typeof entryMap;
 	type AllValuesOf<T> = T extends any ? T[keyof T] : never;
-	type ValidEntrySlug<C extends EntryMapKeys> = AllValuesOf<(typeof entryMap)[C]>['slug'];
+	type ValidContentEntrySlug<C extends keyof ContentEntryMap> = AllValuesOf<
+		ContentEntryMap[C]
+	>['slug'];
 
 	export function getEntryBySlug<
-		C extends keyof typeof entryMap,
-		E extends ValidEntrySlug<C> | (string & {})
+		C extends keyof ContentEntryMap,
+		E extends ValidContentEntrySlug<C> | (string & {})
 	>(
 		collection: C,
 		// Note that this has to accept a regular string too, for SSR
 		entrySlug: E
-	): E extends ValidEntrySlug<C>
+	): E extends ValidContentEntrySlug<C>
 		? Promise<CollectionEntry<C>>
 		: Promise<CollectionEntry<C> | undefined>;
-	export function getCollection<C extends keyof typeof entryMap, E extends CollectionEntry<C>>(
+
+	export function getDataEntryById<C extends keyof DataEntryMap, E extends keyof DataEntryMap[C]>(
+		collection: C,
+		entryId: E
+	): Promise<CollectionEntry<C>>;
+
+	export function getCollection<C extends keyof AnyEntryMap, E extends CollectionEntry<C>>(
 		collection: C,
 		filter?: (entry: CollectionEntry<C>) => entry is E
 	): Promise<E[]>;
-	export function getCollection<C extends keyof typeof entryMap>(
+	export function getCollection<C extends keyof AnyEntryMap>(
 		collection: C,
 		filter?: (entry: CollectionEntry<C>) => unknown
 	): Promise<CollectionEntry<C>[]>;
 
+	export function getEntry<
+		C extends keyof ContentEntryMap,
+		E extends ValidContentEntrySlug<C> | (string & {})
+	>(entry: {
+		collection: C;
+		slug: E;
+	}): E extends ValidContentEntrySlug<C>
+		? Promise<CollectionEntry<C>>
+		: Promise<CollectionEntry<C> | undefined>;
+	export function getEntry<
+		C extends keyof DataEntryMap,
+		E extends keyof DataEntryMap[C] | (string & {})
+	>(entry: {
+		collection: C;
+		id: E;
+	}): E extends keyof DataEntryMap[C]
+		? Promise<DataEntryMap[C][E]>
+		: Promise<CollectionEntry<C> | undefined>;
+	export function getEntry<
+		C extends keyof ContentEntryMap,
+		E extends ValidContentEntrySlug<C> | (string & {})
+	>(
+		collection: C,
+		slug: E
+	): E extends ValidContentEntrySlug<C>
+		? Promise<CollectionEntry<C>>
+		: Promise<CollectionEntry<C> | undefined>;
+	export function getEntry<
+		C extends keyof DataEntryMap,
+		E extends keyof DataEntryMap[C] | (string & {})
+	>(
+		collection: C,
+		id: E
+	): E extends keyof DataEntryMap[C]
+		? Promise<DataEntryMap[C][E]>
+		: Promise<CollectionEntry<C> | undefined>;
+
+	/** Resolve an array of entry references from the same collection */
+	export function getEntries<C extends keyof ContentEntryMap>(
+		entries: {
+			collection: C;
+			slug: ValidContentEntrySlug<C>;
+		}[]
+	): Promise<CollectionEntry<C>[]>;
+	export function getEntries<C extends keyof DataEntryMap>(
+		entries: {
+			collection: C;
+			id: keyof DataEntryMap[C];
+		}[]
+	): Promise<CollectionEntry<C>[]>;
+
+	export function reference<C extends keyof AnyEntryMap>(
+		collection: C
+	): import('astro/zod').ZodEffects<
+		import('astro/zod').ZodString,
+		C extends keyof ContentEntryMap
+			? {
+					collection: C;
+					slug: ValidContentEntrySlug<C>;
+			  }
+			: {
+					collection: C;
+					id: keyof DataEntryMap[C];
+			  }
+	>;
+	// Allow generic `string` to avoid excessive type errors in the config
+	// if `dev` is not running to update as you edit.
+	// Invalid collection names will be caught at build time.
+	export function reference<C extends string>(
+		collection: C
+	): import('astro/zod').ZodEffects<import('astro/zod').ZodString, never>;
+
 	type ReturnTypeOrOriginal<T> = T extends (...args: any[]) => infer R ? R : T;
-	type InferEntrySchema<C extends keyof typeof entryMap> = import('astro/zod').infer<
+	type InferEntrySchema<C extends keyof AnyEntryMap> = import('astro/zod').infer<
 		ReturnTypeOrOriginal<Required<ContentConfig['collections'][C]>['schema']>
 	>;
 
-	const entryMap: {
-		// @@ENTRY_MAP@@
+	type ContentEntryMap = {
+		// @@CONTENT_ENTRY_MAP@@
 	};
 
+	type DataEntryMap = {
+		// @@DATA_ENTRY_MAP@@
+	};
+
+	type AnyEntryMap = ContentEntryMap & DataEntryMap;
+
 	type ContentConfig = '@@CONTENT_CONFIG_TYPE@@';
 }

package/src/content/template/virtual-mod.mjs

@@ -2,29 +2,34 @@
 import {
 	createCollectionToGlobResultMap,
 	createGetCollection,
+	createGetDataEntryById,
+	createGetEntries,
+	createGetEntry,
 	createGetEntryBySlug,
+	createReference,
 } from 'astro/content/runtime';
 
 export { z } from 'astro/zod';
 
-export function defineCollection(config) {
-	return config;
-}
-
-// TODO: Remove this when having this fallback is no longer relevant. 2.3? 3.0? - erika, 2023-04-04
-export const image = () => {
-	throw new Error(
-		'Importing `image()` from `astro:content` is no longer supported. See https://docs.astro.build/en/guides/assets/#update-content-collections-schemas for our new import instructions.'
-	);
-};
-
 const contentDir = '@@CONTENT_DIR@@';
 
-const entryGlob = import.meta.glob('@@ENTRY_GLOB_PATH@@', {
-	query: { astroContent: true },
+const contentEntryGlob = import.meta.glob('@@CONTENT_ENTRY_GLOB_PATH@@', {
+	query: { astroContentCollectionEntry: true },
+});
+const contentCollectionToEntryMap = createCollectionToGlobResultMap({
+	globResult: contentEntryGlob,
+	contentDir,
+});
+
+const dataEntryGlob = import.meta.glob('@@DATA_ENTRY_GLOB_PATH@@', {
+	query: { astroDataCollectionEntry: true },
+});
+const dataCollectionToEntryMap = createCollectionToGlobResultMap({
+	globResult: dataEntryGlob,
+	contentDir,
 });
 const collectionToEntryMap = createCollectionToGlobResultMap({
-	globResult: entryGlob,
+	globResult: { ...contentEntryGlob, ...dataEntryGlob },
 	contentDir,
 });
 
@@ -33,7 +38,7 @@ let lookupMap = {};
 
 function createGlobLookup(glob) {
 	return async (collection, lookupId) => {
-		const filePath = lookupMap[collection]?.[lookupId];
+		const filePath = lookupMap[collection]?.entries[lookupId];
 
 		if (!filePath) return undefined;
 		return glob[collection][filePath];
@@ -48,12 +53,31 @@ const collectionToRenderEntryMap = createCollectionToGlobResultMap({
 	contentDir,
 });
 
+export function defineCollection(config) {
+	if (!config.type) config.type = 'content';
+	return config;
+}
+
 export const getCollection = createGetCollection({
-	collectionToEntryMap,
+	contentCollectionToEntryMap,
+	dataCollectionToEntryMap,
 	getRenderEntryImport: createGlobLookup(collectionToRenderEntryMap),
 });
 
 export const getEntryBySlug = createGetEntryBySlug({
+	getEntryImport: createGlobLookup(contentCollectionToEntryMap),
+	getRenderEntryImport: createGlobLookup(collectionToRenderEntryMap),
+});
+
+export const getDataEntryById = createGetDataEntryById({
+	dataCollectionToEntryMap,
+});
+
+export const getEntry = createGetEntry({
 	getEntryImport: createGlobLookup(collectionToEntryMap),
 	getRenderEntryImport: createGlobLookup(collectionToRenderEntryMap),
 });
+
+export const getEntries = createGetEntries(getEntry);
+
+export const reference = createReference({ lookupMap });

package/types.d.ts

@@ -9,6 +9,9 @@ export type HTMLAttributes<Tag extends HTMLTag> = Omit<
 	keyof Omit<AstroBuiltinAttributes, 'class:list'>
 >;
 
-// TODO: Enable generic/polymorphic types once compiler output stabilizes in the Language Server
-// type PolymorphicAttributes<P extends { as: HTMLTag }> = Omit<(P & HTMLAttributes<P['as']>), 'as'> & { as?: P['as'] };
-// export type Polymorphic<P extends { as: HTMLTag }> = PolymorphicAttributes<Omit<P, 'as'> & { as: NonNullable<P['as']>}>;
+type PolymorphicAttributes<P extends { as: HTMLTag }> = Omit<P & HTMLAttributes<P['as']>, 'as'> & {
+	as?: P['as'];
+};
+export type Polymorphic<P extends { as: HTMLTag }> = PolymorphicAttributes<
+	Omit<P, 'as'> & { as: NonNullable<P['as']> }
+>;