git-patch 0.1.2 → 0.1.3

package/.github/workflows/ci.yml

@@ -28,3 +28,12 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm test
+
+  coverage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+      - run: npm run test:coverage

package/lib/selector.js

@@ -2,12 +2,12 @@
  * Parse hunk/line selector strings.
  *
  * Formats:
- *   "1"         → { type: "hunks", ids: [1] }
- *   "1,3,5"     → { type: "hunks", ids: [1,3,5] }
- *   "1-5"       → { type: "hunks", ids: [1,2,3,4,5] }
- *   "1-3,7,9"   → { type: "hunks", ids: [1,2,3,7,9] }
- *   "1:2-4"     → { type: "lines", hunkId: 1, lines: [2,3,4] }
- *   "1:3,5,8"   → { type: "lines", hunkId: 1, lines: [3,5,8] }
+ *   "1"         -> { type: "hunks", ids: [1] }
+ *   "1,3,5"     -> { type: "hunks", ids: [1,3,5] }
+ *   "1-5"       -> { type: "hunks", ids: [1,2,3,4,5] }
+ *   "1-3,7,9"   -> { type: "hunks", ids: [1,2,3,7,9] }
+ *   "1:2-4"     -> { type: "lines", hunkId: 1, lines: [2,3,4] }
+ *   "1:3,5,8"   -> { type: "lines", hunkId: 1, lines: [3,5,8] }
  */
 export function parseSelector(str) {
   if (!str) throw new Error("No selector provided");
@@ -15,8 +15,12 @@ export function parseSelector(str) {
   // Line-level: "hunkId:lineSpec"
   if (str.includes(":")) {
     let [hunkPart, linePart] = str.split(":", 2);
-    let hunkId = parseInt(hunkPart, 10);
-    if (Number.isNaN(hunkId)) throw new Error(`Invalid hunk ID: ${hunkPart}`);
+    let trimmedHunkPart = hunkPart.trim();
+    if (!/^\d+$/.test(trimmedHunkPart)) {
+      throw new Error(`Invalid hunk ID: ${hunkPart}`);
+    }
+
+    let hunkId = Number(trimmedHunkPart);
     let lines = expandNumberSpec(linePart);
     return { type: "lines", hunkId, lines };
   }
@@ -29,17 +33,26 @@ export function parseSelector(str) {
 function expandNumberSpec(spec) {
   let parts = spec.split(",");
   let result = [];
+
   for (let part of parts) {
     part = part.trim();
+    if (part.length === 0) throw new Error("Invalid number: ");
+
     if (part.includes("-")) {
-      let [start, end] = part.split("-", 2).map((s) => parseInt(s.trim(), 10));
-      if (Number.isNaN(start) || Number.isNaN(end)) throw new Error(`Invalid range: ${part}`);
+      let match = part.match(/^(\d+)\s*-\s*(\d+)$/);
+      if (!match) throw new Error(`Invalid range: ${part}`);
+
+      let start = Number(match[1]);
+      let end = Number(match[2]);
+      if (start > end) throw new Error(`Invalid range: ${part}`);
+
       for (let i = start; i <= end; i++) result.push(i);
-    } else {
-      let n = parseInt(part, 10);
-      if (Number.isNaN(n)) throw new Error(`Invalid number: ${part}`);
-      result.push(n);
+      continue;
     }
+
+    if (!/^\d+$/.test(part)) throw new Error(`Invalid number: ${part}`);
+    result.push(Number(part));
   }
+
   return result;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-patch",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Non-interactive hunk staging for LLMs — stage, unstage, and discard git changes by hunk or line",
   "type": "module",
   "bin": {
@@ -8,6 +8,7 @@
   },
   "scripts": {
     "test": "node --test test/*.test.js",
+    "test:coverage": "node --test --experimental-test-coverage --test-coverage-lines=100 --test-coverage-functions=100 --test-coverage-branches=100 '--test-coverage-include=bin/*.js' '--test-coverage-include=lib/**/*.js' test/*.test.js",
     "lint": "biome check .",
     "format": "biome format --write .",
     "lint:fix": "biome check --write ."

package/test/coverage-edges.test.js

@@ -56,6 +56,21 @@ describe("coverage edges", () => {
     assert.throws(() => parseSelector("1:1-a"), /Invalid range: 1-a/);
   });
 
+  it("throws for mixed hunk and line selectors", () => {
+    assert.throws(() => parseSelector("1,2:3"), /Invalid hunk ID: 1,2/);
+  });
+
+  it("throws for partially numeric selector tokens", () => {
+    assert.throws(() => parseSelector("1x"), /Invalid number: 1x/);
+    assert.throws(() => parseSelector("1-2x"), /Invalid range: 1-2x/);
+    assert.throws(() => parseSelector("1:2,3x"), /Invalid number: 3x/);
+  });
+
+  it("throws for empty selector segments and descending ranges", () => {
+    assert.throws(() => parseSelector("1,,2"), /Invalid number: /);
+    assert.throws(() => parseSelector("3-1"), /Invalid range: 3-1/);
+  });
+
   it("finds line-level hunks across multiple files", () => {
     let patch = buildPatchFromLines(
       [

package/test/integration.test.js

@@ -7,6 +7,12 @@ import { after, before, beforeEach, describe, it } from "node:test";
 
 let tmp;
 let bin = join(import.meta.dirname, "..", "bin", "git-patch.js");
+let gitIdentityEnv = {
+  GIT_AUTHOR_NAME: "Test",
+  GIT_AUTHOR_EMAIL: "test@test.com",
+  GIT_COMMITTER_NAME: "Test",
+  GIT_COMMITTER_EMAIL: "test@test.com",
+};
 
 function gp(args, opts = {}) {
   return execSync(`node ${bin} ${args}`, {
@@ -14,10 +20,7 @@ function gp(args, opts = {}) {
     encoding: "utf-8",
     env: {
       ...process.env,
-      GIT_AUTHOR_NAME: "Test",
-      GIT_AUTHOR_EMAIL: "test@test.com",
-      GIT_COMMITTER_NAME: "Test",
-      GIT_COMMITTER_EMAIL: "test@test.com",
+      ...gitIdentityEnv,
     },
     ...opts,
   }).trim();
@@ -30,10 +33,7 @@ function gpResult(args, opts = {}) {
       encoding: "utf-8",
       env: {
         ...process.env,
-        GIT_AUTHOR_NAME: "Test",
-        GIT_AUTHOR_EMAIL: "test@test.com",
-        GIT_COMMITTER_NAME: "Test",
-        GIT_COMMITTER_EMAIL: "test@test.com",
+        ...gitIdentityEnv,
       },
       stdio: ["pipe", "pipe", "pipe"],
       ...opts,
@@ -49,7 +49,14 @@ function gpResult(args, opts = {}) {
 }
 
 function git(args) {
-  return execSync(`git ${args}`, { cwd: tmp, encoding: "utf-8" }).trim();
+  return execSync(`git ${args}`, {
+    cwd: tmp,
+    encoding: "utf-8",
+    env: {
+      ...process.env,
+      ...gitIdentityEnv,
+    },
+  }).trim();
 }
 
 function writeFile(name, content) {
@@ -428,6 +435,28 @@ describe("git-patch integration", () => {
       assert.match(result.stderr, /Invalid hunk ID: x/);
     });
 
+    it("fails on mixed hunk and line selectors", () => {
+      writeFile(
+        "src/app.js",
+        [
+          "function greet(name) {",
+          '  return "Hi, " + name;',
+          "}",
+          "",
+          "function farewell(name) {",
+          '  return "Goodbye, " + name;',
+          "}",
+          "",
+          "module.exports = { greet, farewell };",
+          "",
+        ].join("\\n"),
+      );
+
+      let result = gpResult("stage 1,2:3");
+      assert.equal(result.status, 1);
+      assert.match(result.stderr, /Invalid hunk ID: 1,2/);
+    });
+
     it("fails on invalid selector range", () => {
       writeFile(
         "src/app.js",