@tool-bridge/server 0.16.0 → 0.17.0

package/dist/{jira-ZDSXGQ6W.js → jira-CHLBKWLO.js}

@@ -1,22 +1,31 @@
+import {
+  createProviderHttpClient
+} from "./chunk-WW2IMPQK.js";
+import {
+  asJsonObject,
+  booleanValue,
+  compactDefined,
+  integerValue,
+  trimmedText
+} from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireCredential,
   upstreamError
-} from "./chunk-VK3V2WTY.js";
+} from "./chunk-YASUMV2K.js";
 import {
-  assertPublicHttpUrl,
-  guardedFetch
-} from "./chunk-2O27H4Y2.js";
-import "./chunk-GKX72JMJ.js";
+  assertPublicHttpUrl
+} from "./chunk-U5UHT7CX.js";
 import {
   TBError,
   external_exports
-} from "./chunk-YB2FLNWI.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-RVWZN3CI.js";
+import "./chunk-U67V476Y.js";
 
 // ../plugins/src/jira/api.ts
 var SERVICE = "jira";
 var DEFAULT_LIMIT = 50;
+var http = createProviderHttpClient({ service: SERVICE });
 var DEFAULT_ISSUE_FIELD_IDS = [
   "summary",
   "description",
@@ -31,32 +40,13 @@ var DEFAULT_ISSUE_FIELD_IDS = [
   "updated",
   "duedate"
 ];
-function text(value) {
-  if (typeof value !== "string") return void 0;
-  const trimmed = value.trim();
-  return trimmed === "" ? void 0 : trimmed;
-}
-function record(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
-}
-function integer(value) {
-  return typeof value === "number" && Number.isInteger(value) ? value : void 0;
-}
-function boolean(value) {
-  return typeof value === "boolean" ? value : void 0;
-}
-function compact(input) {
-  return Object.fromEntries(
-    Object.entries(input).filter(([, value]) => value !== void 0)
-  );
-}
 function stringArray(value) {
   if (!Array.isArray(value)) return [];
-  return value.map((item) => text(item)).filter((item) => item !== void 0);
+  return value.map((item) => trimmedText(item)).filter((item) => item !== void 0);
 }
 function recordArray(value) {
   if (!Array.isArray(value)) return [];
-  return value.map((item) => record(item)).filter((item) => item !== void 0);
+  return value.map((item) => asJsonObject(item)).filter((item) => item !== void 0);
 }
 function joinOptionalList(values) {
   return values.length > 0 ? values.join(",") : void 0;
@@ -98,7 +88,7 @@ function buildUrl(base, pathOrUrl, query) {
   const target = isAbsoluteUrl(pathOrUrl) ? new URL(pathOrUrl) : new URL(pathOrUrl.replace(/^\/+/, ""), `${base}/`);
   const baseUrl = new URL(base);
   if (target.origin !== baseUrl.origin || !target.pathname.startsWith(`${baseUrl.pathname}/`)) {
-    throw new TBError("invalid_argument", `jira requests must target ${base}`);
+    throw new TBError("invalid_argument", "jira requests must target the configured API base");
   }
   for (const [key, value] of Object.entries(query ?? {})) {
     if (value === void 0 || value === "") continue;
@@ -107,53 +97,53 @@ function buildUrl(base, pathOrUrl, query) {
   return target.toString();
 }
 function errorMessage(payload) {
-  const body = record(payload);
+  const body = asJsonObject(payload);
   if (body === void 0) return "jira request failed";
   const messages = stringArray(body.errorMessages);
   if (messages.length > 0) return messages.join("; ");
-  const fieldErrors = record(body.errors);
+  const fieldErrors = asJsonObject(body.errors);
   if (fieldErrors !== void 0) {
     const parts = [];
     for (const [key, value] of Object.entries(fieldErrors)) {
-      const message = text(value);
+      const message = trimmedText(value);
       if (message !== void 0) parts.push(`${key}: ${message}`);
     }
     if (parts.length > 0) return parts.join("; ");
   }
-  return text(body.message) ?? "jira request failed";
+  return trimmedText(body.message) ?? "jira request failed";
 }
-async function readPayload(response) {
-  const raw = await response.text().catch(() => "");
-  if (raw === "") return {};
-  try {
-    return JSON.parse(raw);
-  } catch {
-    return { message: raw };
-  }
+function responsePayload(data, bodyKind) {
+  if (bodyKind === "empty") return {};
+  return bodyKind === "invalid-json" ? { message: data } : data;
 }
 async function requestValue(ctx, options) {
-  const headers = {
-    accept: "application/json",
-    authorization: `Bearer ${requireCredential(ctx, SERVICE, "personalAccessToken")}`
-  };
-  if (options.body !== void 0) headers["content-type"] = "application/json";
-  const response = await guardedFetch(buildUrl(apiBaseUrl(ctx), options.path, options.query), {
+  const baseUrl = apiBaseUrl(ctx);
+  const result = await http.request({
+    baseUrl,
+    // create_issue 会跟随 Jira 返回的 self；buildUrl 先锁定 origin 与 REST API path 前缀。
+    path: buildUrl(baseUrl, options.path, options.query),
     method: options.method ?? (options.body === void 0 ? "GET" : "POST"),
-    headers,
-    ...options.body === void 0 ? {} : { body: JSON.stringify(options.body) }
+    headers: {
+      accept: "application/json",
+      authorization: `Bearer ${requireCredential(ctx, SERVICE, "personalAccessToken")}`
+    },
+    ...options.body === void 0 ? {} : { json: options.body },
+    invalidJson: "text",
+    mapError: ({ bodyKind, data, status }) => upstreamError(
+      status,
+      errorMessage(responsePayload(data, bodyKind))
+    )
   });
-  const payload = await readPayload(response);
-  if (!response.ok) throw upstreamError(response.status, errorMessage(payload));
-  return payload;
+  return responsePayload(result.data, result.bodyKind);
 }
 async function requestObject(ctx, options) {
   const payload = await requestValue(ctx, options);
-  const body = record(payload);
+  const body = asJsonObject(payload);
   if (body === void 0) throw upstreamError(502, "jira response payload must be a JSON object");
   return body;
 }
 function parseCursor(value) {
-  const cursor = text(value);
+  const cursor = trimmedText(value);
   if (cursor === void 0) return 0;
   const parsed = Number(cursor);
   if (!Number.isInteger(parsed) || parsed < 0) {
@@ -168,86 +158,86 @@ function nextNumericCursor(startAt, itemCount, total, isLast) {
   return String(startAt + itemCount);
 }
 function requireText(value, field) {
-  const result = text(value);
+  const result = trimmedText(value);
   if (result === void 0) throw new TBError("invalid_argument", `${field} is required`);
   return result;
 }
 function normalizeUser(value) {
-  const user = record(value);
+  const user = asJsonObject(value);
   if (user === void 0) return void 0;
-  return compact({
-    accountId: text(user.accountId),
-    accountType: text(user.accountType),
+  return compactDefined({
+    accountId: trimmedText(user.accountId),
+    accountType: trimmedText(user.accountType),
     // DC 用 name/key 标识用户,而不是 Cloud 的 accountId。
-    name: text(user.name),
-    key: text(user.key),
-    displayName: text(user.displayName),
-    emailAddress: text(user.emailAddress),
-    active: boolean(user.active),
-    self: text(user.self),
-    timeZone: text(user.timeZone)
+    name: trimmedText(user.name),
+    key: trimmedText(user.key),
+    displayName: trimmedText(user.displayName),
+    emailAddress: trimmedText(user.emailAddress),
+    active: booleanValue(user.active),
+    self: trimmedText(user.self),
+    timeZone: trimmedText(user.timeZone)
   });
 }
 function normalizeNamedReference(value) {
-  const reference = record(value);
+  const reference = asJsonObject(value);
   if (reference === void 0) return void 0;
-  return compact({
-    id: text(reference.id),
-    name: text(reference.name),
-    key: text(reference.key),
-    self: text(reference.self),
-    description: text(reference.description)
+  return compactDefined({
+    id: trimmedText(reference.id),
+    name: trimmedText(reference.name),
+    key: trimmedText(reference.key),
+    self: trimmedText(reference.self),
+    description: trimmedText(reference.description)
   });
 }
 function normalizeProject(project) {
-  return compact({
-    id: text(project.id),
-    key: text(project.key),
-    name: text(project.name),
-    self: text(project.self),
-    description: text(project.description),
-    projectTypeKey: text(project.projectTypeKey),
-    simplified: boolean(project.simplified),
-    style: text(project.style),
-    url: text(project.url),
+  return compactDefined({
+    id: trimmedText(project.id),
+    key: trimmedText(project.key),
+    name: trimmedText(project.name),
+    self: trimmedText(project.self),
+    description: trimmedText(project.description),
+    projectTypeKey: trimmedText(project.projectTypeKey),
+    simplified: booleanValue(project.simplified),
+    style: trimmedText(project.style),
+    url: trimmedText(project.url),
     lead: normalizeUser(project.lead),
     projectCategory: normalizeNamedReference(project.projectCategory),
-    avatarUrls: record(project.avatarUrls),
+    avatarUrls: asJsonObject(project.avatarUrls),
     raw: project
   });
 }
 function normalizeIssue(issue) {
-  const fields = record(issue.fields) ?? {};
-  return compact({
-    id: text(issue.id),
-    key: text(issue.key),
-    self: text(issue.self),
-    summary: text(fields.summary),
+  const fields = asJsonObject(issue.fields) ?? {};
+  return compactDefined({
+    id: trimmedText(issue.id),
+    key: trimmedText(issue.key),
+    self: trimmedText(issue.self),
+    summary: trimmedText(fields.summary),
     description: fields.description,
     status: normalizeNamedReference(fields.status),
     issueType: normalizeNamedReference(fields.issuetype),
-    project: record(fields.project) === void 0 ? void 0 : normalizeProject(record(fields.project)),
+    project: asJsonObject(fields.project) === void 0 ? void 0 : normalizeProject(asJsonObject(fields.project)),
     assignee: normalizeUser(fields.assignee),
     reporter: normalizeUser(fields.reporter),
     priority: normalizeNamedReference(fields.priority),
     labels: stringArray(fields.labels),
-    created: text(fields.created),
-    updated: text(fields.updated),
-    dueDate: text(fields.duedate),
+    created: trimmedText(fields.created),
+    updated: trimmedText(fields.updated),
+    dueDate: trimmedText(fields.duedate),
     fields,
     raw: issue
   });
 }
 function normalizeComment(comment) {
-  return compact({
-    id: text(comment.id),
-    self: text(comment.self),
+  return compactDefined({
+    id: trimmedText(comment.id),
+    self: trimmedText(comment.self),
     body: comment.body,
     author: normalizeUser(comment.author),
     updateAuthor: normalizeUser(comment.updateAuthor),
-    created: text(comment.created),
-    updated: text(comment.updated),
-    jsdPublic: boolean(comment.jsdPublic),
+    created: trimmedText(comment.created),
+    updated: trimmedText(comment.updated),
+    jsdPublic: booleanValue(comment.jsdPublic),
     raw: comment
   });
 }
@@ -255,19 +245,19 @@ function rawText(value) {
   return typeof value === "string" && value !== "" ? value : void 0;
 }
 function appendAdfText(value, parts) {
-  const node = record(value);
+  const node = asJsonObject(value);
   if (node === void 0) return;
-  const type = text(node.type);
+  const type = trimmedText(node.type);
   if (type === "text") {
     const content = rawText(node.text);
     if (content !== void 0) parts.push(content);
   } else if (type === "hardBreak") {
     parts.push("\n");
   } else if (type === "mention" || type === "emoji" || type === "date" || type === "status") {
-    const content = rawText(record(node.attrs)?.text);
+    const content = rawText(asJsonObject(node.attrs)?.text);
     if (content !== void 0) parts.push(content);
   } else if (type === "inlineCard") {
-    const url = rawText(record(node.attrs)?.url);
+    const url = rawText(asJsonObject(node.attrs)?.url);
     if (url !== void 0) parts.push(url);
   }
   const children = Array.isArray(node.content) ? node.content : [];
@@ -286,7 +276,7 @@ async function listProjects(input, ctx) {
   const startAt = parseCursor(input.cursor);
   const payload = await requestValue(ctx, {
     path: "/project",
-    query: compact({ expand: joinOptionalList(stringArray(input.expand)) })
+    query: compactDefined({ expand: joinOptionalList(stringArray(input.expand)) })
   });
   const projects = recordArray(payload).map((project) => normalizeProject(project));
   const page = projects.slice(startAt, startAt + limit);
@@ -300,7 +290,7 @@ async function listProjects(input, ctx) {
 async function getProject(input, ctx) {
   const payload = await requestObject(ctx, {
     path: `/project/${encodeURIComponent(requireText(input.projectIdOrKey, "projectIdOrKey"))}`,
-    query: compact({ expand: joinOptionalList(stringArray(input.expand)) })
+    query: compactDefined({ expand: joinOptionalList(stringArray(input.expand)) })
   });
   return { project: normalizeProject(payload) };
 }
@@ -309,7 +299,7 @@ async function searchIssues(input, ctx) {
   const payload = await requestObject(ctx, {
     path: "/search",
     method: "POST",
-    body: compact({
+    body: compactDefined({
       jql: requireText(input.jql, "jql"),
       maxResults: input.limit ?? DEFAULT_LIMIT,
       // DC 的 POST /rest/api/2/search 绑的是 SearchRequestBean,fields 与 expand 都收**数组**;
@@ -323,14 +313,14 @@ async function searchIssues(input, ctx) {
   return {
     issues: issues.map((issue) => normalizeIssue(issue)),
     pagination: {
-      nextCursor: nextNumericCursor(startAt, issues.length, integer(payload.total))
+      nextCursor: nextNumericCursor(startAt, issues.length, integerValue(payload.total))
     }
   };
 }
 async function getIssue(input, ctx) {
   const payload = await requestObject(ctx, {
     path: `/issue/${encodeURIComponent(requireText(input.issueIdOrKey, "issueIdOrKey"))}`,
-    query: compact({
+    query: compactDefined({
       // 这个端点上 fields 是**逗号串**,不是数组。
       fields: joinOptionalList(mergeUniqueFieldIds(DEFAULT_ISSUE_FIELD_IDS, stringArray(input.includeFields))),
       expand: joinOptionalList(stringArray(input.expand))
@@ -339,42 +329,42 @@ async function getIssue(input, ctx) {
   return { issue: normalizeIssue(payload) };
 }
 function projectReference(input) {
-  const projectId = text(input.projectId);
+  const projectId = trimmedText(input.projectId);
   if (projectId !== void 0) return { id: projectId };
-  const projectKey = text(input.projectKey);
+  const projectKey = trimmedText(input.projectKey);
   if (projectKey !== void 0) return { key: projectKey };
   throw new TBError("invalid_argument", "projectKey or projectId is required");
 }
 function issueTypeReference(input) {
-  const issueTypeId = text(input.issueTypeId);
+  const issueTypeId = trimmedText(input.issueTypeId);
   if (issueTypeId !== void 0) return { id: issueTypeId };
-  const issueTypeName = text(input.issueTypeName);
+  const issueTypeName = trimmedText(input.issueTypeName);
   if (issueTypeName !== void 0) return { name: issueTypeName };
   throw new TBError("invalid_argument", "issueTypeId or issueTypeName is required");
 }
 async function createIssue(input, ctx) {
-  const description = record(input.description);
-  const explicitFields = compact({
+  const description = asJsonObject(input.description);
+  const explicitFields = compactDefined({
     project: projectReference(input),
     issuetype: issueTypeReference(input),
     summary: requireText(input.summary, "summary"),
     // DC 的 description 是纯文本:给了 ADF 就拍平,只给了 descriptionText 就直接用。
-    description: description !== void 0 ? adfToPlainText(description) : text(input.descriptionText),
+    description: description !== void 0 ? adfToPlainText(description) : trimmedText(input.descriptionText),
     // 上游这里用的是 `readStringArray`,没给 labels 时得到的是 `[]` 而非 undefined,于是
     // 创建请求总会带上 `labels: []`。保留这个行为(创建时本就没有标签,发空数组无副作用)。
     labels: stringArray(input.labels),
-    assignee: text(input.assigneeAccountId) === void 0 ? void 0 : { name: text(input.assigneeAccountId) },
-    priority: text(input.priorityId) === void 0 ? void 0 : { id: text(input.priorityId) },
-    duedate: text(input.dueDate),
-    parent: text(input.parentIssueKey) === void 0 ? void 0 : { key: text(input.parentIssueKey) }
+    assignee: trimmedText(input.assigneeAccountId) === void 0 ? void 0 : { name: trimmedText(input.assigneeAccountId) },
+    priority: trimmedText(input.priorityId) === void 0 ? void 0 : { id: trimmedText(input.priorityId) },
+    duedate: trimmedText(input.dueDate),
+    parent: trimmedText(input.parentIssueKey) === void 0 ? void 0 : { key: trimmedText(input.parentIssueKey) }
   });
   const created = await requestObject(ctx, {
     path: "/issue",
     method: "POST",
     // extraFields 在前:同名键由显式入参覆盖,免得裸传的 extraFields 悄悄改掉 summary 之类。
-    body: { fields: { ...record(input.extraFields) ?? {}, ...explicitFields } }
+    body: { fields: { ...asJsonObject(input.extraFields) ?? {}, ...explicitFields } }
   });
-  const createdRef = text(created.key) ?? text(created.id) ?? text(created.self);
+  const createdRef = trimmedText(created.key) ?? trimmedText(created.id) ?? trimmedText(created.self);
   if (createdRef === void 0) throw upstreamError(502, "missing jira created issue self");
   const issue = await requestObject(ctx, {
     // self 是绝对地址,`buildUrl` 会验它仍落在 base URL 之内。
@@ -388,7 +378,7 @@ async function listIssueComments(input, ctx) {
   const startAt = parseCursor(input.cursor);
   const payload = await requestObject(ctx, {
     path: `/issue/${encodeURIComponent(requireText(input.issueIdOrKey, "issueIdOrKey"))}/comment`,
-    query: compact({
+    query: compactDefined({
       maxResults: String(limit),
       startAt: String(startAt),
       expand: joinOptionalList(stringArray(input.expand))
@@ -397,12 +387,12 @@ async function listIssueComments(input, ctx) {
   const comments = recordArray(payload.comments).map((comment) => normalizeComment(comment));
   return {
     comments,
-    pagination: { nextCursor: nextNumericCursor(startAt, comments.length, integer(payload.total)) }
+    pagination: { nextCursor: nextNumericCursor(startAt, comments.length, integerValue(payload.total)) }
   };
 }
 async function addComment(input, ctx) {
-  const document = record(input.body);
-  const body = document !== void 0 ? adfToPlainText(document) : text(input.bodyText);
+  const document = asJsonObject(input.body);
+  const body = document !== void 0 ? adfToPlainText(document) : trimmedText(input.bodyText);
   if (body === void 0 || body === "") {
     throw new TBError("invalid_argument", "comment body or bodyText is required");
   }