@malloy-publisher/server 0.0.90 → 0.0.92

package/tests/harness/e2e.ts

@@ -4,18 +4,18 @@ import path from "path";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import type {
-  Request,
-  Notification,
-  Result,
+   Request,
+   Notification,
+   Result,
 } from "@modelcontextprotocol/sdk/types.js";
 
 /**
  * E2E environment descriptor returned by {@link startE2E}.
  */
 export interface E2EEnv {
-  httpServer: http.Server;
-  serverUrl: string;
-  mcpClient: Client<Request, Notification, Result>;
+   httpServer: http.Server;
+   serverUrl: string;
+   mcpClient: Client<Request, Notification, Result>;
 }
 
 let originalServerRoot: string | undefined;
@@ -26,65 +26,67 @@ let originalServerRoot: string | undefined;
  * once its suite finishes.
  */
 export async function startE2E(): Promise<E2EEnv & { stop(): Promise<void> }> {
-  //--------------------------------------------------------------------------
-  // 1.  Set SERVER_ROOT so ProjectStore loader finds publisher.config.json
-  //--------------------------------------------------------------------------
-  originalServerRoot = process.env.SERVER_ROOT;
-  const serverPackageDir = path.resolve(__dirname, "../../../"); // packages/server
-  process.env.SERVER_ROOT = serverPackageDir;
+   //--------------------------------------------------------------------------
+   // 1.  Set SERVER_ROOT so ProjectStore loader finds publisher.config.json
+   //--------------------------------------------------------------------------
+   originalServerRoot = process.env.SERVER_ROOT;
+   const serverPackageDir = path.resolve(__dirname, "../../../"); // packages/server
+   process.env.SERVER_ROOT = serverPackageDir;
 
-  //--------------------------------------------------------------------------
-  // 2.  Dynamically import the configured Express app AFTER env var mutation
-  //--------------------------------------------------------------------------
-  const { mcpApp } = await import("../../src/server");
+   //--------------------------------------------------------------------------
+   // 2.  Dynamically import the configured Express app AFTER env var mutation
+   //--------------------------------------------------------------------------
+   const { mcpApp } = await import("../../src/server");
 
-  //--------------------------------------------------------------------------
-  // 3.  Start HTTP server on a predictable high port (4042 by default)
-  //--------------------------------------------------------------------------
-  const TEST_PORT = Number(process.env.MCP_PORT || 4040) + 2;
+   //--------------------------------------------------------------------------
+   // 3.  Start HTTP server on a predictable high port (4042 by default)
+   //--------------------------------------------------------------------------
+   const TEST_PORT = Number(process.env.MCP_PORT || 4040) + 2;
 
-  const httpServer: http.Server = await new Promise<http.Server>((resolve, reject) => {
-    const srv = http
-      .createServer(mcpApp)
-      .listen(TEST_PORT, "127.0.0.1", () => resolve(srv));
+   const httpServer: http.Server = await new Promise<http.Server>(
+      (resolve, reject) => {
+         const srv = http
+            .createServer(mcpApp)
+            .listen(TEST_PORT, "127.0.0.1", () => resolve(srv));
 
-    srv.on("error", (err: NodeJS.ErrnoException) => {
-      /* c8 ignore next 3 */
-      console.error("[E2E] server listen error", err);
-      reject(err);
-    });
-  });
+         srv.on("error", (err: NodeJS.ErrnoException) => {
+            /* c8 ignore next 3 */
+            console.error("[E2E] server listen error", err);
+            reject(err);
+         });
+      },
+   );
 
-  const serverUrl = `http://127.0.0.1:${TEST_PORT}`;
+   const serverUrl = `http://127.0.0.1:${TEST_PORT}`;
 
-  //--------------------------------------------------------------------------
-  // 4.  Connect MCP client over HTTP streaming bridge
-  //--------------------------------------------------------------------------
-  const mcpClient = new Client<Request, Notification, Result>({
-    name: "mcp-e2e-client",
-    version: "1.0",
-  });
+   //--------------------------------------------------------------------------
+   // 4.  Connect MCP client over HTTP streaming bridge
+   //--------------------------------------------------------------------------
+   const mcpClient = new Client<Request, Notification, Result>({
+      name: "mcp-e2e-client",
+      version: "1.0",
+   });
 
-  const transport = new StreamableHTTPClientTransport(
-    new URL(`${serverUrl}/mcp`),
-  );
+   const transport = new StreamableHTTPClientTransport(
+      new URL(`${serverUrl}/mcp`),
+   );
 
-  await mcpClient.connect(transport);
+   await mcpClient.connect(transport);
 
-  //--------------------------------------------------------------------------
-  // 5.  Return env + graceful stop helper
-  //--------------------------------------------------------------------------
-  const stop = async (): Promise<void> => {
-    try {
-      await mcpClient.close();
-    } finally {
-      httpServer.closeAllConnections?.();
-      await new Promise<void>((r) => httpServer.close(() => r()));
-      // Restore SERVER_ROOT
-      if (originalServerRoot === undefined) delete process.env.SERVER_ROOT;
-      else process.env.SERVER_ROOT = originalServerRoot;
-    }
-  };
+   //--------------------------------------------------------------------------
+   // 5.  Return env + graceful stop helper
+   //--------------------------------------------------------------------------
+   const stop = async (): Promise<void> => {
+      try {
+         await mcpClient.close();
+      } finally {
+         httpServer.closeAllConnections?.();
+         await new Promise<void>((r) => httpServer.close(() => r()));
+         // Restore SERVER_ROOT
+         if (originalServerRoot === undefined) delete process.env.SERVER_ROOT;
+         else process.env.SERVER_ROOT = originalServerRoot;
+      }
+   };
 
-  return { httpServer, serverUrl, mcpClient, stop };
-} 
+   return { httpServer, serverUrl, mcpClient, stop };
+}

package/tests/harness/uris.ts

@@ -1,31 +1,28 @@
 export interface FixtureUris {
-  project: string;
-  package: string;
-  flightsModel: string;
-  source: string;
-  view: string;
-  query: string;
-  notebook: string;
+   project: string;
+   package: string;
+   flightsModel: string;
+   source: string;
+   view: string;
+   query: string;
+   notebook: string;
 }
 
 /**
  * Return canonical URIs used across integration tests, parametrised by project
  * and package. Most suites will call this with defaults.
  */
-export function malloyUris(
-  project = "home",
-  pkg = "faa",
-): FixtureUris {
-  const base = `malloy://project/${project}`;
-  const pkgUri = `${base}/package/${pkg}`;
-  const model = `${pkgUri}/models/flights.malloy`;
-  return {
-    project: base,
-    package: pkgUri,
-    flightsModel: model,
-    source: `${model}/sources/flights`,
-    view: `${model}/sources/flights/views/flights_by_month`,
-    query: `${model}/queries/flights_by_carrier`,
-    notebook: `${pkgUri}/notebooks/overview.malloynb`,
-  };
-} 
+export function malloyUris(project = "home", pkg = "faa"): FixtureUris {
+   const base = `malloy://project/${project}`;
+   const pkgUri = `${base}/package/${pkg}`;
+   const model = `${pkgUri}/models/flights.malloy`;
+   return {
+      project: base,
+      package: pkgUri,
+      flightsModel: model,
+      source: `${model}/sources/flights`,
+      view: `${model}/sources/flights/views/flights_by_month`,
+      query: `${model}/queries/flights_by_carrier`,
+      notebook: `${pkgUri}/notebooks/overview.malloynb`,
+   };
+}

package/tests/integration/mcp/mcp_resource.integration.spec.ts

@@ -631,6 +631,16 @@ describe("MCP Resource Handlers (E2E Integration)", () => {
          expect(errorPayload.suggestions).toBeDefined();
          expect(Array.isArray(errorPayload.suggestions)).toBe(true);
          expect(errorPayload.suggestions.length).toBeGreaterThan(0);
+
+         const expectedSuggestions = [
+            "Verify the identifier or URI",
+            "project 'malloy-samples'",
+            "is spelled correctly",
+            "Check capitalization and path separators.",
+         ];
+         for (const chunk of errorPayload.suggestions) {
+            expect(expectedSuggestions).toContain(chunk);
+         }
          // Check suggestion content for project not found
          expect(errorPayload.suggestions[0]).toContain(
             "Verify the identifier or URI (project 'malloy-samples') is spelled correctly",