@bdsqqq/lnr-cli 1.6.0 → 2.0.1

package/src/router/search.ts

@@ -1,4 +1,5 @@
-import { z } from "zod";
+import "../lib/arktype-config";
+import { type } from "arktype";
 import { getClient, searchIssues } from "@bdsqqq/lnr-core";
 import { router, procedure } from "./trpc";
 import { handleApiError } from "../lib/error";
@@ -10,11 +11,11 @@ import {
   truncate,
 } from "../lib/output";
 
-const searchInput = z.object({
-  query: z.string().meta({ positional: true }).describe("search query"),
-  team: z.string().optional().describe("filter by team key"),
-  json: z.boolean().optional().describe("output as json"),
-  quiet: z.boolean().optional().describe("output ids only"),
+export const searchInput = type({
+  query: type("string").configure({ positional: true }).describe("search query"),
+  "team?": type("string").describe("filter by team key"),
+  "json?": type("boolean").describe("output as json"),
+  "quiet?": type("boolean").describe("output ids only"),
 });
 
 export const searchRouter = router({

package/src/router/teams.ts

@@ -1,50 +1,92 @@
-import { z } from "zod";
+import "../lib/arktype-config";
+import { type } from "arktype";
 import {
   getClient,
   listTeams,
   getTeam,
   getTeamMembers,
   getAvailableTeamKeys,
+  type Team,
+  type TeamMember,
 } from "@bdsqqq/lnr-core";
 import { router, procedure } from "./trpc";
 import { exitWithError, handleApiError, EXIT_CODES } from "../lib/error";
-import { outputJson, outputQuiet, outputTable } from "../lib/output";
+import {
+  outputJson,
+  outputQuiet,
+  outputTable,
+  getOutputFormat,
+  truncate,
+  type OutputOptions,
+  type TableColumn,
+} from "../lib/output";
 
-const teamsInput = z.object({
-  json: z.boolean().optional().describe("output as json"),
-  quiet: z.boolean().optional().describe("output keys only"),
+export const listTeamsInput = type({
+  "json?": type("boolean").describe("output as json"),
+  "quiet?": type("boolean").describe("output keys only"),
+  "verbose?": type("boolean").describe("show all columns"),
 });
 
-const teamInput = z.object({
-  key: z.string().meta({ positional: true }).describe("team key"),
-  members: z.boolean().optional().describe("list team members"),
-  json: z.boolean().optional().describe("output as json"),
+export const teamInput = type({
+  key: type("string").configure({ positional: true }).describe("team key"),
+  "members?": type("boolean").describe("list team members"),
+  "json?": type("boolean").describe("output as json"),
+  "quiet?": type("boolean").describe("output id only"),
+  "verbose?": type("boolean").describe("show all columns"),
 });
 
+const teamColumns: TableColumn<Team>[] = [
+  { header: "KEY", value: (t) => t.key, width: 8 },
+  { header: "NAME", value: (t) => t.name, width: 24 },
+  { header: "DESCRIPTION", value: (t) => truncate(t.description ?? "-", 40), width: 40 },
+];
+
+const verboseTeamColumns: TableColumn<Team>[] = [
+  ...teamColumns,
+  { header: "PRIVATE", value: (t) => (t.private ? "yes" : "no"), width: 8 },
+  { header: "TIMEZONE", value: (t) => t.timezone ?? "-", width: 20 },
+  { header: "ID", value: (t) => t.id, width: 36 },
+];
+
+const memberColumns: TableColumn<TeamMember>[] = [
+  { header: "NAME", value: (m) => m.name, width: 24 },
+  { header: "EMAIL", value: (m) => m.email ?? "-", width: 32 },
+  { header: "ACTIVE", value: (m) => (m.active ? "yes" : "no"), width: 8 },
+];
+
+const verboseMemberColumns: TableColumn<TeamMember>[] = [
+  ...memberColumns,
+  { header: "DISPLAY NAME", value: (m) => m.displayName ?? "-", width: 24 },
+  { header: "ID", value: (m) => m.id, width: 36 },
+];
+
 export const teamsRouter = router({
   teams: procedure
     .meta({ aliases: { command: ["t"] }, description: "list teams" })
-    .input(teamsInput)
+    .input(listTeamsInput)
     .query(async ({ input }) => {
       try {
         const client = getClient();
         const teams = await listTeams(client);
 
-        if (input.json) {
+        const outputOpts: OutputOptions = {
+          format: input.json ? "json" : input.quiet ? "quiet" : undefined,
+          verbose: input.verbose,
+        };
+        const format = getOutputFormat(outputOpts);
+
+        if (format === "json") {
           outputJson(teams);
           return;
         }
 
-        if (input.quiet) {
+        if (format === "quiet") {
           outputQuiet(teams.map((t) => t.key));
           return;
         }
 
-        outputTable(teams, [
-          { header: "KEY", value: (t) => t.key, width: 8 },
-          { header: "NAME", value: (t) => t.name, width: 24 },
-          { header: "DESCRIPTION", value: (t) => t.description ?? "-", width: 40 },
-        ]);
+        const columns = input.verbose ? verboseTeamColumns : teamColumns;
+        outputTable(teams, columns, outputOpts);
       } catch (error) {
         handleApiError(error);
       }
@@ -67,34 +109,50 @@ export const teamsRouter = router({
           );
         }
 
+        const outputOpts: OutputOptions = {
+          format: input.json ? "json" : input.quiet ? "quiet" : undefined,
+          verbose: input.verbose,
+        };
+        const format = getOutputFormat(outputOpts);
+
         if (input.members) {
           const members = await getTeamMembers(client, input.key);
 
-          if (input.json) {
+          if (format === "json") {
             outputJson(members);
             return;
           }
 
+          if (format === "quiet") {
+            outputQuiet(members.map((m) => m.id));
+            return;
+          }
+
           console.log(`${team.name} (${team.key}) members:\n`);
-          outputTable(members, [
-            { header: "NAME", value: (m) => m.name, width: 24 },
-            { header: "EMAIL", value: (m) => m.email ?? "-", width: 32 },
-            { header: "ACTIVE", value: (m) => (m.active ? "yes" : "no"), width: 8 },
-          ]);
+          const cols = input.verbose ? verboseMemberColumns : memberColumns;
+          outputTable(members, cols, outputOpts);
           return;
         }
 
-        if (input.json) {
+        if (format === "json") {
           outputJson(team);
           return;
         }
 
+        if (format === "quiet") {
+          console.log(team.id);
+          return;
+        }
+
         console.log(`${team.name} (${team.key})`);
         if (team.description) {
           console.log(team.description);
         }
         console.log(`timezone: ${team.timezone ?? "-"}`);
         console.log(`private: ${team.private ? "yes" : "no"}`);
+        if (input.verbose) {
+          console.log(`id: ${team.id}`);
+        }
       } catch (error) {
         handleApiError(error);
       }

package/src/router/users.ts

@@ -0,0 +1,126 @@
+import "../lib/arktype-config";
+import { type } from "arktype";
+import {
+  getClient,
+  listUsers,
+  findUserByNameOrEmail,
+  type User,
+} from "@bdsqqq/lnr-core";
+import { router, procedure } from "./trpc";
+import { exitWithError, handleApiError, EXIT_CODES } from "../lib/error";
+import {
+  outputJson,
+  outputQuiet,
+  outputTable,
+  getOutputFormat,
+  type OutputOptions,
+  type TableColumn,
+} from "../lib/output";
+
+export const listUsersInput = type({
+  "json?": type("boolean").describe("output as json"),
+  "quiet?": type("boolean").describe("output ids only"),
+  "verbose?": type("boolean").describe("show all columns"),
+});
+
+export const userInput = type({
+  nameOrEmail: type("string").configure({ positional: true }).describe("user name or email"),
+  "json?": type("boolean").describe("output as json"),
+  "quiet?": type("boolean").describe("output id only"),
+  "verbose?": type("boolean").describe("show all columns"),
+});
+
+const userColumns: TableColumn<User>[] = [
+  { header: "NAME", value: (u) => u.name, width: 24 },
+  { header: "EMAIL", value: (u) => u.email ?? "-", width: 32 },
+  { header: "ACTIVE", value: (u) => (u.active ? "yes" : "no"), width: 8 },
+  { header: "ADMIN", value: (u) => (u.admin ? "yes" : "no"), width: 8 },
+];
+
+const verboseUserColumns: TableColumn<User>[] = [
+  ...userColumns,
+  { header: "DISPLAY NAME", value: (u) => u.displayName ?? "-", width: 24 },
+  { header: "ID", value: (u) => u.id, width: 36 },
+];
+
+export const usersRouter = router({
+  users: procedure
+    .meta({ aliases: { command: ["u"] }, description: "list users" })
+    .input(listUsersInput)
+    .query(async ({ input }) => {
+      try {
+        const client = getClient();
+        const users = await listUsers(client);
+
+        const outputOpts: OutputOptions = {
+          format: input.json ? "json" : input.quiet ? "quiet" : undefined,
+          verbose: input.verbose,
+        };
+        const format = getOutputFormat(outputOpts);
+
+        if (format === "json") {
+          outputJson(users);
+          return;
+        }
+
+        if (format === "quiet") {
+          outputQuiet(users.map((u) => u.id));
+          return;
+        }
+
+        const columns = input.verbose ? verboseUserColumns : userColumns;
+        outputTable(users, columns, outputOpts);
+      } catch (error) {
+        handleApiError(error);
+      }
+    }),
+
+  user: procedure
+    .meta({ description: "show user details" })
+    .input(userInput)
+    .query(async ({ input }) => {
+      try {
+        const client = getClient();
+        const user = await findUserByNameOrEmail(client, input.nameOrEmail);
+
+        if (!user) {
+          exitWithError(
+            `user "${input.nameOrEmail}" not found`,
+            "try: lnr users",
+            EXIT_CODES.NOT_FOUND
+          );
+        }
+
+        const outputOpts: OutputOptions = {
+          format: input.json ? "json" : input.quiet ? "quiet" : undefined,
+          verbose: input.verbose,
+        };
+        const format = getOutputFormat(outputOpts);
+
+        if (format === "json") {
+          outputJson(user);
+          return;
+        }
+
+        if (format === "quiet") {
+          console.log(user.id);
+          return;
+        }
+
+        console.log(`${user.name}`);
+        if (user.email) {
+          console.log(`email: ${user.email}`);
+        }
+        if (user.displayName) {
+          console.log(`display name: ${user.displayName}`);
+        }
+        console.log(`active: ${user.active ? "yes" : "no"}`);
+        console.log(`admin: ${user.admin ? "yes" : "no"}`);
+        if (input.verbose) {
+          console.log(`id: ${user.id}`);
+        }
+      } catch (error) {
+        handleApiError(error);
+      }
+    }),
+});