feat: added blockVitest environment and flags intake (#2162)

## PR Checklist

- [x] Addresses an existing open issue: fixes #2159, #2160
- [x] That issue was marked as [`status: accepting
prs`](https://github.com/JoshuaKGoldberg/create-typescript-app/issues?q=is%3Aopen+is%3Aissue+label%3A%22status%3A+accepting+prs%22)
- [x] Steps in
[CONTRIBUTING.md](https://github.com/JoshuaKGoldberg/create-typescript-app/blob/main/.github/CONTRIBUTING.md)
were taken

## Overview

🎁

Author: JoshuaKGoldberg

src/base.ts

@@ -136,7 +136,7 @@ export const base = createBase({
 				devDependencies: z.record(z.string(), z.string()).optional(),
 				peerDependencies: z.record(z.string(), z.string()).optional(),
 				peerDependenciesMeta: z.record(z.unknown()).optional(),
-				scripts: z.record(z.string(), z.string()).optional(),
+				scripts: z.record(z.string(), z.string().optional()).optional(),
 			})
 			.optional()
 			.describe("additional properties to include in `package.json`"),

src/blocks/blockVitest.test.ts

@@ -1041,76 +1041,83 @@ describe("blockVitest", () => {
 	});
 
 	describe("intake", () => {
-		it("returns undefined when vitest.config.ts does not exist", () => {
+		it("returns nothing when vitest.config.ts does not exist", () => {
 			const actual = testIntake(blockVitest, {
 				files: {
 					src: {},
 				},
+				options: optionsBase,
 			});
 
-			expect(actual).toEqual(undefined);
+			expect(actual).toEqual({});
 		});
 
-		it("returns undefined when vitest.config.ts does not contain the expected defineConfig", () => {
+		it("returns nothing when vitest.config.ts does not contain the expected defineConfig", () => {
 			const actual = testIntake(blockVitest, {
 				files: {
 					"vitest.config.ts": [`invalid`],
 				},
+				options: optionsBase,
 			});
 
-			expect(actual).toEqual(undefined);
+			expect(actual).toEqual({});
 		});
 
-		it("returns undefined when vitest.config.ts passes a non-object to defineConfig", () => {
+		it("returns nothing when vitest.config.ts passes a non-object to defineConfig", () => {
 			const actual = testIntake(blockVitest, {
 				files: {
 					"vitest.config.ts": [`defineConfig("invalid")`],
 				},
+				options: optionsBase,
 			});
 
-			expect(actual).toEqual(undefined);
+			expect(actual).toEqual({});
 		});
 
-		it("returns undefined when vitest.config.ts does not pass a test to defineConfig", () => {
+		it("returns nothing when vitest.config.ts does not pass a test to defineConfig", () => {
 			const actual = testIntake(blockVitest, {
 				files: {
 					"vitest.config.ts": [`defineConfig({ other: true })`],
 				},
+				options: optionsBase,
 			});
 
-			expect(actual).toEqual(undefined);
+			expect(actual).toEqual({});
 		});
 
-		it("returns undefined when vitest.config.ts passes unknown test data to defineConfig", () => {
+		it("returns nothing when vitest.config.ts passes unknown test data to defineConfig", () => {
 			const actual = testIntake(blockVitest, {
 				files: {
 					"vitest.config.ts": [`defineConfig({ test: true })`],
 				},
+				options: optionsBase,
 			});
 
-			expect(actual).toEqual(undefined);
+			expect(actual).toEqual({});
 		});
 
-		it("returns undefined when vitest.config.ts passes invalid test syntax to defineConfig", () => {
+		it("returns nothing when vitest.config.ts passes invalid test syntax to defineConfig", () => {
 			const actual = testIntake(blockVitest, {
 				files: {
 					"vitest.config.ts": [`defineConfig({ test: { ! } })`],
 				},
+				options: optionsBase,
 			});
 
-			expect(actual).toEqual(undefined);
+			expect(actual).toEqual({});
 		});
 
-		it("returns undefined when vitest.config.ts passes invalid test data to defineConfig", () => {
+		it("returns nothing when vitest.config.ts passes invalid test data to defineConfig", () => {
 			const actual = testIntake(blockVitest, {
 				files: {
 					"vitest.config.ts": [
 						`defineConfig({ test: { coverage: 'invalid' } })`,
 					],
 				},
+				options: optionsBase,
 			});
 
-			expect(actual).toEqual(undefined);
+			expect(actual).toEqual({});
 		});
 
 		it("returns coverage and exclude when they exist in vitest.config.ts", () => {
@@ -1135,6 +1142,7 @@ export default defineConfig({
 `,
 					],
 				},
+				options: optionsBase,
 			});
 
 			expect(actual).toEqual({
@@ -1145,5 +1153,45 @@ export default defineConfig({
 				exclude: ["lib", "node_modules"],
 			});
 		});
+
+		it("returns environment when it exists in vitest.config.ts", () => {
+			const actual = testIntake(blockVitest, {
+				files: {
+					"vitest.config.ts": [
+						`import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+	test: {
+		environment: "happy-dom",
+	},
+});
+`,
+					],
+				},
+				options: optionsBase,
+			});
+
+			expect(actual).toEqual({
+				environment: "happy-dom",
+			});
+		});
+
+		it("returns flags when it exists in package.json", () => {
+			const actual = testIntake(blockVitest, {
+				files: {},
+				options: {
+					...optionsBase,
+					packageData: {
+						scripts: {
+							test: "vitest --typecheck",
+						},
+					},
+				},
+			});
+
+			expect(actual).toEqual({
+				flags: ["--typecheck"],
+			});
+		});
 	});
 });

src/blocks/blockVitest.ts

@@ -1,3 +1,4 @@
+import { IntakeDirectory } from "bingo-fs";
 import JSON5 from "json5";
 import { z } from "zod";
 
@@ -33,12 +34,46 @@ const zCoverage = z.object({
 	include: z.array(z.string()).optional(),
 });
 
+const zEnvironment = z.string();
+
 const zExclude = z.array(z.string());
 
-const zTest = z.object({
-	coverage: zCoverage,
-	exclude: zExclude,
-});
+const zTest = z
+	.object({
+		coverage: zCoverage,
+		environment: zEnvironment,
+		exclude: zExclude,
+	})
+	.partial();
+
+function intakeFromConfig(files: IntakeDirectory) {
+	const file = intakeFile(files, ["vitest.config.ts"]);
+	if (!file) {
+		return undefined;
+	}
+
+	const normalized = file[0].replaceAll(/[\n\r]/g, "");
+	const matched = /defineConfig\(\{(.+)\}\)\s*(?:;\s*)?$/u.exec(normalized);
+	if (!matched) {
+		return undefined;
+	}
+
+	const rawData = tryParseJSON5(`{${matched[1]}}`);
+	if (typeof rawData !== "object" || typeof rawData.test !== "object") {
+		return undefined;
+	}
+
+	const parsedData = zTest.safeParse(rawData.test).data;
+	if (!parsedData) {
+		return undefined;
+	}
+
+	return {
+		coverage: parsedData.coverage,
+		environment: parsedData.environment,
+		exclude: parsedData.exclude,
+	};
+}
 
 export const blockVitest = base.createBlock({
 	about: {
@@ -47,35 +82,16 @@ export const blockVitest = base.createBlock({
 	addons: {
 		actionSteps: z.array(zActionStep).default([]),
 		coverage: zCoverage.default({}),
-		environment: z.string().optional(),
+		environment: zEnvironment.optional(),
 		exclude: zExclude.default([]),
 		flags: z.array(z.string()).default([]),
 	},
-	intake({ files }) {
-		const file = intakeFile(files, ["vitest.config.ts"]);
-		if (!file) {
-			return undefined;
-		}
-
-		const normalized = file[0].replaceAll(/[\n\r]/g, "");
-		const matched = /defineConfig\(\{(.+)\}\)\s*(?:;\s*)?$/u.exec(normalized);
-		if (!matched) {
-			return undefined;
-		}
-
-		const rawData = tryParseJSON5(`{${matched[1]}}`);
-		if (typeof rawData !== "object" || typeof rawData.test !== "object") {
-			return undefined;
-		}
-
-		const parsedData = zTest.safeParse(rawData.test).data;
-		if (!parsedData) {
-			return undefined;
-		}
-
+	intake({ files, options }) {
 		return {
-			coverage: parsedData.coverage,
-			exclude: parsedData.exclude,
+			...intakeFromConfig(files),
+			flags: options.packageData?.scripts?.test
+				?.match(/^vitest (.+)/)?.[1]
+				.split(" "),
 		};
 	},
 	produce({ addons }) {