@nimbus-dev/connectors 0.2.1 → 0.2.2

package/connectors/bitbucket/src/tools.ts

@@ -0,0 +1,241 @@
+import { z } from "zod";
+import type { ConsentServer } from "../../../shared/consent-kit.ts";
+import { createWriteToolRegistrar } from "../../../shared/consent-kit.ts";
+import { resolveUrlWithBase } from "../../../shared/fetch-bearer-json.ts";
+import {
+  createRegisterSimpleTool,
+  createZodToolRegistrar,
+  encodeBasicAuthHeader,
+  type McpListResult,
+  mcpJsonResultIfOk,
+  requireProcessEnv,
+} from "../../../shared/mcp-tool-kit.ts";
+import { type RestFetchResult, toRestFetchResult } from "../../../shared/rest-tool-kit.ts";
+
+const BB_API = "https://api.bitbucket.org/2.0";
+
+function basicAuthHeader(): string {
+  const user = requireProcessEnv("BITBUCKET_USERNAME");
+  const pass = requireProcessEnv("BITBUCKET_APP_PASSWORD");
+  return encodeBasicAuthHeader(user, pass);
+}
+
+function splitRepoFull(full: string): { workspace: string; repoSlug: string } {
+  const i = full.indexOf("/");
+  if (i <= 0 || i === full.length - 1) {
+    throw new Error("repoFull must be workspace/repo_slug");
+  }
+  return { workspace: full.slice(0, i), repoSlug: full.slice(i + 1) };
+}
+
+/** `/repositories/<workspace>/<repo_slug>` for a `workspace/repo_slug` full name, both encoded. */
+function repoPath(repoFull: string): string {
+  const { workspace, repoSlug } = splitRepoFull(repoFull);
+  return `/repositories/${encodeURIComponent(workspace)}/${encodeURIComponent(repoSlug)}`;
+}
+
+/**
+ * One credentialed Bitbucket request. `path` is relative to {@link BB_API}, or an absolute URL —
+ * the `next` link of an earlier page, which a paged tool takes back as its `page` ARGUMENT, so the
+ * model chooses it. `resolveUrlWithBase` refuses an absolute URL on any other origin before
+ * anything is sent: fetched as given, it would hand that host the username and app password.
+ */
+async function bbFetch(path: string, init?: RequestInit): Promise<RestFetchResult> {
+  const url = resolveUrlWithBase(BB_API, path);
+  const baseHeaders: Record<string, string> = {
+    Authorization: basicAuthHeader(),
+    Accept: "application/json",
+  };
+  const extra = init?.headers as Record<string, string> | undefined;
+  const headers = extra === undefined ? baseHeaders : { ...baseHeaders, ...extra };
+  const res = await fetch(url, {
+    ...init,
+    headers,
+  });
+  return toRestFetchResult(res);
+}
+
+/** A Bitbucket request answered as the tool result; Bitbucket's status and body on failure. */
+async function bbResult(path: string, init?: RequestInit): Promise<McpListResult> {
+  const res = await bbFetch(path, init);
+  return mcpJsonResultIfOk("Bitbucket", res);
+}
+
+/**
+ * One page of a paged list: the `next` URL from an earlier response when the caller passes one
+ * back, otherwise the first page — which `firstPage` builds only in that case.
+ */
+async function bbPage(page: string | undefined, firstPage: () => string): Promise<McpListResult> {
+  return bbResult(page?.startsWith("http") ? page : firstPage());
+}
+
+/** Tool names exposed by this connector — for contract/introspection tests. */
+export const BITBUCKET_TOOL_NAMES = [
+  "bitbucket_repo_list",
+  "bitbucket_pr_list",
+  "bitbucket_pr_get",
+  "bitbucket_pr_merge",
+  "bitbucket_pipeline_list",
+  "bitbucket_pipeline_get",
+  "bitbucket_issue_list",
+] as const;
+
+export function registerBitbucketTools(
+  server: ConsentServer & { tool: (...args: never) => unknown },
+): void {
+  const registerSimpleTool = createRegisterSimpleTool(server);
+  const reg = createZodToolRegistrar(registerSimpleTool);
+
+  /**
+   * Every MUTATING bitbucket tool goes through here. Outside the gateway this adds the
+   * consent gate, the write-scope allow-list, the mutation budget and the audit record; inside
+   * the gateway it is a pass-through, because executor.ts (I2) is the gate there.
+   */
+  const registerWriteTool = createWriteToolRegistrar(server, {
+    connector: "bitbucket",
+    scopeEnv: "NIMBUS_MCP_BITBUCKET_WRITE_SCOPE",
+    scopeKinds: ["repo"],
+  });
+
+  const repoFullArg = z.object({
+    repoFull: z
+      .string()
+      .min(3)
+      .describe("Repository full name: workspace/repo_slug (e.g. myteam/my-service)"),
+  });
+
+  const bitbucketRepoListSchema = z.object({
+    pagelen: z.number().int().min(1).max(100).optional(),
+    page: z
+      .string()
+      .max(2000)
+      .optional()
+      .describe("Opaque page URL or token from a prior next link"),
+  });
+
+  reg(
+    "bitbucket_repo_list",
+    "List repositories where the authenticated user is a member.",
+    bitbucketRepoListSchema,
+    async (parsed) =>
+      bbPage(parsed.page, () => {
+        const qs = new URLSearchParams();
+        qs.set("role", "member");
+        qs.set("pagelen", String(parsed.pagelen ?? 30));
+        return `/repositories?${qs.toString()}`;
+      }),
+  );
+
+  const bitbucketPrListSchema = repoFullArg.extend({
+    state: z.enum(["OPEN", "MERGED", "DECLINED", "SUPERSEDED"]).optional(),
+    pagelen: z.number().int().min(1).max(100).optional(),
+    page: z.string().max(2000).optional().describe("Opaque next URL from a prior response"),
+  });
+
+  reg(
+    "bitbucket_pr_list",
+    "List pull requests for a repository.",
+    bitbucketPrListSchema,
+    async (parsed) =>
+      bbPage(parsed.page, () => {
+        const base = `${repoPath(parsed.repoFull)}/pullrequests`;
+        const qs = new URLSearchParams();
+        qs.set("pagelen", String(parsed.pagelen ?? 30));
+        qs.set("sort", "-updated_on");
+        if (parsed.state !== undefined) {
+          qs.set("q", `state="${parsed.state}"`);
+        }
+        return `${base}?${qs.toString()}`;
+      }),
+  );
+
+  const bitbucketPrGetSchema = repoFullArg.extend({
+    pullRequestId: z.number().int().min(1),
+  });
+
+  reg(
+    "bitbucket_pr_get",
+    "Get a single pull request by numeric id.",
+    bitbucketPrGetSchema,
+    async (parsed) =>
+      bbResult(`${repoPath(parsed.repoFull)}/pullrequests/${String(parsed.pullRequestId)}`),
+  );
+
+  const bitbucketPrMergeSchema = repoFullArg.extend({
+    pullRequestId: z.number().int().min(1),
+    mergeStrategy: z.enum(["merge_commit", "squash", "fast_forward"]).optional(),
+    message: z.string().max(32_768).optional(),
+  });
+
+  registerWriteTool(
+    "bitbucket_pr_merge",
+    {
+      mutates: "bitbucket.pr.merge",
+      recoverable: true,
+      scopeTargetOf: (p) => ({ kind: "repo", value: p.repoFull }),
+    },
+    "Merge a pull request.",
+    bitbucketPrMergeSchema,
+    async (parsed) => {
+      const path = `${repoPath(parsed.repoFull)}/pullrequests/${String(parsed.pullRequestId)}/merge`;
+      const body: Record<string, unknown> = { type: "pullrequest" };
+      if (parsed.mergeStrategy !== undefined) {
+        body["merge_strategy"] = parsed.mergeStrategy;
+      }
+      if (parsed.message !== undefined) {
+        body["message"] = parsed.message;
+      }
+      return bbResult(path, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(body),
+      });
+    },
+  );
+
+  const bitbucketRepoPagedSchema = repoFullArg.extend({
+    pagelen: z.number().int().min(1).max(100).optional(),
+    page: z.string().max(2000).optional(),
+  });
+
+  reg(
+    "bitbucket_pipeline_list",
+    "List Pipelines runs for a repository.",
+    bitbucketRepoPagedSchema,
+    async (parsed) =>
+      bbPage(parsed.page, () => {
+        const base = `${repoPath(parsed.repoFull)}/pipelines/`;
+        const qs = new URLSearchParams();
+        qs.set("pagelen", String(parsed.pagelen ?? 30));
+        return `${base}?${qs.toString()}`;
+      }),
+  );
+
+  const bitbucketPipelineGetSchema = repoFullArg.extend({
+    pipelineUuid: z.string().min(8).max(128),
+  });
+
+  reg(
+    "bitbucket_pipeline_get",
+    "Get a single pipeline run by UUID.",
+    bitbucketPipelineGetSchema,
+    async (parsed) => {
+      const base = repoPath(parsed.repoFull);
+      const encUuid = encodeURIComponent(parsed.pipelineUuid);
+      return bbResult(`${base}/pipelines/${encUuid}`);
+    },
+  );
+
+  reg(
+    "bitbucket_issue_list",
+    "List issues for a repository (issue tracker must be enabled).",
+    bitbucketRepoPagedSchema,
+    async (parsed) =>
+      bbPage(parsed.page, () => {
+        const base = `${repoPath(parsed.repoFull)}/issues`;
+        const qs = new URLSearchParams();
+        qs.set("pagelen", String(parsed.pagelen ?? 30));
+        return `${base}?${qs.toString()}`;
+      }),
+  );
+}

package/connectors/bitrise/src/server.ts

@@ -1,83 +1,6 @@
-import { z } from "zod";
-import { matchesResult } from "../../../shared/mcp-search-tool.ts";
-import { mcpJsonResult as jsonResult } from "../../../shared/mcp-tool-kit.ts";
 import { runReadOnlyMcpConnector } from "../../../shared/run-read-only-mcp-connector.ts";
-import { filterBitriseBuilds } from "./search-filter.ts";
-
-const BITRISE_API = "https://api.bitrise.io";
-
-function authHeader(): Record<string, string> {
-  const t = process.env["BITRISE_TOKEN"]?.trim();
-  if (t === undefined || t === "") {
-    throw new Error("BITRISE_TOKEN is not set");
-  }
-  return { Authorization: t, Accept: "application/json" };
-}
-
-async function bitriseGet(path: string): Promise<unknown> {
-  const res = await fetch(`${BITRISE_API}${path}`, { headers: authHeader() });
-  const text = await res.text();
-  if (!res.ok) {
-    throw new Error(`Bitrise ${String(res.status)}: ${text.slice(0, 400)}`);
-  }
-  return JSON.parse(text) as unknown;
-}
+import { registerBitriseTools } from "./tools.ts";
 
 await runReadOnlyMcpConnector("nimbus-bitrise", (reg) => {
-  reg(
-    "bitrise_list",
-    "List Bitrise resources. When `appSlug` is omitted, returns the user's accessible apps via `/v0.1/me/apps`. When `appSlug` is provided, returns the app's recent builds via `/v0.1/apps/<slug>/builds` (status filter and limit optional).",
-    z.object({
-      appSlug: z.string().min(1).optional(),
-      status: z.enum(["not-finished", "successful", "failed", "aborted"]).optional(),
-      limit: z.number().int().min(1).max(50).optional(),
-    }),
-    async (p) => {
-      if (p.appSlug === undefined) {
-        const limit = p.limit ?? 50;
-        return jsonResult(await bitriseGet(`/v0.1/me/apps?limit=${String(limit)}`));
-      }
-      const params: string[] = [];
-      params.push(`limit=${String(p.limit ?? 50)}`);
-      if (p.status !== undefined) {
-        const map = { "not-finished": 0, successful: 1, failed: 2, aborted: 3 } as const;
-        params.push(`status=${String(map[p.status])}`);
-      }
-      const qs = `?${params.join("&")}`;
-      return jsonResult(
-        await bitriseGet(`/v0.1/apps/${encodeURIComponent(p.appSlug)}/builds${qs}`),
-      );
-    },
-  );
-
-  reg(
-    "bitrise_get",
-    "Fetch a single Bitrise resource. When `buildSlug` is provided, returns the build via `/v0.1/apps/<appSlug>/builds/<buildSlug>`. When omitted, returns the app via `/v0.1/apps/<appSlug>`.",
-    z.object({
-      appSlug: z.string().min(1),
-      buildSlug: z.string().min(1).optional(),
-    }),
-    async (p) => {
-      if (p.buildSlug === undefined) {
-        return jsonResult(await bitriseGet(`/v0.1/apps/${encodeURIComponent(p.appSlug)}`));
-      }
-      const path = `/v0.1/apps/${encodeURIComponent(p.appSlug)}/builds/${encodeURIComponent(p.buildSlug)}`;
-      return jsonResult(await bitriseGet(path));
-    },
-  );
-
-  reg(
-    "bitrise_search",
-    "Substring search across a Bitrise app's recent builds. Matches the query against `branch`, `commit_message`, `triggered_workflow`, and `status_text` (case-insensitive). Returns a `{ matches: [...] }` envelope.",
-    z.object({
-      appSlug: z.string().min(1),
-      query: z.string().min(1),
-      limit: z.number().int().min(1).max(200).optional(),
-    }),
-    async (p) => {
-      const root = await bitriseGet(`/v0.1/apps/${encodeURIComponent(p.appSlug)}/builds?limit=50`);
-      const data = (root as { data?: unknown[] } | null)?.data;
-      return matchesResult(data, filterBitriseBuilds, p);
-    },
-  );
+  registerBitriseTools(reg);
 });

package/connectors/bitrise/src/tools.ts

@@ -0,0 +1,76 @@
+import { z } from "zod";
+import { createJsonGetter, envAuthHeaders } from "../../../shared/env-json-api.ts";
+import { matchesResult } from "../../../shared/mcp-search-tool.ts";
+import { mcpJsonResult as jsonResult } from "../../../shared/mcp-tool-kit.ts";
+import type { ZodToolRegistrar } from "../../../shared/run-read-only-mcp-connector.ts";
+import { filterBitriseBuilds } from "./search-filter.ts";
+
+const BITRISE_API = "https://api.bitrise.io";
+
+const bitriseGet = createJsonGetter({
+  base: BITRISE_API,
+  label: "Bitrise",
+  headers: envAuthHeaders({ env: "BITRISE_TOKEN", scheme: "" }),
+});
+
+/** Tool names exposed by this connector — for contract/introspection tests. */
+export const BITRISE_TOOL_NAMES = ["bitrise_get", "bitrise_list", "bitrise_search"] as const;
+
+export function registerBitriseTools(reg: ZodToolRegistrar): void {
+  reg(
+    "bitrise_list",
+    "List Bitrise resources. When `appSlug` is omitted, returns the user's accessible apps via `/v0.1/me/apps`. When `appSlug` is provided, returns the app's recent builds via `/v0.1/apps/<slug>/builds` (status filter and limit optional).",
+    z.object({
+      appSlug: z.string().min(1).optional(),
+      status: z.enum(["not-finished", "successful", "failed", "aborted"]).optional(),
+      limit: z.number().int().min(1).max(50).optional(),
+    }),
+    async (p) => {
+      if (p.appSlug === undefined) {
+        const limit = p.limit ?? 50;
+        return jsonResult(await bitriseGet(`/v0.1/me/apps?limit=${String(limit)}`));
+      }
+      const params: string[] = [];
+      params.push(`limit=${String(p.limit ?? 50)}`);
+      if (p.status !== undefined) {
+        const map = { "not-finished": 0, successful: 1, failed: 2, aborted: 3 } as const;
+        params.push(`status=${String(map[p.status])}`);
+      }
+      const qs = `?${params.join("&")}`;
+      return jsonResult(
+        await bitriseGet(`/v0.1/apps/${encodeURIComponent(p.appSlug)}/builds${qs}`),
+      );
+    },
+  );
+
+  reg(
+    "bitrise_get",
+    "Fetch a single Bitrise resource. When `buildSlug` is provided, returns the build via `/v0.1/apps/<appSlug>/builds/<buildSlug>`. When omitted, returns the app via `/v0.1/apps/<appSlug>`.",
+    z.object({
+      appSlug: z.string().min(1),
+      buildSlug: z.string().min(1).optional(),
+    }),
+    async (p) => {
+      if (p.buildSlug === undefined) {
+        return jsonResult(await bitriseGet(`/v0.1/apps/${encodeURIComponent(p.appSlug)}`));
+      }
+      const path = `/v0.1/apps/${encodeURIComponent(p.appSlug)}/builds/${encodeURIComponent(p.buildSlug)}`;
+      return jsonResult(await bitriseGet(path));
+    },
+  );
+
+  reg(
+    "bitrise_search",
+    "Substring search across a Bitrise app's recent builds. Matches the query against `branch`, `commit_message`, `triggered_workflow`, and `status_text` (case-insensitive). Returns a `{ matches: [...] }` envelope.",
+    z.object({
+      appSlug: z.string().min(1),
+      query: z.string().min(1),
+      limit: z.number().int().min(1).max(200).optional(),
+    }),
+    async (p) => {
+      const root = await bitriseGet(`/v0.1/apps/${encodeURIComponent(p.appSlug)}/builds?limit=50`);
+      const data = (root as { data?: unknown[] } | null)?.data;
+      return matchesResult(data, filterBitriseBuilds, p);
+    },
+  );
+}

package/connectors/canva/src/search-filter.ts

@@ -1,8 +1,7 @@
 import {
-  asObjectish,
+  fieldsFromKeys,
   makeQueryFilter,
   type SearchMatchOptions,
-  stringField,
 } from "../../../shared/search-filter.ts";
 
 export type CanvaSearchMatchOptions = SearchMatchOptions;
@@ -12,12 +11,4 @@ export type CanvaSearchMatchOptions = SearchMatchOptions;
  * thumbnail: { url, ... }, ... }`. Designs carry no description or owner field,
  * so match against the design title (case-insensitive substring).
  */
-function fieldsOf(item: unknown): readonly string[] | null {
-  const row = asObjectish(item);
-  if (row === undefined) {
-    return null;
-  }
-  return [stringField(row, "title")];
-}
-
-export const filterCanvaDesigns = makeQueryFilter(fieldsOf);
+export const filterCanvaDesigns = makeQueryFilter(fieldsFromKeys(["title"]));

package/connectors/canva/src/server.ts

@@ -1,77 +1,6 @@
-import { z } from "zod";
-import { searchToolInputSchema } from "../../../shared/mcp-search-tool.ts";
-import { mcpJsonResult as jsonResult } from "../../../shared/mcp-tool-kit.ts";
 import { runReadOnlyMcpConnector } from "../../../shared/run-read-only-mcp-connector.ts";
-import { filterCanvaDesigns } from "./search-filter.ts";
-
-const BASE = "https://api.canva.com";
-
-function apiToken(): string {
-  const t = process.env["CANVA_TOKEN"]?.trim();
-  if (t === undefined || t === "") {
-    throw new Error("CANVA_TOKEN is not set");
-  }
-  return t;
-}
-
-function authHeader(): Record<string, string> {
-  return { Authorization: `Bearer ${apiToken()}`, Accept: "application/json" };
-}
-
-async function canvaGet(path: string): Promise<unknown> {
-  const res = await fetch(`${BASE}${path}`, { headers: authHeader() });
-  const text = await res.text();
-  if (!res.ok) {
-    throw new Error(`Canva ${String(res.status)}: ${text.slice(0, 400)}`);
-  }
-  return JSON.parse(text) as unknown;
-}
-
-function designsFrom(root: unknown): unknown[] {
-  const items = (root as { items?: unknown } | null)?.items;
-  return Array.isArray(items) ? items : [];
-}
+import { registerCanvaTools } from "./tools.ts";
 
 await runReadOnlyMcpConnector("nimbus-canva", (reg) => {
-  reg(
-    "canva_list",
-    "List the authenticated user's Canva designs (GET /rest/v1/designs?continuation=<token>). Returns the { items: [...], continuation? } envelope — `items` holds the design objects, each shaped { id, title, created_at, updated_at, urls: { edit_url, view_url }, thumbnail: { url, width, height }, ... }; `continuation` (when present) is the opaque token for the next page.",
-    z.object({
-      continuation: z.string().optional(),
-    }),
-    async (p) => {
-      const params = new URLSearchParams();
-      if (p.continuation !== undefined && p.continuation !== "") {
-        params.set("continuation", p.continuation);
-      }
-      const qs = params.toString();
-      const query = qs === "" ? "" : `?${qs}`;
-      return jsonResult(await canvaGet(`/rest/v1/designs${query}`));
-    },
-  );
-
-  reg(
-    "canva_get",
-    "Fetch one Canva design by its id (GET /rest/v1/designs/{designId}). Returns the { design: { id, title, created_at, updated_at, urls, thumbnail, ... } } envelope. Throws when no design with that id exists.",
-    z.object({
-      id: z.string().min(1),
-    }),
-    async (p) => {
-      return jsonResult(await canvaGet(`/rest/v1/designs/${encodeURIComponent(p.id)}`));
-    },
-  );
-
-  reg(
-    "canva_search",
-    "**Substring search over the FIRST PAGE only** of the authenticated user's Canva designs. This tool fetches GET /rest/v1/designs once and matches the query locally (case-insensitive) against the design title. **Designs beyond the first page are not searchable here — query the local Nimbus index instead for full coverage.** Returns a { matches: [...] } envelope.",
-    searchToolInputSchema(100),
-    async (p) => {
-      const root = await canvaGet("/rest/v1/designs");
-      const matches = filterCanvaDesigns(designsFrom(root), {
-        query: p.query,
-        limit: p.limit,
-      });
-      return jsonResult({ matches });
-    },
-  );
+  registerCanvaTools(reg);
 });

package/connectors/canva/src/tools.ts

@@ -0,0 +1,66 @@
+import { z } from "zod";
+import { createJsonGetter, envAuthHeaders } from "../../../shared/env-json-api.ts";
+import { searchToolInputSchema } from "../../../shared/mcp-search-tool.ts";
+import { mcpJsonResult as jsonResult } from "../../../shared/mcp-tool-kit.ts";
+import type { ZodToolRegistrar } from "../../../shared/run-read-only-mcp-connector.ts";
+import { filterCanvaDesigns } from "./search-filter.ts";
+
+const BASE = "https://api.canva.com";
+
+const canvaGet = createJsonGetter({
+  base: BASE,
+  label: "Canva",
+  headers: envAuthHeaders({ env: "CANVA_TOKEN" }),
+});
+
+function designsFrom(root: unknown): unknown[] {
+  const items = (root as { items?: unknown } | null)?.items;
+  return Array.isArray(items) ? items : [];
+}
+
+/** Tool names exposed by this connector — for contract/introspection tests. */
+export const CANVA_TOOL_NAMES = ["canva_get", "canva_list", "canva_search"] as const;
+
+export function registerCanvaTools(reg: ZodToolRegistrar): void {
+  reg(
+    "canva_list",
+    "List the authenticated user's Canva designs (GET /rest/v1/designs?continuation=<token>). Returns the { items: [...], continuation? } envelope — `items` holds the design objects, each shaped { id, title, created_at, updated_at, urls: { edit_url, view_url }, thumbnail: { url, width, height }, ... }; `continuation` (when present) is the opaque token for the next page.",
+    z.object({
+      continuation: z.string().optional(),
+    }),
+    async (p) => {
+      const params = new URLSearchParams();
+      if (p.continuation !== undefined && p.continuation !== "") {
+        params.set("continuation", p.continuation);
+      }
+      const qs = params.toString();
+      const query = qs === "" ? "" : `?${qs}`;
+      return jsonResult(await canvaGet(`/rest/v1/designs${query}`));
+    },
+  );
+
+  reg(
+    "canva_get",
+    "Fetch one Canva design by its id (GET /rest/v1/designs/{designId}). Returns the { design: { id, title, created_at, updated_at, urls, thumbnail, ... } } envelope. Throws when no design with that id exists.",
+    z.object({
+      id: z.string().min(1),
+    }),
+    async (p) => {
+      return jsonResult(await canvaGet(`/rest/v1/designs/${encodeURIComponent(p.id)}`));
+    },
+  );
+
+  reg(
+    "canva_search",
+    "**Substring search over the FIRST PAGE only** of the authenticated user's Canva designs. This tool fetches GET /rest/v1/designs once and matches the query locally (case-insensitive) against the design title. **Designs beyond the first page are not searchable here — query the local Nimbus index instead for full coverage.** Returns a { matches: [...] } envelope.",
+    searchToolInputSchema(100),
+    async (p) => {
+      const root = await canvaGet("/rest/v1/designs");
+      const matches = filterCanvaDesigns(designsFrom(root), {
+        query: p.query,
+        limit: p.limit,
+      });
+      return jsonResult({ matches });
+    },
+  );
+}