putout 29.13.5 → 29.14.0

package/ChangeLog

@@ -1,3 +1,8 @@
+2023.06.15, v29.14.0
+
+feature:
+- 5d0accb16 putout: use @putout/git-status-porcelain for --staged
+
 2023.06.14, v29.13.5
 
 feature:

package/lib/cli/staged.js

@@ -1,25 +1,14 @@
 'use strict';
 
 const {join} = require('path');
-const fs = require('fs');
+const {spawnSync} = require('child_process');
 
-const git = require('isomorphic-git');
+const porcelain = require('@putout/git-status-porcelain');
 const once = require('once');
 const fullstore = require('fullstore');
-
 const {isSupported} = require('./supported-files');
 
-const STAGED_INDEX = 3;
-const STAGED = 2;
-const STAGED_WITH_CHANGES = 3;
-
-const MODIFIED_INDEX = 2;
-const MODIFIED = 2;
-
 const namesStore = fullstore([]);
-const isStagedStr = (statuses) => (name) => /^\*?(added|modified)$/.test(statuses[name]);
-
-const {fromEntries} = Object;
 
 const findGit = once(async ({findUp}) => {
     const type = 'directory';
@@ -36,9 +25,6 @@ const findGit = once(async ({findUp}) => {
     return dir;
 });
 
-const isStaged = (a) => a[STAGED_INDEX] === STAGED || a[STAGED_INDEX] === STAGED_WITH_CHANGES;
-const isModified = (a) => a[MODIFIED_INDEX] === MODIFIED;
-const head = ([a]) => a;
 const joinDir = (a) => (b) => join(a, b);
 
 module.exports.get = async function get({findUp}) {
@@ -46,56 +32,39 @@ module.exports.get = async function get({findUp}) {
         findUp,
     });
     
-    const status = await git.statusMatrix({
-        fs,
-        dir,
-        filter: isSupported,
-    });
-    
-    const names = status
-        .filter(isStaged)
-        .filter(isModified)
-        .map(head);
+    const names = porcelain({
+        modified: true,
+        added: true,
+    }).filter(isSupported);
     
     namesStore(names);
     
     return names.map(joinDir(dir));
 };
 
-async function getStatus(dir, filepath) {
-    const status = await git.status({
-        fs,
-        dir,
-        filepath,
-    });
-    
-    return [filepath, status];
-}
-
 module.exports.set = async function set({findUp}) {
     const dir = await findGit({
         findUp,
     });
     
     const names = namesStore();
-    const statusPromises = [];
     
-    for (const filepath of names) {
-        statusPromises.push(await getStatus(dir, filepath));
-    }
+    const staged = porcelain({
+        unstaged: true,
+    });
     
-    const statuses = fromEntries(await Promise.all(statusPromises));
-    const staged = names.filter(isStagedStr(statuses));
-    const promises = [];
+    const namesToAdd = [];
     
-    for (const filepath of names)
-        promises.push(git.add({
-            fs,
-            dir,
-            filepath,
-        }));
+    for (const filepath of names) {
+        if (!staged.includes(filepath))
+            namesToAdd.push(filepath);
+    }
     
-    await Promise.all(promises);
+    add(namesToAdd.map(joinDir(dir)));
     
     return staged;
 };
+
+function add(names) {
+    spawnSync('git', ['add', ...names]);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "putout",
-  "version": "29.13.5",
+  "version": "29.14.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊 Pluggable and configurable code transformer with built-in ESLint, Babel and support of js, jsx, typescript, flow, markdown, yaml and json",
@@ -66,6 +66,7 @@
     "@putout/formatter-progress": "^4.0.0",
     "@putout/formatter-progress-bar": "^3.0.0",
     "@putout/formatter-stream": "^4.0.0",
+    "@putout/git-status-porcelain": "^3.0.0",
     "@putout/operate": "^8.0.0",
     "@putout/operator-add-args": "^4.0.0",
     "@putout/operator-declare": "^5.0.0",
@@ -180,7 +181,6 @@
     "fullstore": "^3.0.0",
     "ignore": "^5.0.4",
     "is-relative": "^1.0.0",
-    "isomorphic-git": "1.23.0",
     "nano-memoize": "^3.0.11",
     "once": "^1.4.0",
     "picomatch": "^2.2.2",