@cosmicdrift/kumiko-testing 0.336.1 → 0.338.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmicdrift/kumiko-testing",
-  "version": "0.336.1",
+  "version": "0.338.0",
   "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>",
@@ -75,9 +75,9 @@
     "kumiko-testing": "./bin/kumiko-testing.ts"
   },
   "dependencies": {
-    "@cosmicdrift/kumiko-bundled-features": "0.336.1",
-    "@cosmicdrift/kumiko-dev-server": "0.336.1",
-    "@cosmicdrift/kumiko-framework": "0.336.1",
+    "@cosmicdrift/kumiko-bundled-features": "0.338.0",
+    "@cosmicdrift/kumiko-dev-server": "0.338.0",
+    "@cosmicdrift/kumiko-framework": "0.338.0",
     "zod": "^4.4.3"
   },
   "peerDependencies": {

package/src/bunfig.ts

@@ -102,7 +102,9 @@ function splitBunfigBlocks(content: string): readonly BunfigBlock[] {
   const blocks: { header: string; lines: string[] }[] = [];
   let current: { header: string; lines: string[] } = { header: "", lines: [] };
   for (const line of content.split("\n")) {
-    const match = /^\[([^\]]+)\]\s*$/.exec(line);
+    // An array-of-tables header keeps its inner brackets in `header`, so it
+    // never equals a generated header and is carried over as a foreign block.
+    const match = /^\[(\[[^\]]+\]|[^[\]]+)\]\s*$/.exec(line);
     if (match?.[1] !== undefined) {
       blocks.push(current);
       current = { header: match[1], lines: [] };
@@ -114,11 +116,19 @@ function splitBunfigBlocks(content: string): readonly BunfigBlock[] {
   return blocks;
 }
 
+const TOML_KEY_SEGMENT = String.raw`"[^"]+"|[A-Za-z_][\w-]*`;
+const TOML_KEY_LINE = new RegExp(
+  String.raw`^(?:"([^"]+)"|([A-Za-z_][\w-]*))(?:\s*\.\s*(?:${TOML_KEY_SEGMENT}))*\s*=`,
+);
+
+// Dotted and quoted keys resolve to their first segment, which is the key
+// the template either owns or doesn't.
 function keysIn(lines: readonly string[]): readonly string[] {
   const keys: string[] = [];
   for (const line of lines) {
-    const match = /^([A-Za-z_][\w-]*)\s*=/.exec(line.trim());
-    if (match?.[1] !== undefined) keys.push(match[1]);
+    const match = TOML_KEY_LINE.exec(line.trim());
+    const key = match?.[1] ?? match?.[2];
+    if (key !== undefined) keys.push(key);
   }
   return keys;
 }
@@ -137,9 +147,12 @@ type MergedArrayKey = (typeof MERGED_ARRAY_KEYS)[number];
 
 const CURRENT_PACKAGE_PRELOADS = new Set<string>([...Object.values(PRELOADS).flat(), DOM_PRELOAD]);
 
-// Old app-local path of DOM_PRELOAD; excluded so an app that hasn't
-// regenerated doesn't run DOM setup twice.
-const SUPERSEDED_PRELOADS = new Set<string>(["./test-setup/dom.preload.ts"]);
+// Old app-local path -> its replacement; dropped only when the replacement is
+// generated for this variant, so an app that hasn't regenerated doesn't run
+// DOM setup twice but a variant without it keeps its own setup.
+const SUPERSEDED_PRELOADS: ReadonlyMap<string, string> = new Map([
+  ["./test-setup/dom.preload.ts", DOM_PRELOAD],
+]);
 
 // Ignore patterns the generator owns across all variants. One it omits for
 // this variant (`**/*.test.tsx` with --dom, `**/*.integration.test.ts` in the
@@ -153,9 +166,14 @@ const TEMPLATE_OWNED_IGNORE_PATTERNS = new Set<string>([
   ]),
 ]);
 
-function isKeepableExtra(key: MergedArrayKey, entry: string): boolean {
+function isKeepableExtra(
+  key: MergedArrayKey,
+  entry: string,
+  generatedValues: readonly string[],
+): boolean {
   if (key !== "preload") return !TEMPLATE_OWNED_IGNORE_PATTERNS.has(entry);
-  if (SUPERSEDED_PRELOADS.has(entry)) return false;
+  const replacement = SUPERSEDED_PRELOADS.get(entry);
+  if (replacement !== undefined) return !generatedValues.includes(replacement);
   if (entry.startsWith(PRELOAD_PREFIX)) return CURRENT_PACKAGE_PRELOADS.has(entry);
   return true;
 }
@@ -232,7 +250,7 @@ export function mergeBunfig(generated: string, existingContent: string): BunfigM
     const generatedValues = arrayField(generatedTest, key);
     const existingValues = arrayField(existingTest, key);
     const extras = existingValues.filter(
-      (item) => !generatedValues.includes(item) && isKeepableExtra(key, item),
+      (item) => !generatedValues.includes(item) && isKeepableExtra(key, item, generatedValues),
     );
     content = appendArrayExtras(content, key, extras);
   }

package/src/changes.json

@@ -1,4 +1,10 @@
 [
+  {
+    "version": "0.337.0",
+    "type": "fix",
+    "title": "bunfig merge reports dotted/quoted keys and keeps array tables, empty schema env defaults are replaced, integration dir expansion prunes node_modules, seedTenant gains unsubscribeSse",
+    "detail": "`kumiko-testing bunfig` now reports dotted and quoted keys as unknown and keeps `[[array-of-tables]]` blocks instead of folding them into `[test]`, and drops the superseded `./test-setup/dom.preload.ts` only when the DOM preload is generated. The schema-env-defaults preload treats empty values like unset ones for every key. `kumiko-testing integration <dir>` skips `node_modules`, `dist` and `e2e` while expanding a directory. `seedTenant` returns `unsubscribeSse` to detach the tenant's SSE client from `events.sse`. A real-provider scenario `waitFor` now times out after `E2E_TIMEOUT_MS.realWait` (180 s), before the 240 s test timeout."
+  },
   {
     "version": "0.336.1",
     "type": "fix",

package/src/e2e/screenshots.ts

@@ -247,6 +247,10 @@ function collectPresentIdentities(): {
   };
 }
 
+export function scenarioWaitForTimeout(realProviderRun: boolean): number {
+  return realProviderRun ? E2E_TIMEOUT_MS.realWait : E2E_TIMEOUT_MS.navigation;
+}
+
 async function openScenario(
   page: Page,
   s: Scenario,
@@ -259,8 +263,9 @@ async function openScenario(
 
   if (s.waitFor) {
     // Real-provider scenarios wait on LLM/OCR latency before the page is ready.
-    const timeout = isRealProviderRun() ? E2E_TIMEOUT_MS.real : E2E_TIMEOUT_MS.navigation;
-    await expect(page.locator(s.waitFor).first()).toBeVisible({ timeout });
+    await expect(page.locator(s.waitFor).first()).toBeVisible({
+      timeout: scenarioWaitForTimeout(isRealProviderRun()),
+    });
   }
   await waitForSettledPage(page, inFlightDataRequests);
 }

package/src/e2e/timeouts.ts

@@ -10,4 +10,7 @@ export const E2E_TIMEOUT_MS = {
   poll: 15_000,
   webServer: 90_000,
   real: 240_000,
+  // Selector wait of a real-provider scenario; below `real` so the locator error
+  // (selector, scenario) fires before the generic test timeout swallows it.
+  realWait: 180_000,
 } as const;

package/src/index.ts

@@ -1,6 +1,7 @@
 export { PROVIDER_ENV_KEYS } from "./provider-env-keys";
 export {
   type BoundApi,
+  type InProcessSeededTenant,
   type PersistedTenant,
   persistTenantRows,
   type SavedRow,

package/src/integration-runner.ts

@@ -34,7 +34,7 @@ export function selectIntegrationFiles(paths: readonly string[]): string[] {
 
 function listDirectoryFiles(path: string): string[] | undefined {
   if (statSync(path, { throwIfNoEntry: false })?.isDirectory() !== true) return undefined;
-  return readdirSync(path, { recursive: true, encoding: "utf8" });
+  return listIntegrationTestFiles(path);
 }
 
 /** Resolves `kumiko-testing integration`'s positional file args against `cwd`

package/src/preload/dom.ts

@@ -49,9 +49,8 @@ if (typeof globalThis.window === "undefined") {
 // time. A static import would evaluate screen before happy-dom registers, so
 // every screen query would throw TypeError. Hence require() only after the
 // registration above.
-const { cleanup } = require("@testing-library/react/pure") as {
-  cleanup: () => void;
-};
+const { cleanup } =
+  require("@testing-library/react/pure") as typeof import("@testing-library/react/pure");
 
 const HTML_PRINT_LIMIT = 2000;
 

package/src/preload/schema-env-defaults.ts

@@ -6,13 +6,11 @@ import { SCHEMA_ENV_DEFAULTS } from "./schema-env-defaults-values";
 const MIN_JWT_SECRET_LENGTH = 32;
 
 function isTooShortJwtSecret(key: string, value: string | undefined): boolean {
-  return key === "JWT_SECRET" && (!value || value.length < MIN_JWT_SECRET_LENGTH);
+  return key === "JWT_SECRET" && value !== undefined && value.length < MIN_JWT_SECRET_LENGTH;
 }
 
+// An empty value counts as unset: `${{ secrets.X }}` in GitHub Actions yields "" for a missing secret.
 for (const [key, value] of Object.entries(SCHEMA_ENV_DEFAULTS)) {
-  if (isTooShortJwtSecret(key, process.env[key])) {
-    process.env[key] = value;
-    continue;
-  }
-  process.env[key] ??= value;
+  const current = process.env[key];
+  if (!current || isTooShortJwtSecret(key, current)) process.env[key] = value;
 }

package/src/seed-tenant.ts

@@ -169,24 +169,30 @@ function lightTenantRows(opts: SeedTenantOptions): PersistedTenant {
   return { ...identity, admin: lightCredentials(adminEmail), members };
 }
 
+export type InProcessSeededTenant = SeededTenant & {
+  // Stops this tenant's events from landing in the stack's `events.sse`.
+  readonly unsubscribeSse: () => void;
+};
+
 export async function seedTenant(
   stack: TestStack,
   opts: SeedTenantOptions = {},
-): Promise<SeededTenant> {
+): Promise<InProcessSeededTenant> {
   const write = stackSeedWriter(stack);
   const persist = opts.persist === true;
   const rows = persist ? await persistTenantRows(write, opts) : lightTenantRows(opts);
   const { id } = rows;
 
   // setupTestStack subscribes events.sse only to test tenant 1; a seeded tenant has a fresh random id.
-  stack.sseBroker.addClient(
-    tenantChannel(id),
+  const channel = tenantChannel(id);
+  const sseClientId = stack.sseBroker.addClient(
+    channel,
     (event) => stack.events.sse.push(event),
     () => {},
   );
 
   const admin = withSession(rows.admin, id, [ROLES.TenantAdmin]);
-  const tenant: SeededTenant = {
+  const tenant: InProcessSeededTenant = {
     id,
     key: rows.key,
     name: rows.name,
@@ -202,6 +208,7 @@ export async function seedTenant(
         id,
         roles,
       ),
+    unsubscribeSse: () => stack.sseBroker.removeClient(channel, sseClientId),
     api: bindApi(stack, admin.session),
     apiAs: (user) => bindApi(stack, user.session),
   };