Ensured existence and corrected templates

Author: JoshuaKGoldberg

src/shared/options/augmentOptionsWithExcludes.test.ts

@@ -8,7 +8,10 @@ const optionsBase = {
 	base: undefined,
 	createRepository: undefined,
 	description: "",
-	email: undefined,
+	email: {
+		github: "[email protected]",
+		npm: "[email protected]",
+	},
 	excludeCompliance: undefined,
 	excludeContributors: undefined,
 	excludeLintJson: undefined,

src/shared/options/readOptions.ts

@@ -169,11 +169,22 @@ export async function readOptions(args: string[]): Promise<OptionsParseResult> {
 		logo = { alt, src: options.logo };
 	}
 
+	const email =
+		options.email ??
+		(await defaults.email()) ??
+		(await getPrefillOrPromptedOption(
+			undefined,
+			"What email should be used in package.json and .md files?",
+		));
+	if (!email) {
+		return { cancelled: true, options };
+	}
+
 	const augmentedOptions = await augmentOptionsWithExcludes({
 		...options,
 		author: options.author ?? (await defaults.owner()),
 		description: options.description,
-		email: options.email ?? (await defaults.email()),
+		email: typeof email === "string" ? { github: email, npm: email } : email,
 		funding: options.funding ?? (await defaults.funding()),
 		logo,
 		owner: options.owner,

src/shared/types.ts

@@ -34,7 +34,7 @@ export interface Options {
 	base?: InputBase;
 	createRepository?: boolean;
 	description: string;
-	email?: OptionsEmail;
+	email: OptionsEmail;
 	excludeCompliance?: boolean;
 	excludeContributors?: boolean;
 	excludeLintJson?: boolean;

src/steps/finalizeDependencies.test.ts

@@ -21,7 +21,10 @@ const options = {
 	base: "everything",
 	createRepository: undefined,
 	description: "Stub description.",
-	email: undefined,
+	email: {
+		github: "[email protected]",
+		npm: "[email protected]",
+	},
 	excludeCompliance: undefined,
 	excludeContributors: undefined,
 	excludeLintJson: undefined,

src/steps/updateLocalFiles.test.ts

@@ -24,7 +24,10 @@ const options = {
 	base: "everything",
 	createRepository: undefined,
 	description: "Stub description.",
-	email: undefined,
+	email: {
+		github: "[email protected]",
+		npm: "[email protected]",
+	},
 	excludeCompliance: undefined,
 	excludeContributors: undefined,
 	excludeLintJson: undefined,

src/steps/writeReadme/generateTopContent.test.ts

@@ -7,7 +7,10 @@ const optionsBase = {
 	base: undefined,
 	createRepository: undefined,
 	description: "",
-	email: undefined,
+	email: {
+		github: "[email protected]",
+		npm: "[email protected]",
+	},
 	excludeCompliance: undefined,
 	excludeContributors: undefined,
 	excludeLintJson: undefined,

src/steps/writing/creation/dotGitHub/createDotGitHubFiles.ts

@@ -68,7 +68,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-${options.email}.
+${options.email.github}.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the
@@ -272,7 +272,7 @@ We take all security vulnerabilities seriously.
 If you have a vulnerability or other security issues to disclose:
 
 - Thank you very much, please do!
-- Please send them to us by emailing \`${options.email}\`
+- Please send them to us by emailing \`${options.email.github}\`
 
 We appreciate your efforts and responsible disclosure and will make every effort to acknowledge your contributions.
 `,