@tool-bridge/server 0.16.0 → 0.17.0

package/dist/{pubmed-WYVLCCN3.js → pubmed-RHU3GXFB.js}

@@ -1,16 +1,22 @@
+import {
+  readBoundedResponseBytes
+} from "./chunk-LMLX3DJF.js";
+import {
+  asJsonObject,
+  trimmedText
+} from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   upstreamError
-} from "./chunk-VK3V2WTY.js";
+} from "./chunk-YASUMV2K.js";
 import {
   guardedFetch
-} from "./chunk-2O27H4Y2.js";
-import "./chunk-GKX72JMJ.js";
+} 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/pubmed/api.ts
 var EUTILS_BASE = "https://eutils.ncbi.nlm.nih.gov/entrez/eutils/";
@@ -28,14 +34,6 @@ var SORT_VALUES = {
   publication_date: "pub date",
   relevance: "relevance"
 };
-function record(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;
-}
 function invalidInput(message) {
   return new TBError("invalid_argument", message);
 }
@@ -43,7 +41,7 @@ function invalidResponse(message) {
   return new TBError("unavailable", message, { retryable: true });
 }
 function requireRecord(value, label) {
-  const result = record(value);
+  const result = asJsonObject(value);
   if (result === void 0) throw invalidResponse(`${label} \u4E0D\u662F\u5BF9\u8C61`);
   return result;
 }
@@ -58,7 +56,7 @@ function requireStringArray(value, label) {
   return value;
 }
 function requireInputText(value, field) {
-  const result = text(value);
+  const result = trimmedText(value);
   if (result === void 0) throw invalidInput(`${field} is required.`);
   return result;
 }
@@ -90,14 +88,14 @@ function readIdType(value) {
   throw invalidInput("idType must be doi, mid, pmcid, or pmid");
 }
 function readSort(value) {
-  const sort = text(value);
+  const sort = trimmedText(value);
   if (sort === void 0) return void 0;
   const mapped = SORT_VALUES[sort];
   if (mapped === void 0) throw invalidInput("sort is not supported by PubMed");
   return mapped;
 }
 function readPublicationDateRange(value) {
-  const range = record(value);
+  const range = asJsonObject(value);
   if (range === void 0) return void 0;
   const from = requireInputText(range.from, "publicationDateRange.from");
   const to = requireInputText(range.to, "publicationDateRange.to");
@@ -113,44 +111,14 @@ async function readBoundedText(response, maxBytes, source) {
   const tooLarge = () => invalidInput(
     `${source} \u54CD\u5E94\u8D85\u8FC7 ${maxBytes} \u5B57\u8282\u4E0A\u9650:\u628A limit / pmids / ids \u8C03\u5C0F\u540E\u91CD\u8BD5`
   );
-  const declared = Number(response.headers.get("content-length"));
-  if (Number.isSafeInteger(declared) && declared > maxBytes) throw tooLarge();
-  if (response.body === null) {
-    const bytes2 = new Uint8Array(await response.arrayBuffer());
-    if (bytes2.byteLength > maxBytes) throw tooLarge();
-    return new TextDecoder().decode(bytes2);
-  }
-  const reader = response.body.getReader();
-  const chunks = [];
-  let total = 0;
-  try {
-    for (; ; ) {
-      const { done, value } = await reader.read();
-      if (done) break;
-      total += value.byteLength;
-      if (total > maxBytes) {
-        await reader.cancel().catch(() => void 0);
-        throw tooLarge();
-      }
-      chunks.push(value);
-    }
-  } finally {
-    reader.releaseLock();
-  }
-  const bytes = new Uint8Array(total);
-  let offset = 0;
-  for (const chunk of chunks) {
-    bytes.set(chunk, offset);
-    offset += chunk.byteLength;
-  }
-  return new TextDecoder().decode(bytes);
+  return new TextDecoder().decode(await readBoundedResponseBytes(response, { maxBytes, tooLarge }));
 }
 function extractError(body) {
   const trimmed = body.trim();
   if (trimmed === "") return void 0;
   try {
-    const payload = record(JSON.parse(trimmed));
-    const direct = text(payload?.error);
+    const payload = asJsonObject(JSON.parse(trimmed));
+    const direct = trimmedText(payload?.error);
     if (direct !== void 0) return direct;
     const errors = payload?.errors;
     if (Array.isArray(errors)) {
@@ -204,7 +172,7 @@ async function eutils(ctx, utility, query, options) {
   for (const [name, value] of Object.entries(query)) {
     if (value !== void 0) url.searchParams.set(name, value);
   }
-  const apiKey = text(ctx.upstreamAuth);
+  const apiKey = trimmedText(ctx.upstreamAuth);
   if (apiKey !== void 0) url.searchParams.set("api_key", apiKey);
   const usePost = utility === "esearch.fcgi" && (query.term?.length ?? 0) > ESEARCH_POST_TERM_LENGTH;
   let body;
@@ -389,7 +357,7 @@ function firstElement(parent, name) {
   return elements(parent, name)[0];
 }
 function attribute(element, name) {
-  return text(element.attributes[name]);
+  return trimmedText(element.attributes[name]);
 }
 function textOf(element) {
   if (element === void 0) return "";
@@ -573,7 +541,7 @@ function readLinkedPmids(payload, linkName, label) {
   const linksets = Array.isArray(payload.linksets) ? requireObjectArray(payload.linksets, `${label} linkset`) : [];
   for (const linkset of linksets) {
     const databases = Array.isArray(linkset.linksetdbs) ? requireObjectArray(linkset.linksetdbs, `${label} database`) : [];
-    const related = databases.find((database) => text(database.linkname) === linkName);
+    const related = databases.find((database) => trimmedText(database.linkname) === linkName);
     if (related !== void 0) return requireStringArray(related.links, label);
   }
   return [];
@@ -592,14 +560,14 @@ async function linkedArticles(ctx, sourcePmid, linkName, limit) {
   };
 }
 function readIntegerString(value, label) {
-  const raw = text(value);
+  const raw = trimmedText(value);
   const parsed = raw === void 0 ? Number.NaN : Number(raw);
   if (!Number.isSafeInteger(parsed) || parsed < 0) throw invalidResponse(`${label} is malformed`);
   return parsed;
 }
 function optionalIdentifier(value) {
   if (typeof value === "number" && Number.isSafeInteger(value) && value >= 0) return String(value);
-  return text(value) ?? null;
+  return trimmedText(value) ?? null;
 }
 async function searchArticles(input, ctx) {
   const query = requireInputText(input.query, "query");
@@ -626,7 +594,7 @@ async function searchArticles(input, ctx) {
     total: readIntegerString(result.count, "PubMed search count"),
     offset,
     limit,
-    queryTranslation: text(result.querytranslation) ?? null,
+    queryTranslation: trimmedText(result.querytranslation) ?? null,
     articles: pmids.length > 0 ? await fetchArticles(ctx, pmids) : []
   };
 }
@@ -696,11 +664,11 @@ async function convertArticleIds(input) {
       return {
         requestedId,
         pmid: optionalIdentifier(item.pmid),
-        pmcid: text(item.pmcid) ?? null,
-        doi: text(item.doi) ?? null,
-        mid: text(item.mid) ?? null,
+        pmcid: trimmedText(item.pmcid) ?? null,
+        doi: trimmedText(item.doi) ?? null,
+        mid: trimmedText(item.mid) ?? null,
         // PMC 用 `errmsg` 报"这个 id 解析不了",是逐条结果的一部分,不是整体失败。
-        error: text(item.errmsg) ?? null
+        error: trimmedText(item.errmsg) ?? null
       };
     })
   };

package/dist/{railway-TWIRD5KR.js → railway-VB6SRLI6.js}

@@ -1,51 +1,44 @@
+import {
+  asJsonObject,
+  compactDefined,
+  trimmedText
+} from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-VK3V2WTY.js";
+} from "./chunk-YASUMV2K.js";
 import {
   guardedFetch
-} from "./chunk-2O27H4Y2.js";
-import "./chunk-GKX72JMJ.js";
+} 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/railway/api.ts
 var SERVICE = "railway";
 var GRAPHQL_URL = "https://backboard.railway.com/graphql/v2";
 var DEFAULT_DEPLOYMENT_LIMIT = 20;
 var DEFAULT_LOG_LIMIT = 500;
-function record(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;
-}
-function compact(input) {
-  return Object.fromEntries(Object.entries(input).filter(([, value]) => value !== void 0));
-}
 function responseError(message) {
   return new TBError("unavailable", message, { retryable: true });
 }
 function required(value, field) {
-  const result = text(value);
+  const result = trimmedText(value);
   if (result === void 0) throw new TBError("invalid_argument", `${field} \u662F\u5FC5\u586B\u7684`);
   return result;
 }
 function errorMessages(payload) {
-  const errors = record(payload)?.errors;
+  const errors = asJsonObject(payload)?.errors;
   if (!Array.isArray(errors)) return void 0;
-  const messages = errors.map((error) => text(record(error)?.message)).filter((message) => message !== void 0);
+  const messages = errors.map((error) => trimmedText(asJsonObject(error)?.message)).filter((message) => message !== void 0);
   return messages.length > 0 ? messages.join("; ") : void 0;
 }
 function errorText(payload, status) {
-  const body = record(payload);
-  return errorMessages(payload) ?? text(body?.message) ?? text(body?.error) ?? text(body?.detail) ?? text(body?.title) ?? `Railway \u8FD4\u56DE HTTP ${status}`;
+  const body = asJsonObject(payload);
+  return errorMessages(payload) ?? trimmedText(body?.message) ?? trimmedText(body?.error) ?? trimmedText(body?.detail) ?? trimmedText(body?.title) ?? `Railway \u8FD4\u56DE HTTP ${status}`;
 }
 async function graphql(ctx, query, variables) {
   const response = await guardedFetch(GRAPHQL_URL, {
@@ -67,19 +60,19 @@ async function graphql(ctx, query, variables) {
     }
   }
   if (!response.ok) throw upstreamError(response.status, errorText(payload, response.status));
-  const envelope = record(payload);
+  const envelope = asJsonObject(payload);
   if (envelope === void 0) throw responseError("Railway GraphQL \u54CD\u5E94\u4E0D\u662F\u5BF9\u8C61");
   const failure = errorMessages(envelope);
   if (failure !== void 0) throw new TBError("invalid_argument", failure);
-  const data = record(envelope.data);
+  const data = asJsonObject(envelope.data);
   if (data === void 0) throw responseError("Railway GraphQL \u54CD\u5E94\u7F3A data");
   return data;
 }
 function nodes(value) {
-  const edges = record(value)?.edges;
+  const edges = asJsonObject(value)?.edges;
   if (!Array.isArray(edges)) return [];
   return edges.flatMap((edge) => {
-    const node = record(record(edge)?.node);
+    const node = asJsonObject(asJsonObject(edge)?.node);
     return node === void 0 ? [] : [node];
   });
 }
@@ -88,7 +81,7 @@ function requireValue(value, message) {
   return value;
 }
 function workspaceId(ctx) {
-  return text(ctx.config?.workspaceId);
+  return trimmedText(ctx.config?.workspaceId);
 }
 var PROJECT_FIELDS = "id name description createdAt updatedAt";
 var DEPLOYMENT_FIELDS = "id status createdAt url staticUrl";
@@ -116,9 +109,9 @@ async function getProject(input, ctx) {
         environments { edges { node { id name } } }
       }
     }`, { id: required(input.projectId, "projectId") });
-  const project = requireValue(record(data.project), "Railway \u6CA1\u6709\u8FD4\u56DE project");
+  const project = requireValue(asJsonObject(data.project), "Railway \u6CA1\u6709\u8FD4\u56DE project");
   return {
-    project: compact({
+    project: compactDefined({
       id: project.id,
       name: project.name,
       // 上游把缺席的 description 显式归一成 null(出参声明里它是 nullable 的)。
@@ -149,7 +142,7 @@ async function getServiceInstance(input, ctx) {
     environmentId: required(input.environmentId, "environmentId")
   });
   return {
-    serviceInstance: requireValue(record(data.serviceInstance), "Railway \u6CA1\u6709\u8FD4\u56DE serviceInstance")
+    serviceInstance: requireValue(asJsonObject(data.serviceInstance), "Railway \u6CA1\u6709\u8FD4\u56DE serviceInstance")
   };
 }
 async function listDeployments(input, ctx) {
@@ -173,7 +166,7 @@ async function getDeployment(input, ctx) {
         ${DEPLOYMENT_FIELDS} meta canRedeploy canRollback
       }
     }`, { id: required(input.deploymentId, "deploymentId") });
-  return { deployment: requireValue(record(data.deployment), "Railway \u6CA1\u6709\u8FD4\u56DE deployment") };
+  return { deployment: requireValue(asJsonObject(data.deployment), "Railway \u6CA1\u6709\u8FD4\u56DE deployment") };
 }
 async function getDeploymentLogs(input, ctx) {
   const data = await graphql(ctx, `query deploymentLogs(
@@ -192,12 +185,12 @@ async function getDeploymentLogs(input, ctx) {
       ) {
         timestamp message severity
       }
-    }`, compact({
+    }`, compactDefined({
     deploymentId: required(input.deploymentId, "deploymentId"),
     limit: input.limit ?? DEFAULT_LOG_LIMIT,
-    filter: text(input.filter),
-    startDate: text(input.startDate),
-    endDate: text(input.endDate)
+    filter: trimmedText(input.filter),
+    startDate: trimmedText(input.startDate),
+    endDate: trimmedText(input.endDate)
   }));
   return { logs: Array.isArray(data.deploymentLogs) ? data.deploymentLogs : [] };
 }
@@ -207,10 +200,10 @@ async function deployService(input, ctx) {
     `mutation serviceInstanceDeployV2($serviceId: String!, $environmentId: String!, $commitSha: String) {
       serviceInstanceDeployV2(serviceId: $serviceId, environmentId: $environmentId, commitSha: $commitSha)
     }`,
-    compact({
+    compactDefined({
       serviceId: required(input.serviceId, "serviceId"),
       environmentId: required(input.environmentId, "environmentId"),
-      commitSha: text(input.commitSha)
+      commitSha: trimmedText(input.commitSha)
     })
   );
   return {
@@ -221,10 +214,10 @@ async function upsertVariable(input, ctx) {
   const data = await graphql(ctx, `mutation variableUpsert($input: VariableUpsertInput!) {
       variableUpsert(input: $input)
     }`, {
-    input: compact({
+    input: compactDefined({
       projectId: required(input.projectId, "projectId"),
       environmentId: required(input.environmentId, "environmentId"),
-      serviceId: text(input.serviceId),
+      serviceId: trimmedText(input.serviceId),
       name: required(input.name, "name"),
       // 变量值不透明:空串与前后空白都要原样写进去。
       value: input.value,
@@ -237,7 +230,7 @@ async function rollbackDeployment(input, ctx) {
   const data = await graphql(ctx, `mutation deploymentRollback($id: String!) {
       deploymentRollback(id: $id) { ${DEPLOYMENT_FIELDS} }
     }`, { id: required(input.deploymentId, "deploymentId") });
-  return { deployment: requireValue(record(data.deploymentRollback), "Railway \u6CA1\u6709\u8FD4\u56DE\u56DE\u6EDA\u540E\u7684 deployment") };
+  return { deployment: requireValue(asJsonObject(data.deploymentRollback), "Railway \u6CA1\u6709\u8FD4\u56DE\u56DE\u6EDA\u540E\u7684 deployment") };
 }
 
 // ../plugins/src/railway/schema.ts

package/dist/{readwise-UZ467IQ7.js → readwise-DIMSKJZR.js}

@@ -1,37 +1,35 @@
+import {
+  createProviderHttpClient
+} from "./chunk-WW2IMPQK.js";
+import {
+  asJsonObject,
+  compactDefined,
+  integerValue,
+  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-YASUMV2K.js";
+import "./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/readwise/api.ts
 var SERVICE = "readwise";
 var API_BASE = "https://readwise.io/api";
-function text(value) {
-  return typeof value === "string" ? value.trim() || void 0 : void 0;
-}
-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;
-}
+var http = createProviderHttpClient({ baseUrl: `${API_BASE}/`, service: SERVICE });
 function readArray(value) {
   return Array.isArray(value) ? value : [];
 }
 function errorMessage(payload, status) {
-  const object = record(payload);
+  const object = asJsonObject(payload);
   if (object !== void 0) {
-    const direct = text(object.detail) ?? text(object.message) ?? text(object.error);
+    const direct = trimmedText(object.detail) ?? trimmedText(object.message) ?? trimmedText(object.error);
     if (direct !== void 0) return direct;
     for (const value of Object.values(object)) {
       if (Array.isArray(value)) {
@@ -43,40 +41,26 @@ function errorMessage(payload, status) {
   return `Readwise request failed with status ${status}`;
 }
 async function request(ctx, input) {
-  const url = new URL(`${API_BASE}${input.path}`);
-  for (const [key, value] of Object.entries(input.query ?? {})) {
-    url.searchParams.set(key, value);
-  }
-  const response = await guardedFetch(url.toString(), {
+  const response = await http.request({
     method: input.method ?? "GET",
+    path: input.path,
+    query: Object.entries(input.query ?? {}),
     headers: {
       accept: "application/json",
       // Readwise 用的是 `Token <key>`,不是 Bearer —— 写成 Bearer 会一直 401。
-      authorization: `Token ${requireApiKey(ctx, SERVICE)}`,
-      ...input.body === void 0 ? {} : { "content-type": "application/json" }
+      authorization: `Token ${requireApiKey(ctx, SERVICE)}`
     },
-    ...input.body === void 0 ? {} : { body: JSON.stringify(input.body) }
+    ...input.body === void 0 ? {} : { json: input.body },
+    invalidJsonMessage: "Readwise \u8FD4\u56DE\u4E86\u975E\u6CD5 JSON",
+    mapError: ({ bodyKind, data, status }) => bodyKind === "invalid-json" ? new TBError("unavailable", "Readwise \u8FD4\u56DE\u4E86\u975E\u6CD5 JSON", { retryable: true }) : upstreamError(status, errorMessage(data, status))
   });
-  const body = await response.text();
-  let payload = null;
-  if (body.trim() !== "") {
-    try {
-      payload = JSON.parse(body);
-    } catch {
-      throw new TBError("unavailable", "Readwise \u8FD4\u56DE\u4E86\u975E\u6CD5 JSON", { retryable: true });
-    }
-  }
-  if (!response.ok) throw upstreamError(response.status, errorMessage(payload, response.status));
-  return payload ?? {};
+  return response.bodyKind === "empty" ? {} : response.data;
 }
 function requireRecord(value, message) {
-  const object = record(value);
+  const object = asJsonObject(value);
   if (object === void 0) throw new TBError("unavailable", message, { retryable: true });
   return object;
 }
-function compact(input) {
-  return Object.fromEntries(Object.entries(input).filter(([, value]) => value !== void 0));
-}
 function query(input) {
   const output = {};
   for (const [key, value] of Object.entries(input)) {
@@ -86,58 +70,58 @@ function query(input) {
   return output;
 }
 function normalizeHighlight(value) {
-  const item = record(value) ?? {};
+  const item = asJsonObject(value) ?? {};
   return {
-    id: integer(item.id) ?? null,
-    text: text(item.text) ?? "",
-    title: text(item.title) ?? null,
-    author: text(item.author) ?? null,
+    id: integerValue(item.id) ?? null,
+    text: trimmedText(item.text) ?? "",
+    title: trimmedText(item.title) ?? null,
+    author: trimmedText(item.author) ?? null,
     // note 保留空串:上游用 typeof 判断而非 optionalString,清空备注要能表达出来。
     note: typeof item.note === "string" ? item.note : null,
-    url: text(item.url) ?? null,
-    highlightedAt: text(item.highlighted_at) ?? text(item.highlightedAt) ?? null,
-    updatedAt: text(item.updated_at) ?? text(item.updatedAt) ?? null,
+    url: trimmedText(item.url) ?? null,
+    highlightedAt: trimmedText(item.highlighted_at) ?? trimmedText(item.highlightedAt) ?? null,
+    updatedAt: trimmedText(item.updated_at) ?? trimmedText(item.updatedAt) ?? null,
     raw: item
   };
 }
 function normalizeBook(value) {
-  const item = record(value) ?? {};
+  const item = asJsonObject(value) ?? {};
   return {
     // export 接口回的是 user_book_id,books 接口回的是 id。
-    id: integer(item.user_book_id) ?? integer(item.id) ?? null,
-    title: text(item.title) ?? null,
-    author: text(item.author) ?? null,
-    category: text(item.category) ?? null,
-    source: text(item.source) ?? null,
-    numHighlights: integer(item.num_highlights) ?? integer(item.numHighlights) ?? null,
-    updatedAt: text(item.updated) ?? text(item.updated_at) ?? null,
+    id: integerValue(item.user_book_id) ?? integerValue(item.id) ?? null,
+    title: trimmedText(item.title) ?? null,
+    author: trimmedText(item.author) ?? null,
+    category: trimmedText(item.category) ?? null,
+    source: trimmedText(item.source) ?? null,
+    numHighlights: integerValue(item.num_highlights) ?? integerValue(item.numHighlights) ?? null,
+    updatedAt: trimmedText(item.updated) ?? trimmedText(item.updated_at) ?? null,
     highlights: readArray(item.highlights).map(normalizeHighlight),
     raw: item
   };
 }
 function readTags(value) {
   if (Array.isArray(value)) return value.filter((item) => typeof item === "string");
-  const object = record(value);
+  const object = asJsonObject(value);
   return object === void 0 ? [] : Object.keys(object);
 }
 function normalizeDocument(value) {
-  const item = record(value) ?? {};
+  const item = asJsonObject(value) ?? {};
   return {
-    id: text(item.id) ?? text(item.document_id) ?? null,
-    url: text(item.url) ?? null,
-    sourceUrl: text(item.source_url) ?? text(item.sourceUrl) ?? null,
-    title: text(item.title) ?? null,
-    author: text(item.author) ?? null,
-    category: text(item.category) ?? null,
-    location: text(item.location) ?? null,
+    id: trimmedText(item.id) ?? trimmedText(item.document_id) ?? null,
+    url: trimmedText(item.url) ?? null,
+    sourceUrl: trimmedText(item.source_url) ?? trimmedText(item.sourceUrl) ?? null,
+    title: trimmedText(item.title) ?? null,
+    author: trimmedText(item.author) ?? null,
+    category: trimmedText(item.category) ?? null,
+    location: trimmedText(item.location) ?? null,
     tags: readTags(item.tags),
-    createdAt: text(item.created_at) ?? text(item.createdAt) ?? null,
-    updatedAt: text(item.updated_at) ?? text(item.updatedAt) ?? null,
+    createdAt: trimmedText(item.created_at) ?? trimmedText(item.createdAt) ?? null,
+    updatedAt: trimmedText(item.updated_at) ?? trimmedText(item.updatedAt) ?? null,
     raw: item
   };
 }
 function readDocumentRecord(payload) {
-  return record(payload.document) ?? record(payload.result) ?? record(payload.saved_document) ?? payload;
+  return asJsonObject(payload.document) ?? asJsonObject(payload.result) ?? asJsonObject(payload.saved_document) ?? payload;
 }
 async function createHighlights(input, ctx) {
   const payload = await request(ctx, {
@@ -157,8 +141,8 @@ async function exportHighlights(input, ctx) {
     "Readwise \u8FD4\u56DE\u4E86\u975E\u6CD5\u7684 export \u54CD\u5E94"
   );
   return {
-    count: integer(payload.count) ?? null,
-    nextPageCursor: text(payload.nextPageCursor) ?? null,
+    count: integerValue(payload.count) ?? null,
+    nextPageCursor: trimmedText(payload.nextPageCursor) ?? null,
     books: readArray(payload.results).map(normalizeBook),
     raw: payload
   };
@@ -178,9 +162,9 @@ async function listBooks(input, ctx) {
     "Readwise \u8FD4\u56DE\u4E86\u975E\u6CD5\u7684 books \u54CD\u5E94"
   );
   return {
-    count: integer(payload.count) ?? null,
-    next: text(payload.next) ?? null,
-    previous: text(payload.previous) ?? null,
+    count: integerValue(payload.count) ?? null,
+    next: trimmedText(payload.next) ?? null,
+    previous: trimmedText(payload.previous) ?? null,
     books: readArray(payload.results).map(normalizeBook),
     raw: payload
   };
@@ -200,8 +184,8 @@ async function listDocuments(input, ctx) {
     "Readwise \u8FD4\u56DE\u4E86\u975E\u6CD5\u7684\u6587\u6863\u5217\u8868"
   );
   return {
-    count: integer(payload.count) ?? null,
-    nextPageCursor: text(payload.nextPageCursor) ?? null,
+    count: integerValue(payload.count) ?? null,
+    nextPageCursor: trimmedText(payload.nextPageCursor) ?? null,
     documents: readArray(payload.results).map(normalizeDocument),
     raw: payload
   };
@@ -211,7 +195,7 @@ async function saveDocument(input, ctx) {
     await request(ctx, {
       path: "/v3/save/",
       method: "POST",
-      body: compact({
+      body: compactDefined({
         url: input.url,
         title: input.title,
         author: input.author,
@@ -230,7 +214,7 @@ async function updateDocument(input, ctx) {
     await request(ctx, {
       path: `/v3/update/${encodeURIComponent(input.documentId)}/`,
       method: "PATCH",
-      body: compact({
+      body: compactDefined({
         location: input.location,
         title: input.title,
         author: input.author,