Only find files once instead of per compressor

Author: sondr3

package.json

@@ -47,7 +47,7 @@
 		"vitest": "3.2.4"
 	},
 	"engines": {
-		"node": ">=22.15.0 <23.0.0 || >=23.8.0"
+		"node": ">=22"
 	},
 	"packageManager": "pnpm@10.14.0-0+sha512.2cd47a0cbf5f1d1de7693a88307a0ede5be94e0d3b34853d800ee775efbea0650cb562b77605ec80bc8d925f5cd27c4dfe8bb04d3a0b76090784c664450d32d6"
 }

src/compress.ts

@@ -10,14 +10,14 @@ import type { AstroIntegrationLogger } from "astro";
 
 export type { BrotliOptions, ZlibOptions, ZstdOptions };
 
-interface CompressionOptions<O extends object> {
-	dir: string;
-	extensions: Array<string>;
+interface CompressionOptions {
+	files: Array<string>;
 	batchSize: number;
-	enabled: boolean | O | undefined;
+	enabled: boolean | undefined;
+	options?: ZlibOptions | BrotliOptions | ZstdOptions | undefined;
 }
 
-async function* walkDir(dir: string, extensions: Array<string>): AsyncGenerator<string> {
+export async function* walkDir(dir: string, extensions: Array<string>): AsyncGenerator<string> {
 	const entries = await readdir(dir, { withFileTypes: true });
 	for (const entry of entries) {
 		const name = resolve(dir, entry.name);
@@ -33,31 +33,26 @@ const filterFile = (file: string, extensions: Array<string>): boolean => {
 	return extensions.some((ext) => extname(file) === ext);
 };
 
-const compress = async <T extends NodeJS.WritableStream, O extends object>(
+const compress = async <T extends NodeJS.WritableStream>(
 	name: string,
 	compressedFileNames: string,
-	compressor: () => T,
+	compressor: (options: ZlibOptions | BrotliOptions | ZstdOptions | undefined) => T,
 	logger: AstroIntegrationLogger,
-	{ dir, extensions, batchSize, enabled }: CompressionOptions<O>,
+	{ files, batchSize, enabled, options }: CompressionOptions,
 ): Promise<void> => {
-	if (!enabled && typeof enabled !== "object") {
+	if (!enabled) {
 		logger.warn(`${name} compression disabled, skipping...`);
 		return;
 	}
 
 	const start = hrtime.bigint();
-	const files = [];
-	for await (const file of walkDir(dir, extensions)) {
-		files.push(file);
-	}
-
 	for (let i = 0; i < files.length; i += batchSize) {
 		const batch = files.slice(i, i + batchSize);
 		await Promise.all(
 			batch.map(async (path) => {
 				const source = createReadStream(path);
 				const destination = createWriteStream(`${path}.${compressedFileNames}`);
-				const comp = compressor();
+				const comp = compressor(options);
 				await stream.pipeline(source, comp, destination);
 			}),
 		);
@@ -68,50 +63,48 @@ const compress = async <T extends NodeJS.WritableStream, O extends object>(
 };
 
 export const gzip = async (
-	dir: string,
+	files: Array<string>,
 	logger: AstroIntegrationLogger,
-	extensions: Array<string>,
 	enabled?: boolean | ZlibOptions,
 	batchSize = 10,
 ): Promise<void> => {
-	await compress("gzip", "gz", zlib.createGzip.bind({ level: 9 }), logger, {
-		dir,
-		extensions,
-		enabled,
+	await compress("gzip", "gz", zlib.createGzip, logger, {
+		files,
+		enabled: enabled === true || typeof enabled === "object",
+		options: typeof enabled === "object" ? enabled : { level: zlib.constants.Z_BEST_COMPRESSION },
 		batchSize,
 	});
 };
 
 export const brotli = async (
-	dir: string,
+	files: Array<string>,
 	logger: AstroIntegrationLogger,
-	extensions: Array<string>,
 	enabled?: boolean | BrotliOptions,
 	batchSize = 10,
 ): Promise<void> => {
 	await compress("brotli", "br", zlib.createBrotliCompress, logger, {
-		dir,
-		extensions,
-		enabled,
+		files,
+		enabled: enabled === true,
+		options: typeof enabled === "object" ? enabled : undefined,
 		batchSize,
 	});
 };
 
 export const zstd = async (
-	dir: string,
+	files: Array<string>,
 	logger: AstroIntegrationLogger,
-	extensions: Array<string>,
 	enabled?: boolean | ZstdOptions,
 	batchSize = 10,
 ): Promise<void> => {
 	if (typeof zlib.createZstdCompress !== "function") {
 		logger.warn("zstd compression is not supported in this Node.js version.");
 		return;
 	}
+
 	await compress("zstd", "zst", zlib.createZstdCompress, logger, {
-		dir,
-		extensions,
-		enabled,
+		files,
+		enabled: enabled === true,
+		options: typeof enabled === "object" ? enabled : undefined,
 		batchSize,
 	});
 };

src/index.ts

@@ -2,7 +2,7 @@ import { fileURLToPath } from "node:url";
 
 import type { AstroIntegration } from "astro";
 import type { BrotliOptions, ZlibOptions, ZstdOptions } from "./compress.js";
-import { brotli, gzip, zstd } from "./compress.js";
+import { brotli, gzip, walkDir, zstd } from "./compress.js";
 
 const defaultFileExtensions = [".css", ".js", ".html", ".xml", ".cjs", ".mjs", ".svg", ".txt"];
 
@@ -35,10 +35,15 @@ export default function (opts: Options = defaultOptions): AstroIntegration {
 		hooks: {
 			"astro:build:done": async ({ dir, logger }) => {
 				const path = fileURLToPath(dir);
+				const files = [];
+				for await (const file of walkDir(path, options.fileExtensions)) {
+					files.push(file);
+				}
+
 				await Promise.allSettled([
-					gzip(path, logger, options.fileExtensions, options.gzip, options.batchSize),
-					brotli(path, logger, options.fileExtensions, options.brotli, options.batchSize),
-					zstd(path, logger, options.fileExtensions, options.zstd, options.batchSize),
+					gzip(files, logger, options.gzip, options.batchSize),
+					brotli(files, logger, options.brotli, options.batchSize),
+					zstd(files, logger, options.zstd, options.batchSize),
 				]);
 				logger.info("Compression finished\n");
 			},