@armit/git - npm Package Compare versions

Comparing version 0.0.32 to 0.0.33

CHANGELOG.md

 # @armit/git
 
+## 0.0.33
+
+### Patch Changes
+
+- [`de8fb41`](https://github.com/armitjs/armit/commit/de8fb41ab1d0c1b5a16eb00715c0643be60dd9e0) Thanks [@tianyingchun](https://github.com/tianyingchun)! - fix wrong `branch` detect between `commits`
+
 ## 0.0.32
@@ -4,0 +10,0 @@

dist/index.d.ts

@@ -42,3 +42,3 @@ /**
  */
-declare const getAllCommitsBetween: (lastCommit: string, earlyCommit: string) => Promise<string[]>;
+declare const getAllCommitsBetween: (lastCommit: string, earlyCommit: string, remote?: boolean) => Promise<string[]>;
 
@@ -45,0 +45,0 @@ /**

dist/index.js

 import { exec } from 'node:child_process';
 
-var $=(r="HEAD",n=!0)=>new Promise(t=>{exec(`git rev-parse ${n?"--short ":""}${r}`,(e,i)=>{if(e)return t(null);t(i.replace(/\r\n|\n|\r/g,""));});});function P(){return new Promise(r=>{exec("git log --pretty=format:'%h' -n 1",(n,t)=>{if(n)return r(null);r(t.replace(/'/g,""));});})}function C(){return new Promise((r,n)=>{exec("git branch | sed -n '/\\* /s///p'",(t,e)=>{if(t)return n(t);r(e.replace(/\r\n|\n|\r/g,""));});})}function q(r){return new Promise((n,t)=>{exec(`git ls-files ${r}`,(e,i)=>{if(e)return t(e);n(i.replace(/\r\n|\n|\r/g,"").length>0);});})}function O(r,n){let t=r&&n?`${n}..${r}`:r;return new Promise(e=>{exec(`git --no-pager diff --name-only ${t}`,(i,o)=>{if(i)return e([]);e(o.split(/[\r\n]/).filter(String));});})}var f=(r,n)=>{let t=n&&r?`${n}..${r}`:r;return new Promise(e=>{exec(`git --no-pager log --oneline ${t} | cut -d " " -f1`,(i,o)=>{if(i)return e([]);e(o.split(/[\r\n|]/).filter(String));});})};function m(r){function n(t,e,i){return i.indexOf(t)===e}return r.filter(n)}var h=(r,n=!0)=>new Promise(t=>{exec(`git --no-pager branch ${n?"-r":""} --contains ${r}`,(e,i)=>{if(e)return t([]);let o=i.split(/[\r\n]/).filter(s=>!~s.toUpperCase().indexOf("(HEAD")).map(s=>s.trim());t(o);});}),j=async(r,n,t=!0)=>{let e=[],i=await f(r,n);for(let o of i){let s=await h(o,t);e.push(...s);}return m(e)};
+var m=(r="HEAD",n=!0)=>new Promise(t=>{exec(`git rev-parse ${n?"--short ":""}${r}`,(e,i)=>{if(e)return t(null);t(i.replace(/\r\n|\n|\r/g,""));});});function b(){return new Promise(r=>{exec("git log --pretty=format:'%h' -n 1",(n,t)=>{if(n)return r(null);r(t.replace(/'/g,""));});})}function A(){return new Promise((r,n)=>{exec("git branch | sed -n '/\\* /s///p'",(t,e)=>{if(t)return n(t);r(e.replace(/\r\n|\n|\r/g,""));});})}function q(r){return new Promise((n,t)=>{exec(`git ls-files ${r}`,(e,i)=>{if(e)return t(e);n(i.replace(/\r\n|\n|\r/g,"").length>0);});})}function S(r,n){let t=r&&n?`${n}..${r}`:r;return new Promise(e=>{exec(`git --no-pager diff --name-only ${t}`,(i,s)=>{if(i)return e([]);e(s.split(/[\r\n]/).filter(String));});})}var c=(r,n,t=!0)=>{let e=n&&r?`${n}..${r}`:r;return new Promise(i=>{exec(`git --no-pager log ${t?"-r":""} --oneline ${e} | cut -d " " -f1`,(s,o)=>{if(s)return i([]);i(o.split(/[\r\n|]/).filter(String));});})};function g(r){function n(t,e,i){return i.indexOf(t)===e}return r.filter(n)}var $=(r,n=!0)=>new Promise(t=>{exec(`git --no-pager branch ${n?"-r":""} --contains ${r}`,(e,i)=>{if(e)return t([]);let s=i.split(/[\r\n]/).filter(o=>!~o.toUpperCase().indexOf("(HEAD")&&!!o.trim()).map(o=>o.trim());t(s);});}),z=async(r,n,t=!0)=>{let e=[],i=await c(r,n,t);for(let o of i){let f=await $(o,t);e.push(...f);}let s=[];for(let o of e){let f=await m(o);f&&i.includes(f)&&s.push(o);}return g(s)};
 
-export { f as getAllCommitsBetween, j as getBranchesBetweenCommits, $ as getCommitIdOfBranch, O as getDiffFiles, q as getFileCommitStatus, P as getLastCommitHash, C as gitBranchName };
+export { c as getAllCommitsBetween, z as getBranchesBetweenCommits, m as getCommitIdOfBranch, S as getDiffFiles, q as getFileCommitStatus, b as getLastCommitHash, A as gitBranchName };
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.js.map

dist/index.js.map

@@ -1,1 +0,1 @@
-{"version":3,"sources":["../src/get-commit-id-of-branch.ts","../src/get-last-commit-hash.ts","../src/get-branch-name.ts","../src/get-file-commit-status.ts","../src/get-diff-files.ts","../src/get-all-commits-between.ts","../src/get-branches-between-commits.ts","../src/array-unique.ts"],"names":["exec","getCommitIdOfBranch","branchName","short","resolve","err","out","getLastCommitHash","gitBranchName","reject","getFileCommitStatus","fileName","getDiffFiles","earlyCommit","lastCommit","diff","getAllCommitsBetween","arrayUnique","arr","onlyUnique","value","index","self","getBranchesContainCommitHash","commit","remote","branches","branch","getBranchesBetweenCommits","allBranches","allCommits"],"mappings":"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","sourcesContent":["import { exec } from 'node:child_process';\n\n/**\n * https://stackoverflow.com/questions/15677439/command-to-get-latest-git-commit-hash-from-a-branch\n * Finding out the latest commit hash locally,\n * @param branchName  e.g. `main`, `workspace`,....\n * @returns The branch commit hash.\n */\nexport const getCommitIdOfBranch = (branchName = 'HEAD', short = true) => {\n  return new Promise<string | null>((resolve) => {\n    exec(\n      `git rev-parse ${short ? '--short ' : ''}${branchName}`,\n      (err, out) => {\n        if (err) {\n          return resolve(null);\n        }\n        resolve(out.replace(/\\r\\n|\\n|\\r/g, ''));\n      }\n    );\n  });\n};\n","import { exec } from 'node:child_process';\n\nexport function getLastCommitHash() {\n  return new Promise<string | null>((resolve) => {\n    exec(`git log --pretty=format:'%h' -n 1`, (err, out) => {\n      if (err) {\n        return resolve(null);\n      }\n      resolve(out.replace(/'/g, ''));\n    });\n  });\n}\n","import { exec } from 'node:child_process';\n\nexport function gitBranchName() {\n  return new Promise<string>((resolve, reject) => {\n    exec(`git branch | sed -n '/\\\\* /s///p'`, (err, out) => {\n      if (err) {\n        return reject(err);\n      }\n      resolve(out.replace(/\\r\\n|\\n|\\r/g, ''));\n    });\n  });\n}\n","import { exec } from 'node:child_process';\n\n/**\n * Check if the filepath has been commited.\n * @param fileName The file name\n * @returns Return true indicates the files has been commited.\n */\nexport function getFileCommitStatus(fileName) {\n  return new Promise<boolean>((resolve, reject) => {\n    exec(`git ls-files ${fileName}`, (err, out) => {\n      if (err) {\n        return reject(err);\n      }\n      resolve(out.replace(/\\r\\n|\\n|\\r/g, '').length > 0);\n    });\n  });\n}\n","import { exec } from 'node:child_process';\n\n/**\n * https://git-scm.com/docs/git-diff#Documentation/git-diff.txt-emgitdiffemltoptionsgtltcommitgtltcommitgt--ltpathgt82308203\n * Viewing the changes between two arbitrary <commit>.\n * If <commit> on one side is omitted, it will have the same effect as using HEAD instead.\n * @example\n * ```shell\n * git --no-pager diff --name-only 2b2ccff..50164ec\n * git --no-pager diff --name-only 2b2ccff 50164ec\n * git --no-pager diff --name-only 1381f5\n * ```\n * @param earlyCommit The diff based earlier commit hash\n * @param lastCommit If is omitted, it will have the same effect as using HEAD instead.\n * @returns Return files between two commit hash\n */\nexport function getDiffFiles(earlyCommit: string, lastCommit?: string) {\n  const diff =\n    earlyCommit && lastCommit ? `${lastCommit}..${earlyCommit}` : earlyCommit;\n\n  return new Promise<string[]>((resolve) => {\n    exec(`git --no-pager diff --name-only ${diff}`, (err, out) => {\n      if (err) {\n        // fatal: ambiguous argument 'df3s053': unknown revision or path not in the working tree.\n        return resolve([]);\n      }\n      resolve(out.split(/[\\r\\n]/).filter(String));\n    });\n  });\n}\n","import { exec } from 'node:child_process';\n\n/**\n * This will list all commits that contain any of the commits between earlyCommit and lastCommit\n * @param lastCommit The lasted commit `HEAD`\n * @param earlyCommit The early commit `master`\n * @returns All commits\n */\nexport const getAllCommitsBetween = (\n  lastCommit: string,\n  earlyCommit: string\n) => {\n  // NOTE: The order is from `${earlyCommit} to ${lastComit}`\n  const diff =\n    earlyCommit && lastCommit ? `${earlyCommit}..${lastCommit}` : lastCommit;\n\n  // if only `lastCommit` provider, will list all commits.\n  return new Promise<string[]>((resolve) => {\n    exec(\n      `git --no-pager log --oneline ${diff} | cut -d \" \" -f1`,\n      (err, out) => {\n        if (err) {\n          // fatal: ambiguous argument 'df3s053': unknown revision or path not in the working tree.\n          return resolve([]);\n        }\n        resolve(out.split(/[\\r\\n|]/).filter(String));\n      }\n    );\n  });\n};\n","import { exec } from 'node:child_process';\nimport { arrayUnique } from './array-unique.js';\nimport { getAllCommitsBetween } from './get-all-commits-between.js';\n\nconst getBranchesContainCommitHash = (commit: string, remote = true) => {\n  return new Promise<string[]>((resolve) => {\n    exec(\n      `git --no-pager branch ${remote ? '-r' : ''} --contains ${commit}`,\n      (err, out) => {\n        if (err) {\n          // fatal: ambiguous argument 'df3s053': unknown revision or path not in the working tree.\n          return resolve([]);\n        }\n        const branches = out\n          .split(/[\\r\\n]/)\n          .filter((branch) => {\n            // Remove `* (HEAD detached at b121521)`\n            return !~branch.toUpperCase().indexOf('(HEAD');\n          })\n          .map((s) => s.trim());\n\n        resolve(branches);\n      }\n    );\n  });\n};\n\n/**\n * This will list all branches that contain any of the commits between commit1 and commit2\n * @param lastCommit if not will look up to first commit `HEAD`\n * @param earlyCommit The earlier commit `master`\n * @param remote The remote-tracking\n * @returns All commits\n */\nexport const getBranchesBetweenCommits = async (\n  lastCommit: string,\n  earlyCommit: string,\n  remote = true\n) => {\n  const allBranches: string[] = [];\n  const allCommits = await getAllCommitsBetween(lastCommit, earlyCommit);\n  for (const commit of allCommits) {\n    const branches = await getBranchesContainCommitHash(commit, remote);\n    allBranches.push(...branches);\n  }\n  return arrayUnique(allBranches);\n};\n","export function arrayUnique<T>(arr: T[]): T[] {\n  function onlyUnique(value, index, self) {\n    return self.indexOf(value) === index;\n  }\n  return arr.filter(onlyUnique);\n}\n"]}
+{"version":3,"sources":["../src/get-commit-id-of-branch.ts","../src/get-last-commit-hash.ts","../src/get-branch-name.ts","../src/get-file-commit-status.ts","../src/get-diff-files.ts","../src/get-all-commits-between.ts","../src/get-branches-between-commits.ts","../src/array-unique.ts"],"names":["exec","getCommitIdOfBranch","branchName","short","resolve","err","out","getLastCommitHash","gitBranchName","reject","getFileCommitStatus","fileName","getDiffFiles","earlyCommit","lastCommit","diff","getAllCommitsBetween","remote","arrayUnique","arr","onlyUnique","value","index","self","getBranchesContainCommitHash","commit","branches","branch","s","getBranchesBetweenCommits","allBranches","allCommits","finalBranches","branchCommitHash"],"mappings":"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","sourcesContent":["import { exec } from 'node:child_process';\n\n/**\n * https://stackoverflow.com/questions/15677439/command-to-get-latest-git-commit-hash-from-a-branch\n * Finding out the latest commit hash locally,\n * @param branchName  e.g. `main`, `workspace`,....\n * @returns The branch commit hash.\n */\nexport const getCommitIdOfBranch = (branchName = 'HEAD', short = true) => {\n  return new Promise<string | null>((resolve) => {\n    exec(\n      `git rev-parse ${short ? '--short ' : ''}${branchName}`,\n      (err, out) => {\n        if (err) {\n          return resolve(null);\n        }\n        resolve(out.replace(/\\r\\n|\\n|\\r/g, ''));\n      }\n    );\n  });\n};\n","import { exec } from 'node:child_process';\n\nexport function getLastCommitHash() {\n  return new Promise<string | null>((resolve) => {\n    exec(`git log --pretty=format:'%h' -n 1`, (err, out) => {\n      if (err) {\n        return resolve(null);\n      }\n      resolve(out.replace(/'/g, ''));\n    });\n  });\n}\n","import { exec } from 'node:child_process';\n\nexport function gitBranchName() {\n  return new Promise<string>((resolve, reject) => {\n    exec(`git branch | sed -n '/\\\\* /s///p'`, (err, out) => {\n      if (err) {\n        return reject(err);\n      }\n      resolve(out.replace(/\\r\\n|\\n|\\r/g, ''));\n    });\n  });\n}\n","import { exec } from 'node:child_process';\n\n/**\n * Check if the filepath has been commited.\n * @param fileName The file name\n * @returns Return true indicates the files has been commited.\n */\nexport function getFileCommitStatus(fileName) {\n  return new Promise<boolean>((resolve, reject) => {\n    exec(`git ls-files ${fileName}`, (err, out) => {\n      if (err) {\n        return reject(err);\n      }\n      resolve(out.replace(/\\r\\n|\\n|\\r/g, '').length > 0);\n    });\n  });\n}\n","import { exec } from 'node:child_process';\n\n/**\n * https://git-scm.com/docs/git-diff#Documentation/git-diff.txt-emgitdiffemltoptionsgtltcommitgtltcommitgt--ltpathgt82308203\n * Viewing the changes between two arbitrary <commit>.\n * If <commit> on one side is omitted, it will have the same effect as using HEAD instead.\n * @example\n * ```shell\n * git --no-pager diff --name-only 2b2ccff..50164ec\n * git --no-pager diff --name-only 2b2ccff 50164ec\n * git --no-pager diff --name-only 1381f5\n * ```\n * @param earlyCommit The diff based earlier commit hash\n * @param lastCommit If is omitted, it will have the same effect as using HEAD instead.\n * @returns Return files between two commit hash\n */\nexport function getDiffFiles(earlyCommit: string, lastCommit?: string) {\n  const diff =\n    earlyCommit && lastCommit ? `${lastCommit}..${earlyCommit}` : earlyCommit;\n\n  return new Promise<string[]>((resolve) => {\n    exec(`git --no-pager diff --name-only ${diff}`, (err, out) => {\n      if (err) {\n        // fatal: ambiguous argument 'df3s053': unknown revision or path not in the working tree.\n        return resolve([]);\n      }\n      resolve(out.split(/[\\r\\n]/).filter(String));\n    });\n  });\n}\n","import { exec } from 'node:child_process';\n\n/**\n * This will list all commits that contain any of the commits between earlyCommit and lastCommit\n * @param lastCommit The lasted commit `HEAD`\n * @param earlyCommit The early commit `master`\n * @returns All commits\n */\nexport const getAllCommitsBetween = (\n  lastCommit: string,\n  earlyCommit: string,\n  remote = true\n) => {\n  // NOTE: The order is from `${earlyCommit} to ${lastComit}`\n  const diff =\n    earlyCommit && lastCommit ? `${earlyCommit}..${lastCommit}` : lastCommit;\n\n  // if only `lastCommit` provider, will list all commits.\n  return new Promise<string[]>((resolve) => {\n    exec(\n      `git --no-pager log ${\n        remote ? '-r' : ''\n      } --oneline ${diff} | cut -d \" \" -f1`,\n      (err, out) => {\n        if (err) {\n          // fatal: ambiguous argument 'df3s053': unknown revision or path not in the working tree.\n          return resolve([]);\n        }\n        resolve(out.split(/[\\r\\n|]/).filter(String));\n      }\n    );\n  });\n};\n","import { exec } from 'node:child_process';\nimport { arrayUnique } from './array-unique.js';\nimport { getAllCommitsBetween } from './get-all-commits-between.js';\nimport { getCommitIdOfBranch } from './get-commit-id-of-branch.js';\n\nconst getBranchesContainCommitHash = (commit: string, remote = true) => {\n  return new Promise<string[]>((resolve) => {\n    // This command will list all the branch names that contain the specified commit ID and output it to the terminal\n    // Note that other branch nodes checkout based on the current branch will also contain this commitId.\n    exec(\n      `git --no-pager branch ${remote ? '-r' : ''} --contains ${commit}`,\n      (err, out) => {\n        if (err) {\n          // fatal: ambiguous argument 'df3s053': unknown revision or path not in the working tree.\n          return resolve([]);\n        }\n        const branches = out\n          .split(/[\\r\\n]/)\n          .filter((branch) => {\n            // Remove `* (HEAD detached at b121521)`\n            return !~branch.toUpperCase().indexOf('(HEAD') && !!branch.trim();\n          })\n          .map((s) => s.trim());\n\n        resolve(branches);\n      }\n    );\n  });\n};\n\n/**\n * This will list all branches that contain any of the commits between commit1 and commit2\n * @param lastCommit if not will look up to first commit `HEAD`\n * @param earlyCommit The earlier commit `master`\n * @param remote The remote-tracking\n * @returns All commits\n */\nexport const getBranchesBetweenCommits = async (\n  lastCommit: string,\n  earlyCommit: string,\n  remote = true\n) => {\n  const allBranches: string[] = [];\n  const allCommits = await getAllCommitsBetween(\n    lastCommit,\n    earlyCommit,\n    remote\n  );\n\n  for (const commit of allCommits) {\n    // Note: it may contains `branches` that checkout based on current `commit hash` but out of the `commit` range we want.\n    const branches = await getBranchesContainCommitHash(commit, remote);\n    allBranches.push(...branches);\n  }\n\n  const finalBranches: string[] = [];\n  // re-loop all branches to check it's commit hash between `${allCommits}`\n  for (const branch of allBranches) {\n    const branchCommitHash = await getCommitIdOfBranch(branch);\n    if (branchCommitHash && allCommits.includes(branchCommitHash)) {\n      finalBranches.push(branch);\n    }\n  }\n\n  return arrayUnique(finalBranches);\n};\n","export function arrayUnique<T>(arr: T[]): T[] {\n  function onlyUnique(value, index, self) {\n    return self.indexOf(value) === index;\n  }\n  return arr.filter(onlyUnique);\n}\n"]}

package.json

 {
   "name": "@armit/git",
-  "version": "0.0.32",
+  "version": "0.0.33",
   "homepage": "https://github.com/armitjs/armit",
@@ -5,0 +5,0 @@ "repository": {

No alert changes

Improved metrics

Total package byte prevSize

22245

7.07%

Lines of code

57

1.79%

No dependency changes