systemd-ts 0.2.0 → 0.3.1

package/dist/test.d.mts

@@ -1,3 +1,5 @@
+import { j as CommandExecutor, n as Systemd } from "./index-DeNBLyGA.mjs";
+
 //#region src/test/host.d.ts
 interface TestHostInfo {
   readonly backend: TestHostBackendName;
@@ -12,6 +14,32 @@ declare function getTestHostInfo(): TestHostInfo;
 declare function ensureTestHost(): Promise<TestHostInfo>;
 declare function closeTestHost(): void;
 declare function runGuestCommand(script: string): Promise<string>;
+declare function runIsolatedGuestCommand(script: string): Promise<string>;
+//#endregion
+//#region src/test/harness.d.ts
+/**
+ * Creates a command executor that runs argv-style commands inside the current
+ * test host guest shell.
+ */
+declare function createGuestCommandExecutor(runCommand: (script: string) => Promise<string>): CommandExecutor;
+/**
+ * Executor that reuses the warm guest shell for fast sandbox-backed tests.
+ */
+declare const guestCommandExecutor: CommandExecutor;
+/**
+ * Executor that runs each guest command in a fresh isolated guest shell.
+ */
+declare const isolatedGuestCommandExecutor: CommandExecutor;
+/**
+ * Creates a `Systemd` instance scoped to the active test sandbox and backed by
+ * the warm guest-shell executor.
+ */
+declare function sandboxSystemd(): Systemd;
+/**
+ * Creates a `Systemd` instance scoped to the active test sandbox and backed by
+ * a fresh guest shell per command.
+ */
+declare function isolatedSandboxSystemd(): Systemd;
 //#endregion
 //#region src/test/sandbox.d.ts
 interface TestSandbox {
@@ -25,4 +53,4 @@ declare function createTestSandbox(testName?: string): Promise<TestSandbox>;
 declare function destroyCurrentTestSandbox(): Promise<void>;
 declare function useCurrentTestSandbox(): TestSandbox;
 //#endregion
-export { type TestHostInfo, type TestSandbox, closeTestHost, createTestSandbox, destroyCurrentTestSandbox, ensureTestHost, getTestHostInfo, runGuestCommand, useCurrentTestSandbox };
+export { type TestHostInfo, type TestSandbox, closeTestHost, createGuestCommandExecutor, createTestSandbox, destroyCurrentTestSandbox, ensureTestHost, getTestHostInfo, guestCommandExecutor, isolatedGuestCommandExecutor, isolatedSandboxSystemd, runGuestCommand, runIsolatedGuestCommand, sandboxSystemd, useCurrentTestSandbox };

package/dist/test.mjs

@@ -1,3 +1,4 @@
+import { n as Systemd } from "./main-BXq7TQdg.mjs";
 import { fileURLToPath } from "node:url";
 import { execFile, spawn } from "node:child_process";
 import { promisify } from "node:util";
@@ -35,6 +36,9 @@ function closeTestHost() {
 async function runGuestCommand(script) {
 	return getGuestShell().run(script);
 }
+async function runIsolatedGuestCommand(script) {
+	return backend.runIsolatedCommand(script);
+}
 async function ensureTestHostInner() {
 	logTestHost(`Ensuring ${backend.info.backend} test host`);
 	await backend.ensureHost();
@@ -287,16 +291,16 @@ var DockerBackend = class {
 			`bash`,
 			`-lc`,
 			[
-				`mkdir -p ${shellQuote$1(dockerStateRoot)}`,
-				`chown ${runtimeInfo.userId}:${runtimeInfo.userId} ${shellQuote$1(dockerStateRoot)}`,
-				`loginctl enable-linger ${shellQuote$1(dockerUser)}`,
+				`mkdir -p ${shellQuote$2(dockerStateRoot)}`,
+				`chown ${runtimeInfo.userId}:${runtimeInfo.userId} ${shellQuote$2(dockerStateRoot)}`,
+				`loginctl enable-linger ${shellQuote$2(dockerUser)}`,
 				`systemctl start user@${runtimeInfo.userId}.service`
 			].join(`\n`)
 		], { timeout: dockerExecTimeoutMs });
 		await this.execDockerAsUser(runtimeInfo, [
 			`bash`,
 			`-lc`,
-			`mkdir -p ${shellQuote$1(`${dockerStateRoot}/tests`)}`
+			`mkdir -p ${shellQuote$2(`${dockerStateRoot}/tests`)}`
 		]);
 		logTestHost(`User session started for ${dockerUser}`);
 	}
@@ -344,7 +348,7 @@ var DockerBackend = class {
 			dockerContainer,
 			`bash`,
 			`-lc`,
-			`getent passwd ${shellQuote$1(dockerUser)} | cut -d: -f6`
+			`getent passwd ${shellQuote$2(dockerUser)} | cut -d: -f6`
 		])).trim();
 		if (home.length === 0) throw new Error(`Could not resolve home directory for Docker test user ${dockerUser}`);
 		logTestHost(`Resolved home directory for ${dockerUser}: ${home}`);
@@ -357,7 +361,7 @@ var DockerBackend = class {
 			dockerContainer,
 			`bash`,
 			`-lc`,
-			`id -u ${shellQuote$1(dockerUser)}`
+			`id -u ${shellQuote$2(dockerUser)}`
 		]);
 		const parsed = Number(output.trim());
 		if (!Number.isInteger(parsed)) throw new Error(`Could not resolve uid for Docker test user ${dockerUser}`);
@@ -456,7 +460,7 @@ printf '\\n${marker}:%s\\n' "$status"
 		this.drain();
 	}
 };
-function shellQuote$1(value) {
+function shellQuote$2(value) {
 	return `'${value.replaceAll(`'`, `'\\''`)}'`;
 }
 const backend = createBackend(selectedBackendName);
@@ -470,8 +474,8 @@ async function createTestSandbox(testName) {
 	const linkedUnitDir = `${rootDir}/linked-units`;
 	const workDir = `${rootDir}/work`;
 	await runGuestCommand(`set -euo pipefail
-rm -rf ${shellQuote(rootDir)}
-mkdir -p ${shellQuote(linkedUnitDir)} ${shellQuote(workDir)}`);
+rm -rf ${shellQuote$1(rootDir)}
+mkdir -p ${shellQuote$1(linkedUnitDir)} ${shellQuote$1(workDir)}`);
 	currentSandbox = {
 		id,
 		linkedUnitDir,
@@ -485,24 +489,97 @@ async function destroyCurrentTestSandbox() {
 	if (currentSandbox === void 0) return;
 	const sandbox = currentSandbox;
 	currentSandbox = void 0;
-	const units = (await runGuestCommand(`systemctl --user list-unit-files --all --no-legend ${shellQuote(`${sandbox.namePrefix}*`)} 2>/dev/null | awk '{print $1}' || true`)).split(`\n`).map((unit) => unit.trim()).filter((unit) => unit.length > 0);
+	const units = (await runGuestCommand(`systemctl --user list-unit-files --all --no-legend ${shellQuote$1(`${sandbox.namePrefix}*`)} 2>/dev/null | awk '{print $1}' || true`)).split(`\n`).map((unit) => unit.trim()).filter((unit) => unit.length > 0);
 	if (units.length > 0) {
-		await runGuestCommand(`systemctl --user stop ${units.map(shellQuote).join(` `)} || true`);
-		await runGuestCommand(`systemctl --user disable ${units.map(shellQuote).join(` `)} || true`);
-		await runGuestCommand(`systemctl --user reset-failed ${units.map(shellQuote).join(` `)} || true`);
+		await runGuestCommand(`systemctl --user stop ${units.map(shellQuote$1).join(` `)} || true`);
+		await runGuestCommand(`systemctl --user disable ${units.map(shellQuote$1).join(` `)} || true`);
+		await runGuestCommand(`systemctl --user reset-failed ${units.map(shellQuote$1).join(` `)} || true`);
 	}
 	await runGuestCommand(`systemctl --user daemon-reload || true`);
-	await runGuestCommand(`rm -rf ${shellQuote(sandbox.rootDir)}`);
+	await runGuestCommand(`rm -rf ${shellQuote$1(sandbox.rootDir)}`);
 }
 function useCurrentTestSandbox() {
 	if (currentSandbox === void 0) throw new Error(`No active test sandbox is available`);
 	return currentSandbox;
 }
-function shellQuote(value) {
+function shellQuote$1(value) {
 	return `'${value.replaceAll(`'`, `'\\''`)}'`;
 }
 function slugify(value) {
 	return value.toLowerCase().replaceAll(/[^a-z0-9]+/g, `-`).replaceAll(/^-+|-+$/g, ``).slice(0, 32);
 }
 //#endregion
-export { closeTestHost, createTestSandbox, destroyCurrentTestSandbox, ensureTestHost, getTestHostInfo, runGuestCommand, useCurrentTestSandbox };
+//#region src/test/harness.ts
+/**
+* Creates a command executor that runs argv-style commands inside the current
+* test host guest shell.
+*/
+function createGuestCommandExecutor(runCommand) {
+	return async (command, args, options = {}) => {
+		try {
+			return {
+				stderr: ``,
+				stdout: await runCommand(buildGuestCommand(command, args, options))
+			};
+		} catch (cause) {
+			throw enrichGuestCommandError(cause);
+		}
+	};
+}
+/**
+* Executor that reuses the warm guest shell for fast sandbox-backed tests.
+*/
+const guestCommandExecutor = createGuestCommandExecutor(runGuestCommand);
+/**
+* Executor that runs each guest command in a fresh isolated guest shell.
+*/
+const isolatedGuestCommandExecutor = createGuestCommandExecutor(runIsolatedGuestCommand);
+/**
+* Creates a `Systemd` instance scoped to the active test sandbox and backed by
+* the warm guest-shell executor.
+*/
+function sandboxSystemd() {
+	return new Systemd({
+		executor: guestCommandExecutor,
+		linkUnits: true,
+		scope: `user`,
+		unitDir: useCurrentTestSandbox().linkedUnitDir
+	});
+}
+/**
+* Creates a `Systemd` instance scoped to the active test sandbox and backed by
+* a fresh guest shell per command.
+*/
+function isolatedSandboxSystemd() {
+	return new Systemd({
+		executor: isolatedGuestCommandExecutor,
+		linkUnits: true,
+		scope: `user`,
+		unitDir: useCurrentTestSandbox().linkedUnitDir
+	});
+}
+function buildGuestCommand(command, args, options) {
+	return [
+		`env`,
+		...options.env === void 0 ? [] : Object.entries(options.env).flatMap(([key, value]) => value === void 0 ? [`-u`, key] : [`${key}=${value}`]),
+		command,
+		...args
+	].map((part) => shellQuote(part)).join(` `);
+}
+function enrichGuestCommandError(cause) {
+	if (cause instanceof Error) return Object.assign(cause, {
+		code: 1,
+		stderr: ``,
+		stdout: cause.message
+	});
+	return Object.assign(/* @__PURE__ */ new Error(`Guest command failed`), {
+		code: 1,
+		stderr: ``,
+		stdout: ``
+	});
+}
+function shellQuote(value) {
+	return `'${value.replaceAll(`'`, `'\\''`)}'`;
+}
+//#endregion
+export { closeTestHost, createGuestCommandExecutor, createTestSandbox, destroyCurrentTestSandbox, ensureTestHost, getTestHostInfo, guestCommandExecutor, isolatedGuestCommandExecutor, isolatedSandboxSystemd, runGuestCommand, runIsolatedGuestCommand, sandboxSystemd, useCurrentTestSandbox };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "systemd-ts",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "TypeScript builders and helpers for systemd services and timers.",
   "license": "MIT",
   "repository": {
@@ -22,7 +22,7 @@
   },
   "devDependencies": {
     "@types/node": "25.6.2",
-    "@typescript/native-preview": "7.0.0-dev.20260510.1",
+    "@typescript/native-preview": "7.0.0-dev.20260511.1",
     "takua": "0.1.1",
     "typescript": "6.0.3",
     "vite-plus": "0.1.20"