@untestutils/astro 0.5.2 → 0.5.4

package/dist/index.d.mts

@@ -1,15 +1,23 @@
-import { type FrameworkBaseOptions, type Recipe } from "@untestutils/core";
+import { type Driver, type FrameworkBaseOptions, type Recipe } from "@untestutils/core";
 export type AstroRun = "preview" | "server" | "dev";
+export type AstroConfigOverride = Record<string, unknown>;
 export interface AstroOptions extends FrameworkBaseOptions {
 	run?: AstroRun;
 	/** SSR entry relative to root (default dist/server/entry.mjs). */
 	serverEntry?: string;
+	/**
+	* Merged onto the app's astro.config via ephemeral `--config` (same role as Nuxt `nuxtConfig`).
+	*/
+	astroConfig?: AstroConfigOverride;
 }
+export type AstroMatrixVariant = Partial<Pick<AstroOptions, "env" | "hashInputs" | "run" | "serverEntry" | "readyPath" | "readyTimeoutMs" | "workspaceDeps" | "astroConfig">>;
 /**
 * Astro Recipe factory.
 * `run: 'preview'` (default) — `astro build` + `astro preview`
 * `run: 'server'` — build + `node dist/server/entry.mjs`
 * `run: 'dev'` — `astro dev`
 */
-export declare function astro(opts: AstroOptions): Recipe;
+export declare const astro: Driver<AstroOptions>;
+/** Expand one Astro recipe base into many recipes with distinct ids. */
+export declare function matrix(base: AstroOptions, variants: Record<string, AstroMatrixVariant>): Record<string, Recipe>;
 export default astro;

package/dist/index.d.ts

@@ -1,16 +1,24 @@
-import { type FrameworkBaseOptions, type Recipe } from '@untestutils/core';
+import { type Driver, type FrameworkBaseOptions, type Recipe } from '@untestutils/core';
 export type AstroRun = 'preview' | 'server' | 'dev';
+export type AstroConfigOverride = Record<string, unknown>;
 export interface AstroOptions extends FrameworkBaseOptions {
     run?: AstroRun;
     /** SSR entry relative to root (default dist/server/entry.mjs). */
     serverEntry?: string;
+    /**
+     * Merged onto the app's astro.config via ephemeral `--config` (same role as Nuxt `nuxtConfig`).
+     */
+    astroConfig?: AstroConfigOverride;
 }
+export type AstroMatrixVariant = Partial<Pick<AstroOptions, 'env' | 'hashInputs' | 'run' | 'serverEntry' | 'readyPath' | 'readyTimeoutMs' | 'workspaceDeps' | 'astroConfig'>>;
 /**
  * Astro Recipe factory.
  * `run: 'preview'` (default) — `astro build` + `astro preview`
  * `run: 'server'` — build + `node dist/server/entry.mjs`
  * `run: 'dev'` — `astro dev`
  */
-export declare function astro(opts: AstroOptions): Recipe;
+export declare const astro: Driver<AstroOptions>;
+/** Expand one Astro recipe base into many recipes with distinct ids. */
+export declare function matrix(base: AstroOptions, variants: Record<string, AstroMatrixVariant>): Record<string, Recipe>;
 export default astro;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAIL,KAAK,oBAAoB,EACzB,KAAK,MAAM,EACZ,MAAM,mBAAmB,CAAC;AAE3B,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,QAAQ,GAAG,KAAK,CAAC;AAEpD,MAAM,WAAW,YAAa,SAAQ,oBAAoB;IACxD,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf,kEAAkE;IAClE,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAYD;;;;;GAKG;AACH,wBAAgB,KAAK,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CA+EhD;AAED,eAAe,KAAK,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAYL,KAAK,MAAM,EACX,KAAK,oBAAoB,EACzB,KAAK,MAAM,EACZ,MAAM,mBAAmB,CAAC;AAE3B,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,QAAQ,GAAG,KAAK,CAAC;AAEpD,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE1D,MAAM,WAAW,YAAa,SAAQ,oBAAoB;IACxD,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf,kEAAkE;IAClE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,WAAW,CAAC,EAAE,mBAAmB,CAAC;CACnC;AAED,MAAM,MAAM,kBAAkB,GAAG,OAAO,CACtC,IAAI,CACF,YAAY,EACV,KAAK,GACL,YAAY,GACZ,KAAK,GACL,aAAa,GACb,WAAW,GACX,gBAAgB,GAChB,eAAe,GACf,aAAa,CAChB,CACF,CAAC;AA4CF;;;;;GAKG;AACH,eAAO,MAAM,KAAK,EAAE,MAAM,CAAC,YAAY,CA8FrC,CAAC;AAEH,wEAAwE;AACxE,wBAAgB,MAAM,CACpB,IAAI,EAAE,YAAY,EAClB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAC3C,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAkBxB;AAED,eAAe,KAAK,CAAC"}

package/dist/index.mjs

@@ -1,6 +1,14 @@
 import { existsSync } from "node:fs";
+import { pathToFileURL } from "node:url";
 import { join, resolve } from "pathe";
-import { cliFrameworkRecipe, frameworkRoots, resolveBin } from "@untestutils/core";
+import { cliFrameworkRecipe, configOverrideHashInput, deepMergePlain, defineDriver, findFirstExistingConfig, frameworkRoots, matrixRecipe, resolveBin, serializeAstroMergeConfigModule, serializeDefaultExport, writeEphemeralConfig } from "@untestutils/core";
+const ASTRO_CONFIG_NAMES = [
+	"astro.config.mjs",
+	"astro.config.js",
+	"astro.config.ts",
+	"astro.config.mts",
+	"astro.config.cjs"
+];
 function resolveAstroBin(root) {
 	return resolveBin({
 		label: "astro",
@@ -10,8 +18,24 @@ function resolveAstroBin(root) {
 		binRelative: ["astro.js", "bin/astro.mjs"]
 	});
 }
+function hashInputsFor(opts, root, extra) {
+	const inputs = [...opts.hashInputs ?? [root], ...extra];
+	if (opts.astroConfig) inputs.push(configOverrideHashInput("astroConfig", opts.astroConfig));
+	return inputs;
+}
+async function astroConfigArgs(root, outDir, astroConfig) {
+	if (!astroConfig || !Object.keys(astroConfig).length) return [];
+	const configPath = join(outDir, "astro.untestutils.mjs");
+	const userConfig = findFirstExistingConfig(root, ASTRO_CONFIG_NAMES);
+	const contents = userConfig ? serializeAstroMergeConfigModule({
+		baseImportSpecifier: pathToFileURL(userConfig).href,
+		overrides: astroConfig
+	}) : serializeDefaultExport(astroConfig);
+	await writeEphemeralConfig(configPath, contents);
+	return ["--config", configPath];
+}
 
-export function astro(opts) {
+export const astro = defineDriver((opts) => {
 	const root = resolve(opts.root);
 	const runMode = opts.run ?? "preview";
 	const id = opts.id ?? `astro-${runMode}-${root.split("/").pop()}`;
@@ -23,21 +47,26 @@ export function astro(opts) {
 			label: "astro",
 			share: "never",
 			env: opts.env,
-			hashInputs: opts.hashInputs ?? [root, "run:dev"],
+			hashInputs: hashInputsFor(opts, root, ["run:dev"]),
 			readyPath: opts.readyPath,
 			readyTimeoutMs: opts.readyTimeoutMs,
-			start: ({ port }) => ({
-				command: process.execPath,
-				args: [
-					bin(),
-					"dev",
-					"--host",
-					"127.0.0.1",
-					"--port",
-					String(port)
-				],
-				cwd: root
-			})
+			workspaceDeps: opts.workspaceDeps,
+			start: async ({ port, outDir }) => {
+				const configArgs = await astroConfigArgs(root, outDir, opts.astroConfig);
+				return {
+					command: process.execPath,
+					args: [
+						bin(),
+						"dev",
+						...configArgs,
+						"--host",
+						"127.0.0.1",
+						"--port",
+						String(port)
+					],
+					cwd: root
+				};
+			}
 		});
 	}
 	if (runMode === "server") {
@@ -48,18 +77,22 @@ export function astro(opts) {
 			label: "astro",
 			share: "always",
 			env: opts.env,
-			hashInputs: opts.hashInputs ?? [
-				root,
-				"run:server",
-				entryRel
-			],
+			hashInputs: hashInputsFor(opts, root, ["run:server", entryRel]),
 			readyPath: opts.readyPath,
 			readyTimeoutMs: opts.readyTimeoutMs,
-			prepare: () => ({
-				command: process.execPath,
-				args: [bin(), "build"],
-				cwd: root
-			}),
+			workspaceDeps: opts.workspaceDeps,
+			prepare: async ({ outDir }) => {
+				const configArgs = await astroConfigArgs(root, outDir, opts.astroConfig);
+				return {
+					command: process.execPath,
+					args: [
+						bin(),
+						"build",
+						...configArgs
+					],
+					cwd: root
+				};
+			},
 			verifyAfterPrepare: () => {
 				const entry = join(root, entryRel);
 				if (!existsSync(entry)) {
@@ -84,26 +117,59 @@ export function astro(opts) {
 		label: "astro",
 		share: "always",
 		env: opts.env,
-		hashInputs: opts.hashInputs ?? [root, "run:preview"],
+		hashInputs: hashInputsFor(opts, root, ["run:preview"]),
 		readyPath: opts.readyPath,
 		readyTimeoutMs: opts.readyTimeoutMs,
-		prepare: () => ({
-			command: process.execPath,
-			args: [bin(), "build"],
-			cwd: root
-		}),
-		start: ({ port, host }) => ({
-			command: process.execPath,
-			args: [
-				bin(),
-				"preview",
-				"--host",
-				host,
-				"--port",
-				String(port)
-			],
-			cwd: root,
-			env: { ASTRO_PREVIEW_BACKGROUND: "0" }
+		workspaceDeps: opts.workspaceDeps,
+		prepare: async ({ outDir }) => {
+			const configArgs = await astroConfigArgs(root, outDir, opts.astroConfig);
+			return {
+				command: process.execPath,
+				args: [
+					bin(),
+					"build",
+					...configArgs
+				],
+				cwd: root
+			};
+		},
+		start: async ({ port, host, outDir }) => {
+			const configArgs = await astroConfigArgs(root, outDir, opts.astroConfig);
+			return {
+				command: process.execPath,
+				args: [
+					bin(),
+					"preview",
+					...configArgs,
+					"--host",
+					host,
+					"--port",
+					String(port)
+				],
+				cwd: root,
+				env: { ASTRO_PREVIEW_BACKGROUND: "0" }
+			};
+		}
+	});
+});
+
+export function matrix(base, variants) {
+	return matrixRecipe(astro, base, variants, {
+		label: "astro",
+		merge: (b, patch, id, name) => ({
+			...b,
+			...patch,
+			id,
+			env: {
+				...b.env ?? {},
+				...patch.env ?? {}
+			},
+			astroConfig: b.astroConfig || patch.astroConfig ? deepMergePlain(b.astroConfig ?? {}, patch.astroConfig ?? {}) : undefined,
+			hashInputs: [
+				...b.hashInputs ?? [b.root],
+				...patch.hashInputs ?? [],
+				`variant:${name}`
+			]
 		})
 	});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@untestutils/astro",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "homepage": "https://s00d.github.io/untestutils/",
   "license": "MIT",
   "repository": {
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "pathe": "^2.0.3",
-    "@untestutils/core": "0.5.2"
+    "@untestutils/core": "0.5.4"
   },
   "devDependencies": {
     "@types/node": "^26.6.1",