@pmate/cli 0.21.18 → 0.21.19

package/dist/index.d.ts

@@ -349,6 +349,23 @@ type RoleCommandArgs = {
     json: boolean;
 };
 type AccountCommandArgs = {
+    type: Command.Account;
+    action: "list";
+    page?: number;
+    pageSize?: number;
+    mobile?: string;
+    nickName?: string;
+    baseUrl?: string;
+    json: boolean;
+} | {
+    type: Command.Account;
+    action: "app-users";
+    app: string;
+    page?: number;
+    pageSize?: number;
+    baseUrl?: string;
+    json: boolean;
+} | {
     type: Command.Account;
     action: "view";
     account?: string;

package/dist/index.js

@@ -19221,6 +19221,28 @@ var AccountCommandHandler = class {
   async handle(args) {
     const token = this.readToken();
     switch (args.action) {
+      case "list": {
+        const baseUrl = this.resolveAuthBaseUrl(args.baseUrl);
+        const result = await this.request(
+          baseUrl,
+          token,
+          "GET",
+          `/accounts?${this.buildAccountListQuery(args)}`
+        );
+        this.renderAccountList(result, args.json);
+        return;
+      }
+      case "app-users": {
+        const baseUrl = this.resolveAuthBaseUrl(args.baseUrl);
+        const result = await this.request(
+          baseUrl,
+          token,
+          "GET",
+          `/accounts/app-users/${encodeURIComponent(args.app)}?${this.buildPagedQuery(args)}`
+        );
+        this.renderAccountAppUsers(result, args.json);
+        return;
+      }
       case "view": {
         const baseUrl = this.resolveAuthBaseUrl(args.baseUrl);
         const result = await this.request(
@@ -19362,6 +19384,20 @@ var AccountCommandHandler = class {
     if (args.nickName) params.set("nickName", args.nickName);
     return params.toString();
   }
+  buildAccountListQuery(args) {
+    const params = new URLSearchParams();
+    if (args.page) params.set("page", String(args.page));
+    if (args.pageSize) params.set("pageSize", String(args.pageSize));
+    if (args.mobile) params.set("mobile", args.mobile);
+    if (args.nickName) params.set("nickName", args.nickName);
+    return params.toString();
+  }
+  buildPagedQuery(args) {
+    const params = new URLSearchParams();
+    if (args.page) params.set("page", String(args.page));
+    if (args.pageSize) params.set("pageSize", String(args.pageSize));
+    return params.toString();
+  }
   buildRoleBindingsQuery(args) {
     const params = new URLSearchParams();
     params.set("account", args.account);
@@ -19440,6 +19476,44 @@ var AccountCommandHandler = class {
       });
     }
   }
+  renderAccountList(result, asJson) {
+    if (asJson) {
+      ui.plain(JSON.stringify(result, null, 2));
+      return;
+    }
+    this.renderAccountView(result.items, false);
+    if (result.items.length > 0) {
+      ui.info(`page ${result.page}`, {
+        pageSize: result.pageSize,
+        totalPages: result.totalPages,
+        hasNext: result.hasNext
+      });
+    }
+  }
+  renderAccountAppUsers(result, asJson) {
+    if (asJson) {
+      ui.plain(JSON.stringify(result, null, 2));
+      return;
+    }
+    if (result.items.length === 0) {
+      ui.warn("No app users found.");
+      return;
+    }
+    for (const item of result.items) {
+      ui.info(item.account.id, {
+        mobile: item.account.mobile,
+        nickNames: item.nickNames,
+        roles: item.roles.map((role) => `${role.namespace}/${role.role}`),
+        sources: item.sources
+      });
+    }
+    ui.info(`page ${result.page}`, {
+      pageSize: result.pageSize,
+      total: result.total,
+      totalPages: result.totalPages,
+      hasNext: result.hasNext
+    });
+  }
   renderJson(value, asJson) {
     if (!asJson) {
       return;
@@ -21514,7 +21588,93 @@ function parseAccountArgs(tokens) {
   const rest = [...tokens];
   const action = rest.shift();
   if (!action) {
-    throw new Error("Missing account action. Use: account view|role");
+    throw new Error("Missing account action. Use: account list|view|app-users|role");
+  }
+  if (action === "list") {
+    let mobile;
+    let nickName;
+    let page;
+    let pageSize;
+    let baseUrl2;
+    let json2 = false;
+    while (rest.length > 0) {
+      const token = rest.shift();
+      switch (token) {
+        case "--mobile":
+          mobile = requireValue8(rest, token);
+          break;
+        case "--nickname":
+        case "--nickName":
+          nickName = requireValue8(rest, token);
+          break;
+        case "--page":
+          page = parsePositiveInt(requireValue8(rest, token), token);
+          break;
+        case "--page-size":
+          pageSize = parsePositiveInt(requireValue8(rest, token), token);
+          break;
+        case "--base-url":
+          baseUrl2 = requireValue8(rest, token);
+          break;
+        case "--json":
+          json2 = true;
+          break;
+        default:
+          throw new Error(`Unknown account list option: ${token}`);
+      }
+    }
+    if (mobile && nickName) {
+      throw new Error(
+        "Usage: account list [--page <n>] [--page-size <n>] [--mobile <mobile> | --nickname <nickname>] [--base-url <url>] [--json]"
+      );
+    }
+    return {
+      type: "account" /* Account */,
+      action: "list",
+      page,
+      pageSize,
+      mobile,
+      nickName,
+      baseUrl: baseUrl2,
+      json: json2
+    };
+  }
+  if (action === "app-users") {
+    const app = parseNamespacedRef(requireValue8(rest, "app-users"), {
+      entityLabel: "app ref"
+    }).fullId;
+    let page;
+    let pageSize;
+    let baseUrl2;
+    let json2 = false;
+    while (rest.length > 0) {
+      const token = rest.shift();
+      switch (token) {
+        case "--page":
+          page = parsePositiveInt(requireValue8(rest, token), token);
+          break;
+        case "--page-size":
+          pageSize = parsePositiveInt(requireValue8(rest, token), token);
+          break;
+        case "--base-url":
+          baseUrl2 = requireValue8(rest, token);
+          break;
+        case "--json":
+          json2 = true;
+          break;
+        default:
+          throw new Error(`Unknown account app-users option: ${token}`);
+      }
+    }
+    return {
+      type: "account" /* Account */,
+      action: "app-users",
+      app,
+      page,
+      pageSize,
+      baseUrl: baseUrl2,
+      json: json2
+    };
   }
   if (action === "view") {
     let account2;
@@ -21737,6 +21897,13 @@ function requireValue8(tokens, optionName) {
   }
   return value;
 }
+function parsePositiveInt(value, optionName) {
+  const parsed = Number(value);
+  if (!Number.isInteger(parsed) || parsed <= 0) {
+    throw new Error(`${optionName} must be a positive integer`);
+  }
+  return parsed;
+}
 
 // src/orgCommandParser.ts
 init_namespacedRef();
@@ -22265,7 +22432,9 @@ var HELP_TEXT = [
   `  ${import_chalk4.default.gray("                  definition create <role> [--display-name <name>] [--description <text>] [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  default base URL: https://auth-api-v2.pmate.chat")}`,
   `  ${import_chalk4.default.cyan("account")}          View accounts and manage account role bindings`,
+  `  ${import_chalk4.default.gray("                  list [--page <n>] [--page-size <n>] [--mobile <mobile> | --nickname <nickname>] [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  view (--account <id> | --mobile <mobile> | --nickname <nickname>) [--base-url <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  app-users <ns:app> [--page <n>] [--page-size <n>] [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  role list --account <id> [--namespace <ns>] [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  role add --account <id> --namespace <ns> --role <role> [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  role remove --account <id> --namespace <ns> --role <role> [--base-url <url>] [--json]")}`,
@@ -23913,7 +24082,7 @@ function parseRandomArgs(tokens) {
         mode = "easy";
         break;
       case "--length":
-        length = parsePositiveInt(requireValue12(rest, token), token);
+        length = parsePositiveInt2(requireValue12(rest, token), token);
         seenLength = true;
         break;
       case "--charset": {
@@ -23928,10 +24097,10 @@ function parseRandomArgs(tokens) {
         break;
       }
       case "--count":
-        count = parsePositiveInt(requireValue12(rest, token), token);
+        count = parsePositiveInt2(requireValue12(rest, token), token);
         break;
       case "--words":
-        words = parsePositiveInt(requireValue12(rest, token), token);
+        words = parsePositiveInt2(requireValue12(rest, token), token);
         seenWords = true;
         break;
       case "--digits":
@@ -23980,7 +24149,7 @@ function requireValue12(tokens, optionName) {
 function decodeEscapedNewlines(value) {
   return value.replace(/(?<!\\)\\r\\n/g, "\n").replace(/(?<!\\)\\n/g, "\n").replace(/(?<!\\)\\r/g, "\n");
 }
-function parsePositiveInt(value, optionName) {
+function parsePositiveInt2(value, optionName) {
   const parsed = Number.parseInt(value, 10);
   if (!Number.isFinite(parsed) || parsed <= 0) {
     throw new Error(`Invalid ${optionName} value: ${value}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmate/cli",
-  "version": "0.21.18",
+  "version": "0.21.19",
   "description": "CLI utilities for the pMate project",
   "license": "MIT",
   "bin": {