azdo-cli 0.22.0-feature-053-comments-edit-delete.824 → 0.22.0-feature-053-comments-edit-delete.826

package/dist/index.js

@@ -916,16 +916,11 @@ async function listWorkItemComments(context, id, cred) {
     comments
   };
 }
-async function addWorkItemComment(context, id, cred, text, format = "html") {
-  const url = buildWorkItemCommentsUrl(context, id);
-  url.searchParams.set("format", format);
+async function sendCommentRequest(url, cred, method, body) {
   const response = await fetchWithErrors(url.toString(), {
-    method: "POST",
-    headers: {
-      ...authHeaders(cred),
-      "Content-Type": "application/json"
-    },
-    body: JSON.stringify({ text })
+    method,
+    headers: body === void 0 ? authHeaders(cred) : { ...authHeaders(cred), "Content-Type": "application/json" },
+    body: body === void 0 ? void 0 : JSON.stringify(body)
   });
   if (response.status === 400) {
     const serverMessage = await readResponseMessage(response) ?? "Unknown error";
@@ -934,38 +929,15 @@ async function addWorkItemComment(context, id, cred, text, format = "html") {
   if (!response.ok) {
     throw httpError(response);
   }
-  const data = await response.json();
-  return {
-    workItemId: data.workItemId ?? id,
-    commentId: data.commentId ?? data.id ?? 0,
-    text: typeof data.text === "string" ? data.text : text,
-    author: data.createdBy?.displayName ?? null,
-    createdAt: data.createdDate ?? null,
-    url: data.url ?? null
-  };
+  return response;
 }
-async function updateWorkItemComment(context, id, commentId, cred, text, format = "html") {
-  const url = buildWorkItemCommentUrl(context, id, commentId);
+async function writeCommentText(url, cred, method, text, format, fallback) {
   url.searchParams.set("format", format);
-  const response = await fetchWithErrors(url.toString(), {
-    method: "PATCH",
-    headers: {
-      ...authHeaders(cred),
-      "Content-Type": "application/json"
-    },
-    body: JSON.stringify({ text })
-  });
-  if (response.status === 400) {
-    const serverMessage = await readResponseMessage(response) ?? "Unknown error";
-    throw new Error(`BAD_REQUEST: ${serverMessage}`);
-  }
-  if (!response.ok) {
-    throw httpError(response);
-  }
+  const response = await sendCommentRequest(url, cred, method, { text });
   const data = await response.json();
   return {
-    workItemId: data.workItemId ?? id,
-    commentId: data.commentId ?? data.id ?? commentId,
+    workItemId: data.workItemId ?? fallback.workItemId,
+    commentId: data.commentId ?? data.id ?? fallback.commentId,
     text: typeof data.text === "string" ? data.text : text,
     author: data.createdBy?.displayName ?? null,
     createdAt: data.createdDate ?? null,
@@ -973,18 +945,32 @@ async function updateWorkItemComment(context, id, commentId, cred, text, format
     url: data.url ?? null
   };
 }
-async function deleteWorkItemComment(context, id, commentId, cred) {
-  const response = await fetchWithErrors(buildWorkItemCommentUrl(context, id, commentId).toString(), {
-    method: "DELETE",
-    headers: authHeaders(cred)
+async function addWorkItemComment(context, id, cred, text, format = "html") {
+  const written = await writeCommentText(
+    buildWorkItemCommentsUrl(context, id),
+    cred,
+    "POST",
+    text,
+    format,
+    { workItemId: id, commentId: 0 }
+  );
+  return {
+    workItemId: written.workItemId,
+    commentId: written.commentId,
+    text: written.text,
+    author: written.author,
+    createdAt: written.createdAt,
+    url: written.url
+  };
+}
+async function updateWorkItemComment(context, id, commentId, cred, text, format = "html") {
+  return writeCommentText(buildWorkItemCommentUrl(context, id, commentId), cred, "PATCH", text, format, {
+    workItemId: id,
+    commentId
   });
-  if (response.status === 400) {
-    const serverMessage = await readResponseMessage(response) ?? "Unknown error";
-    throw new Error(`BAD_REQUEST: ${serverMessage}`);
-  }
-  if (!response.ok) {
-    throw httpError(response);
-  }
+}
+async function deleteWorkItemComment(context, id, commentId, cred) {
+  await sendCommentRequest(buildWorkItemCommentUrl(context, id, commentId), cred, "DELETE");
   return { workItemId: id, commentId, deleted: true };
 }
 async function updateWorkItem(context, id, cred, fieldName, operations) {
@@ -7692,6 +7678,26 @@ function createPipelineCommand() {
 
 // src/commands/comments.ts
 import { Command as Command15 } from "commander";
+async function runCommentWrite(options, target, request, humanLine) {
+  let context;
+  try {
+    context = resolveContext(options);
+    const credential = await requireAuthCredential(context.org);
+    const result = await request(context, credential);
+    process.stdout.write(options.json ? `${JSON.stringify(result, null, 2)}
+` : `${humanLine(result)}
+`);
+  } catch (err) {
+    if (target.commentId === void 0) {
+      handleCommandError(err, target.id, context, "write");
+    } else {
+      handleCommentWriteError(err, target.id, target.commentId, context);
+    }
+  }
+}
+function commentFormat(options) {
+  return options.markdown === true ? "markdown" : "html";
+}
 function writeError3(message) {
   process.stderr.write(`Error: ${message}
 `);
@@ -7746,22 +7752,12 @@ function createCommentsAddCommand() {
     if (text.trim() === "") {
       writeError3("Comment text must be a non-empty string.");
     }
-    let context;
-    try {
-      context = resolveContext(options);
-      const credential = await requireAuthCredential(context.org);
-      const format = options.markdown === true ? "markdown" : "html";
-      const result = await addWorkItemComment(context, id, credential, text, format);
-      if (options.json) {
-        process.stdout.write(`${JSON.stringify(result, null, 2)}
-`);
-        return;
-      }
-      process.stdout.write(`Added comment #${result.commentId} to work item #${result.workItemId}
-`);
-    } catch (err) {
-      handleCommandError(err, id, context, "write");
-    }
+    await runCommentWrite(
+      options,
+      { id },
+      (context, credential) => addWorkItemComment(context, id, credential, text, commentFormat(options)),
+      (result) => `Added comment #${result.commentId} to work item #${result.workItemId}`
+    );
   });
   return command;
 }
@@ -7803,22 +7799,12 @@ function createCommentsEditCommand() {
     const id = parseWorkItemId(idStr);
     const commentId = parseCommentId(commentIdStr);
     const body = resolveEditText(text, options.file);
-    let context;
-    try {
-      context = resolveContext(options);
-      const credential = await requireAuthCredential(context.org);
-      const format = options.markdown === true ? "markdown" : "html";
-      const result = await updateWorkItemComment(context, id, commentId, credential, body, format);
-      if (options.json) {
-        process.stdout.write(`${JSON.stringify(result, null, 2)}
-`);
-        return;
-      }
-      process.stdout.write(`Updated comment #${result.commentId} on work item #${result.workItemId}
-`);
-    } catch (err) {
-      handleCommentWriteError(err, id, commentId, context);
-    }
+    await runCommentWrite(
+      options,
+      { id, commentId },
+      (context, credential) => updateWorkItemComment(context, id, commentId, credential, body, commentFormat(options)),
+      (result) => `Updated comment #${result.commentId} on work item #${result.workItemId}`
+    );
   });
   return command;
 }
@@ -7828,21 +7814,12 @@ function createCommentsDeleteCommand() {
     validateOrgProjectPair(options);
     const id = parseWorkItemId(idStr);
     const commentId = parseCommentId(commentIdStr);
-    let context;
-    try {
-      context = resolveContext(options);
-      const credential = await requireAuthCredential(context.org);
-      const result = await deleteWorkItemComment(context, id, commentId, credential);
-      if (options.json) {
-        process.stdout.write(`${JSON.stringify(result, null, 2)}
-`);
-        return;
-      }
-      process.stdout.write(`Deleted comment #${result.commentId} from work item #${result.workItemId}
-`);
-    } catch (err) {
-      handleCommentWriteError(err, id, commentId, context);
-    }
+    await runCommentWrite(
+      options,
+      { id, commentId },
+      (context, credential) => deleteWorkItemComment(context, id, commentId, credential),
+      (result) => `Deleted comment #${result.commentId} from work item #${result.workItemId}`
+    );
   });
   return command;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "azdo-cli",
-  "version": "0.22.0-feature-053-comments-edit-delete.824",
+  "version": "0.22.0-feature-053-comments-edit-delete.826",
   "description": "Azure DevOps CLI tool",
   "type": "module",
   "bin": {