@tool-bridge/server 0.16.0 → 0.17.0

package/dist/{pinecone-JSJIXZYN.js → pinecone-RY5AZPQM.js}

@@ -1,41 +1,36 @@
+import {
+  createProviderHttpClient
+} from "./chunk-WW2IMPQK.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-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/pinecone/api.ts
 var SERVICE = "pinecone";
 var CONTROL_API_BASE = "https://api.pinecone.io";
 var API_VERSION = "2026-04";
-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;
-}
+var http = createProviderHttpClient({ service: SERVICE });
 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 compact(input) {
-  return Object.fromEntries(Object.entries(input).filter(([, value]) => value !== void 0));
-}
 function compactDeep(value) {
   if (Array.isArray(value)) return value.map((item) => compactDeep(item));
-  const fields = record(value);
+  const fields = asJsonObject(value);
   if (fields === void 0) return value;
   return Object.fromEntries(
     Object.entries(fields).filter(([, child]) => child !== void 0).map(([key, child]) => [key, compactDeep(child)])
@@ -53,22 +48,9 @@ function requireIndexHost(value) {
   if (parsed.username !== "" || parsed.password !== "") {
     throw new TBError("invalid_argument", "indexHost must not include credentials");
   }
-  parsed.pathname = parsed.pathname.replace(/\/+$/, "");
   parsed.search = "";
   parsed.hash = "";
-  return parsed.toString().replace(/\/+$/, "");
-}
-function buildUrl(baseUrl, path, query) {
-  const url = new URL(path, `${baseUrl.replace(/\/+$/, "")}/`);
-  for (const [key, value] of Object.entries(query ?? {})) {
-    if (value === void 0) continue;
-    if (Array.isArray(value)) {
-      for (const item of value) url.searchParams.append(key, item);
-      continue;
-    }
-    url.searchParams.set(key, value);
-  }
-  return url.toString();
+  return parsed.origin;
 }
 function headers(apiKey, hasBody) {
   return {
@@ -80,41 +62,33 @@ function headers(apiKey, hasBody) {
 }
 function errorMessage(payload, status) {
   if (typeof payload === "string") {
-    const message2 = text(payload);
+    const message2 = trimmedText(payload);
     if (message2 !== void 0) return message2;
   }
-  const fields = record(payload);
-  const message = text(fields?.message) ?? text(record(fields?.error)?.message);
+  const fields = asJsonObject(payload);
+  const message = trimmedText(fields?.message) ?? trimmedText(asJsonObject(fields?.error)?.message);
   return message ?? `Pinecone request failed with status ${status}`;
 }
 async function request(ctx, input) {
   const apiKey = requireApiKey(ctx, SERVICE);
-  let response;
-  try {
-    response = await guardedFetch(buildUrl(input.baseUrl ?? CONTROL_API_BASE, input.path, input.query), {
-      method: input.method,
-      headers: headers(apiKey, input.body !== void 0),
-      body: input.body === void 0 ? void 0 : JSON.stringify(compactDeep(input.body))
-    });
-  } catch (error) {
-    if (error instanceof TBError) throw error;
-    const message = error instanceof Error ? `Pinecone request failed: ${error.message}` : "Pinecone request failed";
-    throw upstreamError(502, message);
-  }
-  const raw = await response.text().catch(() => "");
-  let payload = {};
-  if (raw.trim() !== "") {
-    try {
-      payload = JSON.parse(raw);
-    } catch {
-      throw upstreamError(502, "Pinecone returned invalid JSON");
-    }
-  }
-  if (!response.ok) throw upstreamError(response.status, errorMessage(payload, response.status));
-  return payload;
+  const result = await http.request({
+    baseUrl: `${(input.baseUrl ?? CONTROL_API_BASE).replace(/\/+$/, "")}/`,
+    path: input.path,
+    method: input.method,
+    query: Object.entries(input.query ?? {}),
+    headers: headers(apiKey, input.body !== void 0),
+    ...input.body === void 0 ? {} : { json: compactDeep(input.body) },
+    invalidJsonMessage: "Pinecone returned invalid JSON",
+    mapError: ({ bodyKind, data, status }) => bodyKind === "invalid-json" ? upstreamError(502, "Pinecone returned invalid JSON") : upstreamError(status, errorMessage(data, status)),
+    mapTransportError: ({ message }) => upstreamError(
+      502,
+      message === void 0 ? "Pinecone request failed" : `Pinecone request failed: ${message}`
+    )
+  });
+  return result.data === void 0 ? {} : result.data;
 }
 function requireObject(payload, label) {
-  const fields = record(payload);
+  const fields = asJsonObject(payload);
   if (fields === void 0) throw upstreamError(502, `${label} must be a JSON object`);
   return fields;
 }
@@ -143,13 +117,13 @@ async function createIndex(input, ctx) {
     method: "POST",
     path: "/indexes",
     // camelCase 入参 → snake_case 请求体,且 spec 恒存在(只支持 serverless)。
-    body: compact({
+    body: compactDefined({
       name: requireText(input.name, "name"),
       dimension: typeof input.dimension === "number" ? input.dimension : void 0,
-      metric: text(input.metric),
-      vector_type: text(input.vectorType),
-      deletion_protection: text(input.deletionProtection),
-      tags: record(input.tags),
+      metric: trimmedText(input.metric),
+      vector_type: trimmedText(input.vectorType),
+      deletion_protection: trimmedText(input.deletionProtection),
+      tags: asJsonObject(input.tags),
       spec: {
         serverless: {
           cloud: requireText(input.cloud, "cloud"),
@@ -164,11 +138,11 @@ async function configureIndex(input, ctx) {
   const payload = await request(ctx, {
     method: "PATCH",
     path: `/indexes/${encodeURIComponent(requireText(input.name, "name"))}`,
-    body: compact({
-      deletion_protection: text(input.deletionProtection),
-      tags: record(input.tags),
+    body: compactDefined({
+      deletion_protection: trimmedText(input.deletionProtection),
+      tags: asJsonObject(input.tags),
       // 没给 readCapacity 就整个不发 spec:发一个空 spec 会被 Pinecone 当成"改成空配置"。
-      spec: input.readCapacity ? { serverless: { read_capacity: record(input.readCapacity) } } : void 0
+      spec: input.readCapacity ? { serverless: { read_capacity: asJsonObject(input.readCapacity) } } : void 0
     })
   });
   return { index: requireObject(payload, "Pinecone configure index response") };
@@ -184,7 +158,7 @@ async function getIndexStats(input, ctx) {
   const payload = await dataRequest(ctx, input.indexHost, {
     method: "POST",
     path: "/describe_index_stats",
-    body: { filter: record(input.filter) }
+    body: { filter: asJsonObject(input.filter) }
   });
   return { stats: requireObject(payload, "Pinecone index stats response") };
 }
@@ -193,7 +167,7 @@ async function upsertVectors(input, ctx) {
     await dataRequest(ctx, input.indexHost, {
       method: "POST",
       path: "/vectors/upsert",
-      body: { vectors: input.vectors, namespace: text(input.namespace) }
+      body: { vectors: input.vectors, namespace: trimmedText(input.namespace) }
     }),
     "Pinecone upsert response"
   );
@@ -214,10 +188,10 @@ async function queryVectors(input, ctx) {
       body: {
         vector: input.values,
         sparseVector: input.sparseValues,
-        id: text(input.id),
+        id: trimmedText(input.id),
         topK: input.topK,
-        namespace: text(input.namespace),
-        filter: record(input.filter),
+        namespace: trimmedText(input.namespace),
+        filter: asJsonObject(input.filter),
         includeValues: input.includeValues,
         includeMetadata: input.includeMetadata
       }
@@ -227,8 +201,8 @@ async function queryVectors(input, ctx) {
   return {
     matches: objectArray(payload.matches),
     // null 与"字段缺席"是两回事:前者是上游明确说"这次没有 namespace"。
-    namespace: text(payload.namespace) ?? null,
-    usage: record(payload.usage) ?? null,
+    namespace: trimmedText(payload.namespace) ?? null,
+    usage: asJsonObject(payload.usage) ?? null,
     raw: payload
   };
 }
@@ -239,16 +213,16 @@ async function fetchVectors(input, ctx) {
       path: "/vectors/fetch",
       // fetch 是 GET:ids 展开成重复的同名 query 参数,不进请求体。
       query: {
-        namespace: text(input.namespace),
+        namespace: trimmedText(input.namespace),
         ids: Array.isArray(input.ids) ? input.ids.map((id) => String(id)) : []
       }
     }),
     "Pinecone fetch response"
   );
   return {
-    vectors: record(payload.vectors) ?? {},
-    namespace: text(payload.namespace) ?? null,
-    usage: record(payload.usage) ?? null,
+    vectors: asJsonObject(payload.vectors) ?? {},
+    namespace: trimmedText(payload.namespace) ?? null,
+    usage: asJsonObject(payload.usage) ?? null,
     raw: payload
   };
 }
@@ -258,10 +232,10 @@ async function listVectorIds(input, ctx) {
       method: "GET",
       path: "/vectors/list",
       query: {
-        namespace: text(input.namespace),
-        prefix: text(input.prefix),
+        namespace: trimmedText(input.namespace),
+        prefix: trimmedText(input.prefix),
         limit: input.limit === void 0 ? void 0 : String(input.limit),
-        paginationToken: text(input.paginationToken)
+        paginationToken: trimmedText(input.paginationToken)
       }
     }),
     "Pinecone list vectors response"
@@ -269,7 +243,7 @@ async function listVectorIds(input, ctx) {
   return {
     vectors: objectArray(payload.vectors),
     // 翻页靠它:上游没有下一页时给 null,把它压成 undefined 会让调用方分不清"到底了"。
-    pagination: record(payload.pagination) ?? null,
+    pagination: asJsonObject(payload.pagination) ?? null,
     raw: payload
   };
 }
@@ -282,8 +256,8 @@ async function deleteVectors(input, ctx) {
     path: "/vectors/delete",
     body: {
       ids: input.ids,
-      namespace: text(input.namespace),
-      filter: record(input.filter),
+      namespace: trimmedText(input.namespace),
+      filter: asJsonObject(input.filter),
       deleteAll: input.deleteAll
     }
   });
@@ -298,12 +272,12 @@ async function updateVector(input, ctx) {
       method: "POST",
       path: "/vectors/update",
       body: {
-        id: text(input.id),
+        id: trimmedText(input.id),
         values: input.values,
         sparseValues: input.sparseValues,
-        setMetadata: record(input.setMetadata),
-        namespace: text(input.namespace),
-        filter: record(input.filter),
+        setMetadata: asJsonObject(input.setMetadata),
+        namespace: trimmedText(input.namespace),
+        filter: asJsonObject(input.filter),
         dryRun: input.dryRun
       }
     }),

package/dist/{pipedrive-D4CKVUXR.js → pipedrive-OHYQNZTU.js}

@@ -1,17 +1,21 @@
+import {
+  createProviderHttpClient
+} from "./chunk-WW2IMPQK.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-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/pipedrive/schema.ts
 var listPersonsInput = external_exports.looseObject({}).describe("Input for listing Pipedrive persons.");
@@ -256,6 +260,7 @@ var pipedriveActions = {
 // ../plugins/src/pipedrive/api.ts
 var SERVICE = "pipedrive";
 var API_BASE = "https://api.pipedrive.com";
+var http = createProviderHttpClient({ baseUrl: `${API_BASE}/`, service: SERVICE });
 var OPERATIONS = {
   list_persons: { method: "GET", path: "/api/v2/persons", listKey: "persons" },
   get_person: { method: "GET", path: "/api/v2/persons/{id}", idField: "personId", itemKey: "person" },
@@ -300,16 +305,8 @@ var OPERATIONS = {
   list_stages: { method: "GET", path: "/api/v2/stages", listKey: "stages" },
   get_stage: { method: "GET", path: "/api/v2/stages/{id}", idField: "stageId", itemKey: "stage" }
 };
-function asRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
-}
-function optionalText(value) {
-  if (typeof value !== "string") return void 0;
-  const trimmed = value.trim();
-  return trimmed === "" ? void 0 : trimmed;
-}
 function requiredText(value, field) {
-  const text = optionalText(value);
+  const text = trimmedText(value);
   if (text === void 0) throw new TBError("invalid_argument", `${field} \u4E0D\u80FD\u4E3A\u7A7A`);
   return text;
 }
@@ -344,55 +341,36 @@ function buildBody(operation, input) {
   }
   return body;
 }
-async function readPayload(response) {
-  const text = await response.text().catch(() => "");
-  if (text.trim() === "") return null;
-  try {
-    return JSON.parse(text);
-  } catch {
-    return text;
-  }
-}
 function errorMessage(payload) {
-  if (typeof payload === "string") return optionalText(payload);
-  const record = asRecord(payload);
+  if (typeof payload === "string") return trimmedText(payload);
+  const record = asJsonObject(payload);
   if (record === void 0) return void 0;
-  return optionalText(record.error) ?? optionalText(record.error_info) ?? optionalText(record.message) ?? optionalText(record.statusText);
+  return trimmedText(record.error) ?? trimmedText(record.error_info) ?? trimmedText(record.message) ?? trimmedText(record.statusText);
 }
 async function request(ctx, operation, input) {
   const apiKey = requireApiKey(ctx, SERVICE);
-  const url = new URL(buildPath(operation, input), API_BASE);
-  if (operation.method === "GET") {
-    for (const [key, value] of Object.entries(buildQuery(operation, input))) {
-      if (value !== void 0) url.searchParams.set(key, value);
-    }
-  }
   const hasBody = operation.method === "POST" || operation.method === "PATCH";
   const headers = {
     "accept": "application/json",
     "x-api-token": apiKey
   };
-  if (hasBody) headers["content-type"] = "application/json";
-  let response;
-  let payload;
-  try {
-    response = await guardedFetch(url.toString(), {
-      method: operation.method,
-      headers,
-      ...hasBody ? { body: JSON.stringify(buildBody(operation, input)) } : {}
-    });
-    payload = await readPayload(response);
-  } catch (error) {
-    if (error instanceof TBError) throw error;
-    throw upstreamError(502, error instanceof Error ? `pipedrive \u8BF7\u6C42\u5931\u8D25: ${error.message}` : "pipedrive \u8BF7\u6C42\u5931\u8D25");
-  }
-  if (!response.ok) {
-    throw upstreamError(
-      response.status,
-      errorMessage(payload) ?? (response.statusText || `pipedrive \u8FD4\u56DE HTTP ${response.status}`)
-    );
-  }
-  const record = payload === null ? {} : asRecord(payload);
+  const response = await http.request({
+    method: operation.method,
+    path: buildPath(operation, input),
+    headers,
+    ...operation.method === "GET" ? { query: Object.entries(buildQuery(operation, input)) } : {},
+    ...hasBody ? { json: buildBody(operation, input) } : {},
+    invalidJson: "text",
+    mapError: ({ data, status, statusText }) => upstreamError(
+      status,
+      errorMessage(data) ?? (statusText || `pipedrive \u8FD4\u56DE HTTP ${status}`)
+    ),
+    mapTransportError: ({ message }) => upstreamError(
+      502,
+      message === void 0 ? "pipedrive \u8BF7\u6C42\u5931\u8D25" : `pipedrive \u8BF7\u6C42\u5931\u8D25: ${message}`
+    )
+  });
+  const record = response.bodyKind === "empty" ? {} : asJsonObject(response.data);
   if (record === void 0) throw upstreamError(502, "pipedrive \u8FD4\u56DE\u7684\u54CD\u5E94\u4E0D\u662F JSON \u5BF9\u8C61");
   if (record.success === false) {
     throw upstreamError(502, errorMessage(record) ?? "pipedrive \u62A5\u544A\u4E86\u4E00\u6B21\u5931\u8D25\u7684\u54CD\u5E94");
@@ -400,13 +378,13 @@ async function request(ctx, operation, input) {
   return record;
 }
 function responseRecord(value, field) {
-  const record = asRecord(value);
+  const record = asJsonObject(value);
   if (record === void 0) throw upstreamError(502, `pipedrive \u54CD\u5E94\u7684 ${field} \u4E0D\u662F\u5BF9\u8C61`);
   return record;
 }
 function nextCursor(envelope) {
-  const pagination = asRecord(asRecord(envelope.additional_data)?.pagination);
-  return optionalText(pagination?.next_cursor) ?? null;
+  const pagination = asJsonObject(asJsonObject(envelope.additional_data)?.pagination);
+  return trimmedText(pagination?.next_cursor) ?? null;
 }
 function shapeOutput(envelope, operation) {
   const data = envelope.data;
@@ -420,7 +398,7 @@ function shapeOutput(envelope, operation) {
     const searchData = responseRecord(data, "data");
     return { items: Array.isArray(searchData.items) ? searchData.items : [], nextCursor: nextCursor(envelope) };
   }
-  const deleted = asRecord(data);
+  const deleted = asJsonObject(data);
   const id = deleted?.id;
   return {
     // id 通常是整数;不是整数时如实透出原值,而不是伪造成 null —— 调用方要能看见上游给了什么。

package/dist/{polar-M7ZYP6UR.js → polar-XZIAHXS5.js}

@@ -1,111 +1,101 @@
+import {
+  createProviderHttpClient
+} from "./chunk-WW2IMPQK.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-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/polar/api.ts
 var SERVICE = "polar";
 var API_BASE = "https://api.polar.sh/v1";
-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;
-}
+var http = createProviderHttpClient({ baseUrl: `${API_BASE}/`, service: SERVICE });
 function requireRecord(value, label) {
-  const result = record(value);
+  const result = asJsonObject(value);
   if (result === void 0) throw new TBError("unavailable", `Polar \u7684${label}\u4E0D\u662F\u5BF9\u8C61`, { retryable: true });
   return result;
 }
 function requireId(value, field) {
-  const id = text(value);
+  const id = trimmedText(value);
   if (id === void 0) throw new TBError("invalid_argument", `${field} \u662F\u5FC5\u586B\u7684`);
   return encodeURIComponent(id);
 }
-function appendQueryValue(url, key, value) {
+function appendQueryValue(query, key, value) {
   if (value === void 0 || value === null) return;
   if (Array.isArray(value)) {
-    for (const child of value) appendQueryValue(url, key, child);
+    for (const child of value) appendQueryValue(query, key, child);
     return;
   }
   if (typeof value === "boolean") {
-    url.searchParams.append(key, value ? "true" : "false");
+    query.push([key, value ? "true" : "false"]);
     return;
   }
   if (typeof value === "number") {
-    url.searchParams.append(key, String(value));
+    query.push([key, String(value)]);
     return;
   }
-  const stringValue = text(value);
-  if (stringValue !== void 0) url.searchParams.append(key, stringValue);
+  const stringValue = trimmedText(value);
+  if (stringValue !== void 0) query.push([key, stringValue]);
 }
-function listUrl(path, input) {
-  const url = new URL(`${API_BASE}${path}`);
+function listQuery(input) {
+  const query = [];
   for (const [key, value] of Object.entries(input)) {
     if (key === "metadata") {
-      const metadata = record(value);
+      const metadata = asJsonObject(value);
       if (metadata !== void 0) {
-        for (const [name, child] of Object.entries(metadata)) appendQueryValue(url, `metadata[${name}]`, child);
+        for (const [name, child] of Object.entries(metadata)) appendQueryValue(query, `metadata[${name}]`, child);
       }
       continue;
     }
-    appendQueryValue(url, key, value);
+    appendQueryValue(query, key, value);
   }
-  return url.toString();
+  return query;
 }
 function errorDetail(payload) {
-  const body = record(payload);
+  const body = asJsonObject(payload);
   if (body === void 0) return void 0;
   const detail = body.detail;
-  const detailText = text(detail);
+  const detailText = trimmedText(detail);
   if (detailText !== void 0) return detailText;
   if (Array.isArray(detail)) {
-    const message = text(record(detail[0])?.msg);
+    const message = trimmedText(asJsonObject(detail[0])?.msg);
     if (message !== void 0) return message;
   }
-  return text(body.message) ?? text(body.error) ?? text(body.title);
+  return trimmedText(body.message) ?? trimmedText(body.error) ?? trimmedText(body.title);
 }
-async function request(ctx, url) {
-  const response = await guardedFetch(url, {
+async function request(ctx, path, query) {
+  const { data } = await http.request({
+    path,
     method: "GET",
+    query,
     headers: {
       accept: "application/json",
       authorization: `Bearer ${requireApiKey(ctx, SERVICE)}`
-    }
+    },
+    invalidJsonMessage: "Polar \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94",
+    mapError: ({ data: payload, status }) => upstreamError(
+      status,
+      errorDetail(payload) ?? `Polar \u8FD4\u56DE HTTP ${status}`
+    )
   });
-  const body = await response.text();
-  let payload = null;
-  if (body.trim() !== "") {
-    try {
-      payload = JSON.parse(body);
-    } catch {
-      if (response.ok) {
-        throw new TBError("unavailable", "Polar \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94", { retryable: true });
-      }
-    }
-  }
-  if (!response.ok) {
-    throw upstreamError(response.status, errorDetail(payload) ?? `Polar \u8FD4\u56DE HTTP ${response.status}`);
-  }
-  return payload;
+  return data ?? null;
 }
 async function listResources(path, input, ctx) {
-  return requireRecord(await request(ctx, listUrl(path, input)), "\u5217\u8868\u54CD\u5E94");
+  return requireRecord(await request(ctx, path, listQuery(input)), "\u5217\u8868\u54CD\u5E94");
 }
 async function getResource(path, ctx) {
-  return { payload: requireRecord(await request(ctx, `${API_BASE}${path}`), "\u8D44\u6E90\u54CD\u5E94") };
+  return { payload: requireRecord(await request(ctx, path), "\u8D44\u6E90\u54CD\u5E94") };
 }
 function listOrganizations(input, ctx) {
   return listResources("/organizations/", input, ctx);