@naturalcycles/dev-lib 14.1.1 → 14.1.3

package/dist/cmd/lint-all.command.js

@@ -25,7 +25,12 @@ async function lintAllCommand() {
             default: false,
         },
     }).argv;
-    const hadChangesBefore = (0, nodejs_lib_1.gitHasUncommittedChanges)();
+    const needToTrackChanges = commitOnChanges || failOnChanges;
+    const gitStatusAtStart = gitStatus();
+    if (needToTrackChanges && gitStatusAtStart) {
+        console.log('lint-all: git shows changes before run:');
+        console.log(gitStatusAtStart);
+    }
     // We run eslint BEFORE Prettier, because eslint can delete e.g unused imports.
     await (0, eslint_all_command_1.eslintAllCommand)();
     if (node_fs_1.default.existsSync(`node_modules/stylelint`) &&
@@ -36,25 +41,21 @@ async function lintAllCommand() {
     runActionLint();
     await runKTLint();
     console.log(`${(0, nodejs_lib_1.boldGrey)('lint-all')} ${(0, nodejs_lib_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
-    if (commitOnChanges || failOnChanges) {
-        // detect changes
-        const hasChanges = (0, nodejs_lib_1.gitHasUncommittedChanges)();
-        if (hasChanges) {
-            if (hadChangesBefore) {
-                console.log(`lint-all: there are changes before running lint-all, will not commit`);
-            }
-            else {
-                const msg = 'style(ci): ' + (0, js_lib_1._truncate)((0, nodejs_lib_1.commitMessageToTitleMessage)((0, nodejs_lib_1.getLastGitCommitMsg)()), 60);
-                // pull, commit, push changes
-                (0, nodejs_lib_1.gitPull)();
-                (0, nodejs_lib_1.gitCommitAll)(msg);
-                (0, nodejs_lib_1.gitPush)();
-            }
-            // fail on changes
-            if (failOnChanges) {
-                console.log('lint-all failOnChanges: exiting with status 1');
-                process.exitCode = 1;
-            }
+    if (needToTrackChanges) {
+        const gitStatusAfter = gitStatus();
+        const hasChanges = gitStatusAfter !== gitStatusAtStart;
+        if (!hasChanges)
+            return;
+        const msg = 'style(ci): ' + (0, js_lib_1._truncate)((0, nodejs_lib_1.commitMessageToTitleMessage)((0, nodejs_lib_1.getLastGitCommitMsg)()), 60);
+        // pull, commit, push changes
+        (0, nodejs_lib_1.gitPull)();
+        (0, nodejs_lib_1.gitCommitAll)(msg);
+        (0, nodejs_lib_1.gitPush)();
+        // fail on changes
+        if (failOnChanges) {
+            console.log(gitStatusAfter);
+            console.log('lint-all failOnChanges: exiting with status 1');
+            process.exitCode = 1;
         }
     }
 }
@@ -86,3 +87,11 @@ function canRunBinary(name) {
         return false;
     }
 }
+function gitStatus() {
+    try {
+        return (0, node_child_process_1.execSync)('git status -s', {
+            encoding: 'utf8',
+        });
+    }
+    catch { }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/dev-lib",
-  "version": "14.1.1",
+  "version": "14.1.3",
   "scripts": {
     "prepare": "husky",
     "tsn-debug": "tsn testScript.ts",