@raisenow/tamaro-cli 3.1.0-dev.1 → 3.2.0-dev.1

package/README.md

@@ -282,9 +282,12 @@ pnpx @raisenow/tamaro-cli update-epms --tag WEB-123
 
 ## `validate`
 
-Validate the current configuration and fail on known issues such as invalid
-email templates, invalid `.env` values, or RaiseNow-generated tax receipts
-enabled without an uploaded organisation template.
+Validate the current configuration and fail on known issues such as:
+
+- Invalid email templates
+- Invalid `organisation_email` / `blind_copy` values in `email-config/parameters.yaml`
+- Invalid `.env` values
+- RaiseNow-generated tax receipts enabled without an uploaded organisation template
 
 When `autogeneratedDonationReceiptEnabled` (or
 `autogenerated_donation_receipt_enabled`) is `true`, this command authenticates

package/dist/cli.js

@@ -323,8 +323,7 @@ var EpmsClient = class EpmsClient {
 	}
 	async listOrganisationFiles(organisationUuid) {
 		try {
-			const response = await this.#epmsClient.get(`organisations/${organisationUuid}/files`).json();
-			return Array.isArray(response) ? response : response.data ?? [];
+			return await this.#epmsClient.get(`organisations/${organisationUuid}/files`).json();
 		} catch (error) {
 			throw new Error(`Failed to list organisation files for organisation UUID: ${organisationUuid}`, { cause: error });
 		}
@@ -483,7 +482,7 @@ const donationReceiptTemplateExists = (files, accountUuid) => {
 * Locate the line of a top-level `key:` assignment in the config.yml source,
 * so the error can be rendered as a code frame pointing at the value.
 */
-const findKeyLocation$1 = (source, key) => {
+const findKeyLocation$2 = (source, key) => {
 	const lines = source.split("\n");
 	const assignment = new RegExp(String.raw`^\s*${key}\s*:`);
 	const index = lines.findIndex((line) => assignment.test(line));
@@ -510,8 +509,8 @@ const findKeyLocation$1 = (source, key) => {
 * 51 | autogeneratedDonationReceiptEnabled: true
 *    |                                      ^^^^ No donation tax receipt PDF template found…
 */
-const formatError$1 = (configYmlPath, source, key, message) => {
-	const location = findKeyLocation$1(source, key);
+const formatError$2 = (configYmlPath, source, key, message) => {
+	const location = findKeyLocation$2(source, key);
 	if (!location) return `${configYmlPath}: ${key}: ${message}`;
 	const frame = codeFrameColumns(source, location, {
 		forceColor: true,
@@ -544,7 +543,7 @@ const validateDonationReceiptTemplates = async (configYmlPath) => {
 		if (!accountUuid) continue;
 		const epmsClient = epmsAuthenticate(env);
 		const organisationUuid = await epmsClient.getOrganisationIdByAccountUuid(accountUuid);
-		if (!donationReceiptTemplateExists(await epmsClient.listOrganisationFiles(organisationUuid), accountUuid)) errors.push(formatError$1(configYmlPath, source, flagKey, `No donation tax receipt PDF template found for the ${label} account (${accountUuid}). See: ${DONATION_RECEIPT_VALIDATION_GUIDE_URL}`));
+		if (!donationReceiptTemplateExists(await epmsClient.listOrganisationFiles(organisationUuid), accountUuid)) errors.push(formatError$2(configYmlPath, source, flagKey, `No donation tax receipt PDF template found for the ${label} account (${accountUuid}). See: ${DONATION_RECEIPT_VALIDATION_GUIDE_URL}`));
 	}
 	return errors;
 };
@@ -685,7 +684,7 @@ const coreVersionExists = async (version) => {
 * Locate the line of a `KEY=` assignment in the .env source, so the error can
 * be rendered as a code frame pointing at the value.
 */
-const findKeyLocation = (source, key) => {
+const findKeyLocation$1 = (source, key) => {
 	const lines = source.split("\n");
 	const assignment = new RegExp(String.raw`^\s*${key}\s*=`);
 	const index = lines.findIndex((line) => assignment.test(line));
@@ -712,8 +711,8 @@ const findKeyLocation = (source, key) => {
 * 2 | CORE_URL_PATTERN=adsf
 *   |                  ^^^^ Must contain the "{{version}}" placeholder
 */
-const formatError = (dotEnvPath, source, key, message) => {
-	const location = findKeyLocation(source, key);
+const formatError$1 = (dotEnvPath, source, key, message) => {
+	const location = findKeyLocation$1(source, key);
 	if (!location) return `${dotEnvPath}: ${key}: ${message}`;
 	const frame = codeFrameColumns(source, location, {
 		forceColor: true,
@@ -734,16 +733,117 @@ const validateEnv = async (dotEnvPath) => {
 		const errors = [];
 		for (const issue of result.error.issues) {
 			const keys = issue.code === "unrecognized_keys" ? issue.keys : [String(issue.path[0] ?? "")];
-			for (const key of keys) errors.push(formatError(dotEnvPath, source, key, issue.message));
+			for (const key of keys) errors.push(formatError$1(dotEnvPath, source, key, issue.message));
 		}
 		return errors;
 	}
 	if (parsed.CORE_VERSION) {
-		if (await coreVersionExists(parsed.CORE_VERSION) === false) return [formatError(dotEnvPath, source, "CORE_VERSION", `Version "${parsed.CORE_VERSION}" does not exist. See all versions at https://www.npmjs.com/package/@raisenow/tamaro-core?activeTab=versions`)];
+		if (await coreVersionExists(parsed.CORE_VERSION) === false) return [formatError$1(dotEnvPath, source, "CORE_VERSION", `Version "${parsed.CORE_VERSION}" does not exist. See all versions at https://www.npmjs.com/package/@raisenow/tamaro-core?activeTab=versions`)];
 	}
 	return [];
 };
 //#endregion
+//#region src/lib/validators/validateParametersYaml.ts
+/** Email-valued keys checked in `email-config/parameters.yaml` when set. */
+const EMAIL_KEYS = ["organisation_email", "blind_copy"];
+const emailSchema = z.email();
+/**
+* Bare `key:`, YAML null, or blank strings are common in customer configs and
+* must not fail validation.
+*/
+const isUnsetEmailValue = (value) => value == void 0 || typeof value === "string" && value.trim() === "";
+/**
+* Locate a `key: value` assignment in the YAML source so the error can be
+* rendered as a code frame pointing at the value.
+*
+* Prefers a key+value match so repeated keys across locales (`all` / `de` /
+* `en`, …) point at the right line; falls back to the first key match.
+*/
+const findKeyLocation = (source, key, value) => {
+	const lines = source.split("\n");
+	let index = -1;
+	if (value !== void 0) {
+		const escapedValue = value.replaceAll(/[.*+?^${}()|[\]\\]/g, String.raw`\$&`);
+		const assignment = new RegExp(String.raw`^\s*${key}\s*:\s*['"]?${escapedValue}['"]?\s*(?:#.*)?$`);
+		index = lines.findIndex((line) => assignment.test(line));
+	}
+	if (index === -1) {
+		const keyOnly = new RegExp(String.raw`^\s*${key}\s*:`);
+		index = lines.findIndex((line) => keyOnly.test(line));
+	}
+	if (index === -1) return;
+	const line = index + 1;
+	const valueStart = lines[index].indexOf(":") + 1;
+	return {
+		end: {
+			column: lines[index].length,
+			line
+		},
+		start: {
+			column: valueStart + 1,
+			line
+		}
+	};
+};
+/**
+* Format an error for a `key:` assignment as a code frame pointing at the
+* value, so it looks fancy like this:
+*
+* email-config/parameters.yaml:3
+* 2 |   organisation_name: Example
+* 3 |   organisation_email: not-an-email
+*   |                       ^^^^^^^^^^^^ Invalid email address
+*/
+const formatError = (parametersPath, source, key, message, value) => {
+	const location = findKeyLocation(source, key, value);
+	if (!location) return `${parametersPath}: ${key}: ${message}`;
+	const frame = codeFrameColumns(source, location, {
+		forceColor: true,
+		highlightCode: true,
+		message
+	});
+	return `\n${parametersPath}:${location.start.line}\n${frame}`;
+};
+/**
+* Validate `organisation_email` and `blind_copy` under each locale block
+* (`all`, `de`, `en`, …) in `email-config/parameters.yaml`.
+*
+* Unset values are allowed; non-empty values must be valid email addresses.
+*/
+const validateParametersYaml = (parametersPath) => {
+	if (!fs.existsSync(parametersPath)) return [];
+	const source = fs.readFileSync(parametersPath, "utf8");
+	let parsed;
+	try {
+		parsed = yaml.load(source);
+	} catch (error) {
+		return [`${parametersPath}: Invalid YAML: ${error instanceof Error ? error.message : String(error)}`];
+	}
+	if (parsed == void 0) return [];
+	if (typeof parsed !== "object" || Array.isArray(parsed)) return [`${parametersPath}: Expected a mapping of locale blocks (e.g. \`all\`), got ${Array.isArray(parsed) ? "an array" : typeof parsed}`];
+	const errors = [];
+	for (const [locale, block] of Object.entries(parsed)) {
+		if (block == void 0) continue;
+		if (typeof block !== "object" || Array.isArray(block)) {
+			errors.push(`${parametersPath}: ${locale}: Expected a mapping of parameters, got ${Array.isArray(block) ? "an array" : typeof block}`);
+			continue;
+		}
+		const parameters = block;
+		for (const key of EMAIL_KEYS) {
+			if (!(key in parameters)) continue;
+			const value = parameters[key];
+			if (isUnsetEmailValue(value)) continue;
+			if (typeof value !== "string") {
+				errors.push(formatError(parametersPath, source, key, "Must be a string email address"));
+				continue;
+			}
+			const result = emailSchema.safeParse(value);
+			if (!result.success) errors.push(formatError(parametersPath, source, key, result.error.issues[0]?.message ?? "Invalid email address", value));
+		}
+	}
+	return errors;
+};
+//#endregion
 //#region src/commands/validate.ts
 /**
 * Validates the current Tamaro configuration to avoid common errors.
@@ -756,6 +856,7 @@ const validate = async () => {
 	const errors = [
 		...await validateEnv(".env"),
 		...validateEmailTemplates(globSync("email-config/templates/**/*.hbs").toSorted()),
+		...validateParametersYaml("email-config/parameters.yaml"),
 		...await validateDonationReceiptTemplates("config.yml")
 	];
 	if (errors.length > 0) {
@@ -1434,7 +1535,7 @@ const promptBucketTamaroEmailConfig = async () => {
 //#endregion
 //#region package.json
 var name = "@raisenow/tamaro-cli";
-var version = "3.1.0-dev.1";
+var version = "3.2.0-dev.1";
 //#endregion
 //#region src/cli.ts
 const cli = createCommand().name(name).description("CLI for Tamaro Customer Configurations development").version(version, "-v, --version");

package/package.json

@@ -1,17 +1,30 @@
 {
   "name": "@raisenow/tamaro-cli",
-  "version": "3.1.0-dev.1",
+  "version": "3.2.0-dev.1",
   "author": {
     "name": "RaiseNow",
     "email": "development@raisenow.com"
   },
   "type": "module",
+  "bin": "dist/cli.js",
+  "packageManager": "pnpm@11.10.0",
   "engines": {
     "node": ">=24.18.0",
     "pnpm": ">=11.10.0",
     "npm": "please-use-pnpm",
     "yarn": "please-use-pnpm"
   },
+  "scripts": {
+    "typecheck": "tsc --build --emitDeclarationOnly",
+    "build": "tsdown",
+    "dev": "pnpm build --watch",
+    "readme": "pnpx http-server . --cors -o /readme.html",
+    "lint": "DEBUG=eslint:eslint-helpers eslint .",
+    "format": "prettier . --write --ignore-path ./.prettierignore",
+    "test": "vitest",
+    "prepare": "husky",
+    "prepublishOnly": "pnpm build"
+  },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.1081.0",
     "@babel/code-frame": "^8.0.0",
@@ -54,17 +67,5 @@
       "eslint --fix",
       "prettier --write"
     ]
-  },
-  "scripts": {
-    "typecheck": "tsc --build --emitDeclarationOnly",
-    "build": "tsdown",
-    "dev": "pnpm build --watch",
-    "readme": "pnpx http-server . --cors -o /readme.html",
-    "lint": "DEBUG=eslint:eslint-helpers eslint .",
-    "format": "prettier . --write --ignore-path ./.prettierignore",
-    "test": "vitest"
-  },
-  "bin": {
-    "tamaro-cli": "dist/cli.js"
   }
-}
+}