fix(diff): cached (#3)

Author: moshfeu

README.md

@@ -1,5 +1,5 @@
 ![thanks for stopping by](https://moshfeudev.wixsite.com/shield/_functions/view/git-wiz)
-![npm version](https://img.shields.io/npm/v/git-wiz)
+[![npm version](https://img.shields.io/npm/v/git-wiz)](https://www.npmjs.com/package/git-wiz)
 
 # Git Wiz 🧙‍♂️
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-wiz",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "author": {
     "email": "[email protected]",
     "name": "Mosh Feu",
@@ -24,6 +24,11 @@
   "homepage": "https://github.com/spread-the-code/git-wiz#readme",
   "license": "MIT",
   "description": "Make git commands interactive",
+  "keywords": [
+    "git",
+    "cli",
+    "node"
+  ],
   "dependencies": {
     "commander": "^6.1.0",
     "inquirer": "^7.3.3",

src/utils/git.ts

@@ -3,10 +3,16 @@ import { execCommand } from './exec';
 type File = {
   status: 'tracked' | 'staged' | 'untracked';
   path: string;
+  deleted?: boolean;
 };
 
-async function runCommand(command: string, files: Array<string>, stdio = false) {
-  const gitCommand = `${command} ${files.join(' ')}`;
+async function runCommand(
+  command: string,
+  files: Array<string>,
+  args?: Array<string>,
+  stdio = false
+) {
+  const gitCommand = `${command} ${[...(args || []), ...files].join(' ')}`;
   await execCommand(gitCommand, stdio);
   if (stdio) {
     return;
@@ -19,29 +25,35 @@ export async function gitStatus(): Promise<Array<File>> {
   const files = status
     .split(/\n/g)
     .filter((line) => line)
-    .reduce((prev, line) => {
-      const [index, ...params] = line.split(/ +/g);
-      const path = params[params.length - 1];
+    .reduce<Array<File>>((prev, line) => {
+      try {
+        const [index, ...params] = line.split(/ +/g);
+        const path = params[params.length - 1];
 
-      if (index === '1') {
-        const [stagedIndication, changedIndication] = params[0].split('');
-        if (stagedIndication !== '.') {
+        if (index === '1') {
+          const [stagedIndication, changedIndication] = params[0].split('');
+          if (stagedIndication !== '.') {
+            prev.push({
+              status: 'staged',
+              path,
+              deleted: stagedIndication === 'D',
+            });
+          }
+          if (changedIndication !== '.') {
+            prev.push({
+              status: 'tracked',
+              path,
+              deleted: changedIndication === 'D',
+            });
+          }
+        } else if (index === '?') {
           prev.push({
-            status: 'staged',
+            status: 'untracked',
             path,
           });
         }
-        if (changedIndication !== '.') {
-          prev.push({
-            status: 'tracked',
-            path,
-          });
-        }
-      } else if (index === '?') {
-        prev.push({
-          status: 'untracked',
-          path,
-        });
+      } catch (err) {
+        console.log(line);
       }
       return prev;
     }, []);
@@ -62,6 +74,6 @@ export async function gitStash(files: Array<string>, message?: string) {
   await runCommand(`stash push${message ? ` -m ${message}` : ''}`, files);
 }
 
-export function gitDiff(files: Array<string>) {
-  return runCommand('diff', files, true);
+export function gitDiff(files: Array<string>, flags: Array<string>) {
+  return runCommand('diff', files, flags, true);
 }

src/utils/program.ts

@@ -23,7 +23,10 @@ export function init() {
 
     program
       .command('diff')
-      .description('do "git diff" with style 🤔')
+      .allowUnknownOption()
+      .description(
+        'do "git diff" with style 🤔 (Accept any argument "git diff" accpets)'
+      )
       .action(diff);
 
     program.parse(process.argv);

src/utils/wiz.ts

@@ -1,10 +1,9 @@
+import { Command } from 'commander';
 import { showFilesChooser, showFilesChooserAnd } from './cli';
 import { gitStatus, gitAdd, gitReset, gitStash, gitDiff } from './git';
 
 export const add = withErrorHandler(async () => {
-  const status = (await gitStatus()).filter(
-    (file) => file.status !== 'staged'
-  );
+  const status = (await gitStatus()).filter((file) => file.status !== 'staged');
   if (!status.length) {
     console.log('\x1b[33m', 'There are no changes here. Get back to work 🤓');
     return;
@@ -15,9 +14,7 @@ export const add = withErrorHandler(async () => {
 });
 
 export const reset = withErrorHandler(async () => {
-  const status = (await gitStatus()).filter(
-    (file) => file.status === 'staged'
-  );
+  const status = (await gitStatus()).filter((file) => file.status === 'staged');
   if (!status.length) {
     console.log(
       '\x1b[33m',
@@ -31,40 +28,51 @@ export const reset = withErrorHandler(async () => {
 });
 
 export const stash = withErrorHandler(async () => {
-  const status = (await gitStatus());
+  const status = await gitStatus();
   if (!status.length) {
     console.log('\x1b[33m', 'Stash what exactly 🤥?');
     return;
   }
   const choices = status.map((file) => file.path);
-  const {files, message} = await showFilesChooserAnd('Files to stash', choices, {
-    message: {
-      type: 'input',
-      message: 'Leave a message to your future self ("-m").. or not, whatever',
+  const { files, message } = await showFilesChooserAnd(
+    'Files to stash',
+    choices,
+    {
+      message: {
+        type: 'input',
+        message:
+          'Leave a message to your future self ("-m").. or not, whatever',
+      },
     }
-  });
+  );
 
   await gitStash(files, message);
 });
 
-export const diff = withErrorHandler(async () => {
-  const status = (await gitStatus());
+export const diff = withErrorHandler(async (comObj: Command) => {
+  const cached = comObj.args.includes('--cached');
+  const status = (await gitStatus()).filter(
+    (file) =>
+      !file.deleted &&
+      (cached ? file.status === 'staged' : file.status !== 'staged')
+  );
+
   if (!status.length) {
     console.log('\x1b[33m', `You can't view diff of.. nothing 🧐`);
     return;
   }
   const choices = status.map((file) => file.path);
   const files = await showFilesChooser('Files to diff', choices);
 
-  await gitDiff(files);
+  await gitDiff(files, comObj.args);
 });
 
 function withErrorHandler(fn: Function) {
-  return (...args: any[]): Promise<void> => {
+  return (...args: Array<unknown>): Promise<void> => {
     try {
       return fn(...args);
     } catch (error) {
       console.log('\x1b[31m', 'Oops, something went wrong', error);
     }
-  }
-}
+  };
+}

webpack.config.js

@@ -3,6 +3,7 @@ const webpack = require('webpack');
 const nodeExternals = require('webpack-node-externals');
 
 module.exports = {
+  mode: 'development',
   entry: './src/index.ts',
   target: 'node',
   module: {