simplify

Author: lilnasy

packages/astro/src/content/utils.ts

@@ -492,7 +492,7 @@ export async function getEntrySlug({
 		contents = await fs.promises.readFile(fileUrl, 'utf-8');
 	} catch (e) {
 		// File contents should exist. Raise unexpected error as "unknown" if not.
-		throw new AstroError(AstroErrorData.UnknownContentCollectionError, undefined, { cause: e });
+		throw new AstroError(AstroErrorData.UnknownContentCollectionError, { cause: e });
 	}
 	const { slug: frontmatterSlug } = await contentEntryType.getEntryInfo({
 		fileUrl,

packages/astro/src/core/errors/errors.ts

@@ -38,10 +38,10 @@ export class AstroError extends Error {
 
 	type: ErrorTypes = 'AstroError';
 
-	constructor(props: ErrorProperties, ...params: Parameters<ErrorConstructor>) {
-		super(...params);
-
+	constructor(props: ErrorProperties, options?: ErrorOptions) {
 		const { name, title, message, stack, location, hint, frame } = props;
+		super(message, options);
+		
 		this.title = title;
 		this.name = name;
 
@@ -81,8 +81,8 @@ export class AstroError extends Error {
 export class CompilerError extends AstroError {
 	type: ErrorTypes = 'CompilerError';
 
-	constructor(props: ErrorProperties, ...params: any) {
-		super(props, ...params);
+	constructor(props: ErrorProperties, options?: ErrorOptions) {
+		super(props, options);
 	}
 
 	static is(err: unknown): err is CompilerError {
@@ -120,8 +120,8 @@ export class AggregateError extends AstroError {
 
 	// Despite being a collection of errors, AggregateError still needs to have a main error attached to it
 	// This is because Vite expects every thrown errors handled during HMR to be, well, Error and have a message
-	constructor(props: ErrorProperties & { errors: AstroError[] }, ...params: any) {
-		super(props, ...params);
+	constructor(props: ErrorProperties & { errors: AstroError[] }, options?: ErrorOptions) {
+		super(props, options);
 
 		this.errors = props.errors;
 	}

packages/astro/src/core/middleware/loadMiddleware.ts

@@ -12,7 +12,7 @@ export async function loadMiddleware(moduleLoader: ModuleLoader) {
 	try {
 		return await moduleLoader.import(MIDDLEWARE_MODULE_ID);
 	} catch (error: any) {
-		const astroError = new AstroError(MiddlewareCantBeLoaded, undefined, { cause: error });
+		const astroError = new AstroError(MiddlewareCantBeLoaded, { cause: error });
 		throw astroError;
 	}
 }

packages/astro/src/core/sync/index.ts

@@ -131,7 +131,6 @@ export async function syncInternal(
 				...AstroErrorData.GenerateContentTypesError,
 				message: AstroErrorData.GenerateContentTypesError.message(safeError.message),
 			},
-			undefined,
 			{ cause: e }
 		);
 	} finally {