@tool-bridge/server 0.16.0 → 0.19.0

package/dist/{render-MECUC5CC.js → render-WIVTUXJH.js}

@@ -1,27 +1,27 @@
+import {
+  createProviderHttpClient
+} from "./chunk-VLOIDU5U.js";
+import {
+  trimmedText
+} from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-VK3V2WTY.js";
-import {
-  guardedFetch
-} from "./chunk-2O27H4Y2.js";
-import "./chunk-GKX72JMJ.js";
+} from "./chunk-B4P6YZFS.js";
+import "./chunk-SWBNHIO4.js";
 import {
   TBError,
   external_exports
-} from "./chunk-YB2FLNWI.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-OKRZPQ3R.js";
+import "./chunk-U67V476Y.js";
 
 // ../plugins/src/render/api.ts
 var SERVICE = "render";
 var API_BASE = "https://api.render.com/v1";
-function nonEmpty(value) {
-  const trimmed = value?.trim();
-  return trimmed === void 0 || trimmed === "" ? void 0 : trimmed;
-}
+var http = createProviderHttpClient({ baseUrl: `${API_BASE}/`, service: SERVICE });
 function pathSegment(value, field) {
-  const parsed = nonEmpty(value);
+  const parsed = trimmedText(value);
   if (parsed === void 0) throw new TBError("invalid_argument", `${field} \u4E0D\u80FD\u4E3A\u7A7A`);
   return encodeURIComponent(parsed);
 }
@@ -31,14 +31,10 @@ function firstString(...values) {
   }
   return void 0;
 }
-async function errorMessage(response) {
-  let payload;
-  try {
-    payload = await response.clone().json();
-  } catch {
-    const text = await response.text().catch(() => "");
-    return text === "" ? `Render \u8FD4\u56DE HTTP ${response.status}` : text;
-  }
+function errorMessage(context) {
+  if (context.bodyKind === "empty") return `Render \u8FD4\u56DE HTTP ${context.status}`;
+  if (context.bodyKind !== "json") return String(context.data);
+  const payload = context.data;
   if (payload !== null && typeof payload === "object" && !Array.isArray(payload)) {
     const object = payload;
     const direct = firstString(object.message, object.error, object.detail, object.title);
@@ -53,51 +49,41 @@ async function errorMessage(response) {
       }
     }
   }
-  return `Render \u8FD4\u56DE HTTP ${response.status}`;
+  return `Render \u8FD4\u56DE HTTP ${context.status}`;
 }
 async function send(ctx, input) {
   const apiKey = requireApiKey(ctx, SERVICE);
-  const url = new URL(`${API_BASE}${input.path}`);
-  for (const [key, value] of Object.entries(input.query ?? {})) {
-    if (value === void 0) continue;
-    if (Array.isArray(value)) {
-      if (value.length > 0) url.searchParams.set(key, value.join(","));
-      continue;
-    }
-    url.searchParams.set(key, String(value));
-  }
-  const headers = {
-    accept: "application/json",
-    authorization: `Bearer ${apiKey}`
-  };
-  if (input.body !== void 0) headers["content-type"] = "application/json";
-  try {
-    return await guardedFetch(url.toString(), {
-      method: input.method ?? "GET",
-      headers,
-      body: input.body === void 0 ? void 0 : JSON.stringify(input.body)
-    });
-  } catch (error) {
-    if (error instanceof TBError) throw error;
-    throw new TBError(
+  const query = Object.entries(input.query ?? {}).flatMap(([key, value]) => {
+    if (Array.isArray(value)) return value.length === 0 ? [] : [[key, value.join(",")]];
+    return [[key, value]];
+  });
+  return await http.request({
+    method: input.method ?? "GET",
+    path: input.path,
+    query,
+    headers: {
+      accept: "application/json",
+      authorization: `Bearer ${apiKey}`
+    },
+    ...input.body === void 0 ? {} : { json: input.body },
+    invalidJson: "text",
+    mapError: (context) => upstreamError(context.status, errorMessage(context)),
+    mapTransportError: ({ message }) => new TBError(
       "unavailable",
-      error instanceof Error ? `Render \u8BF7\u6C42\u5931\u8D25: ${error.message}` : "Render \u8BF7\u6C42\u5931\u8D25",
+      message === void 0 ? "Render \u8BF7\u6C42\u5931\u8D25" : `Render \u8BF7\u6C42\u5931\u8D25: ${message}`,
       { retryable: true }
-    );
-  }
+    )
+  });
 }
 async function requestJson(ctx, input) {
   const response = await send(ctx, input);
-  if (!response.ok) throw upstreamError(response.status, await errorMessage(response));
-  try {
-    return await response.json();
-  } catch {
+  if (response.bodyKind !== "json") {
     throw new TBError("unavailable", "Render \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94", { retryable: true });
   }
+  return response.data;
 }
 async function requestAck(ctx, input) {
-  const response = await send(ctx, input);
-  if (!response.ok) throw upstreamError(response.status, await errorMessage(response));
+  await send(ctx, input);
 }
 function unwrapCursorList(payload, key) {
   if (!Array.isArray(payload)) {
@@ -115,7 +101,7 @@ function unwrapCursorList(payload, key) {
       throw new TBError("unavailable", `Render \u54CD\u5E94\u7F3A\u5C11 ${key}`, { retryable: true });
     }
     items.push(value);
-    nextCursor = nonEmpty(typeof record.cursor === "string" ? record.cursor : void 0) ?? nextCursor;
+    nextCursor = trimmedText(typeof record.cursor === "string" ? record.cursor : void 0) ?? nextCursor;
   }
   return { items, nextCursor };
 }
@@ -128,7 +114,7 @@ async function listWorkspaces(input, ctx) {
     query: {
       name: input.name,
       email: input.email,
-      cursor: nonEmpty(input.cursor),
+      cursor: trimmedText(input.cursor),
       limit: input.limit
     }
   });
@@ -144,7 +130,7 @@ async function listServices(input, ctx) {
       ownerId: input.ownerId,
       suspended: input.suspended,
       includePreviews: input.includePreviews,
-      cursor: nonEmpty(input.cursor),
+      cursor: trimmedText(input.cursor),
       limit: input.limit
     }
   });
@@ -159,7 +145,7 @@ async function listDeploys(input, ctx) {
     path: `/services/${pathSegment(input.serviceId, "serviceId")}/deploys`,
     query: {
       status: input.status,
-      cursor: nonEmpty(input.cursor),
+      cursor: trimmedText(input.cursor),
       limit: input.limit
     }
   });
@@ -177,22 +163,20 @@ async function triggerDeploy(input, ctx) {
     // clearCache 没给时上游也显式发 do_not_clear(而不是省略),保持等价。
     body: {
       clearCache: input.clearCache === true ? "clear" : "do_not_clear",
-      ...nonEmpty(input.commitId) === void 0 ? {} : { commitId: nonEmpty(input.commitId) },
-      ...nonEmpty(input.imageUrl) === void 0 ? {} : { imageUrl: nonEmpty(input.imageUrl) },
+      ...trimmedText(input.commitId) === void 0 ? {} : { commitId: trimmedText(input.commitId) },
+      ...trimmedText(input.imageUrl) === void 0 ? {} : { imageUrl: trimmedText(input.imageUrl) },
       ...input.deployMode === void 0 ? {} : { deployMode: input.deployMode }
     }
   });
-  if (!response.ok) throw upstreamError(response.status, await errorMessage(response));
   if (response.status === 202) return { queued: true, serviceId: input.serviceId };
-  try {
-    return await response.json();
-  } catch {
+  if (response.bodyKind !== "json") {
     throw new TBError("unavailable", "Render \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94", { retryable: true });
   }
+  return response.data;
 }
 async function rollbackDeploy(input, ctx) {
   const serviceId = pathSegment(input.serviceId, "serviceId");
-  const deployId = nonEmpty(input.deployId);
+  const deployId = trimmedText(input.deployId);
   if (deployId === void 0) throw new TBError("invalid_argument", "deployId \u4E0D\u80FD\u4E3A\u7A7A");
   return await requestJson(ctx, {
     path: `/services/${serviceId}/rollback`,

package/dist/{replicate-A5MEK3SW.js → replicate-JJYPA43D.js}

@@ -1,37 +1,30 @@
+import {
+  createProviderHttpClient
+} from "./chunk-VLOIDU5U.js";
+import {
+  asJsonObject,
+  compactDefined,
+  trimmedText
+} from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-VK3V2WTY.js";
-import {
-  guardedFetch
-} from "./chunk-2O27H4Y2.js";
-import "./chunk-GKX72JMJ.js";
+} from "./chunk-B4P6YZFS.js";
+import "./chunk-SWBNHIO4.js";
 import {
   TBError,
   external_exports
-} from "./chunk-YB2FLNWI.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-OKRZPQ3R.js";
+import "./chunk-U67V476Y.js";
 
 // ../plugins/src/replicate/api.ts
 var SERVICE = "replicate";
 var API_BASE = "https://api.replicate.com";
 var ACCOUNT_PATH = "/v1/account";
-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 compact(input) {
-  return Object.fromEntries(
-    Object.entries(input).filter(([, value]) => value !== void 0)
-  );
-}
+var http = createProviderHttpClient({ baseUrl: `${API_BASE}/`, service: SERVICE });
 function required(value, field) {
-  const trimmed = text(value);
+  const trimmed = trimmedText(value);
   if (trimmed === void 0) throw new TBError("invalid_argument", `${field} \u4E0D\u80FD\u4E3A\u7A7A`);
   return trimmed;
 }
@@ -39,42 +32,32 @@ function segment(value, field) {
   return encodeURIComponent(required(value, field));
 }
 async function request(ctx, input) {
-  const url = new URL(`${API_BASE}${input.path}`);
-  for (const [key, value] of Object.entries(input.query ?? {})) {
-    if (value !== void 0 && value !== "") url.searchParams.set(key, value);
-  }
   const headers = {
     accept: "application/json",
     authorization: `Bearer ${requireApiKey(ctx, SERVICE)}`,
     ...input.headers
   };
-  if (input.body !== void 0) headers["content-type"] = "application/json";
-  const response = await guardedFetch(url.toString(), {
+  const response = await http.request({
     method: input.method ?? "GET",
+    path: input.path,
+    // 上游这里连空串一起跳过(空的 created_after 打出去会被上游当成非法时间戳)。
+    query: Object.entries(input.query ?? {}).filter(([, value]) => value !== void 0 && value !== ""),
     headers,
-    body: input.body === void 0 ? void 0 : JSON.stringify(input.body)
-  });
-  const raw = await response.text();
-  let payload = {};
-  let isJson = true;
-  if (raw !== "") {
-    try {
-      payload = JSON.parse(raw);
-    } catch {
-      isJson = false;
-      payload = { detail: raw };
+    ...input.body === void 0 ? {} : { json: input.body },
+    invalidJson: "text",
+    mapError: ({ bodyKind, data, status }) => {
+      const body = bodyKind === "json" ? asJsonObject(data) ?? {} : { detail: data };
+      return upstreamError(status, trimmedText(body.detail) ?? trimmedText(body.title) ?? `Replicate \u8FD4\u56DE HTTP ${status}`);
     }
+  });
+  if (response.bodyKind === "empty") return {};
+  if (response.bodyKind !== "json") {
+    throw new TBError("unavailable", "Replicate \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94", { retryable: true });
   }
-  if (!response.ok) {
-    const body = record(payload) ?? {};
-    const message = text(body.detail) ?? text(body.title) ?? `Replicate \u8FD4\u56DE HTTP ${response.status}`;
-    throw upstreamError(response.status, message);
-  }
-  if (!isJson) throw new TBError("unavailable", "Replicate \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94", { retryable: true });
-  return payload;
+  return response.data;
 }
 function requireRecord(value, label) {
-  const payload = record(value);
+  const payload = asJsonObject(value);
   if (payload === void 0) {
     throw new TBError("unavailable", `Replicate \u7684 ${label} \u54CD\u5E94\u4E0D\u662F\u5BF9\u8C61`, { retryable: true });
   }
@@ -100,9 +83,9 @@ async function getAccount(_input, ctx) {
 async function listModels(input, ctx) {
   const payload = await request(ctx, {
     path: "/v1/models",
-    query: compact({
-      sort_by: text(input.sortBy),
-      sort_direction: text(input.sortDirection)
+    query: compactDefined({
+      sort_by: trimmedText(input.sortBy),
+      sort_direction: trimmedText(input.sortDirection)
     })
   });
   return pageOf(payload, "models");
@@ -127,18 +110,18 @@ async function getCollection(input, ctx) {
   return wrap(await request(ctx, { path }), "collection");
 }
 async function createPrediction(input, ctx) {
-  const headers = compact({
+  const headers = compactDefined({
     "Prefer": input.waitSeconds === void 0 ? void 0 : `wait=${input.waitSeconds}`,
-    "Cancel-After": text(input.cancelAfter)
+    "Cancel-After": trimmedText(input.cancelAfter)
   });
   const payload = await request(ctx, {
     method: "POST",
     path: "/v1/predictions",
     headers,
-    body: compact({
+    body: compactDefined({
       version: required(input.version, "version"),
-      input: record(input.input) ?? {},
-      webhook: text(input.webhook),
+      input: asJsonObject(input.input) ?? {},
+      webhook: trimmedText(input.webhook),
       webhook_events_filter: input.webhookEventsFilter
     })
   });
@@ -151,10 +134,10 @@ async function getPrediction(input, ctx) {
 async function listPredictions(input, ctx) {
   const payload = await request(ctx, {
     path: "/v1/predictions",
-    query: compact({
-      created_after: text(input.createdAfter),
-      created_before: text(input.createdBefore),
-      source: text(input.source)
+    query: compactDefined({
+      created_after: trimmedText(input.createdAfter),
+      created_before: trimmedText(input.createdBefore),
+      source: trimmedText(input.source)
     })
   });
   return pageOf(payload, "predictions");

package/dist/{resend-BC6EAWJQ.js → resend-TKHZVG7A.js}

@@ -1,17 +1,21 @@
+import {
+  createProviderHttpClient
+} from "./chunk-VLOIDU5U.js";
+import {
+  asJsonObject,
+  trimmedText
+} from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-VK3V2WTY.js";
-import {
-  guardedFetch
-} from "./chunk-2O27H4Y2.js";
-import "./chunk-GKX72JMJ.js";
+} from "./chunk-B4P6YZFS.js";
+import "./chunk-SWBNHIO4.js";
 import {
   TBError,
   external_exports
-} from "./chunk-YB2FLNWI.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-OKRZPQ3R.js";
+import "./chunk-U67V476Y.js";
 
 // ../plugins/src/resend/schema.handwritten.ts
 var sendEmailInput = external_exports.strictObject({
@@ -40,47 +44,33 @@ var resendActions = {
 
 // ../plugins/src/resend/api.ts
 var SERVICE = "resend";
-var API_BASE = "https://api.resend.com";
 var AUTH_ERROR_NAMES = /* @__PURE__ */ new Set(["invalid_api_key", "missing_api_key"]);
-async function readPayload(response) {
-  const text2 = await response.text().catch(() => "");
-  if (text2 === "") return {};
-  try {
-    const parsed = JSON.parse(text2);
-    return parsed !== null && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
-  } catch {
-    return { message: text2 };
-  }
+var http = createProviderHttpClient({ baseUrl: "https://api.resend.com/", service: SERVICE });
+function payloadOf(data) {
+  return asJsonObject(data) ?? (typeof data === "string" ? { message: data } : {});
 }
-function text(value) {
-  return typeof value === "string" && value !== "" ? value : void 0;
-}
-function resendError(status, payload) {
-  const name = text(payload.name) ?? text(payload.error) ?? "provider_error";
-  const message = text(payload.message) ?? text(payload.error_description) ?? `Resend \u8FD4\u56DE HTTP ${status}`;
-  if (AUTH_ERROR_NAMES.has(name)) {
-    return new TBError("permission_denied", message, { httpStatus: 401 });
-  }
-  return upstreamError(status, message);
+function resendError(status, data) {
+  const payload = payloadOf(data);
+  const name = trimmedText(payload.name) ?? trimmedText(payload.error) ?? "provider_error";
+  const message = trimmedText(payload.message) ?? trimmedText(payload.error_description) ?? `Resend \u8FD4\u56DE HTTP ${status}`;
+  return AUTH_ERROR_NAMES.has(name) ? new TBError("permission_denied", message, { httpStatus: 401 }) : upstreamError(status, message);
 }
 async function sendEmail(input, ctx) {
-  const response = await guardedFetch(`${API_BASE}/emails`, {
+  const { data } = await http.request({
+    path: "emails",
     method: "POST",
-    headers: {
-      "authorization": `Bearer ${requireApiKey(ctx, SERVICE)}`,
-      "content-type": "application/json"
-    },
-    body: JSON.stringify({
+    headers: { authorization: `Bearer ${requireApiKey(ctx, SERVICE)}` },
+    json: {
       from: input.from,
       to: input.to,
       subject: input.subject,
       ...input.html === void 0 ? {} : { html: input.html },
       ...input.text === void 0 ? {} : { text: input.text }
-    })
+    },
+    invalidJson: "text",
+    mapError: ({ data: payload, status }) => resendError(status, payload)
   });
-  const payload = await readPayload(response);
-  if (!response.ok) throw resendError(response.status, payload);
-  const emailId = text(payload.id);
+  const emailId = trimmedText(payloadOf(data).id);
   if (emailId === void 0) {
     throw new TBError("unavailable", "Resend \u7684\u6210\u529F\u54CD\u5E94\u91CC\u6CA1\u6709 email id", { retryable: true });
   }

package/dist/{rootly-ZM3QDUIS.js → rootly-FRSZLG5U.js}

@@ -1,69 +1,62 @@
+import {
+  createProviderHttpClient
+} from "./chunk-VLOIDU5U.js";
+import {
+  asJsonObject,
+  compactDefined,
+  trimmedText
+} from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-VK3V2WTY.js";
-import {
-  guardedFetch
-} from "./chunk-2O27H4Y2.js";
-import "./chunk-GKX72JMJ.js";
+} from "./chunk-B4P6YZFS.js";
+import "./chunk-SWBNHIO4.js";
 import {
   external_exports
-} from "./chunk-YB2FLNWI.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-OKRZPQ3R.js";
+import "./chunk-U67V476Y.js";
 
 // ../plugins/src/rootly/api.ts
 var SERVICE = "rootly";
 var API_BASE = "https://api.rootly.com/v1";
 var JSON_API_CONTENT_TYPE = "application/vnd.api+json";
-function toRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
-}
-function text(value) {
-  if (typeof value !== "string") return void 0;
-  const trimmed = value.trim();
-  return trimmed === "" ? void 0 : trimmed;
-}
+var http = createProviderHttpClient({ baseUrl: `${API_BASE}/`, service: SERVICE });
 function requireRecord(value, label) {
-  const record = toRecord(value);
+  const record = asJsonObject(value);
   if (record === void 0) throw upstreamError(502, `${label} was not an object`);
   return record;
 }
-async function readPayload(response) {
-  const body = await response.text();
-  if (body.trim() === "") return {};
-  try {
-    return JSON.parse(body);
-  } catch {
-    if (!response.ok) return { errors: [{ detail: body }] };
-    throw upstreamError(502, "Rootly returned invalid JSON");
-  }
-}
 function errorMessage(payload, status) {
-  const object = toRecord(payload);
+  const object = asJsonObject(payload);
   const errors = Array.isArray(object?.errors) ? object.errors : [];
-  const first = toRecord(errors[0]);
-  return text(first?.detail) ?? text(first?.title) ?? `Rootly request failed with ${status}`;
+  const first = asJsonObject(errors[0]);
+  return trimmedText(first?.detail) ?? trimmedText(first?.title) ?? `Rootly request failed with ${status}`;
 }
 async function requestJson(ctx, path, query) {
-  const url = new URL(`${API_BASE}${path}`);
-  for (const [name, value] of Object.entries(query)) url.searchParams.set(name, value);
-  const response = await guardedFetch(url.toString(), {
+  const response = await http.request({
+    path,
+    query: Object.entries(query),
     headers: {
       "accept": JSON_API_CONTENT_TYPE,
       "authorization": `Bearer ${requireApiKey(ctx, SERVICE)}`,
       "content-type": JSON_API_CONTENT_TYPE
-    }
+    },
+    invalidJson: "text",
+    mapError: ({ bodyKind, data, status }) => upstreamError(
+      status,
+      errorMessage(bodyKind === "json" ? data : { errors: [{ detail: data }] }, status)
+    )
   });
-  const payload = await readPayload(response);
-  if (!response.ok) throw upstreamError(response.status, errorMessage(payload, response.status));
-  return payload;
+  if (response.bodyKind === "empty") return {};
+  if (response.bodyKind !== "json") throw upstreamError(502, "Rootly returned invalid JSON");
+  return response.data;
 }
 function readResource(value, label) {
   const object = requireRecord(value, label);
   const data = object.data === void 0 ? object : requireRecord(object.data, `${label} data`);
-  const id = text(data.id);
-  const type = text(data.type);
+  const id = trimmedText(data.id);
+  const type = trimmedText(data.type);
   if (id === void 0 || type === void 0) {
     throw upstreamError(502, `${label} did not include JSON:API id and type`);
   }
@@ -71,15 +64,15 @@ function readResource(value, label) {
     ...data,
     id,
     type,
-    attributes: toRecord(data.attributes) ?? {},
-    relationships: toRecord(data.relationships) ?? {}
+    attributes: asJsonObject(data.attributes) ?? {},
+    relationships: asJsonObject(data.relationships) ?? {}
   };
 }
 function readSidecars(payload) {
   const object = requireRecord(payload, "Rootly response");
   const included = Array.isArray(object.included) ? object.included : void 0;
-  const links = toRecord(object.links);
-  const meta = toRecord(object.meta);
+  const links = asJsonObject(object.links);
+  const meta = asJsonObject(object.meta);
   return {
     ...included === void 0 ? {} : { included },
     ...links === void 0 ? {} : { links },
@@ -102,69 +95,64 @@ async function getList(ctx, path, query) {
     raw: payload
   };
 }
-function compact(input) {
-  return Object.fromEntries(
-    Object.entries(input).filter((entry) => entry[1] !== void 0)
-  );
-}
 function includeQuery(include) {
   return { include: include === void 0 || include.length === 0 ? void 0 : include.join(",") };
 }
 function pageQuery(input, options = {}) {
   return {
-    ...options.cursor === true ? { "page[after]": text(input.pageAfter) } : {},
+    ...options.cursor === true ? { "page[after]": trimmedText(input.pageAfter) } : {},
     "page[number]": input.pageNumber === void 0 ? void 0 : String(input.pageNumber),
     "page[size]": input.pageSize === void 0 ? void 0 : String(input.pageSize)
   };
 }
 function configurationQuery(input, options = {}) {
-  return compact({
+  return compactDefined({
     ...includeQuery(input.include),
     ...pageQuery(input),
-    "filter[search]": text(input.search),
-    "filter[name]": text(input.name),
-    "filter[slug]": text(input.slug),
-    "filter[external_id]": text(input.externalId),
-    ...options.includeColor === true ? { "filter[color]": text(input.color) } : {},
+    "filter[search]": trimmedText(input.search),
+    "filter[name]": trimmedText(input.name),
+    "filter[slug]": trimmedText(input.slug),
+    "filter[external_id]": trimmedText(input.externalId),
+    ...options.includeColor === true ? { "filter[color]": trimmedText(input.color) } : {},
     "filter[alert_broadcast_enabled]": input.alertBroadcastEnabled === void 0 ? void 0 : String(input.alertBroadcastEnabled),
     "filter[incident_broadcast_enabled]": input.incidentBroadcastEnabled === void 0 ? void 0 : String(input.incidentBroadcastEnabled),
-    "filter[created_at][gt]": text(input.createdAtGt),
-    "filter[created_at][gte]": text(input.createdAtGte),
-    "filter[created_at][lt]": text(input.createdAtLt),
-    "filter[created_at][lte]": text(input.createdAtLte),
-    "sort": text(input.sort)
+    "filter[created_at][gt]": trimmedText(input.createdAtGt),
+    "filter[created_at][gte]": trimmedText(input.createdAtGte),
+    "filter[created_at][lt]": trimmedText(input.createdAtLt),
+    "filter[created_at][lte]": trimmedText(input.createdAtLte),
+    "sort": trimmedText(input.sort)
   });
 }
 function getCurrentUser(_input, ctx) {
   return getSingleResource(ctx, "/users/me", {});
 }
 function listIncidents(input, ctx) {
-  return getList(ctx, "/incidents", compact({
+  return getList(ctx, "/incidents", compactDefined({
     ...pageQuery(input, { cursor: true }),
-    "filter[search]": text(input.search),
-    "filter[kind]": text(input.kind),
-    "filter[status]": text(input.status),
+    "filter[search]": trimmedText(input.search),
+    "filter[kind]": trimmedText(input.kind),
+    "filter[status]": trimmedText(input.status),
     "filter[private]": input.private === void 0 ? void 0 : String(input.private),
     "filter[user_id]": input.userId === void 0 ? void 0 : String(input.userId),
-    "filter[severity]": text(input.severity),
-    "filter[severity_id]": text(input.severityId),
-    "filter[labels]": text(input.labels),
-    "filter[service_ids]": text(input.serviceIds),
-    "filter[service_names]": text(input.serviceNames),
-    "filter[team_ids]": text(input.teamIds),
-    "filter[team_names]": text(input.teamNames),
-    "filter[created_at][gt]": text(input.createdAtGt),
-    "filter[created_at][gte]": text(input.createdAtGte),
-    "filter[created_at][lt]": text(input.createdAtLt),
-    "filter[created_at][lte]": text(input.createdAtLte),
-    "sort": text(input.sort)
+    "filter[severity]": trimmedText(input.severity),
+    "filter[severity_id]": trimmedText(input.severityId),
+    "filter[labels]": trimmedText(input.labels),
+    "filter[service_ids]": trimmedText(input.serviceIds),
+    "filter[service_names]": trimmedText(input.serviceNames),
+    "filter[team_ids]": trimmedText(input.teamIds),
+    "filter[team_names]": trimmedText(input.teamNames),
+    "filter[created_at][gt]": trimmedText(input.createdAtGt),
+    "filter[created_at][gte]": trimmedText(input.createdAtGte),
+    "filter[created_at][lt]": trimmedText(input.createdAtLt),
+    "filter[created_at][lte]": trimmedText(input.createdAtLte),
+    "sort": trimmedText(input.sort)
   }));
 }
 function getIncident(input, ctx) {
   return getSingleResource(
     ctx,
     `/incidents/${encodeURIComponent(input.id)}`,
-    compact(includeQuery(input.include))
+    compactDefined(includeQuery(input.include))
   );
 }
 function listServices(input, ctx) {