refactor: refactor branch status

Author: zdm

lib/commands/ls.js

@@ -66,7 +66,7 @@ export default class extends Command {
                     : "-" ) },
                 "pushed": { "title": ansi.hl( "NOT\nPUSHED" ), "width": 8, "align": "end", "headerAlign": "center" },
                 "last": { "title": ansi.hl( "LAST\nRELEASE" ), "width": 20, "align": "end", "headerAlign": "center" },
-                "current": { "title": ansi.hl( "CURRENT\nRELEASE" ), "width": 20, "align": "end", "headerAlign": "center" },
+                "current": { "title": ansi.hl( "CURRENT\nRELEASE" ), "width": 23, "align": "end", "headerAlign": "center" },
                 "unreleased": { "title": ansi.hl( "UNRELEASED\nCOMMITS" ), "width": 12, "align": "end", "headerAlign": "center" },
             },
         } ).pipe( process.stdout );
@@ -121,7 +121,9 @@ export default class extends Command {
                     ? ansi.error( ` ${ currentBranchPushStatus } ` )
                     : " - ",
                 "last": this.#formatVersion( status.releases.lastRelease, pkg.isReleaseEnabled ),
-                "current": this.#formatVersion( status.currentRelease, pkg.isReleaseEnabled ),
+                "current": this.#formatVersion( status.currentRelease, pkg.isReleaseEnabled ) + ( status.currentRelease && status.releases?.lastRelease.eq( status.currentRelease )
+                    ? " ✅️"
+                    : "   " ),
                 "unreleased": pkg.isReleaseEnabled
                     ? ( status.currentReleaseDistance
                         ? ansi.error( ` ${ status.currentReleaseDistance } ` )

lib/commands/status.js

@@ -1,4 +1,5 @@
 import ansi from "#core/ansi";
+import Table from "#core/text/table";
 import Command from "#lib/command";
 
 export default class extends Command {
@@ -42,14 +43,14 @@ Last release (next):     ${ ansi.hl( status.releases.lastRelease || "-" ) }
 Is dirty:                ${ status.isDirty
     ? ansi.error( " DIRTY " )
     : ansi.ok( " COMMITED " ) }
-Branch sync. status:     ${ Object.keys( status.branchStatus )
-    .map( branch => branch + ": " + this.#getBranchStatusText( status.branchStatus[ branch ] ) )
-    .join( "\n" + " ".repeat( 25 ) ) }
 Unreleased commits:      ${ pkg.isReleaseEnabled
     ? ( status.currentReleaseDistance
         ? ansi.error( " " + status.currentReleaseDistance + " " )
         : ansi.ok( " RELEASED " ) )
     : "-" }
+
+Branch status:
+${ await this.#createBranchStatus( pkg, status.branchStatus ) }
         `.trim() );
 
         if ( upstream ) {
@@ -80,27 +81,104 @@ Clone wiki:              ${ ansi.hl( upstream.wikiSshCloneUrl ) }
     }
 
     // private
-    #getBranchStatusText ( status ) {
-        if ( status.upstream ) {
-            if ( status.synchronized ) {
-                return "OK";
-            }
-            else {
-                const text = [];
-
-                if ( status.ahead ) {
-                    text.push( "push " + ansi.error( ` ${ status.ahead } ` ) );
-                }
+    async #createBranchStatus ( pkg, branchStatus ) {
+        const table = new Table( {
+            "ansi": true,
+            "columns": {
+                "branch": {
+                    "title": ansi.hl( "BRANCH" ),
+                    "headerAlign": "center",
+                    "headerValign": "end",
+                    "width": 30,
+                },
+                "pushStatus": {
+                    "title": ansi.hl( "PUSH STATUS" ),
+                    "headerAlign": "center",
+                    "headerValign": "end",
+                    "width": 20,
+                    "align": "end",
+                    "format": status => {
+                        if ( status.upstream ) {
+                            if ( status.synchronized ) {
+                                return " - ";
+                            }
+                            else {
+                                const text = [];
+
+                                if ( status.ahead ) {
+                                    text.push( "push: " + ansi.error( ` ${ status.ahead } ` ) );
+                                }
+
+                                if ( status.behind ) {
+                                    text.push( "pull: " + ansi.error( ` ${ status.behind } ` ) );
+                                }
+
+                                return text.join( ", " );
+                            }
+                        }
+                        else {
+                            return ansi.dim( "NOT TRACKED" );
+                        }
+                    },
+                },
+                "currentRelease": {
+                    "title": ansi.hl( "CURRENT\nRELEASE" ),
+                    "headerAlign": "center",
+                    "headerValign": "end",
+                    "width": 15,
+                    "align": "end",
+                    "format": status => {
+                        if ( pkg.isReleaseEnabled ) {
+                            if ( status.currentRelease ) {
+                                return `${ status.currentRelease.versionString }${ status.releases.lastRelease.eq( status.currentRelease )
+                                    ? " ✅️"
+                                    : "   " }`;
+                            }
+                            else {
+                                return " - " + "   ";
+                            }
+                        }
+                        else {
+                            return ansi.dim( " DISABLED " );
+                        }
+                    },
+                },
+                "unreleasedCommits": {
+                    "title": ansi.hl( "UNRELEASED\nCOMMITS" ),
+                    "headerAlign": "center",
+                    "headerValign": "end",
+                    "width": 15,
+                    "align": "end",
+                    "format": status => {
+                        if ( pkg.isReleaseEnabled ) {
+                            if ( status.currentReleaseDistance ) {
+                                return ansi.error( ` ${ status.currentReleaseDistance } ` );
+                            }
+                            else {
+                                return " - ";
+                            }
+                        }
+                        else {
+                            return ansi.dim( " DISABLED " );
+                        }
+                    },
+                },
+            },
+        } );
 
-                if ( status.behind ) {
-                    text.push( "pull " + ansi.error( ` ${ status.behind } ` ) );
-                }
+        for ( const branch of Object.keys( branchStatus ).sort() ) {
+            const res = await pkg.git.getCurrentRelease( { "commitRef": branch } );
 
-                return text.join( ", " );
-            }
-        }
-        else {
-            return "NOT TRACKED";
+            table.write( {
+                branch,
+                "pushStatus": branchStatus[ branch ],
+                "currentRelease": res.data,
+                "unreleasedCommits": res.data,
+            } );
         }
+
+        table.end();
+
+        return table.content + "✅️ - latest release";
     }
 }