@specific.dev/spectest 0.120.1 → 0.122.0

package/src/components/supabase.ts

@@ -75,6 +75,7 @@ import { microsoft } from "./microsoft.js";
 import { SUPABASE_WEBHOOKS_SQL } from "./supabase-webhooks.js";
 import { postgresTls } from "./postgres-tls.js";
 import { supabasePoolerService } from "./supabase-pooler.js";
+import { SUPABASE_COVERAGE_COLLECTOR, supabaseFunctionsCoverage } from "./supabase-coverage.js";
 import {
   mapSupabaseConfig,
   parseSupabaseConfigFile,
@@ -1065,6 +1066,8 @@ services:
 // ──────────────────────────────────────────────────────────────────────────
 
 const FUNCTIONS_MAIN_TS = String.raw`// spectest-generated edge-functions router. Do not edit.
+import { EdgeCoverage } from "./coverage.js";
+const edgeCoverage = new EdgeCoverage();
 const FUNCTIONS_DIR = Deno.env.get("FUNCTIONS_DIR") ?? "/repo/supabase/functions";
 const JWT_SECRET = Deno.env.get("JWT_SECRET") ?? "";
 const VERIFY_JWT = Deno.env.get("VERIFY_JWT") === "true";
@@ -1129,8 +1132,10 @@ const WORKER_TIMEOUT_MS = 24 * 60 * 60 * 1000;
  *  isolates, and an isolate reaped for idleness is rebooted by the next
  *  test that calls the function — a boot's worth of dirtied memory in that
  *  test's own snapshot diff. */
-function workerFor(name: string) {
+async function workerFor(name: string) {
+  const maybeEntrypoint = await edgeCoverage.wrap(FUNCTIONS_DIR + "/" + name + "/index.ts");
   return EdgeRuntime.userWorkers.create({
+    maybeEntrypoint,
     servicePath: FUNCTIONS_DIR + "/" + name,
     memoryLimitMb: 256,
     workerTimeoutMs: WORKER_TIMEOUT_MS,
@@ -1353,6 +1358,7 @@ async function sharedWorker(): Promise<any | null> {
         try {
           await createShared();
         } catch (e) {
+          await edgeCoverage.forgetUnstarted(SHARED_DIR + "/index.ts");
           reason = "the shared isolate failed to boot: " + String(e);
         }
       }
@@ -1364,8 +1370,10 @@ async function sharedWorker(): Promise<any | null> {
   return spec.reason === null ? createShared() : null;
 }
 
-function createShared() {
+async function createShared() {
+  const maybeEntrypoint = await edgeCoverage.wrap(SHARED_DIR + "/index.ts");
   return EdgeRuntime.userWorkers.create({
+    maybeEntrypoint,
     servicePath: SHARED_DIR,
     // A cap on the one isolate that holds every function, not a reservation.
     memoryLimitMb: 2048,
@@ -1393,8 +1401,8 @@ function createShared() {
 async function warmAll(): Promise<{ mode: "shared" | "per-function"; warmed: string[]; failed: Record<string, string> }> {
   const names = await functionNames();
   if ((await sharedWorker()) !== null) return { mode: "shared", warmed: names, failed: {} };
-  // All at once: each boot is mostly module loading, and the isolates come
-  // up concurrently.
+  // Each worker starts behind a generated gate; attach and initialize them
+  // concurrently, then release each only after precise coverage has started.
   const results = await Promise.allSettled(names.map((name) => workerFor(name)));
   const warmed: string[] = [];
   const failed: Record<string, string> = {};
@@ -1411,8 +1419,16 @@ Deno.serve(async (req: Request) => {
   // Ready probe — answered before any auth check, so bring-up never needs a
   // token, and never treated as a function name.
   if (pathname === "/_spectest/health") return new Response("ok");
+  if (pathname === "/_spectest/coverage" && req.method === "POST") {
+    try { return json(await edgeCoverage.capture()); }
+    catch (error) { return json({ error: String(error) }, 500); }
+  }
   // Setup-time warm-up (see warmAll); never treated as a function name.
-  if (pathname === "/_spectest/warm") return json(await warmAll());
+  if (pathname === "/_spectest/warm") {
+    const warmed = await warmAll();
+    await edgeCoverage.ready();
+    return json(warmed);
+  }
 
   const name = pathname.split("/")[1] ?? "";
   if (name === "") return json({ msg: "missing function name in request" }, 400);
@@ -2286,8 +2302,15 @@ CREATE SCHEMA IF NOT EXISTS _supavisor AUTHORIZATION supabase_admin;
           volumes: [{ source: projectRootPath(), target: REPO_MOUNT, readOnly: true, reachExempt: true }],
           // Our router (see FUNCTIONS_MAIN_TS) sits outside that mount, so
           // the project never has to carry a `main/` function of ours.
-          files: [{ path: "/home/deno/main/index.ts", content: FUNCTIONS_MAIN_TS }],
-          args: ["start", "--main-service", "/home/deno/main", "--port", "9000"],
+          files: [
+            { path: "/home/deno/main/index.ts", content: FUNCTIONS_MAIN_TS },
+            { path: "/home/deno/main/coverage.js", content: SUPABASE_COVERAGE_COLLECTOR },
+          ],
+          // Generated entry gates hold project imports until coverage starts;
+          // the inspector stays live and is not exposed to peer containers.
+          args: ["start", "--main-service", "/home/deno/main", "--port", "9000", "--inspect=127.0.0.1:9229"],
+          workdir: REPO_MOUNT,
+          coverage: { adapters: [supabaseFunctionsCoverage(fnRelPath)] },
           env: {
             JWT_SECRET: jwtSecret,
             // Where the router looks for `<name>/`, inside the repo mount.

package/src/index.ts

@@ -895,7 +895,11 @@ export interface ServiceGroupInput<
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   H extends Record<string, any> = Record<string, never>,
   Primary extends keyof P & string = keyof P & string,
-> {
+> extends Partial<ServiceConfig> {
+  // ServiceConfig fields on the group override its primary container. This
+  // preserves the usual `{ ...component(), hostnames: [...] }` customization
+  // when a component expands to multiple services. Helpers/setup below are
+  // group hooks, not container overrides.
   /**
    * Build the group's member services, keyed by RELATIVE part name
    * (`db`, `auth`, …). Called at expansion time with the final naming
@@ -1127,14 +1131,17 @@ function expandServiceGroups(input: InputServicesMap): ServicesMap {
         );
       }
     }
+    const { primary: _primary, services: _services, helpers: _helpers,
+      setup: _setup, expectKey: _expectKey, [SERVICE_GROUP]: _marker,
+      ...primaryOverrides } = entry;
     for (const [part, svc] of Object.entries(parts)) {
       const finalKey = naming.key(part);
       claim(finalKey, owner);
       // Rewrite relative dependsOn to final keys; a spread keeps function
       // fields (helpers/setup) and the enumerable-symbol ingress decls.
-      const final: ServiceConfig = { ...svc };
-      if (svc.dependsOn?.length) {
-        final.dependsOn = svc.dependsOn.map((d) =>
+      const final: ServiceConfig = { ...svc, ...(part === entry.primary ? primaryOverrides : {}) };
+      if (final.dependsOn?.length) {
+        final.dependsOn = final.dependsOn.map((d) =>
           partKeys.has(d) ? naming.key(d) : d,
         );
       }