refactor: use version string in reports

Author: zdm

lib/commands/ls.js

@@ -60,7 +60,7 @@ export default class extends Command {
         const table = new Table( {
             "columns": {
                 "packageName": { "title": ansi.hl( "PACKAGE NAME" ), "headerAlign": "center", "headerValign": "end" },
-                "branch": { "title": ansi.hl( "BRANCH" ), "width": 15, "headerAlign": "center", "headerValign": "end" },
+                "branchName": { "title": ansi.hl( "BRANCH NAME" ), "width": 15, "headerAlign": "center", "headerValign": "end" },
                 "dirty": { "title": ansi.hl( "IS\nDIRTY" ), "width": 7, "align": "center", "format": value => ( value
                     ? ansi.error( " DIRTY " )
                     : "-" ) },
@@ -113,7 +113,7 @@ export default class extends Command {
                 "packageName": ( pkg.isPrivate
                     ? "🔒"
                     : "  " ) + " " + this.#prepareName( pkg ),
-                "branch": status.head.branch
+                "branchName": status.head.branch
                     ? status.head.branch
                     : ansi.error( status.head.abbrev ),
                 "dirty": status.isDirty,

lib/commands/status.js

@@ -39,7 +39,7 @@ Publishable:             ${ pkg.isPrivate
 Stable release (latest): ${ ansi.hl( status.releases.lastStableRelease?.versionString || "-" ) }
 Last release (next):     ${ ansi.hl( status.releases.lastRelease?.versionString || "-" ) }
 
-Branch:                  ${ ansi.hl( status.head.branch ) }
+Branch name:             ${ ansi.hl( status.head.branch ) }
 Current release:         ${ ansi.hl( status.currentRelease?.versionString || "-" ) }${ status.currentRelease && status.releases.lastRelease?.eq( status.currentRelease )
     ? " 🚩"
     : "" }
@@ -88,8 +88,8 @@ Clone wiki:              ${ ansi.hl( upstream.wikiSshCloneUrl ) }
             "ansi": true,
             "width": 90,
             "columns": {
-                "branch": {
-                    "title": ansi.hl( "BRANCH" ),
+                "branchName": {
+                    "title": ansi.hl( "BRANCH NAME" ),
                     "headerAlign": "center",
                     "headerValign": "end",
                     "format": branch => {
@@ -173,12 +173,12 @@ Clone wiki:              ${ ansi.hl( upstream.wikiSshCloneUrl ) }
             },
         } );
 
-        for ( const branch of Object.keys( status.branchStatus ).sort() ) {
-            const res = await pkg.git.getCurrentRelease( { "commitRef": branch } );
+        for ( const branchName of Object.keys( status.branchStatus ).sort() ) {
+            const res = await pkg.git.getCurrentRelease( { "commitRef": branchName } );
 
             table.write( {
-                branch,
-                "syncStatus": status.branchStatus[ branch ],
+                branchName,
+                "syncStatus": status.branchStatus[ branchName ],
                 "currentRelease": res.data,
                 "unreleasedCommits": res.data,
             } );