feat(npm): smart force scan

Airkro · Jul 3, 2023 · 22eae2f · 22eae2f
1 parent df2f75f
commit 22eae2f
Show file tree

Hide file tree

Showing 7 changed files with 309 additions and 299 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,11 +25,11 @@
     "packages/*"
   ],
   "devDependencies": {
-    "@nice-move/cli": "^0.10.8",
-    "@nice-move/eslint-config-base": "^0.9.14",
+    "@nice-move/cli": "^0.10.9",
+    "@nice-move/eslint-config-base": "^0.9.15",
     "@nice-move/prettier-config": "^0.8.1",
-    "best-shot": "^0.3.6",
-    "eslint": "^8.43.0",
+    "best-shot": "^0.4.1",
+    "eslint": "^8.44.0",
     "garou": "^0.6.11",
     "playwright-core": "^1.35.1",
     "prettier": "^2.8.8"

diff --git a/packages/npm/lib/npm/git.mjs b/packages/npm/lib/npm/git.mjs
@@ -1,5 +1,5 @@
 import { EOL } from 'node:os';
-import { resolve } from 'node:path';
+import { dirname, resolve } from 'node:path';
 
 import { logger } from './logger.mjs';
 import { Exec } from './utils.mjs';
@@ -105,15 +105,33 @@ export async function branchCanRelease() {
   );
 }
 
-export function getFileFromLastCommit(filename) {
+export function getFileContentFromLastCommit(filename) {
   return Git('show', `HEAD~1:${filename}`);
 }
 
-export async function getLastCommitFiles({ force }) {
-  const fallback = () => Git('ls-files', 'package.json', '*/package.json');
+async function getChangedPackages() {
+  const pkgs = await Git('ls-files', 'package.json', '*/package.json')
+    .then((raw = '') => raw.split('\n').map((line) => dirname(line)))
+    .catch(() => []);
+
+  const io = [];
+
+  for (const pkg of pkgs) {
+    const check = await Git('diff', '--name-only', 'HEAD~')
+      .then((raw) => Boolean(raw.trim()))
+      .catch(() => false);
+
+    if (check) {
+      io.push(pkg);
+    }
+  }
+
+  return io;
+}
 
+export async function getLastCommitFiles({ force }) {
   const io = force
-    ? fallback()
+    ? getChangedPackages()
     : Git('cat-file', '-t', 'HEAD~1').then(
         () =>
           Git(
@@ -128,7 +146,7 @@ export async function getLastCommitFiles({ force }) {
             'package.json',
             '*/package.json',
           ),
-        fallback,
+        getChangedPackages,
       );
 
   const list = await io.then((raw) => (raw ? raw.split('\n') : []));

diff --git a/packages/npm/lib/npm/scan.mjs b/packages/npm/lib/npm/scan.mjs
@@ -2,7 +2,7 @@ import { readFile } from 'node:fs/promises';
 import { dirname } from 'node:path';
 
 import { filter } from './filter.mjs';
-import { getFileFromLastCommit, getLastCommitFiles } from './git.mjs';
+import { getFileContentFromLastCommit, getLastCommitFiles } from './git.mjs';
 import { logger } from './logger.mjs';
 import { Exec } from './utils.mjs';
 
@@ -63,7 +63,7 @@ async function versionChanged(list) {
   const io = [];
 
   for (const item of list) {
-    const old = await getFileFromLastCommit(item.pkg)
+    const old = await getFileContentFromLastCommit(item.pkg)
       .then((raw) => JSON.parse(raw))
       .catch(() => false);
 

diff --git a/packages/npm/package.json b/packages/npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bring-it/npm",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "Publish npm packages when needed",
   "license": "MIT",
   "author": {

diff --git a/packages/sample/package.json b/packages/sample/package.json
@@ -43,7 +43,7 @@
   "devDependencies": {
     "@bring-it/utils": "*",
     "cheetor": "^0.13.0",
-    "globby": "^13.2.0"
+    "globby": "^13.2.1"
   },
   "peerDependencies": {
     "playwright-core": "^1.33.0"

diff --git a/packages/sftp/package.json b/packages/sftp/package.json
@@ -44,7 +44,7 @@
   "devDependencies": {
     "@bring-it/utils": "*",
     "cheetor": "^0.13.0",
-    "globby": "^13.2.0",
+    "globby": "^13.2.1",
     "lodash": "^4.17.21",
     "node-ssh": "^13.1.0",
     "p-all": "^5.0.0",