@jterrazz/test 6.0.0 → 6.2.0

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { a as ServiceHandle, i as postgres, n as redis, o as IsolationStrategy, r as PostgresOptions, s as DatabasePort, t as RedisOptions } from "./redis.adapter.cjs";
+import { a as PostgresOptions, c as IsolationStrategy, i as redis, l as DatabasePort, n as sqlite, o as postgres, r as RedisOptions, s as ServiceHandle, t as SqliteOptions } from "./sqlite.adapter.cjs";
 import { i as mockOfDate, n as mockOf, r as MockDatePort, t as MockPort } from "./mock-of.cjs";
 
 //#region src/ports/command.port.d.ts
@@ -56,7 +56,7 @@ interface ServerResponse {
  */
 interface ServerPort {
   /** Send an HTTP request and return the parsed response. */
-  request(method: string, path: string, body?: unknown): Promise<ServerResponse>;
+  request(method: string, path: string, body?: unknown, headers?: Record<string, string>): Promise<ServerResponse>;
 }
 //#endregion
 //#region src/builder/directory-accessor.d.ts
@@ -214,6 +214,7 @@ declare class SpecificationBuilder {
   private mocks;
   private projectName;
   private request;
+  private requestHeaders;
   private seeds;
   private spawnConfig;
   private testDir;
@@ -244,6 +245,13 @@ declare class SpecificationBuilder {
    *   spec("...").env({ HOME: "$WORKDIR", TZ: "UTC" }).exec("status").run();
    */
   env(env: CommandEnv): this;
+  /**
+   * Set HTTP headers for the request. Multiple calls merge.
+   *
+   * @example
+   *   spec("french").headers({ 'Accept-Language': 'fr' }).get("/articles").run();
+   */
+  headers(headers: Record<string, string>): this;
   /**
    * Send a GET request to the server adapter.
    *
@@ -440,18 +448,16 @@ declare class Orchestrator {
 }
 //#endregion
 //#region src/runner/targets.d.ts
-/**
- * Target factories for {@link spec}. Each target describes what is being tested
- * and how the specification runner should connect to it.
- */
+/** Any object with a request method compatible with Hono's app.request(). */
 type HonoApp$1 = {
-  fetch: (...args: any[]) => any;
   request: (path: string, init?: RequestInit) => Promise<Response> | Response;
 };
+/** Services map passed to the app factory after infrastructure starts. */
+type AppServices = Record<string, ServiceHandle>;
 /** In-process Hono app target. Created by {@link app}. */
 interface AppTarget {
   readonly kind: 'app';
-  readonly factory: () => HonoApp$1;
+  readonly factory: (services: AppServices) => HonoApp$1;
 }
 /** Docker compose stack target. Created by {@link stack}. */
 interface StackTarget {
@@ -468,15 +474,19 @@ type HttpTarget = AppTarget | StackTarget;
 /** Any valid spec target. */
 type SpecTarget = AppTarget | CommandTarget | StackTarget;
 /**
- * Test against an in-process Hono app. Services are started via testcontainers
- * and the app runs without network overhead.
+ * Test against an in-process Hono app. The factory receives started services
+ * so you can wire connection strings into your app/DI container.
  *
- * @param factory - Function that returns a Hono app instance (called after services start).
+ * @param factory - Function that receives services and returns a Hono app instance.
  *
  * @example
- *   await spec(app(() => createApp(db)), { services: [db] });
+ *   const db = postgres({ compose: 'db' });
+ *   await spec(
+ *       app((services) => createApp({ databaseUrl: services.db.connectionString })),
+ *       { services: [db] },
+ *   );
  */
-declare function app(factory: () => HonoApp$1): AppTarget;
+declare function app(factory: (services: AppServices) => HonoApp$1): AppTarget;
 /**
  * Test against a full docker compose stack. The stack is started with
  * `docker compose up` and real HTTP requests are sent to the app service.
@@ -580,7 +590,7 @@ declare class ExecAdapter implements CommandPort {
 declare class FetchAdapter implements ServerPort {
   private baseUrl;
   constructor(url: string);
-  request(method: string, path: string, body?: unknown): Promise<ServerResponse>;
+  request(method: string, path: string, body?: unknown, headers?: Record<string, string>): Promise<ServerResponse>;
 }
 //#endregion
 //#region src/adapters/hono.adapter.d.ts
@@ -593,7 +603,7 @@ declare class HonoAdapter implements ServerPort {
   constructor(app: {
     request: (path: string, init?: RequestInit) => Promise<Response> | Response;
   });
-  request(method: string, path: string, body?: unknown): Promise<ServerResponse>;
+  request(method: string, path: string, body?: unknown, headers?: Record<string, string>): Promise<ServerResponse>;
 }
 //#endregion
 //#region src/runner/integration.d.ts
@@ -670,5 +680,5 @@ declare function normalizeOutput(str: string): string;
 /** Create a {@link DockerContainerPort} bound to an existing container by ID. */
 declare function dockerContainer(containerId: string): DockerContainerPort;
 //#endregion
-export { type AppTarget, type CliOptions, type CommandEnv, type CommandPort, type CommandResult, type CommandTarget, type ContainerPort, type DatabasePort, DirectoryAccessor, type DirectorySnapshotOptions, DockerAssertion, type DockerContainerPort, type DockerInspectResult, type E2eOptions, ExecAdapter, FetchAdapter, type FileAccessor, HonoAdapter, type HttpTarget, type IntegrationOptions, type IsolationStrategy, type MockDatePort, type MockPort, Orchestrator, type PostgresOptions, type RedisOptions, ResponseAccessor, type ServerPort, type ServerResponse, type ServiceHandle, type SpawnOptions, type SpecOptions, type SpecRunner, type SpecTarget, SpecificationBuilder, type SpecificationConfig, SpecificationResult, type SpecificationRunner, type SpecificationRunnerWithCleanup, type StackTarget, TableAssertion, app, cli, command, createSpecificationRunner, dockerContainer, e2e, grep, integration, mockOf, mockOfDate, normalizeOutput, postgres, redis, spec, stack, stripAnsi };
+export { type AppServices, type AppTarget, type CliOptions, type CommandEnv, type CommandPort, type CommandResult, type CommandTarget, type ContainerPort, type DatabasePort, DirectoryAccessor, type DirectorySnapshotOptions, DockerAssertion, type DockerContainerPort, type DockerInspectResult, type E2eOptions, ExecAdapter, FetchAdapter, type FileAccessor, HonoAdapter, type HttpTarget, type IntegrationOptions, type IsolationStrategy, type MockDatePort, type MockPort, Orchestrator, type PostgresOptions, type RedisOptions, ResponseAccessor, type ServerPort, type ServerResponse, type ServiceHandle, type SpawnOptions, type SpecOptions, type SpecRunner, type SpecTarget, SpecificationBuilder, type SpecificationConfig, SpecificationResult, type SpecificationRunner, type SpecificationRunnerWithCleanup, type SqliteOptions, type StackTarget, TableAssertion, app, cli, command, createSpecificationRunner, dockerContainer, e2e, grep, integration, mockOf, mockOfDate, normalizeOutput, postgres, redis, spec, sqlite, stack, stripAnsi };
 //# sourceMappingURL=index.d.cts.map

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { a as ServiceHandle, i as postgres, n as redis, o as IsolationStrategy, r as PostgresOptions, s as DatabasePort, t as RedisOptions } from "./redis.adapter.js";
+import { a as PostgresOptions, c as IsolationStrategy, i as redis, l as DatabasePort, n as sqlite, o as postgres, r as RedisOptions, s as ServiceHandle, t as SqliteOptions } from "./sqlite.adapter.js";
 import { i as mockOfDate, n as mockOf, r as MockDatePort, t as MockPort } from "./mock-of.js";
 
 //#region src/ports/command.port.d.ts
@@ -56,7 +56,7 @@ interface ServerResponse {
  */
 interface ServerPort {
   /** Send an HTTP request and return the parsed response. */
-  request(method: string, path: string, body?: unknown): Promise<ServerResponse>;
+  request(method: string, path: string, body?: unknown, headers?: Record<string, string>): Promise<ServerResponse>;
 }
 //#endregion
 //#region src/builder/directory-accessor.d.ts
@@ -214,6 +214,7 @@ declare class SpecificationBuilder {
   private mocks;
   private projectName;
   private request;
+  private requestHeaders;
   private seeds;
   private spawnConfig;
   private testDir;
@@ -244,6 +245,13 @@ declare class SpecificationBuilder {
    *   spec("...").env({ HOME: "$WORKDIR", TZ: "UTC" }).exec("status").run();
    */
   env(env: CommandEnv): this;
+  /**
+   * Set HTTP headers for the request. Multiple calls merge.
+   *
+   * @example
+   *   spec("french").headers({ 'Accept-Language': 'fr' }).get("/articles").run();
+   */
+  headers(headers: Record<string, string>): this;
   /**
    * Send a GET request to the server adapter.
    *
@@ -440,18 +448,16 @@ declare class Orchestrator {
 }
 //#endregion
 //#region src/runner/targets.d.ts
-/**
- * Target factories for {@link spec}. Each target describes what is being tested
- * and how the specification runner should connect to it.
- */
+/** Any object with a request method compatible with Hono's app.request(). */
 type HonoApp$1 = {
-  fetch: (...args: any[]) => any;
   request: (path: string, init?: RequestInit) => Promise<Response> | Response;
 };
+/** Services map passed to the app factory after infrastructure starts. */
+type AppServices = Record<string, ServiceHandle>;
 /** In-process Hono app target. Created by {@link app}. */
 interface AppTarget {
   readonly kind: 'app';
-  readonly factory: () => HonoApp$1;
+  readonly factory: (services: AppServices) => HonoApp$1;
 }
 /** Docker compose stack target. Created by {@link stack}. */
 interface StackTarget {
@@ -468,15 +474,19 @@ type HttpTarget = AppTarget | StackTarget;
 /** Any valid spec target. */
 type SpecTarget = AppTarget | CommandTarget | StackTarget;
 /**
- * Test against an in-process Hono app. Services are started via testcontainers
- * and the app runs without network overhead.
+ * Test against an in-process Hono app. The factory receives started services
+ * so you can wire connection strings into your app/DI container.
  *
- * @param factory - Function that returns a Hono app instance (called after services start).
+ * @param factory - Function that receives services and returns a Hono app instance.
  *
  * @example
- *   await spec(app(() => createApp(db)), { services: [db] });
+ *   const db = postgres({ compose: 'db' });
+ *   await spec(
+ *       app((services) => createApp({ databaseUrl: services.db.connectionString })),
+ *       { services: [db] },
+ *   );
  */
-declare function app(factory: () => HonoApp$1): AppTarget;
+declare function app(factory: (services: AppServices) => HonoApp$1): AppTarget;
 /**
  * Test against a full docker compose stack. The stack is started with
  * `docker compose up` and real HTTP requests are sent to the app service.
@@ -580,7 +590,7 @@ declare class ExecAdapter implements CommandPort {
 declare class FetchAdapter implements ServerPort {
   private baseUrl;
   constructor(url: string);
-  request(method: string, path: string, body?: unknown): Promise<ServerResponse>;
+  request(method: string, path: string, body?: unknown, headers?: Record<string, string>): Promise<ServerResponse>;
 }
 //#endregion
 //#region src/adapters/hono.adapter.d.ts
@@ -593,7 +603,7 @@ declare class HonoAdapter implements ServerPort {
   constructor(app: {
     request: (path: string, init?: RequestInit) => Promise<Response> | Response;
   });
-  request(method: string, path: string, body?: unknown): Promise<ServerResponse>;
+  request(method: string, path: string, body?: unknown, headers?: Record<string, string>): Promise<ServerResponse>;
 }
 //#endregion
 //#region src/runner/integration.d.ts
@@ -670,5 +680,5 @@ declare function normalizeOutput(str: string): string;
 /** Create a {@link DockerContainerPort} bound to an existing container by ID. */
 declare function dockerContainer(containerId: string): DockerContainerPort;
 //#endregion
-export { type AppTarget, type CliOptions, type CommandEnv, type CommandPort, type CommandResult, type CommandTarget, type ContainerPort, type DatabasePort, DirectoryAccessor, type DirectorySnapshotOptions, DockerAssertion, type DockerContainerPort, type DockerInspectResult, type E2eOptions, ExecAdapter, FetchAdapter, type FileAccessor, HonoAdapter, type HttpTarget, type IntegrationOptions, type IsolationStrategy, type MockDatePort, type MockPort, Orchestrator, type PostgresOptions, type RedisOptions, ResponseAccessor, type ServerPort, type ServerResponse, type ServiceHandle, type SpawnOptions, type SpecOptions, type SpecRunner, type SpecTarget, SpecificationBuilder, type SpecificationConfig, SpecificationResult, type SpecificationRunner, type SpecificationRunnerWithCleanup, type StackTarget, TableAssertion, app, cli, command, createSpecificationRunner, dockerContainer, e2e, grep, integration, mockOf, mockOfDate, normalizeOutput, postgres, redis, spec, stack, stripAnsi };
+export { type AppServices, type AppTarget, type CliOptions, type CommandEnv, type CommandPort, type CommandResult, type CommandTarget, type ContainerPort, type DatabasePort, DirectoryAccessor, type DirectorySnapshotOptions, DockerAssertion, type DockerContainerPort, type DockerInspectResult, type E2eOptions, ExecAdapter, FetchAdapter, type FileAccessor, HonoAdapter, type HttpTarget, type IntegrationOptions, type IsolationStrategy, type MockDatePort, type MockPort, Orchestrator, type PostgresOptions, type RedisOptions, ResponseAccessor, type ServerPort, type ServerResponse, type ServiceHandle, type SpawnOptions, type SpecOptions, type SpecRunner, type SpecTarget, SpecificationBuilder, type SpecificationConfig, SpecificationResult, type SpecificationRunner, type SpecificationRunnerWithCleanup, type SqliteOptions, type StackTarget, TableAssertion, app, cli, command, createSpecificationRunner, dockerContainer, e2e, grep, integration, mockOf, mockOfDate, normalizeOutput, postgres, redis, spec, sqlite, stack, stripAnsi };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,4 +1,4 @@
-import { n as postgres, t as redis } from "./redis.adapter.js";
+import { n as redis, r as postgres, t as sqlite } from "./sqlite.adapter.js";
 import { n as mockOfDate, t as mockOf } from "./mock-of.js";
 import { execSync, spawn } from "node:child_process";
 import { cpSync, existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, statSync } from "node:fs";
@@ -113,22 +113,25 @@ var FetchAdapter = class {
 	constructor(url) {
 		this.baseUrl = url.replace(/\/$/, "");
 	}
-	async request(method, path, body) {
+	async request(method, path, body, headers) {
 		const init = {
 			method,
-			headers: { "Content-Type": "application/json" }
+			headers: {
+				"Content-Type": "application/json",
+				...headers
+			}
 		};
 		if (body !== void 0) init.body = JSON.stringify(body);
 		const response = await fetch(`${this.baseUrl}${path}`, init);
 		const responseBody = await response.json().catch(() => null);
-		const headers = {};
+		const responseHeaders = {};
 		response.headers.forEach((value, key) => {
-			headers[key] = value;
+			responseHeaders[key] = value;
 		});
 		return {
 			status: response.status,
 			body: responseBody,
-			headers
+			headers: responseHeaders
 		};
 	}
 };
@@ -143,22 +146,25 @@ var HonoAdapter = class {
 	constructor(app) {
 		this.app = app;
 	}
-	async request(method, path, body) {
+	async request(method, path, body, headers) {
 		const init = {
 			method,
-			headers: { "Content-Type": "application/json" }
+			headers: {
+				"Content-Type": "application/json",
+				...headers
+			}
 		};
 		if (body !== void 0) init.body = JSON.stringify(body);
 		const response = await this.app.request(path, init);
 		const responseBody = await response.json().catch(() => null);
-		const headers = {};
+		const responseHeaders = {};
 		response.headers.forEach((value, key) => {
-			headers[key] = value;
+			responseHeaders[key] = value;
 		});
 		return {
 			status: response.status,
 			body: responseBody,
-			headers
+			headers: responseHeaders
 		};
 	}
 };
@@ -588,6 +594,7 @@ var SpecificationBuilder = class {
 	mocks = [];
 	projectName = null;
 	request = null;
+	requestHeaders = {};
 	seeds = [];
 	spawnConfig = null;
 	testDir;
@@ -642,6 +649,19 @@ var SpecificationBuilder = class {
 		return this;
 	}
 	/**
+	* Set HTTP headers for the request. Multiple calls merge.
+	*
+	* @example
+	*   spec("french").headers({ 'Accept-Language': 'fr' }).get("/articles").run();
+	*/
+	headers(headers) {
+		this.requestHeaders = {
+			...this.requestHeaders,
+			...headers
+		};
+		return this;
+	}
+	/**
 	* Send a GET request to the server adapter.
 	*
 	* @example
@@ -762,7 +782,8 @@ var SpecificationBuilder = class {
 		if (!this.config.server) throw new Error("HTTP actions require a server adapter (use integration() or e2e())");
 		let body;
 		if (this.request.bodyFile) body = JSON.parse(readFileSync(resolve(this.testDir, "requests", this.request.bodyFile), "utf8"));
-		const response = await this.config.server.request(this.request.method, this.request.path, body);
+		const headers = Object.keys(this.requestHeaders).length > 0 ? this.requestHeaders : void 0;
+		const response = await this.config.server.request(this.request.method, this.request.path, body, headers);
 		return new SpecificationResult({
 			config: this.config,
 			requestInfo: {
@@ -1210,7 +1231,13 @@ var Orchestrator = class {
 		const composePath = findComposeFile(this.root);
 		const composeDir = composePath ? dirname(composePath) : this.root;
 		const composeConfig = composePath ? parseComposeFile(composePath) : null;
-		const containerTasks = this.services.map((handle) => {
+		const containerServices = [];
+		const embeddedServices = [];
+		for (const handle of this.services) {
+			if (handle.defaultPort === 0) {
+				embeddedServices.push(handle);
+				continue;
+			}
 			let image = handle.defaultImage;
 			let env = { ...handle.environment };
 			if (handle.composeName && composeConfig) {
@@ -1224,18 +1251,26 @@ var Orchestrator = class {
 					Object.assign(handle.environment, composeService.environment);
 				}
 			}
-			return {
-				container: new TestcontainersAdapter({
-					image,
-					port: handle.defaultPort,
-					env
-				}),
+			const container = new TestcontainersAdapter({
+				image,
+				port: handle.defaultPort,
+				env
+			});
+			containerServices.push({
+				container,
 				handle
-			};
-		});
-		await Promise.all(containerTasks.map(({ container }) => container.start()));
+			});
+		}
+		await Promise.all([...containerServices.map(({ container }) => container.start()), ...embeddedServices.map(async (handle) => {
+			await handle.initialize(composeDir);
+			handle.started = true;
+			this.running.push({
+				handle,
+				container: null
+			});
+		})]);
 		const reports = [];
-		for (const { container, handle } of containerTasks) {
+		for (const { container, handle } of containerServices) {
 			const serviceStartTime = Date.now();
 			try {
 				const host = container.getHost();
@@ -1449,7 +1484,12 @@ async function startApp(target, options) {
 	});
 	await orchestrator.start();
 	await acquireIsolation(services);
-	const honoApp = target.factory();
+	const servicesMap = {};
+	for (const svc of services) {
+		const key = svc.composeName ?? svc.type;
+		servicesMap[key] = svc;
+	}
+	const honoApp = target.factory(servicesMap);
 	const database = orchestrator.getDatabase() ?? void 0;
 	const databases = orchestrator.getDatabases();
 	const runner = createSpecificationRunner({
@@ -1525,13 +1565,17 @@ async function startCommand(target, options) {
 //#endregion
 //#region src/runner/targets.ts
 /**
-* Test against an in-process Hono app. Services are started via testcontainers
-* and the app runs without network overhead.
+* Test against an in-process Hono app. The factory receives started services
+* so you can wire connection strings into your app/DI container.
 *
-* @param factory - Function that returns a Hono app instance (called after services start).
+* @param factory - Function that receives services and returns a Hono app instance.
 *
 * @example
-*   await spec(app(() => createApp(db)), { services: [db] });
+*   const db = postgres({ compose: 'db' });
+*   await spec(
+*       app((services) => createApp({ databaseUrl: services.db.connectionString })),
+*       { services: [db] },
+*   );
 */
 function app(factory) {
 	return {
@@ -1655,6 +1699,6 @@ async function integration(options) {
 	return runner;
 }
 //#endregion
-export { DirectoryAccessor, DockerAssertion, ExecAdapter, FetchAdapter, HonoAdapter, Orchestrator, ResponseAccessor, SpecificationBuilder, SpecificationResult, TableAssertion, app, cli, command, createSpecificationRunner, dockerContainer, e2e, grep, integration, mockOf, mockOfDate, normalizeOutput, postgres, redis, spec, stack, stripAnsi };
+export { DirectoryAccessor, DockerAssertion, ExecAdapter, FetchAdapter, HonoAdapter, Orchestrator, ResponseAccessor, SpecificationBuilder, SpecificationResult, TableAssertion, app, cli, command, createSpecificationRunner, dockerContainer, e2e, grep, integration, mockOf, mockOfDate, normalizeOutput, postgres, redis, spec, sqlite, stack, stripAnsi };
 
 //# sourceMappingURL=index.js.map