exec-staged 0.2.2 → 0.3.0

package/dist/lib/stage.d.ts

@@ -8,6 +8,7 @@ export declare class Stage {
     private readonly mergeStatus;
     private head?;
     private _gitDir?;
+    private needsRevert;
     private get gitDir();
     private get artifactsDir();
     private get patchPath();

package/dist/lib/stage.js

@@ -4,6 +4,7 @@ import { spawn, spawnSync } from './spawn.js';
 import micromatch from 'micromatch';
 import fs from 'node:fs';
 import path from 'node:path';
+import { deregisterExitHandler, registerExitHandler } from 'on-process-exit';
 import semver from 'semver';
 import parseArgsStringToArgv from 'string-argv';
 export class Stage {
@@ -14,6 +15,7 @@ export class Stage {
     mergeStatus = [];
     head;
     _gitDir;
+    needsRevert = false;
     get gitDir() {
         return (this._gitDir ??= this.git(['rev-parse', '--absolute-git-dir']));
     }
@@ -37,6 +39,13 @@ export class Stage {
             this.logger.debug(error);
             throw error;
         }
+        this.needsRevert = true;
+        const exitHandlerId = registerExitHandler(() => {
+            if (this.needsRevert) {
+                this.needsRevert = false;
+                this.revert();
+            }
+        });
         try {
             await this.run(tasks);
             this.merge();
@@ -44,6 +53,7 @@ export class Stage {
         catch (error) {
             this.logger.debug(error);
             try {
+                this.needsRevert = false;
                 this.revert();
             }
             catch (error) {
@@ -51,6 +61,9 @@ export class Stage {
             }
             throw error;
         }
+        finally {
+            deregisterExitHandler(exitHandlerId);
+        }
     }
     check() {
         this.logger.log(stageLifecycleMessages.check);
@@ -70,15 +83,15 @@ export class Stage {
             this.logger.log('⚠️ Unsupported git version!');
             throw new Error('unsupported git version');
         }
-        let gitRootDirectory;
+        let prefix;
         try {
-            gitRootDirectory = this.git(['rev-parse', '--show-toplevel']).trim();
+            prefix = this.git(['rev-parse', '--show-prefix']).trim();
         }
         catch (error) {
             this.logger.log('⚠️ Not a git repository!');
             throw new Error('cwd is not a git repository');
         }
-        if (gitRootDirectory !== this.cwd) {
+        if (prefix !== '') {
             this.logger.log('⚠️ Not in git root directory!');
             throw new Error('cwd is not a git repository root directory');
         }
@@ -237,16 +250,19 @@ export class Stage {
                 '-m',
                 STAGED_CHANGES_COMMIT_MESSAGE,
             ]);
-            // apply patch containing unstaged changes
-            this.git([
-                'apply',
-                '--allow-empty',
-                '--recount',
-                '--unidiff-zero',
-                '--whitespace=nowarn',
-                '--3way',
-                this.patchPath,
-            ]);
+            // apply patch containing unstaged changes.
+            // `--allow-empty` could be used here, but it was not added to `git apply`
+            // until 2.35.0 (January 2022), so we skip the call when the patch is empty.
+            if (fs.statSync(this.patchPath).size > 0) {
+                this.git([
+                    'apply',
+                    '--recount',
+                    '--unidiff-zero',
+                    '--whitespace=nowarn',
+                    '--3way',
+                    this.patchPath,
+                ]);
+            }
             // unstaged deletions are not included in the patch and must be handled
             // separately because the patch cannot be applied if such files are
             // modified by tasks; use force: true to handle cases where the file
@@ -268,6 +284,7 @@ export class Stage {
             this.logger.log('⚠️ Error restoring unstaged changes from stash!');
             throw error;
         }
+        this.needsRevert = false;
     }
     revert() {
         this.logger.log(stageLifecycleMessages.revert);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exec-staged",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "Run commands against the current git index",
   "keywords": [
     "git",
@@ -27,33 +27,36 @@
     "dist/",
     "src/"
   ],
+  "scripts": {
+    "build": "pnpm clean && tsc --build",
+    "clean": "rm -rf dist/",
+    "prepare": "husky",
+    "prepublishOnly": "pnpm build",
+    "test": "pnpm build && tsx --test --experimental-test-coverage"
+  },
   "dependencies": {
-    "commander": "^14.0.0",
-    "cosmiconfig": "^9.0.0",
-    "env-paths": "^3.0.0",
-    "execa": "^9.6.0",
+    "commander": "^15.0.0",
+    "cosmiconfig": "^9.0.2",
+    "env-paths": "^4.0.0",
+    "execa": "^9.6.1",
     "micromatch": "^4.0.8",
-    "on-process-exit": "^1.0.2",
-    "semver": "^7.7.2",
+    "on-process-exit": "^1.1.0",
+    "semver": "^7.8.5",
     "string-argv": "^0.3.2"
   },
   "devDependencies": {
-    "@trivago/prettier-plugin-sort-imports": "^5.2.2",
-    "@tsconfig/node22": "^22.0.2",
-    "@types/micromatch": "^4.0.9",
-    "@types/node": "^22.15.31",
-    "@types/semver": "^7.7.0",
+    "@trivago/prettier-plugin-sort-imports": "^6.0.2",
+    "@tsconfig/node22": "^22.0.5",
+    "@types/micromatch": "^4.0.10",
+    "@types/node": "^22.20.0",
+    "@types/semver": "^7.7.1",
     "husky": "^9.1.7",
-    "knip": "^5.60.2",
+    "knip": "^6.17.1",
     "lint-staged": "github:ItsNickBarry/lint-staged#knip",
-    "prettier": "^3.5.3",
-    "prettier-plugin-packagejson": "^2.5.15",
-    "tsx": "^4.20.1",
-    "typescript": "^5.8.3"
-  },
-  "scripts": {
-    "build": "pnpm clean && tsc --build",
-    "clean": "rm -rf dist/",
-    "test": "pnpm build && tsx --test --experimental-test-coverage"
+    "prettier": "^3.8.4",
+    "prettier-plugin-packagejson": "^3.0.2",
+    "release-it": "^20.2.0",
+    "tsx": "^4.22.4",
+    "typescript": "^6.0.3"
   }
-}
+}

package/src/lib/stage.ts

@@ -12,6 +12,7 @@ import { spawn, spawnSync } from './spawn.js';
 import micromatch from 'micromatch';
 import fs from 'node:fs';
 import path from 'node:path';
+import { deregisterExitHandler, registerExitHandler } from 'on-process-exit';
 import semver from 'semver';
 import parseArgsStringToArgv from 'string-argv';
 
@@ -23,6 +24,7 @@ export class Stage {
   private readonly mergeStatus: (typeof MERGE_FILES)[number][] = [];
   private head?: string;
   private _gitDir?: string;
+  private needsRevert: boolean = false;
 
   private get gitDir(): string {
     return (this._gitDir ??= this.git(['rev-parse', '--absolute-git-dir']));
@@ -51,6 +53,15 @@ export class Stage {
       throw error;
     }
 
+    this.needsRevert = true;
+
+    const exitHandlerId = registerExitHandler(() => {
+      if (this.needsRevert) {
+        this.needsRevert = false;
+        this.revert();
+      }
+    });
+
     try {
       await this.run(tasks);
       this.merge();
@@ -58,12 +69,15 @@ export class Stage {
       this.logger.debug(error);
 
       try {
+        this.needsRevert = false;
         this.revert();
       } catch (error) {
         this.logger.debug(error);
       }
 
       throw error;
+    } finally {
+      deregisterExitHandler(exitHandlerId);
     }
   }
 
@@ -90,16 +104,16 @@ export class Stage {
       throw new Error('unsupported git version');
     }
 
-    let gitRootDirectory: string;
+    let prefix: string;
 
     try {
-      gitRootDirectory = this.git(['rev-parse', '--show-toplevel']).trim();
+      prefix = this.git(['rev-parse', '--show-prefix']).trim();
     } catch (error) {
       this.logger.log('⚠️ Not a git repository!');
       throw new Error('cwd is not a git repository');
     }
 
-    if (gitRootDirectory !== this.cwd) {
+    if (prefix !== '') {
       this.logger.log('⚠️ Not in git root directory!');
       throw new Error('cwd is not a git repository root directory');
     }
@@ -311,16 +325,19 @@ export class Stage {
         STAGED_CHANGES_COMMIT_MESSAGE,
       ]);
 
-      // apply patch containing unstaged changes
-      this.git([
-        'apply',
-        '--allow-empty',
-        '--recount',
-        '--unidiff-zero',
-        '--whitespace=nowarn',
-        '--3way',
-        this.patchPath,
-      ]);
+      // apply patch containing unstaged changes.
+      // `--allow-empty` could be used here, but it was not added to `git apply`
+      // until 2.35.0 (January 2022), so we skip the call when the patch is empty.
+      if (fs.statSync(this.patchPath).size > 0) {
+        this.git([
+          'apply',
+          '--recount',
+          '--unidiff-zero',
+          '--whitespace=nowarn',
+          '--3way',
+          this.patchPath,
+        ]);
+      }
 
       // unstaged deletions are not included in the patch and must be handled
       // separately because the patch cannot be applied if such files are
@@ -345,6 +362,8 @@ export class Stage {
       this.logger.log('⚠️ Error restoring unstaged changes from stash!');
       throw error;
     }
+
+    this.needsRevert = false;
   }
 
   protected revert() {