@pruddiman/dispatch 1.3.0 → 1.3.1

package/dist/cli.js

@@ -1030,7 +1030,8 @@ function slugify(input3, maxLength) {
 
 // src/datasources/github.ts
 init_logger();
-var exec = promisify(execFile);
+
+// src/helpers/branch-validation.ts
 var InvalidBranchNameError = class extends Error {
   constructor(branch, reason) {
     const detail = reason ? ` (${reason})` : "";
@@ -1038,14 +1039,6 @@ var InvalidBranchNameError = class extends Error {
     this.name = "InvalidBranchNameError";
   }
 };
-async function git(args, cwd) {
-  const { stdout } = await exec("git", args, { cwd });
-  return stdout;
-}
-async function gh(args, cwd) {
-  const { stdout } = await exec("gh", args, { cwd });
-  return stdout;
-}
 var VALID_BRANCH_NAME_RE = /^[a-zA-Z0-9._\-/]+$/;
 function isValidBranchName(name) {
   if (name.length === 0 || name.length > 255) return false;
@@ -1057,6 +1050,17 @@ function isValidBranchName(name) {
   if (name.includes("//")) return false;
   return true;
 }
+
+// src/datasources/github.ts
+var exec = promisify(execFile);
+async function git(args, cwd) {
+  const { stdout } = await exec("git", args, { cwd });
+  return stdout;
+}
+async function gh(args, cwd) {
+  const { stdout } = await exec("gh", args, { cwd });
+  return stdout;
+}
 function buildBranchName(issueNumber, title, username = "unknown") {
   const slug = slugify(title, 50);
   return `${username}/dispatch/${issueNumber}-${slug}`;
@@ -1267,6 +1271,25 @@ import { execFile as execFile2 } from "child_process";
 import { promisify as promisify2 } from "util";
 init_logger();
 var exec2 = promisify2(execFile2);
+function mapWorkItemToIssueDetails(item, id, comments, defaults) {
+  const fields = item.fields ?? {};
+  return {
+    number: String(item.id ?? id),
+    title: fields["System.Title"] ?? defaults?.title ?? "",
+    body: fields["System.Description"] ?? defaults?.body ?? "",
+    labels: (fields["System.Tags"] ?? "").split(";").map((t) => t.trim()).filter(Boolean),
+    state: fields["System.State"] ?? defaults?.state ?? "",
+    url: item._links?.html?.href ?? item.url ?? "",
+    comments,
+    acceptanceCriteria: fields["Microsoft.VSTS.Common.AcceptanceCriteria"] ?? "",
+    iterationPath: fields["System.IterationPath"] || void 0,
+    areaPath: fields["System.AreaPath"] || void 0,
+    assignee: fields["System.AssignedTo"]?.displayName || void 0,
+    priority: fields["Microsoft.VSTS.Common.Priority"] ?? void 0,
+    storyPoints: fields["Microsoft.VSTS.Scheduling.StoryPoints"] ?? fields["Microsoft.VSTS.Scheduling.Effort"] ?? fields["Microsoft.VSTS.Scheduling.Size"] ?? void 0,
+    workItemType: fields["System.WorkItemType"] || defaults?.workItemType || void 0
+  };
+}
 async function detectWorkItemType(opts = {}) {
   try {
     const args = ["boards", "work-item", "type", "list", "--output", "json"];
@@ -1325,17 +1348,50 @@ var datasource2 = {
     } catch {
       throw new Error(`Failed to parse Azure CLI output: ${stdout.slice(0, 200)}`);
     }
-    const items = [];
-    if (Array.isArray(data)) {
-      for (const row of data) {
-        const id = String(row.id ?? row.ID ?? "");
-        if (id) {
-          const detail = await datasource2.fetch(id, opts);
-          items.push(detail);
-        }
+    if (!Array.isArray(data)) return [];
+    const ids = data.map((row) => String(row.id ?? row.ID ?? "")).filter(Boolean);
+    if (ids.length === 0) return [];
+    try {
+      const batchArgs = [
+        "boards",
+        "work-item",
+        "show",
+        "--id",
+        ...ids,
+        "--output",
+        "json"
+      ];
+      if (opts.org) batchArgs.push("--org", opts.org);
+      if (opts.project) batchArgs.push("--project", opts.project);
+      const { stdout: batchStdout } = await exec2("az", batchArgs, {
+        cwd: opts.cwd || process.cwd()
+      });
+      let batchItems;
+      try {
+        batchItems = JSON.parse(batchStdout);
+      } catch {
+        throw new Error(`Failed to parse Azure CLI output: ${batchStdout.slice(0, 200)}`);
       }
+      const itemsArray = Array.isArray(batchItems) ? batchItems : [batchItems];
+      const commentsArray = [];
+      const CONCURRENCY = 5;
+      for (let i = 0; i < itemsArray.length; i += CONCURRENCY) {
+        const batch = itemsArray.slice(i, i + CONCURRENCY);
+        const batchResults = await Promise.all(
+          batch.map((item) => fetchComments(String(item.id), opts))
+        );
+        commentsArray.push(...batchResults);
+      }
+      return itemsArray.map(
+        (item, i) => mapWorkItemToIssueDetails(item, String(item.id), commentsArray[i])
+      );
+    } catch (err) {
+      log.debug(`Batch work-item show failed, falling back to individual fetches: ${log.extractMessage(err)}`);
+      const results = await Promise.all(
+        ids.map((id) => datasource2.fetch(id, opts))
+      );
+      return results;
     }
-    return items;
   },
   async fetch(issueId, opts = {}) {
     const args = [
@@ -1362,24 +1418,8 @@ var datasource2 = {
     } catch {
       throw new Error(`Failed to parse Azure CLI output: ${stdout.slice(0, 200)}`);
     }
-    const fields = item.fields ?? {};
     const comments = await fetchComments(issueId, opts);
-    return {
-      number: String(item.id ?? issueId),
-      title: fields["System.Title"] ?? "",
-      body: fields["System.Description"] ?? "",
-      labels: (fields["System.Tags"] ?? "").split(";").map((t) => t.trim()).filter(Boolean),
-      state: fields["System.State"] ?? "",
-      url: item._links?.html?.href ?? item.url ?? "",
-      comments,
-      acceptanceCriteria: fields["Microsoft.VSTS.Common.AcceptanceCriteria"] ?? "",
-      iterationPath: fields["System.IterationPath"] || void 0,
-      areaPath: fields["System.AreaPath"] || void 0,
-      assignee: fields["System.AssignedTo"]?.displayName || void 0,
-      priority: fields["Microsoft.VSTS.Common.Priority"] ?? void 0,
-      storyPoints: fields["Microsoft.VSTS.Scheduling.StoryPoints"] ?? fields["Microsoft.VSTS.Scheduling.Effort"] ?? fields["Microsoft.VSTS.Scheduling.Size"] ?? void 0,
-      workItemType: fields["System.WorkItemType"] || void 0
-    };
+    return mapWorkItemToIssueDetails(item, issueId, comments);
   },
   async update(issueId, title, body, opts = {}) {
     const args = [
@@ -1442,30 +1482,26 @@ var datasource2 = {
     } catch {
       throw new Error(`Failed to parse Azure CLI output: ${stdout.slice(0, 200)}`);
     }
-    const fields = item.fields ?? {};
-    return {
-      number: String(item.id),
-      title: fields["System.Title"] ?? title,
-      body: fields["System.Description"] ?? body,
-      labels: (fields["System.Tags"] ?? "").split(";").map((t) => t.trim()).filter(Boolean),
-      state: fields["System.State"] ?? "New",
-      url: item._links?.html?.href ?? item.url ?? "",
-      comments: [],
-      acceptanceCriteria: fields["Microsoft.VSTS.Common.AcceptanceCriteria"] ?? "",
-      iterationPath: fields["System.IterationPath"] || void 0,
-      areaPath: fields["System.AreaPath"] || void 0,
-      assignee: fields["System.AssignedTo"]?.displayName || void 0,
-      priority: fields["Microsoft.VSTS.Common.Priority"] ?? void 0,
-      storyPoints: fields["Microsoft.VSTS.Scheduling.StoryPoints"] ?? fields["Microsoft.VSTS.Scheduling.Effort"] ?? fields["Microsoft.VSTS.Scheduling.Size"] ?? void 0,
-      workItemType: fields["System.WorkItemType"] || workItemType
-    };
+    return mapWorkItemToIssueDetails(item, String(item.id), [], {
+      title,
+      body,
+      state: "New",
+      workItemType
+    });
   },
   async getDefaultBranch(opts) {
     try {
       const { stdout } = await exec2("git", ["symbolic-ref", "refs/remotes/origin/HEAD"], { cwd: opts.cwd });
       const parts = stdout.trim().split("/");
-      return parts[parts.length - 1];
-    } catch {
+      const branch = parts[parts.length - 1];
+      if (!isValidBranchName(branch)) {
+        throw new InvalidBranchNameError(branch, "from symbolic-ref output");
+      }
+      return branch;
+    } catch (err) {
+      if (err instanceof InvalidBranchNameError) {
+        throw err;
+      }
       try {
         await exec2("git", ["rev-parse", "--verify", "main"], { cwd: opts.cwd });
         return "main";
@@ -1499,9 +1535,16 @@ var datasource2 = {
   },
   buildBranchName(issueNumber, title, username) {
     const slug = slugify(title, 50);
-    return `${username}/dispatch/${issueNumber}-${slug}`;
+    const branch = `${username}/dispatch/${issueNumber}-${slug}`;
+    if (!isValidBranchName(branch)) {
+      throw new InvalidBranchNameError(branch);
+    }
+    return branch;
   },
   async createAndSwitchBranch(branchName, opts) {
+    if (!isValidBranchName(branchName)) {
+      throw new InvalidBranchNameError(branchName);
+    }
     try {
       await exec2("git", ["checkout", "-b", branchName], { cwd: opts.cwd });
     } catch (err) {
@@ -5136,7 +5179,7 @@ async function main() {
     process.exit(0);
   }
   if (args.version) {
-    console.log(`dispatch v${"1.3.0"}`);
+    console.log(`dispatch v${"1.3.1"}`);
     process.exit(0);
   }
   const orchestrator = await boot9({ cwd: args.cwd });