@pilatos/bitbucket-cli 1.8.2 → 1.8.3

package/dist/index.js

@@ -21341,6 +21341,288 @@ class CloneCommand extends BaseCommand {
   }
 }
 
+// src/services/response-parsers.ts
+function isRecord(value) {
+  return typeof value === "object" && value !== null;
+}
+function getString(value) {
+  return typeof value === "string" ? value : undefined;
+}
+function getNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : undefined;
+}
+function getIterable(value) {
+  if (Array.isArray(value)) {
+    return value;
+  }
+  if (typeof value !== "object" || value === null) {
+    return;
+  }
+  const iterableCandidate = value;
+  const iterator2 = iterableCandidate[Symbol.iterator];
+  return typeof iterator2 === "function" ? value : undefined;
+}
+function getValuesIterable(data) {
+  if (isRecord(data) && "values" in data) {
+    return getIterable(data.values);
+  }
+  return getIterable(data);
+}
+function mapPaginatedValues(data, mapValue) {
+  const iterableValues = getValuesIterable(data);
+  const values = [];
+  if (iterableValues) {
+    for (const value of iterableValues) {
+      const mappedValue = mapValue(value);
+      if (mappedValue !== undefined) {
+        values.push(mappedValue);
+      }
+    }
+  }
+  const next = isRecord(data) ? getString(data.next) : undefined;
+  return {
+    values,
+    next
+  };
+}
+function getCommitFilePath(file) {
+  if (!isRecord(file)) {
+    return;
+  }
+  const path = file.path;
+  return typeof path === "string" && path.length > 0 ? path : undefined;
+}
+function parseDiffstatFile(value) {
+  if (!isRecord(value)) {
+    return;
+  }
+  return {
+    path: getCommitFilePath(value.new) ?? getCommitFilePath(value.old) ?? "unknown",
+    additions: getNumber(value.lines_added) ?? 0,
+    deletions: getNumber(value.lines_removed) ?? 0
+  };
+}
+function parseActivityUser(value) {
+  if (!isRecord(value)) {
+    return;
+  }
+  const displayName = getString(value.display_name);
+  const username = getString(value.username);
+  const nickname = getString(value.nickname);
+  if (!displayName && !username && !nickname) {
+    return;
+  }
+  return {
+    display_name: displayName,
+    username,
+    nickname
+  };
+}
+function parseActivityHash(value) {
+  if (!isRecord(value)) {
+    return;
+  }
+  const hash = getString(value.hash);
+  return hash ? { hash } : undefined;
+}
+function parseActivityComment(value) {
+  if (!isRecord(value)) {
+    return;
+  }
+  const id = getNumber(value.id);
+  const raw = getRawContent(value.content);
+  const user = parseActivityUser(value.user);
+  const author = parseActivityUser(value.author);
+  const createdOn = getString(value.created_on);
+  if (id === undefined && raw === undefined && !user && !author && !createdOn) {
+    return;
+  }
+  return {
+    id,
+    content: raw === undefined ? undefined : { raw },
+    user,
+    author,
+    created_on: createdOn
+  };
+}
+function parseApproval(value) {
+  if (!isRecord(value)) {
+    return;
+  }
+  const user = parseActivityUser(value.user);
+  const date = getString(value.date);
+  if (!user && !date) {
+    return;
+  }
+  return { user, date };
+}
+function parseChangesRequested(value) {
+  if (!isRecord(value)) {
+    return;
+  }
+  const user = parseActivityUser(value.user);
+  const reason = getString(value.reason);
+  const date = getString(value.date);
+  if (!user && !reason && !date) {
+    return;
+  }
+  return {
+    user,
+    reason,
+    date
+  };
+}
+function parseMerge(value) {
+  if (!isRecord(value)) {
+    return;
+  }
+  const user = parseActivityUser(value.user);
+  const date = getString(value.date);
+  const commit = parseActivityHash(value.commit);
+  if (!user && !date && !commit) {
+    return;
+  }
+  return {
+    user,
+    date,
+    commit
+  };
+}
+function parseDecline(value) {
+  if (!isRecord(value)) {
+    return;
+  }
+  const user = parseActivityUser(value.user);
+  const date = getString(value.date);
+  if (!user && !date) {
+    return;
+  }
+  return { user, date };
+}
+function parseCommit(value) {
+  if (!isRecord(value)) {
+    return;
+  }
+  const date = getString(value.date);
+  const hash = getString(value.hash);
+  const author = isRecord(value.author) ? {
+    user: parseActivityUser(value.author.user)
+  } : undefined;
+  if (!date && !hash && !author?.user) {
+    return;
+  }
+  return {
+    date,
+    hash,
+    author
+  };
+}
+function parseUpdate(value) {
+  if (!isRecord(value)) {
+    return;
+  }
+  const author = parseActivityUser(value.author);
+  const date = getString(value.date);
+  const title = getString(value.title);
+  const description = getString(value.description);
+  const state = getString(value.state);
+  if (!author && !date && !title && !description && !state) {
+    return;
+  }
+  return {
+    author,
+    date,
+    title,
+    description,
+    state
+  };
+}
+function parseActivity(value) {
+  if (!isRecord(value)) {
+    return;
+  }
+  return {
+    type: getString(value.type),
+    comment: parseActivityComment(value.comment),
+    approval: parseApproval(value.approval),
+    changes_requested: parseChangesRequested(value.changes_requested),
+    merge: parseMerge(value.merge),
+    decline: parseDecline(value.decline),
+    commit: parseCommit(value.commit),
+    update: parseUpdate(value.update),
+    user: parseActivityUser(value.user)
+  };
+}
+function getLinkHref(links, key) {
+  if (!isRecord(links)) {
+    return;
+  }
+  const link = links[key];
+  if (!isRecord(link)) {
+    return;
+  }
+  return getString(link.href);
+}
+function getCloneLinks(links) {
+  if (!isRecord(links)) {
+    return [];
+  }
+  const cloneLinks = getIterable(links.clone);
+  if (!cloneLinks) {
+    return [];
+  }
+  const parsedLinks = [];
+  for (const cloneLink of cloneLinks) {
+    if (!isRecord(cloneLink)) {
+      continue;
+    }
+    const name = getString(cloneLink.name);
+    const href = getString(cloneLink.href);
+    if (name && href) {
+      parsedLinks.push({ name, href });
+    }
+  }
+  return parsedLinks;
+}
+function getBranchName(endpoint) {
+  if (!isRecord(endpoint)) {
+    return;
+  }
+  const branch = endpoint.branch;
+  if (!isRecord(branch)) {
+    return;
+  }
+  const name = branch.name;
+  return typeof name === "string" && name.length > 0 ? name : undefined;
+}
+function getUserDisplayName(user) {
+  if (!isRecord(user)) {
+    return;
+  }
+  const nickname = getString(user.nickname);
+  if (nickname && nickname.length > 0) {
+    return nickname;
+  }
+  const displayName = getString(user.display_name);
+  if (displayName && displayName.length > 0) {
+    return displayName;
+  }
+  const username = getString(user.username);
+  return username && username.length > 0 ? username : undefined;
+}
+function getRawContent(content) {
+  if (!isRecord(content)) {
+    return;
+  }
+  return getString(content.raw);
+}
+function parseDiffstatFiles(data) {
+  return Array.from(mapPaginatedValues(data, parseDiffstatFile).values ?? []);
+}
+function parsePullrequestActivitiesPage(data) {
+  return mapPaginatedValues(data, parseActivity);
+}
+
 // src/commands/repo/create.command.ts
 class CreateRepoCommand extends BaseCommand {
   repositoriesApi;
@@ -21379,8 +21661,9 @@ class CreateRepoCommand extends BaseCommand {
       return;
     }
     this.output.success(`Created repository ${repo.full_name}`);
-    this.output.text(`  ${this.output.dim("URL:")} ${repo.links?.html?.href}`);
-    const sshClone = Array.from(repo.links?.clone ?? []).find((c) => c.name === "ssh");
+    const repoUrl = getLinkHref(repo.links, "html") ?? "";
+    this.output.text(`  ${this.output.dim("URL:")} ${repoUrl}`);
+    const sshClone = getCloneLinks(repo.links).find((cloneLink) => cloneLink.name === "ssh");
     if (sshClone?.href) {
       this.output.text(`  ${this.output.dim("Clone:")} git clone ${sshClone.href}`);
     }
@@ -21553,8 +21836,9 @@ class ViewRepoCommand extends BaseCommand {
     this.output.text(`  ${this.output.dim("Created:")} ${this.output.formatDate(repo.created_on ?? "")}`);
     this.output.text(`  ${this.output.dim("Updated:")} ${this.output.formatDate(repo.updated_on ?? "")}`);
     this.output.text("");
-    this.output.text(`  ${this.output.dim("URL:")} ${repo.links?.html?.href}`);
-    const sshClone = Array.from(repo.links?.clone ?? []).find((c) => c.name === "ssh");
+    const repoUrl = getLinkHref(repo.links, "html") ?? "";
+    this.output.text(`  ${this.output.dim("URL:")} ${repoUrl}`);
+    const sshClone = getCloneLinks(repo.links).find((cloneLink) => cloneLink.name === "ssh");
     if (sshClone?.href) {
       this.output.text(`  ${this.output.dim("SSH:")} ${sshClone.href}`);
     }
@@ -22143,7 +22427,7 @@ class CheckoutPRCommand extends BaseCommand {
       pullRequestId: prId
     });
     const pr = prResponse.data;
-    const branchName = pr.source?.branch?.name;
+    const branchName = getBranchName(pr.source);
     const localBranchName = `pr-${prId}`;
     if (!branchName) {
       throw new BBError({
@@ -22233,8 +22517,7 @@ class DiffPRCommand extends BaseCommand {
           return response.data;
         },
         shouldInclude: (pullRequest) => {
-          const source = pullRequest.source;
-          return source?.branch?.name === currentBranch;
+          return getBranchName(pullRequest.source) === currentBranch;
         }
       });
       const pr = matches[0];
@@ -22318,8 +22601,7 @@ class DiffPRCommand extends BaseCommand {
       repoSlug,
       pullRequestId: prId
     });
-    const links = prResponse.data.links;
-    const htmlUrl = links?.html?.href;
+    const htmlUrl = getLinkHref(prResponse.data.links, "html");
     if (htmlUrl) {
       const normalizedHtmlUrl = htmlUrl.replace(/\/$/, "");
       return `${normalizedHtmlUrl}/diff`;
@@ -22332,15 +22614,7 @@ class DiffPRCommand extends BaseCommand {
       repoSlug,
       pullRequestId: prId
     });
-    const diffstat = diffstatResponse.data;
-    const files = Array.from(diffstat.values ?? []).map((file) => {
-      const path = file.new?.path || file.old?.path || "unknown";
-      return {
-        path,
-        additions: file.lines_added ?? 0,
-        deletions: file.lines_removed ?? 0
-      };
-    });
+    const files = parseDiffstatFiles(diffstatResponse.data);
     const totalAdditions = files.reduce((sum, f) => sum + f.additions, 0);
     const totalDeletions = files.reduce((sum, f) => sum + f.deletions, 0);
     const filesChanged = files.length;
@@ -22378,8 +22652,7 @@ class DiffPRCommand extends BaseCommand {
       repoSlug,
       pullRequestId: prId
     });
-    const diffstat = diffstatResponse.data;
-    const fileNames = Array.from(diffstat.values ?? []).map((file) => file.new?.path || file.old?.path || "unknown");
+    const fileNames = parseDiffstatFiles(diffstatResponse.data).map((file) => file.path);
     if (useJson) {
       return fileNames;
     }
@@ -22459,7 +22732,7 @@ class ActivityPRCommand extends BaseCommand {
         }, {
           params: { page, pagelen }
         });
-        return response.data;
+        return parsePullrequestActivitiesPage(response.data);
       },
       shouldInclude: (activity) => {
         if (filterTypes.length === 0) {
@@ -22468,7 +22741,6 @@ class ActivityPRCommand extends BaseCommand {
         return filterTypes.includes(this.getActivityType(activity));
       }
     });
-    const typedActivities = activities;
     if (context.globalOptions.json) {
       this.output.json({
         workspace: repoContext.workspace,
@@ -22477,12 +22749,12 @@ class ActivityPRCommand extends BaseCommand {
         filters: {
           types: filterTypes
         },
-        count: typedActivities.length,
-        activities: typedActivities
+        count: activities.length,
+        activities
       });
       return;
     }
-    if (typedActivities.length === 0) {
+    if (activities.length === 0) {
       if (filterTypes.length > 0) {
         this.output.info("No activity entries matched the requested filter");
       } else {
@@ -22490,7 +22762,7 @@ class ActivityPRCommand extends BaseCommand {
       }
       return;
     }
-    const rows = typedActivities.map((activity) => {
+    const rows = activities.map((activity) => {
       const activityType = this.getActivityType(activity);
       return [
         activityType.toUpperCase(),
@@ -22533,10 +22805,7 @@ class ActivityPRCommand extends BaseCommand {
   }
   getActorName(activity) {
     const user = activity.comment?.user ?? activity.comment?.author ?? activity.approval?.user ?? activity.update?.author ?? activity.changes_requested?.user ?? activity.merge?.user ?? activity.decline?.user ?? activity.commit?.author?.user ?? activity.user;
-    if (!user) {
-      return "Unknown";
-    }
-    return user.display_name || user.username || "Unknown";
+    return getUserDisplayName(user) ?? "Unknown";
   }
   formatActivityDate(activity) {
     const date = activity.comment?.created_on ?? activity.approval?.date ?? activity.update?.date ?? activity.changes_requested?.date ?? activity.merge?.date ?? activity.decline?.date ?? activity.commit?.date;
@@ -22548,7 +22817,7 @@ class ActivityPRCommand extends BaseCommand {
   buildActivityDetails(activity, type) {
     switch (type) {
       case "comment": {
-        const content = activity.comment?.content?.raw ?? "";
+        const content = getRawContent(activity.comment?.content) ?? "";
         const id = activity.comment?.id ? `#${activity.comment.id}` : "";
         const snippet = this.truncate(content, 80);
         return [id, snippet].filter(Boolean).join(" ");
@@ -22728,10 +22997,10 @@ class ListCommentsPRCommand extends BaseCommand {
       return;
     }
     const rows = values.map((comment) => {
-      const content = comment.content?.raw ?? "";
+      const content = getRawContent(comment.content) ?? "";
       return [
         comment.id?.toString() ?? "",
-        comment.user?.nickname ?? comment.user?.display_name ?? "Unknown",
+        getUserDisplayName(comment.user) ?? "Unknown",
         comment.deleted ? "[deleted]" : options.truncate === false ? content : content.slice(0, 60) + (content.length > 60 ? "..." : ""),
         this.output.formatDate(comment.created_on ?? "")
       ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pilatos/bitbucket-cli",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "description": "A command-line interface for Bitbucket Cloud",
   "author": "",
   "license": "MIT",