astro 5.15.3 → 6.0.0-alpha.0

package/templates/content/types.d.ts

@@ -20,16 +20,10 @@ declare module 'astro:content' {
 declare module 'astro:content' {
 	type Flatten<T> = T extends { [K: string]: infer U } ? U : never;
 
-	export type CollectionKey = keyof AnyEntryMap;
-	export type CollectionEntry<C extends CollectionKey> = Flatten<AnyEntryMap[C]>;
-
-	export type ContentCollectionKey = keyof ContentEntryMap;
-	export type DataCollectionKey = keyof DataEntryMap;
+	export type CollectionKey = keyof DataEntryMap;
+	export type CollectionEntry<C extends CollectionKey> = Flatten<DataEntryMap[C]>;
 
 	type AllValuesOf<T> = T extends any ? T[keyof T] : never;
-	type ValidContentEntrySlug<C extends keyof ContentEntryMap> = AllValuesOf<
-		ContentEntryMap[C]
-	>['slug'];
 
 	export type ReferenceDataEntry<
 		C extends CollectionKey,
@@ -38,41 +32,17 @@ declare module 'astro:content' {
 		collection: C;
 		id: E;
 	};
-	export type ReferenceContentEntry<
-		C extends keyof ContentEntryMap,
-		E extends ValidContentEntrySlug<C> | (string & {}) = string,
-	> = {
-		collection: C;
-		slug: E;
-	};
+
 	export type ReferenceLiveEntry<C extends keyof LiveContentConfig['collections']> = {
 		collection: C;
 		id: string;
 	};
 
-	/** @deprecated Use `getEntry` instead. */
-	export function getEntryBySlug<
-		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 ValidContentEntrySlug<C>
-		? Promise<CollectionEntry<C>>
-		: Promise<CollectionEntry<C> | undefined>;
-
-	/** @deprecated Use `getEntry` instead. */
-	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>>(
+	export function getCollection<C extends keyof DataEntryMap, E extends CollectionEntry<C>>(
 		collection: C,
 		filter?: (entry: CollectionEntry<C>) => entry is E,
 	): Promise<E[]>;
-	export function getCollection<C extends keyof AnyEntryMap>(
+	export function getCollection<C extends keyof DataEntryMap>(
 		collection: C,
 		filter?: (entry: CollectionEntry<C>) => unknown,
 	): Promise<CollectionEntry<C>[]>;
@@ -84,14 +54,6 @@ declare module 'astro:content' {
 		import('astro').LiveDataCollectionResult<LiveLoaderDataType<C>, LiveLoaderErrorType<C>>
 	>;
 
-	export function getEntry<
-		C extends keyof ContentEntryMap,
-		E extends ValidContentEntrySlug<C> | (string & {}),
-	>(
-		entry: ReferenceContentEntry<C, 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 & {}),
@@ -100,15 +62,6 @@ declare module 'astro:content' {
 	): 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 & {}),
@@ -126,24 +79,19 @@ declare module 'astro:content' {
 	): Promise<import('astro').LiveDataEntryResult<LiveLoaderDataType<C>, LiveLoaderErrorType<C>>>;
 
 	/** Resolve an array of entry references from the same collection */
-	export function getEntries<C extends keyof ContentEntryMap>(
-		entries: ReferenceContentEntry<C, ValidContentEntrySlug<C>>[],
-	): Promise<CollectionEntry<C>[]>;
 	export function getEntries<C extends keyof DataEntryMap>(
 		entries: ReferenceDataEntry<C, keyof DataEntryMap[C]>[],
 	): Promise<CollectionEntry<C>[]>;
 
-	export function render<C extends keyof AnyEntryMap>(
-		entry: AnyEntryMap[C][string],
+	export function render<C extends keyof DataEntryMap>(
+		entry: DataEntryMap[C][string],
 	): Promise<RenderResult>;
 
-	export function reference<C extends keyof AnyEntryMap>(
+	export function reference<C extends keyof DataEntryMap>(
 		collection: C,
 	): import('astro/zod').ZodEffects<
 		import('astro/zod').ZodString,
-		C extends keyof ContentEntryMap
-			? ReferenceContentEntry<C, ValidContentEntrySlug<C>>
-			: ReferenceDataEntry<C, keyof DataEntryMap[C]>
+		ReferenceDataEntry<C, keyof DataEntryMap[C]>
 	>;
 	// Allow generic `string` to avoid excessive type errors in the config
 	// if `dev` is not running to update as you edit.
@@ -153,20 +101,14 @@ declare module 'astro:content' {
 	): 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 AnyEntryMap> = import('astro/zod').infer<
+	type InferEntrySchema<C extends keyof DataEntryMap> = import('astro/zod').infer<
 		ReturnTypeOrOriginal<Required<ContentConfig['collections'][C]>['schema']>
 	>;
 
-	type ContentEntryMap = {
-		// @@CONTENT_ENTRY_MAP@@
-	};
-
 	type DataEntryMap = {
 		// @@DATA_ENTRY_MAP@@
 	};
 
-	type AnyEntryMap = ContentEntryMap & DataEntryMap;
-
 	type ExtractLoaderTypes<T> = T extends import('astro/loaders').LiveLoader<
 		infer TData,
 		infer TEntryFilter,
@@ -175,7 +117,6 @@ declare module 'astro:content' {
 	>
 		? { data: TData; entryFilter: TEntryFilter; collectionFilter: TCollectionFilter; error: TError }
 		: { data: never; entryFilter: never; collectionFilter: never; error: never };
-	type ExtractDataType<T> = ExtractLoaderTypes<T>['data'];
 	type ExtractEntryFilterType<T> = ExtractLoaderTypes<T>['entryFilter'];
 	type ExtractCollectionFilterType<T> = ExtractLoaderTypes<T>['collectionFilter'];
 	type ExtractErrorType<T> = ExtractLoaderTypes<T>['error'];

package/dist/config/vite-plugin-content-listen.d.ts

@@ -1,17 +0,0 @@
-import type fsMod from 'node:fs';
-import type { Plugin } from 'vite';
-import type { Logger } from '../core/logger/core.js';
-import type { AstroSettings } from '../types/astro.js';
-/**
- * Listen for Astro content directory changes and generate types.
- *
- * This is a separate plugin for `getViteConfig` as the `attachContentServerListeners` API
- * needs to be called at different times in `astro dev` and `getViteConfig`. For `astro dev`,
- * it needs to be called after the Astro server is started (packages/astro/src/core/dev/dev.ts).
- * For `getViteConfig`, it needs to be called after the Vite server is started.
- */
-export declare function astroContentListenPlugin({ settings, logger, fs, }: {
-    settings: AstroSettings;
-    logger: Logger;
-    fs: typeof fsMod;
-}): Plugin;

package/dist/config/vite-plugin-content-listen.js

@@ -1,26 +0,0 @@
-import { attachContentServerListeners } from "../content/server-listeners.js";
-function astroContentListenPlugin({
-  settings,
-  logger,
-  fs
-}) {
-  let server;
-  return {
-    name: "astro:content-listen",
-    apply: "serve",
-    configureServer(_server) {
-      server = _server;
-    },
-    async buildStart() {
-      await attachContentServerListeners({
-        fs,
-        settings,
-        logger,
-        viteServer: server
-      });
-    }
-  };
-}
-export {
-  astroContentListenPlugin
-};

package/dist/container/polyfill.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/container/polyfill.js

@@ -1,2 +0,0 @@
-import { applyPolyfills } from "../core/app/node.js";
-applyPolyfills();

package/dist/core/polyfill.d.ts

@@ -1,5 +0,0 @@
-/**
- * Astro aims to compatible with web standards as much as possible.
- * This function adds two objects that are globally-available on most javascript runtimes but not on node 18.
- */
-export declare function apply(): void;

package/dist/core/polyfill.js

@@ -1,17 +0,0 @@
-import buffer from "node:buffer";
-import crypto from "node:crypto";
-function apply() {
-  if (!globalThis.crypto) {
-    Object.defineProperty(globalThis, "crypto", {
-      value: crypto.webcrypto
-    });
-  }
-  if (!globalThis.File) {
-    Object.defineProperty(globalThis, "File", {
-      value: buffer.File
-    });
-  }
-}
-export {
-  apply
-};

package/dist/vite-plugin-astro-postprocess/index.d.ts

@@ -1,2 +0,0 @@
-import type { Plugin } from 'vite';
-export default function astro(): Plugin;

package/dist/vite-plugin-astro-postprocess/index.js

@@ -1,48 +0,0 @@
-import { parse } from "acorn";
-import { walk } from "estree-walker";
-import MagicString from "magic-string";
-import { isMarkdownFile } from "../core/util.js";
-const ASTRO_GLOB_REGEX = /Astro2?\s*\.\s*glob\s*\(/;
-function astro() {
-  return {
-    name: "astro:postprocess",
-    async transform(code, id) {
-      if (!id.endsWith(".astro") && !isMarkdownFile(id)) {
-        return null;
-      }
-      if (!ASTRO_GLOB_REGEX.test(code)) {
-        return null;
-      }
-      let s;
-      const ast = parse(code, {
-        ecmaVersion: "latest",
-        sourceType: "module"
-      });
-      walk(ast, {
-        enter(node) {
-          if (node.type === "CallExpression" && node.callee.type === "MemberExpression" && node.callee.property.name === "glob" && (node.callee.object.name === "Astro" || node.callee.object.name === "Astro2") && node.arguments.length) {
-            const firstArgStart = node.arguments[0].start;
-            const firstArgEnd = node.arguments[0].end;
-            const lastArgEnd = node.arguments[node.arguments.length - 1].end;
-            const firstArg = code.slice(firstArgStart, firstArgEnd);
-            s ??= new MagicString(code);
-            s.overwrite(
-              firstArgStart,
-              lastArgEnd,
-              `import.meta.glob(${firstArg}), () => ${firstArg}`
-            );
-          }
-        }
-      });
-      if (s) {
-        return {
-          code: s.toString(),
-          map: s.generateMap({ hires: "boundary" })
-        };
-      }
-    }
-  };
-}
-export {
-  astro as default
-};