codemodctl 0.1.4 → 0.1.6

package/dist/cli.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
-import { analyzeCodeowners } from "./codeowner-analysis-CeRIGuLu.js";
+import { analyzeCodeowners } from "./codeowner-analysis-CcSOX0Ve.js";
 import { defineCommand, runMain } from "citty";
-import { exec } from "node:child_process";
 import crypto from "node:crypto";
+import { $ } from "execa";
 import fetch from "node-fetch";
 import { writeFile } from "node:fs/promises";
 
@@ -71,52 +71,62 @@ const createCommand = defineCommand({
 			console.error("Error: BUTTERFLOW_API_AUTH_TOKEN environment variable is required");
 			process.exit(1);
 		}
-		if (exec("git diff --quiet || git diff --cached --quiet").stderr?.read().toString().trim()) {
-			console.error("No changes detected, skipping pull request creation.");
-			process.exit(0);
-		}
-		const taskIdSignature = crypto.createHash("sha256").update(taskId).digest("hex").slice(0, 8);
-		const codemodBranchName = branchName ? branchName : `codemod-${taskIdSignature}`;
-		const remoteBaseBranchExec = exec("git remote show origin | sed -n '/HEAD branch/s/.*: //p'");
-		if (remoteBaseBranchExec.stderr?.read().toString().trim()) {
-			console.error("Error: Failed to get remote base branch");
-			console.error(remoteBaseBranchExec.stderr?.read().toString().trim());
-			process.exit(1);
-		}
-		const remoteBaseBranch = remoteBaseBranchExec.stdout?.read().toString().trim();
-		console.debug(`Remote base branch: ${remoteBaseBranch}`);
+		const prData = { title };
 		if (push) {
-			const gitCheckoutBranchExec = exec(`git checkout -b ${codemodBranchName}`);
-			if (gitCheckoutBranchExec.stderr?.read().toString().trim()) {
+			try {
+				await $`git diff --quiet`;
+				await $`git diff --cached --quiet`;
+				console.error("No changes detected, skipping pull request creation.");
+				process.exit(0);
+			} catch {
+				console.log("Changes detected, proceeding with pull request creation...");
+			}
+			const taskIdSignature = crypto.createHash("sha256").update(taskId).digest("hex").slice(0, 8);
+			const codemodBranchName = branchName ? branchName : `codemod-${taskIdSignature}`;
+			let remoteBaseBranch;
+			try {
+				remoteBaseBranch = (await $`git remote show origin`).stdout.match(/HEAD branch: (.+)/)?.[1]?.trim() || "main";
+			} catch (error) {
+				console.error("Error: Failed to get remote base branch");
+				console.error(error);
+				process.exit(1);
+			}
+			if (codemodBranchName) prData.head = codemodBranchName;
+			if (remoteBaseBranch) prData.base = remoteBaseBranch;
+			console.debug(`Remote base branch: ${remoteBaseBranch}`);
+			try {
+				await $`git checkout -b ${codemodBranchName}`;
+			} catch (error) {
 				console.error("Error: Failed to checkout branch");
-				console.error(gitCheckoutBranchExec.stderr?.read().toString().trim());
+				console.error(error);
 				process.exit(1);
 			}
-			const addChanges = exec("git add .");
-			if (addChanges.stderr?.read().toString().trim()) {
+			try {
+				await $`git add .`;
+			} catch (error) {
 				console.error("Error: Failed to add changes");
-				console.error(addChanges.stderr?.read().toString().trim());
+				console.error(error);
 				process.exit(1);
 			}
-			const commitChanges = exec(`git commit -m "${commitMessage}"`);
-			if (commitChanges.stderr?.read().toString().trim()) {
+			try {
+				await $`git commit -m ${commitMessage}`;
+			} catch (error) {
 				console.error("Error: Failed to commit changes");
-				console.error(commitChanges.stderr?.read().toString().trim());
+				console.error(error);
 				process.exit(1);
 			}
-			const pushChanges = exec(`git push origin ${codemodBranchName} --force`);
-			if (pushChanges.stderr?.read().toString().trim()) {
+			try {
+				await $`git push origin ${codemodBranchName} --force`;
+				console.log(`Pushed branch to origin: ${codemodBranchName}`);
+			} catch (error) {
 				console.error("Error: Failed to push changes");
-				console.error(pushChanges.stderr?.read().toString().trim());
+				console.error(error);
 				process.exit(1);
 			}
 		}
-		const prData = { title };
 		if (body) prData.body = body;
-		if (codemodBranchName && push) prData.head = codemodBranchName;
-		else if (head) prData.head = head;
-		if (base) prData.base = base;
-		else if (remoteBaseBranch) prData.base = remoteBaseBranch;
+		if (head && !prData.head) prData.head = head;
+		if (base && !prData.base) prData.base = base;
 		try {
 			console.debug("Creating pull request...");
 			console.debug(`Title: ${title}`);

package/dist/{codeowner-analysis-CeRIGuLu.js → codeowner-analysis-CcSOX0Ve.js}

@@ -97,6 +97,7 @@ const countedFindInFiles = countedPromise(findInFiles);
 /**
 * Finds and resolves the CODEOWNERS file path
 * Searches in common locations: root, .github/, docs/
+* Returns null if no CODEOWNERS file is found
 */
 async function findCodeownersFile(projectRoot = process.cwd(), explicitPath) {
 	if (explicitPath) {
@@ -110,7 +111,7 @@ async function findCodeownersFile(projectRoot = process.cwd(), explicitPath) {
 		resolve(projectRoot, "docs", "CODEOWNERS")
 	];
 	for (const searchPath of searchPaths) if (existsSync(searchPath)) return searchPath;
-	throw new Error("CODEOWNERS file not found. Please specify path explicitly or ensure CODEOWNERS file exists in project root, .github/, or docs/ folder.");
+	return null;
 }
 /**
 * Loads and parses AST-grep rule from YAML file
@@ -159,6 +160,28 @@ async function analyzeFilesByOwner(codeownersPath, rule, projectRoot = process.c
 	return filesByOwner;
 }
 /**
+* Analyzes files without codeowner parsing - assigns all files to "unassigned"
+*/
+async function analyzeFilesWithoutOwner(rule, projectRoot = process.cwd()) {
+	const filesByOwner = /* @__PURE__ */ new Map();
+	filesByOwner.set("unassigned", []);
+	await countedFindInFiles(Lang.TypeScript, {
+		matcher: rule,
+		paths: [projectRoot]
+	}, (err, matches) => {
+		if (err) {
+			console.error("AST-grep error:", err);
+			return;
+		}
+		if (!matches || matches.length === 0) return;
+		const fileName = matches[0]?.getRoot().filename();
+		if (!fileName) return;
+		const relativePath = path.relative(projectRoot, fileName);
+		filesByOwner.get("unassigned").push(relativePath);
+	});
+	return filesByOwner;
+}
+/**
 * Generates shard configuration from team file analysis
 */
 function generateShards(filesByOwner, shardSize) {
@@ -169,7 +192,8 @@ function generateShards(filesByOwner, shardSize) {
 		console.log(`Team "${team}" owns ${fileCount} files, creating ${numShards} shards`);
 		for (let i = 1; i <= numShards; i++) allShards.push({
 			team,
-			shard: `${i}/${numShards}`
+			shard: `${i}/${numShards}`,
+			shardId: `${team} ${i}/${numShards}`
 		});
 	}
 	return allShards;
@@ -191,11 +215,18 @@ async function analyzeCodeowners(options) {
 	const { shardSize, codeownersPath, rulePath, projectRoot = process.cwd() } = options;
 	const resolvedCodeownersPath = await findCodeownersFile(projectRoot, codeownersPath);
 	const rule = await loadAstGrepRule(rulePath);
-	console.log(`Analyzing CODEOWNERS file: ${resolvedCodeownersPath}`);
-	console.log(`Using rule file: ${rulePath}`);
-	console.log(`Shard size: ${shardSize}`);
-	console.log("Analyzing files with AST-grep...");
-	const filesByOwner = await analyzeFilesByOwner(resolvedCodeownersPath, rule, projectRoot);
+	let filesByOwner;
+	console.debug(`Using rule file: ${rulePath}`);
+	console.debug(`Shard size: ${shardSize}`);
+	if (resolvedCodeownersPath) {
+		console.log(`Analyzing CODEOWNERS file: ${resolvedCodeownersPath}`);
+		console.log("Analyzing files with AST-grep...");
+		filesByOwner = await analyzeFilesByOwner(resolvedCodeownersPath, rule, projectRoot);
+	} else {
+		console.log("No CODEOWNERS file found, assigning all files to 'unassigned'");
+		console.log("Analyzing files with AST-grep...");
+		filesByOwner = await analyzeFilesWithoutOwner(rule, projectRoot);
+	}
 	console.log("File analysis completed. Generating shards...");
 	const teams = getTeamFileInfo(filesByOwner);
 	const shards = generateShards(filesByOwner, shardSize);
@@ -209,4 +240,4 @@ async function analyzeCodeowners(options) {
 }
 
 //#endregion
-export { analyzeCodeowners, analyzeFilesByOwner, calculateOptimalShardCount, distributeFilesAcrossShards, findCodeownersFile, fitsInShard, generateShards, getFileHashPosition, getNumericFileNameSha1, getShardForFilename, getTeamFileInfo, loadAstGrepRule, normalizeOwnerName };
+export { analyzeCodeowners, analyzeFilesByOwner, analyzeFilesWithoutOwner, calculateOptimalShardCount, distributeFilesAcrossShards, findCodeownersFile, fitsInShard, generateShards, getFileHashPosition, getNumericFileNameSha1, getShardForFilename, getTeamFileInfo, loadAstGrepRule, normalizeOwnerName };

package/dist/index.d.ts

@@ -57,6 +57,7 @@ declare function calculateOptimalShardCount(totalFiles: number, targetShardSize:
 interface ShardResult {
   team: string;
   shard: string;
+  shardId: string;
 }
 interface TeamFileInfo {
   team: string;
@@ -77,8 +78,9 @@ interface CodeownerAnalysisResult {
 /**
  * Finds and resolves the CODEOWNERS file path
  * Searches in common locations: root, .github/, docs/
+ * Returns null if no CODEOWNERS file is found
  */
-declare function findCodeownersFile(projectRoot?: string, explicitPath?: string): Promise<string>;
+declare function findCodeownersFile(projectRoot?: string, explicitPath?: string): Promise<string | null>;
 /**
  * Loads and parses AST-grep rule from YAML file
  */
@@ -91,6 +93,10 @@ declare function normalizeOwnerName(owner: string): string;
  * Analyzes files and groups them by codeowner team
  */
 declare function analyzeFilesByOwner(codeownersPath: string, rule: any, projectRoot?: string): Promise<Map<string, string[]>>;
+/**
+ * Analyzes files without codeowner parsing - assigns all files to "unassigned"
+ */
+declare function analyzeFilesWithoutOwner(rule: any, projectRoot?: string): Promise<Map<string, string[]>>;
 /**
  * Generates shard configuration from team file analysis
  */
@@ -104,4 +110,4 @@ declare function getTeamFileInfo(filesByOwner: Map<string, string[]>): TeamFileI
  */
 declare function analyzeCodeowners(options: CodeownerAnalysisOptions): Promise<CodeownerAnalysisResult>;
 //#endregion
-export { CodeownerAnalysisOptions, CodeownerAnalysisResult, ShardResult, TeamFileInfo, analyzeCodeowners, analyzeFilesByOwner, calculateOptimalShardCount, distributeFilesAcrossShards, findCodeownersFile, fitsInShard, generateShards, getFileHashPosition, getNumericFileNameSha1, getShardForFilename, getTeamFileInfo, loadAstGrepRule, normalizeOwnerName };
+export { CodeownerAnalysisOptions, CodeownerAnalysisResult, ShardResult, TeamFileInfo, analyzeCodeowners, analyzeFilesByOwner, analyzeFilesWithoutOwner, calculateOptimalShardCount, distributeFilesAcrossShards, findCodeownersFile, fitsInShard, generateShards, getFileHashPosition, getNumericFileNameSha1, getShardForFilename, getTeamFileInfo, loadAstGrepRule, normalizeOwnerName };

package/dist/index.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-import { analyzeCodeowners, analyzeFilesByOwner, calculateOptimalShardCount, distributeFilesAcrossShards, findCodeownersFile, fitsInShard, generateShards, getFileHashPosition, getNumericFileNameSha1, getShardForFilename, getTeamFileInfo, loadAstGrepRule, normalizeOwnerName } from "./codeowner-analysis-CeRIGuLu.js";
+import { analyzeCodeowners, analyzeFilesByOwner, analyzeFilesWithoutOwner, calculateOptimalShardCount, distributeFilesAcrossShards, findCodeownersFile, fitsInShard, generateShards, getFileHashPosition, getNumericFileNameSha1, getShardForFilename, getTeamFileInfo, loadAstGrepRule, normalizeOwnerName } from "./codeowner-analysis-CcSOX0Ve.js";
 
-export { analyzeCodeowners, analyzeFilesByOwner, calculateOptimalShardCount, distributeFilesAcrossShards, findCodeownersFile, fitsInShard, generateShards, getFileHashPosition, getNumericFileNameSha1, getShardForFilename, getTeamFileInfo, loadAstGrepRule, normalizeOwnerName };
+export { analyzeCodeowners, analyzeFilesByOwner, analyzeFilesWithoutOwner, calculateOptimalShardCount, distributeFilesAcrossShards, findCodeownersFile, fitsInShard, generateShards, getFileHashPosition, getNumericFileNameSha1, getShardForFilename, getTeamFileInfo, loadAstGrepRule, normalizeOwnerName };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codemodctl",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "CLI tool and utilities for workflow engine operations, file sharding, and codeowner analysis",
   "type": "module",
   "exports": {