refactor: update status report

Author: zdm

lib/commands/ls.js

@@ -122,7 +122,7 @@ export default class extends Command {
                     : " - ",
                 "last": this.#formatVersion( status.releases.lastRelease, pkg.isReleaseEnabled ),
                 "current": this.#formatVersion( status.currentRelease, pkg.isReleaseEnabled ) + ( status.currentRelease && status.releases?.lastRelease.eq( status.currentRelease )
-                    ? " ✅️"
+                    ? " 🚩"
                     : "   " ),
                 "unreleased": pkg.isReleaseEnabled
                     ? ( status.currentReleaseDistance

lib/commands/status.js

@@ -48,11 +48,14 @@ Unreleased commits:      ${ pkg.isReleaseEnabled
         ? ansi.error( " " + status.currentReleaseDistance + " " )
         : ansi.ok( " RELEASED " ) )
     : "-" }
+`.trim() );
 
-Branch status:
-${ await this.#createBranchStatus( pkg, status.branchStatus ) }
-        `.trim() );
+        // branch status
+        console.log();
+        console.log( "Branch status:" );
+        console.log( await this.#createBranchStatus( pkg, status ) );
 
+        // upstream links
         if ( upstream ) {
             console.log();
 
@@ -67,32 +70,33 @@ Clone wiki:              ${ ansi.hl( upstream.wikiSshCloneUrl ) }
             `.trim() );
         }
 
-        const localizationStatus = pkg.localization.status();
+        // localization status
+        const localizationStatus = this.#createLocalizationStatus( pkg );
 
-        if ( localizationStatus.data ) {
-            console.log( "\nLocalization status:\n" );
-
-            for ( const [ poFilePath, isTranslated ] of Object.entries( localizationStatus.data ) ) {
-                console.log( isTranslated
-                    ? " OK    "
-                    : ansi.error( " FUZZY " ), poFilePath );
-            }
+        if ( localizationStatus ) {
+            console.log( "" );
+            console.log( "Localization status:\n" + localizationStatus );
         }
     }
 
     // private
-    async #createBranchStatus ( pkg, branchStatus ) {
+    async #createBranchStatus ( pkg, status ) {
         const table = new Table( {
             "ansi": true,
+            "width": 90,
             "columns": {
                 "branch": {
                     "title": ansi.hl( "BRANCH" ),
                     "headerAlign": "center",
                     "headerValign": "end",
-                    "width": 30,
+                    "format": branch => {
+                        return `${ status.head.branch === branch
+                            ? "🔶"
+                            : "  " } ${ branch }`;
+                    },
                 },
-                "pushStatus": {
-                    "title": ansi.hl( "PUSH STATUS" ),
+                "syncStatus": {
+                    "title": ansi.hl( "SYNC STATUS" ),
                     "headerAlign": "center",
                     "headerValign": "end",
                     "width": 20,
@@ -105,14 +109,14 @@ Clone wiki:              ${ ansi.hl( upstream.wikiSshCloneUrl ) }
                             else {
                                 const text = [];
 
-                                if ( status.ahead ) {
-                                    text.push( "push: " + ansi.error( ` ${ status.ahead } ` ) );
-                                }
-
                                 if ( status.behind ) {
                                     text.push( "pull: " + ansi.error( ` ${ status.behind } ` ) );
                                 }
 
+                                if ( status.ahead ) {
+                                    text.push( "push: " + ansi.error( ` ${ status.ahead } ` ) );
+                                }
+
                                 return text.join( ", " );
                             }
                         }
@@ -131,7 +135,7 @@ Clone wiki:              ${ ansi.hl( upstream.wikiSshCloneUrl ) }
                         if ( pkg.isReleaseEnabled ) {
                             if ( status.currentRelease ) {
                                 return `${ status.currentRelease.versionString }${ status.releases.lastRelease.eq( status.currentRelease )
-                                    ? " ✅️"
+                                    ? " 🚩"
                                     : "   " }`;
                             }
                             else {
@@ -166,19 +170,62 @@ Clone wiki:              ${ ansi.hl( upstream.wikiSshCloneUrl ) }
             },
         } );
 
-        for ( const branch of Object.keys( branchStatus ).sort() ) {
+        for ( const branch of Object.keys( status.branchStatus ).sort() ) {
             const res = await pkg.git.getCurrentRelease( { "commitRef": branch } );
 
             table.write( {
                 branch,
-                "pushStatus": branchStatus[ branch ],
+                "syncStatus": status.branchStatus[ branch ],
                 "currentRelease": res.data,
                 "unreleasedCommits": res.data,
             } );
         }
 
         table.end();
 
-        return table.content + "✅️ - latest release";
+        return `${ table.content.trim() }
+🔶 - current branch
+🚩 - latest release
+`.trim();
+    }
+
+    #createLocalizationStatus ( pkg ) {
+        const localizationStatus = pkg.localization.status(),
+            table = new Table( {
+                "ansi": true,
+                "width": 90,
+                "columns": {
+                    "isTranslated": {
+                        "title": ansi.hl( "STATUS" ),
+                        "headerAlign": "center",
+                        "headerValign": "end",
+                        "width": 13,
+                        "align": "end",
+                        "format": isTranslated => {
+                            return isTranslated
+                                ? " OK "
+                                : ansi.error( " FUZZY " );
+                        },
+                    },
+                    "poFilePath": {
+                        "title": ansi.hl( "PATH" ),
+                        "headerAlign": "center",
+                        "headerValign": "end",
+                    },
+                },
+            } );
+
+        if ( localizationStatus.data ) {
+            for ( const [ poFilePath, isTranslated ] of Object.entries( localizationStatus.data ) ) {
+                table.write( {
+                    poFilePath,
+                    isTranslated,
+                } );
+            }
+        }
+
+        table.end();
+
+        return table.content;
     }
 }