@bensandee/tooling 0.24.0 → 0.25.0

package/dist/bin.mjs

@@ -22,7 +22,7 @@ const LEGACY_TOOLS = [
 //#endregion
 //#region src/utils/json.ts
 const StringRecord = z.record(z.string(), z.string());
-const PackageJsonSchema = z.object({
+const PackageJsonSchema = z.looseObject({
 	name: z.string().optional(),
 	version: z.string().optional(),
 	private: z.boolean().optional(),
@@ -35,20 +35,21 @@ const PackageJsonSchema = z.object({
 	main: z.string().optional(),
 	types: z.string().optional(),
 	typings: z.string().optional(),
-	engines: StringRecord.optional()
-}).loose();
-const TsconfigSchema = z.object({
+	engines: StringRecord.optional(),
+	repository: z.union([z.string(), z.looseObject({ url: z.string() })]).optional()
+});
+const TsconfigSchema = z.looseObject({
 	extends: z.union([z.string(), z.array(z.string())]).optional(),
 	include: z.array(z.string()).optional(),
 	exclude: z.array(z.string()).optional(),
 	files: z.array(z.string()).optional(),
-	references: z.array(z.object({ path: z.string() }).loose()).optional(),
+	references: z.array(z.looseObject({ path: z.string() })).optional(),
 	compilerOptions: z.record(z.string(), z.unknown()).optional()
-}).loose();
-const RenovateSchema = z.object({
+});
+const RenovateSchema = z.looseObject({
 	$schema: z.string().optional(),
 	extends: z.array(z.string()).optional()
-}).loose();
+});
 /** Parse a JSONC string as a tsconfig.json. Returns a typed object with `{}` fallback on failure. */
 function parseTsconfig(raw) {
 	const result = TsconfigSchema.safeParse(parse(raw));
@@ -63,7 +64,7 @@ function parseRenovateJson(raw) {
 		return {};
 	}
 }
-const ChangesetConfigSchema = z.object({ commit: z.union([z.boolean(), z.string()]).optional() }).loose();
+const ChangesetConfigSchema = z.looseObject({ commit: z.union([z.boolean(), z.string()]).optional() });
 /** Parse a JSON string as a .changeset/config.json. Returns `undefined` on failure. */
 function parseChangesetConfig(raw) {
 	try {
@@ -108,6 +109,7 @@ function detectProject(targetDir) {
 		hasReleaseItConfig: exists(".release-it.json") || exists(".release-it.yaml") || exists(".release-it.toml"),
 		hasSimpleReleaseConfig: exists(".versionrc") || exists(".versionrc.json") || exists(".versionrc.js"),
 		hasChangesetsConfig: exists(".changeset/config.json"),
+		hasRepositoryField: !!readPackageJson(targetDir)?.repository,
 		legacyConfigs: detectLegacyConfigs(targetDir)
 	};
 }
@@ -981,7 +983,7 @@ function getAddedDevDepNames(config) {
 	const deps = { ...ROOT_DEV_DEPS };
 	if (config.structure !== "monorepo") Object.assign(deps, PER_PACKAGE_DEV_DEPS);
 	deps["@bensandee/config"] = "0.8.2";
-	deps["@bensandee/tooling"] = "0.24.0";
+	deps["@bensandee/tooling"] = "0.25.0";
 	if (config.formatter === "oxfmt") deps["oxfmt"] = "0.35.0";
 	if (config.formatter === "prettier") deps["prettier"] = "3.8.1";
 	addReleaseDeps(deps, config);
@@ -1006,7 +1008,7 @@ async function generatePackageJson(ctx) {
 	const devDeps = { ...ROOT_DEV_DEPS };
 	if (!isMonorepo) Object.assign(devDeps, PER_PACKAGE_DEV_DEPS);
 	devDeps["@bensandee/config"] = isWorkspacePackage(ctx, "@bensandee/config") ? "workspace:*" : "0.8.2";
-	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.24.0";
+	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.25.0";
 	if (ctx.config.useEslintPlugin) devDeps["@bensandee/eslint-plugin"] = isWorkspacePackage(ctx, "@bensandee/eslint-plugin") ? "workspace:*" : "0.9.2";
 	if (ctx.config.formatter === "oxfmt") devDeps["oxfmt"] = "0.35.0";
 	if (ctx.config.formatter === "prettier") devDeps["prettier"] = "3.8.1";
@@ -1894,7 +1896,8 @@ function buildSettings(ctx) {
 		instructions: [
 			"Use pnpm, not npm/yarn/npx. Run binaries with `pnpm exec`.",
 			"No typecasts (as/any). Use zod schemas, type guards, or narrowing instead.",
-			"Fix lint violations instead of suppressing them. Only add disable comments when suppression is genuinely the best option."
+			"Fix lint violations instead of suppressing them. Only add disable comments when suppression is genuinely the best option.",
+			"Prefer extensionless imports; if an extension is required, use .ts over .js."
 		],
 		enabledPlugins,
 		extraKnownMarketplaces
@@ -2475,7 +2478,7 @@ const SCHEMA_NPM_PATH = "@bensandee/config/schemas/forgejo-workflow.schema.json"
 const SCHEMA_LOCAL_PATH = ".vscode/forgejo-workflow.schema.json";
 const SETTINGS_PATH = ".vscode/settings.json";
 const SCHEMA_GLOB = ".forgejo/workflows/*.{yml,yaml}";
-const VscodeSettingsSchema = z.object({ "yaml.schemas": z.record(z.string(), z.unknown()).default({}) }).loose();
+const VscodeSettingsSchema = z.looseObject({ "yaml.schemas": z.record(z.string(), z.unknown()).default({}) });
 function readSchemaFromNodeModules(targetDir) {
 	const candidate = path.join(targetDir, "node_modules", SCHEMA_NPM_PATH);
 	if (!existsSync(candidate)) return void 0;
@@ -2924,6 +2927,17 @@ function generateMigratePrompt(results, config, detected) {
 	}
 	sections.push("## Migration tasks");
 	sections.push("");
+	if (config.releaseStrategy !== "none" && !detected.hasRepositoryField) {
+		sections.push("### Add repository field to package.json");
+		sections.push("");
+		sections.push(`The release strategy \`${config.releaseStrategy}\` requires a \`repository\` field in \`package.json\` so that \`release:trigger\` can determine the correct hosting platform (Forgejo vs GitHub).`);
+		sections.push("");
+		sections.push("Add the appropriate repository URL to `package.json`:");
+		sections.push("");
+		sections.push("- For Forgejo: `\"repository\": \"https://your-forgejo-instance.com/owner/repo\"`");
+		sections.push("- For GitHub: `\"repository\": \"https://github.com/owner/repo\"`");
+		sections.push("");
+	}
 	const legacyToRemove = detected.legacyConfigs.filter((legacy) => !(legacy.tool === "prettier" && config.formatter === "prettier"));
 	if (legacyToRemove.length > 0) {
 		sections.push("### Remove legacy tooling");
@@ -3096,6 +3110,7 @@ async function runInit(config, options = {}) {
 		if (p.isCancel(result)) return "skip";
 		return result;
 	}));
+	if (config.releaseStrategy !== "none" && !ctx.packageJson?.repository) p.log.warn(`package.json is missing a "repository" field — required for release strategy "${config.releaseStrategy}"`);
 	logDetectionSummary(ctx);
 	s.start("Generating configuration files...");
 	let results;
@@ -3588,7 +3603,8 @@ async function runVersionMode(executor, config) {
 	debugExec(config, "pnpm install --no-frozen-lockfile", executor.exec("pnpm install --no-frozen-lockfile", { cwd: config.cwd }));
 	const { title, body } = buildPrContent(executor, config.cwd, packagesBefore);
 	debug(config, `PR title: ${title}`);
-	executor.exec("git add -A", { cwd: config.cwd });
+	const addResult = executor.exec("git add -A", { cwd: config.cwd });
+	if (addResult.exitCode !== 0) throw new FatalError(`git add failed: ${addResult.stderr || addResult.stdout}`);
 	const remainingChangesets = executor.listChangesetFiles(config.cwd);
 	if (remainingChangesets.length > 0) p.log.warn(`Changeset files still present after versioning: ${remainingChangesets.join(", ")}`);
 	debug(config, `Changeset files after versioning: ${remainingChangesets.length > 0 ? remainingChangesets.join(", ") : "(none — all consumed)"}`);
@@ -3608,7 +3624,9 @@ async function runVersionMode(executor, config) {
 			pr: "none"
 		};
 	}
-	debugExec(config, "git push", executor.exec(`git push origin "HEAD:refs/heads/${BRANCH}" --force`, { cwd: config.cwd }));
+	const pushResult = executor.exec(`git push origin "HEAD:refs/heads/${BRANCH}" --force`, { cwd: config.cwd });
+	debugExec(config, "git push", pushResult);
+	if (pushResult.exitCode !== 0) throw new FatalError(`git push failed (exit code ${String(pushResult.exitCode)}):\n${pushResult.stderr || pushResult.stdout}`);
 	const conn = {
 		serverUrl: config.serverUrl,
 		repository: config.repository,
@@ -3700,8 +3718,12 @@ async function runPublishMode(executor, config) {
 	const errors = [];
 	for (const tag of allTags) try {
 		if (!remoteSet.has(tag)) {
-			if (executor.exec(`git tag -l ${JSON.stringify(tag)}`, { cwd: config.cwd }).stdout.trim() === "") executor.exec(`git tag ${JSON.stringify(tag)}`, { cwd: config.cwd });
-			executor.exec(`git push origin refs/tags/${tag}`, { cwd: config.cwd });
+			if (executor.exec(`git tag -l ${JSON.stringify(tag)}`, { cwd: config.cwd }).stdout.trim() === "") {
+				const tagResult = executor.exec(`git tag ${JSON.stringify(tag)}`, { cwd: config.cwd });
+				if (tagResult.exitCode !== 0) throw new FatalError(`Failed to create tag ${tag}: ${tagResult.stderr || tagResult.stdout}`);
+			}
+			const pushTagResult = executor.exec(`git push origin refs/tags/${tag}`, { cwd: config.cwd });
+			if (pushTagResult.exitCode !== 0) throw new FatalError(`Failed to push tag ${tag}: ${pushTagResult.stderr || pushTagResult.stdout}`);
 		}
 		if (await findRelease(executor, conn, tag)) p.log.warn(`Release for ${tag} already exists — skipping`);
 		else {
@@ -3893,7 +3915,8 @@ async function triggerForgejo(conn, ref) {
 	p.log.info(`Triggered release workflow on Forgejo (ref: ${ref})`);
 }
 function triggerGitHub(ref) {
-	createRealExecutor().exec(`gh workflow run release.yml --ref ${ref}`, { cwd: process.cwd() });
+	const result = createRealExecutor().exec(`gh workflow run release.yml --ref ${ref}`, { cwd: process.cwd() });
+	if (result.exitCode !== 0) throw new FatalError(`Failed to trigger GitHub workflow: ${result.stderr || result.stdout || "unknown error"}`);
 	p.log.info(`Triggered release workflow on GitHub (ref: ${ref})`);
 }
 //#endregion
@@ -3962,7 +3985,8 @@ function mergeGitHub(dryRun) {
 		p.log.info(`[dry-run] Would merge PR #${prNum} and delete branch ${HEAD_BRANCH}`);
 		return;
 	}
-	executor.exec(`gh pr merge ${HEAD_BRANCH} --merge --delete-branch`, { cwd: process.cwd() });
+	const result = executor.exec(`gh pr merge ${HEAD_BRANCH} --merge --delete-branch`, { cwd: process.cwd() });
+	if (result.exitCode !== 0) throw new FatalError(`Failed to merge PR: ${result.stderr || result.stdout || "unknown error"}`);
 	p.log.info(`Merged changesets PR and deleted branch ${HEAD_BRANCH}`);
 }
 //#endregion
@@ -4033,7 +4057,10 @@ async function runSimpleRelease(executor, config) {
 	let slidingTags = [];
 	if (!config.noSlidingTags && pushed) {
 		slidingTags = computeSlidingTags(version);
-		for (const slidingTag of slidingTags) executor.exec(`git tag -f ${slidingTag}`, { cwd: config.cwd });
+		for (const slidingTag of slidingTags) {
+			const slidingTagResult = executor.exec(`git tag -f ${slidingTag}`, { cwd: config.cwd });
+			if (slidingTagResult.exitCode !== 0) throw new FatalError(`Failed to create sliding tag ${slidingTag}: ${slidingTagResult.stderr || slidingTagResult.stdout}`);
+		}
 		const forcePushResult = executor.exec(`git push origin ${slidingTags.join(" ")} --force`, { cwd: config.cwd });
 		debugExec(config, "force-push sliding tags", forcePushResult);
 		if (forcePushResult.exitCode !== 0) p.log.warn(`Warning: Failed to push sliding tags: ${forcePushResult.stderr || forcePushResult.stdout}`);
@@ -4288,6 +4315,22 @@ const publishDockerCommand = defineCommand({
 });
 //#endregion
 //#region src/commands/docker-build.ts
+/**
+* Detect if cwd is inside a packages/ subdirectory.
+* If so, return the project root and the relative package dir.
+* Otherwise return cwd as-is with no packageDir.
+*/
+function detectSubpackage(cwd) {
+	const parent = path.dirname(cwd);
+	if (path.basename(parent) === "packages" && existsSync(path.join(parent, "..", "package.json"))) return {
+		root: path.dirname(parent),
+		packageDir: `packages/${path.basename(cwd)}`
+	};
+	return {
+		root: cwd,
+		packageDir: void 0
+	};
+}
 const dockerBuildCommand = defineCommand({
 	meta: {
 		name: "docker:build",
@@ -4312,9 +4355,16 @@ const dockerBuildCommand = defineCommand({
 		const executor = createRealExecutor();
 		const rawExtra = args._ ?? [];
 		const extraArgs = Array.isArray(rawExtra) ? rawExtra.map(String) : [String(rawExtra)];
+		let cwd = process.cwd();
+		let packageDir = args.package;
+		if (!packageDir) {
+			const detected = detectSubpackage(cwd);
+			cwd = detected.root;
+			packageDir = detected.packageDir;
+		}
 		runDockerBuild(executor, {
-			cwd: process.cwd(),
-			packageDir: args.package,
+			cwd,
+			packageDir,
 			verbose: args.verbose === true,
 			extraArgs: extraArgs.filter((a) => a.length > 0)
 		});
@@ -4330,16 +4380,16 @@ const COMPOSE_FILE_CANDIDATES = [
 	"compose.yml"
 ];
 /** Zod schema for the subset of compose YAML we care about. */
-const ComposePortSchema = z.union([z.string(), z.object({
+const ComposePortSchema = z.union([z.string(), z.looseObject({
 	published: z.union([z.string(), z.number()]),
 	target: z.union([z.string(), z.number()]).optional()
-}).loose()]);
-const ComposeServiceSchema = z.object({
+})]);
+const ComposeServiceSchema = z.looseObject({
 	image: z.string().optional(),
 	ports: z.array(ComposePortSchema).optional(),
 	healthcheck: z.unknown().optional()
-}).loose();
-const ComposeFileSchema = z.object({ services: z.record(z.string(), ComposeServiceSchema).optional() }).loose();
+});
+const ComposeFileSchema = z.looseObject({ services: z.record(z.string(), ComposeServiceSchema).optional() });
 /** Directories to scan for compose files, in priority order. */
 const COMPOSE_DIR_CANDIDATES = [".", "docker"];
 /** Detect which compose files exist at conventional paths.
@@ -4418,11 +4468,20 @@ function parseComposeServices(cwd, composeFiles) {
 	}
 	return [...serviceMap.values()];
 }
+/**
+* Strip Docker Compose variable substitutions from an image string.
+* Handles `${VAR:-default}`, `${VAR-default}`, `${VAR:+alt}`, `${VAR+alt}`,
+* `${VAR:?err}`, `${VAR?err}`, and plain `${VAR}`.
+* Nested braces are not supported.
+*/
+function stripComposeVariables(image) {
+	return image.replace(/\$\{[^}]*\}/g, "");
+}
 /** Extract deduplicated bare image names (without tags) from parsed services. */
 function extractComposeImageNames(services) {
 	const names = /* @__PURE__ */ new Set();
 	for (const service of services) if (service.image) {
-		const bare = service.image.split(":")[0];
+		const bare = stripComposeVariables(service.image).split(":")[0];
 		if (bare) names.add(bare);
 	}
 	return [...names];
@@ -4607,7 +4666,7 @@ const dockerCheckCommand = defineCommand({
 const main = defineCommand({
 	meta: {
 		name: "tooling",
-		version: "0.24.0",
+		version: "0.25.0",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -4623,7 +4682,7 @@ const main = defineCommand({
 		"docker:check": dockerCheckCommand
 	}
 });
-console.log(`@bensandee/tooling v0.24.0`);
+console.log(`@bensandee/tooling v0.25.0`);
 async function run() {
 	await runMain(main);
 	process.exit(process.exitCode ?? 0);

package/dist/index.d.mts

@@ -15,6 +15,9 @@ declare const PackageJsonSchema: z.ZodObject<{
   types: z.ZodOptional<z.ZodString>;
   typings: z.ZodOptional<z.ZodString>;
   engines: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+  repository: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodObject<{
+    url: z.ZodString;
+  }, z.core.$loose>]>>;
 }, z.core.$loose>;
 type PackageJson = z.infer<typeof PackageJsonSchema>;
 //#endregion
@@ -91,6 +94,8 @@ interface DetectedProjectState {
   hasReleaseItConfig: boolean;
   hasSimpleReleaseConfig: boolean;
   hasChangesetsConfig: boolean;
+  /** Whether package.json has a repository field (needed for release workflows) */
+  hasRepositoryField: boolean;
   /** Legacy tooling configs found */
   legacyConfigs: LegacyConfig[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bensandee/tooling",
-  "version": "0.24.0",
+  "version": "0.25.0",
   "description": "CLI tool to bootstrap and maintain standardized TypeScript project tooling",
   "bin": {
     "tooling": "./dist/bin.mjs"