@peachlife/artisan 0.1.3 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@peachlife/artisan",
-	"version": "0.1.3",
+	"version": "0.1.4",
 	"type": "module",
 	"bin": {
 		"artisan": "./bin/artisan.mjs"

package/src/api/injection.mjs

@@ -7,14 +7,30 @@ export {
 	expect,
 } from "vitest";
 
-import { test as vitestTest } from "vitest";
+import { onTestFailed as vitestOnTestFailed, test as vitestTest } from "vitest";
 import { DEFAULT_XDG_CONFIG_HOME } from "../core/constants.mjs";
 import { ContainerManager } from "../core/container-manager.mjs";
 
-export function createTestContext(container) {
+export function createTestContext(
+	container,
+	{ onTestFailed = vitestOnTestFailed } = {},
+) {
+	let lastRun;
+
+	onTestFailed(() => {
+		if (!lastRun) return;
+		console.error("\n--- artisan: last run() output ---");
+		if (lastRun.stdout) console.error("stdout:", lastRun.stdout);
+		if (lastRun.stderr) console.error("stderr:", lastRun.stderr);
+		console.error("exitCode:", lastRun.exitCode);
+		console.error("---");
+	});
+
 	return {
 		async run(arguments_ = "", options = {}) {
-			return container.exec(arguments_, options);
+			const result = await container.exec(arguments_, options);
+			lastRun = result;
+			return result;
 		},
 		async copyFixture(localPath, containerPath) {
 			return container.copyFile(localPath, containerPath);
@@ -29,6 +45,11 @@ export function createTestContext(container) {
 				}
 			}
 		},
+		async shell(command, options = {}) {
+			const result = await container.shell(command, options);
+			lastRun = result;
+			return result;
+		},
 	};
 }
 
@@ -81,6 +102,9 @@ function buildExtendedTest() {
 		)
 		.extend("setup", async ({ artisanContext }) =>
 			artisanContext.setup.bind(artisanContext),
+		)
+		.extend("shell", async ({ artisanContext }) =>
+			artisanContext.shell.bind(artisanContext),
 		);
 }
 

package/src/cli/commands/test.mjs

@@ -77,13 +77,13 @@ function buildVitestArguments({ options, merged, testFiles }) {
 			value:
 				options.retries === undefined ? undefined : String(options.retries),
 		},
-		{ flag: "--verbose", value: options.verbose, boolean: true },
 	];
 	for (const { flag, value, boolean = false } of flagRules) {
 		if (!value) continue;
 		vitestArguments.push(flag);
 		if (!boolean) vitestArguments.push(value);
 	}
+	if (options.verbose) vitestArguments.push("--reporter", "verbose");
 	return vitestArguments;
 }
 

package/src/core/config.mjs

@@ -1,5 +1,5 @@
-import { readFile } from "node:fs/promises";
-import { join } from "node:path";
+import { access, readFile } from "node:fs/promises";
+import { isAbsolute, join } from "node:path";
 import { UsageError } from "../utils/errors.mjs";
 import { DEFAULT_DISTROS } from "./constants.mjs";
 
@@ -63,6 +63,14 @@ function validateConfigShape(config) {
 	if (config.artifact !== undefined && typeof config.artifact !== "string") {
 		throw new UsageError('"artifact" must be a string');
 	}
+	if (
+		typeof config.artifact === "string" &&
+		(isAbsolute(config.artifact) || config.artifact.startsWith("~"))
+	) {
+		throw new UsageError(
+			'"artifact" must be a repo-relative path (e.g. "./bin/mycli"), not an absolute or home-relative path',
+		);
+	}
 	if (config.distros !== undefined)
 		assertStringArray(config.distros, "distros");
 	if (
@@ -118,8 +126,28 @@ export async function readJsonConfig(configPath, { optional = false } = {}) {
 	}
 }
 
+async function fileExists(filePath) {
+	try {
+		await access(filePath);
+		return true;
+	} catch (error) {
+		if (error?.code === "ENOENT") return false;
+		throw error;
+	}
+}
+
 export async function loadConfig(cwd = process.cwd()) {
 	const configPath = join(cwd, "artisan.config.json");
+	const packageJsonPath = join(cwd, "package.json");
+	const [configExists, packageExists] = await Promise.all([
+		fileExists(configPath),
+		fileExists(packageJsonPath),
+	]);
+	if (!configExists && !packageExists) {
+		throw new UsageError(
+			"No artisan.config.json or package.json found — run from the project root",
+		);
+	}
 	const fileConfig = await readJsonConfig(configPath, { optional: true });
 	if (fileConfig.configs !== undefined) {
 		validateConfigs(fileConfig.configs);

package/src/core/container-manager.mjs

@@ -8,6 +8,8 @@ import { BINARY_MOUNT_DIR } from "./constants.mjs";
 const NO_CAP = 0;
 const SH_C = ["sh", "-c"];
 const ERR_NOT_STARTED = "Container not started";
+// eslint-disable-next-line sonarjs/publicly-writable-directories
+const DEFAULT_WORKDIR = "/tmp/work";
 
 function parseChar(state, char) {
 	if (state.isEscaped) {
@@ -173,6 +175,17 @@ export class ContainerManager {
 
 			this.#container = await builder.start();
 
+			const workdirResult = await this.#execBounded(
+				[...SH_C, `mkdir -p ${DEFAULT_WORKDIR}`],
+				{},
+				NO_CAP,
+			);
+			if (workdirResult.exitCode !== 0) {
+				throw new DockerError(
+					`failed to initialize default workdir ${DEFAULT_WORKDIR}\n${workdirResult.stderr || workdirResult.stdout}`,
+				);
+			}
+
 			for (const command of this.#setupCommands) {
 				const result = await this.#execBounded([...SH_C, command], {}, NO_CAP);
 				if (result.exitCode !== 0) {
@@ -201,7 +214,7 @@ export class ContainerManager {
 		const {
 			env: environment = {},
 			timeout = NO_CAP,
-			cwd = BINARY_MOUNT_DIR,
+			cwd = DEFAULT_WORKDIR,
 		} = options;
 		const command = [
 			this.#mountTarget,