ls: Show keys and values

jest.config.js

@@ -4,5 +4,5 @@ module.exports = {
   prettierPath: null,
   preset: "ts-jest",
   testEnvironment: "node",
-  modulePathIgnorePatterns: ["/build"],
+  modulePathIgnorePatterns: ["/dist"],
 };

src/commands/__tests__/__snapshots__/ls.test.ts.snap

@@ -19,10 +19,10 @@ Unknown argument: foo",
 exports[`ls when valid ls command should print list response 1`] = `
 [
   [
-    "instance-1",
+    "instance-1 - Instance 1",
   ],
   [
-    "instance-2",
+    "instance-2 - Instance 2",
   ],
 ]
 `;

src/commands/__tests__/ls.test.ts

@@ -31,7 +31,10 @@ describe("ls", () => {
         ok: true,
         term: "",
         arg: "destination",
-        items: ["instance-1", "instance-2"],
+        items: [
+          { key: "instance-1", value: "Instance 1" },
+          { key: "instance-2", value: "Instance 2" },
+        ],
       });
     });
 

src/commands/ls.ts

@@ -12,12 +12,13 @@ import { fetchCommand } from "../drivers/api";
 import { authenticate } from "../drivers/auth";
 import { guard } from "../drivers/firestore";
 import { print2, print1 } from "../drivers/stdio";
+import { max } from "lodash";
 import pluralize from "pluralize";
 import yargs from "yargs";
 
 type LsResponse = {
   ok: true;
-  items: string[];
+  items: { key: string; value: string; group?: string }[];
   isTruncated: boolean;
   term: string;
   arg: string;
@@ -50,15 +51,27 @@ const ls = async (
     "ls",
     ...args.arguments,
   ]);
+  const allArguments = [...args._, ...args.arguments];
 
   if (data && "ok" in data && data.ok) {
-    print2(
-      `Showing${
-        data.isTruncated ? ` the first ${data.items.length}` : ""
-      } ${pluralize(data.arg)}${data.term ? ` matching '${data.term}'` : ""}:`
-    );
+    const truncationPart = data.isTruncated
+      ? ` the first ${data.items.length}`
+      : "";
+    const argPart = pluralize(data.arg);
+    const postfixPart = data.term
+      ? ` matching '${data.term}'`
+      : data.isTruncated
+        ? ` (use \`p0
+         ${allArguments.join(" ")} <like>\` to narrow results)`
+        : "";
+
+    print2(`Showing${truncationPart} ${argPart}${postfixPart}:`);
+    const isSameValue = data.items.every((i) => !i.group && i.key === i.value);
+    const longest = max(data.items.map((i) => i.key.length)) || 0;
     for (const item of data.items) {
-      print1(item);
+      print1(
+        isSameValue ? item.key : `${item.key.padEnd(longest)} - ${item.value}`
+      );
     }
   } else {
     throw data;