git-er-done 0.1.19 → 0.1.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-er-done",
-  "version": "0.1.19",
+  "version": "0.1.22",
   "description": "Utility for dealing with modified, created, deleted files since a git commit",
   "main": "src/index.js",
   "types": "types/index.d.ts",

package/src/git/diffToGitJSONDSL.js

@@ -9,6 +9,10 @@ module.exports.diffToGitJSONDSL = (diff, commits) => {
   const fileDiffs = parseDiff(diff)
   const addedDiffs = fileDiffs.filter(diff => diff['new'])
   const removedDiffs = fileDiffs.filter(diff => diff['deleted'])
+  // Renames have both from and to, but no new/deleted flag, and paths differ
+  const renamedDiffs = fileDiffs.filter(
+    diff => diff.from && diff.to && !diff['new'] && !diff['deleted'] && diff.from !== diff.to
+  )
   const modifiedDiffs = fileDiffs.filter(
     diff => !includes(addedDiffs, diff) && !includes(removedDiffs, diff)
   )
@@ -19,6 +23,8 @@ module.exports.diffToGitJSONDSL = (diff, commits) => {
     ),
     created_files: addedDiffs.map(d => d.to),
     deleted_files: removedDiffs.map(d => d.from),
+    // Renamed files with old and new paths
+    renamed_files: renamedDiffs.map(d => ({ from: d.from, to: d.to })),
     commits: commits
   }
 }

package/src/git/getDiffFormatted.js

@@ -51,6 +51,12 @@ function getLongestLineLength(diff) {
   return maxLength
 }
 
+/**
+ * @typedef {Object} FormattedDiffResult
+ * @property {string} formatted - Terminal-formatted diff with colors
+ * @property {string} raw - Raw unified diff from git
+ */
+
 /**
  * Get formatted diff for a specific file
  * @param {Object} options - Options for getting formatted diff
@@ -62,7 +68,8 @@ function getLongestLineLength(diff) {
  * @param {number} [options.leftMargin=0] - Number of spaces to add to the left of each line
  * @param {number} [options.width=140] - Width of the diff output (ignored if shrinkToLongestLine is true)
  * @param {boolean} [options.hideHeader=false] - Remove the file path header from the diff
- * @returns {Promise<string | null>} Formatted diff string or null if no diff
+ * @param {boolean} [options.returnRaw=false] - Return both formatted and raw diff
+ * @returns {Promise<string | FormattedDiffResult | null>} Formatted diff string, or {formatted, raw} if returnRaw, or null if no diff
  */
 async function getFormattedDiff({
   filePath,
@@ -72,7 +79,8 @@ async function getFormattedDiff({
   shrinkToLongestLine = false,
   leftMargin = 0,
   width = 140,
-  hideHeader = false
+  hideHeader = false,
+  returnRaw = false
 }) {
   try {
     const { formatDiff } = await import('@davidwells/git-split-diffs')
@@ -130,9 +138,12 @@ async function getFormattedDiff({
     // Add left margin if specified
     if (leftMargin > 0) {
       const margin = ' '.repeat(leftMargin)
-      return formatted.split('\n').map(line => margin + line).join('\n')
+      formatted = formatted.split('\n').map(line => margin + line).join('\n')
     }
 
+    if (returnRaw) {
+      return { formatted, raw: diff }
+    }
     return formatted
   } catch (err) {
     console.error(`Error formatting diff for ${filePath}:`, err.message)

package/src/git/gitJSONToGitDSL.js

@@ -223,6 +223,7 @@ module.exports.gitJSONToGitDSL = (gitJSONRep, config) => {
     modifiedFiles: gitJSONRep.modified_files,
     createdFiles: gitJSONRep.created_files,
     deletedFiles: gitJSONRep.deleted_files,
+    renamedFiles: gitJSONRep.renamed_files || [],
     commits: gitJSONRep.commits,
     lastCommit: gitJSONRep.commits && gitJSONRep.commits[0] && gitJSONRep.commits[0].sha,
     dir: config.repo,

package/src/types.js

@@ -35,12 +35,19 @@
  * @property {function(): Object<string, string[]>} getKeyedPaths - Returns an object with keys (modified, created, deleted, edited) mapped to their matching file arrays
  */
 
+/**
+ * @typedef {Object} RenamedFile
+ * @property {string} from - Original file path before rename
+ * @property {string} to - New file path after rename
+ */
+
 /**
  * @typedef {Object} GitDetails
  * @property {function(...(string|string[])): FileMatchResult} fileMatch - Function to match files by glob pattern(s). Accepts multiple strings, arrays of strings, or a mix using rest parameters. Supports negation patterns with '!' prefix
  * @property {string[]} modifiedFiles - Array of modified file paths
  * @property {string[]} createdFiles - Array of created file paths
  * @property {string[]} deletedFiles - Array of deleted file paths
+ * @property {RenamedFile[]} renamedFiles - Array of renamed files with from/to paths
  * @property {CommitInfo[]} commits - Array of commits between base and head
  * @property {string} lastCommit - SHA of the last commit
  * @property {string} dir - Root path of the git repository

package/types/git/diffToGitJSONDSL.d.ts

@@ -2,5 +2,9 @@ export function diffToGitJSONDSL(diff: any, commits: any): {
     modified_files: string[];
     created_files: string[];
     deleted_files: string[];
+    renamed_files: {
+        from: string;
+        to: string;
+    }[];
     commits: any;
 };

package/types/git/getDiffFormatted.d.ts

@@ -1,3 +1,18 @@
+export type FormattedDiffResult = {
+    /**
+     * - Terminal-formatted diff with colors
+     */
+    formatted: string;
+    /**
+     * - Raw unified diff from git
+     */
+    raw: string;
+};
+/**
+ * @typedef {Object} FormattedDiffResult
+ * @property {string} formatted - Terminal-formatted diff with colors
+ * @property {string} raw - Raw unified diff from git
+ */
 /**
  * Get formatted diff for a specific file
  * @param {Object} options - Options for getting formatted diff
@@ -9,9 +24,10 @@
  * @param {number} [options.leftMargin=0] - Number of spaces to add to the left of each line
  * @param {number} [options.width=140] - Width of the diff output (ignored if shrinkToLongestLine is true)
  * @param {boolean} [options.hideHeader=false] - Remove the file path header from the diff
- * @returns {Promise<string | null>} Formatted diff string or null if no diff
+ * @param {boolean} [options.returnRaw=false] - Return both formatted and raw diff
+ * @returns {Promise<string | FormattedDiffResult | null>} Formatted diff string, or {formatted, raw} if returnRaw, or null if no diff
  */
-export function getFormattedDiff({ filePath, gitRootDir, cwd, baseBranch, shrinkToLongestLine, leftMargin, width, hideHeader }: {
+export function getFormattedDiff({ filePath, gitRootDir, cwd, baseBranch, shrinkToLongestLine, leftMargin, width, hideHeader, returnRaw }: {
     filePath: string;
     gitRootDir?: string;
     cwd?: string;
@@ -20,4 +36,5 @@ export function getFormattedDiff({ filePath, gitRootDir, cwd, baseBranch, shrink
     leftMargin?: number;
     width?: number;
     hideHeader?: boolean;
-}): Promise<string | null>;
+    returnRaw?: boolean;
+}): Promise<string | FormattedDiffResult | null>;

package/types/git/gitJSONToGitDSL.d.ts

@@ -3,6 +3,7 @@ export function gitJSONToGitDSL(gitJSONRep: any, config: any): {
     modifiedFiles: any;
     createdFiles: any;
     deletedFiles: any;
+    renamedFiles: any;
     commits: any;
     lastCommit: any;
     dir: any;

package/types/types.d.ts

@@ -92,6 +92,16 @@ export type FileMatchResult = {
         [x: string]: string[];
     };
 };
+export type RenamedFile = {
+    /**
+     * - Original file path before rename
+     */
+    from: string;
+    /**
+     * - New file path after rename
+     */
+    to: string;
+};
 export type GitDetails = {
     /**
      * - Function to match files by glob pattern(s). Accepts multiple strings, arrays of strings, or a mix using rest parameters. Supports negation patterns with '!' prefix
@@ -109,6 +119,10 @@ export type GitDetails = {
      * - Array of deleted file paths
      */
     deletedFiles: string[];
+    /**
+     * - Array of renamed files with from/to paths
+     */
+    renamedFiles: RenamedFile[];
     /**
      * - Array of commits between base and head
      */