@cosmicdrift/kumiko-testing 0.364.0 → 0.365.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmicdrift/kumiko-testing",
-  "version": "0.364.0",
+  "version": "0.365.1",
   "description": "Test template for Kumiko apps: per-flow seedTenant, app test stack, canonical test preloads, bunfig generator and integration runner.",
   "license": "BUSL-1.1",
   "author": "Marc Frost <marc@cosmicdriftgamestudio.com>",
@@ -79,10 +79,10 @@
     "kumiko-testing": "./bin/kumiko-testing.ts"
   },
   "dependencies": {
-    "@cosmicdrift/kumiko-bundled-features": "0.364.0",
-    "@cosmicdrift/kumiko-dev-server": "0.364.0",
-    "@cosmicdrift/kumiko-framework": "0.364.0",
-    "@cosmicdrift/kumiko-types": "0.364.0",
+    "@cosmicdrift/kumiko-bundled-features": "0.365.1",
+    "@cosmicdrift/kumiko-dev-server": "0.365.1",
+    "@cosmicdrift/kumiko-framework": "0.365.1",
+    "@cosmicdrift/kumiko-types": "0.365.1",
     "zod": "^4.4.3"
   },
   "peerDependencies": {

package/src/changes.json

@@ -1,4 +1,16 @@
 [
+  {
+    "version": "0.365.0",
+    "type": "fix",
+    "title": "E2E webServer env no longer overrides keys from .env.local or .env.<NODE_ENV>",
+    "detail": "Keys defined in the app's .env.local or .env.<NODE_ENV> (not only .env) are now left to the server's own dotenv loading instead of being overridden by the template service defaults."
+  },
+  {
+    "version": "0.365.0",
+    "type": "improvement",
+    "title": "extractMailLink and extractMailLinkToken in kumiko-testing/e2e",
+    "detail": "mailLinks, extractMailLink(mail, fragment) and extractMailLinkToken(mail, fragment, param) read href values from a captured HTML mail and decode HTML entities such as &#x3D; and &amp; once, so e2e specs no longer need their own mail helper."
+  },
   {
     "version": "0.357.0",
     "type": "improvement",

package/src/e2e/constants.ts

@@ -13,6 +13,8 @@ export const PLAYWRIGHT_DEMO_ENV = {
 export const CSRF_COOKIE_NAME = sessionCookieName(CSRF_COOKIE_BASE, { secure: false });
 export const CSRF_HEADER_NAME = "X-CSRF-Token";
 
+// Duplicated from kumiko-framework (SEED_MODE_ENV): the Playwright config runs under Node
+// and cannot import the framework barrel.
 export const SEED_ENABLE_ENV = "KUMIKO_TEST_SEED";
 export const SEED_TOKEN_ENV = "KUMIKO_TEST_SEED_TOKEN";
 export const SEED_TOKEN_HEADER = "x-kumiko-test-seed";

package/src/e2e/define-app-e2e-config.ts

@@ -38,11 +38,17 @@ const OPT_IN_SERVICE_ENV_KEYS: readonly string[] = [
 
 // Bun never overrides a variable that is already set, so a default placed in
 // webServer.env would beat the same key in the app's `.env`. Keys the app's
-// `.env` defines are therefore left out and stay with the server's own loading.
+// dotenv files define are therefore left out and stay with the server's own loading.
 function keysDefinedInAppDotenv(): ReadonlySet<string> {
-  const dotenvPath = join(process.cwd(), ".env");
-  if (!existsSync(dotenvPath)) return new Set();
-  return new Set(Object.keys(parseEnv(readFileSync(dotenvPath, "utf-8"))));
+  // Same files Bun loads: .env, .env.<NODE_ENV>, .env.local. Only the key set matters, not precedence.
+  const nodeEnv = process.env["NODE_ENV"] ?? "development";
+  const keys = new Set<string>();
+  for (const fileName of [".env", `.env.${nodeEnv}`, ".env.local"]) {
+    const dotenvPath = join(process.cwd(), fileName);
+    if (!existsSync(dotenvPath)) continue;
+    for (const key of Object.keys(parseEnv(readFileSync(dotenvPath, "utf-8")))) keys.add(key);
+  }
+  return keys;
 }
 
 // Precedence per key: shell/CI environment, then the app's `.env`, then the local-dev default.

package/src/e2e/index.ts

@@ -37,6 +37,12 @@ export {
   resolveE2eWorkers,
 } from "./define-app-e2e-config";
 export { type MailCaptureOptions, mailCapture } from "./mail-capture";
+export {
+  decodeHtmlAttribute,
+  extractMailLink,
+  extractMailLinkToken,
+  mailLinks,
+} from "./mail-links";
 export { pinEnglishLocale } from "./pin-english-locale";
 export { pollForRow, waitForProjection } from "./poll";
 export {

package/src/e2e/mail-links.ts

@@ -0,0 +1,50 @@
+import type { CapturedMail } from "./seed-contract";
+
+const NAMED_ENTITIES: Readonly<Record<string, string>> = {
+  amp: "&",
+  quot: '"',
+  apos: "'",
+  lt: "<",
+  gt: ">",
+};
+
+// The mail renderer entity-encodes attribute values (`=` arrives as `&#x3D;`).
+// One pass, so an encoded "&amp;#x3D;" stays the literal text "&#x3D;".
+export function decodeHtmlAttribute(value: string): string {
+  return value.replace(/&(#x[0-9a-f]+|#\d+|[a-z]+);/gi, (entity, body: string) => {
+    if (body.startsWith("#x") || body.startsWith("#X")) {
+      return String.fromCodePoint(Number.parseInt(body.slice(2), 16));
+    }
+    if (body.startsWith("#")) return String.fromCodePoint(Number.parseInt(body.slice(1), 10));
+    return NAMED_ENTITIES[body.toLowerCase()] ?? entity;
+  });
+}
+
+export function mailLinks(mail: Pick<CapturedMail, "html">): readonly string[] {
+  return [...mail.html.matchAll(/href="([^"]+)"/g)].map((match) =>
+    decodeHtmlAttribute(match[1] ?? ""),
+  );
+}
+
+export function extractMailLink(
+  mail: Pick<CapturedMail, "html" | "to">,
+  pathFragment: string,
+): string {
+  const link = mailLinks(mail).find((href) => href.includes(pathFragment));
+  if (link === undefined) {
+    throw new Error(`No link containing "${pathFragment}" found in mail to ${mail.to}`);
+  }
+  return link;
+}
+
+export function extractMailLinkToken(
+  mail: Pick<CapturedMail, "html" | "to">,
+  pathFragment: string,
+  param = "token",
+): string {
+  const token = new URL(extractMailLink(mail, pathFragment)).searchParams.get(param);
+  if (!token) {
+    throw new Error(`Link "${pathFragment}" in mail to ${mail.to} carries no "${param}" parameter`);
+  }
+  return token;
+}