@malloy-publisher/server 0.0.225 → 0.0.227

package/tests/harness/e2e.ts

@@ -1,96 +0,0 @@
-import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
-import type {
-   Notification,
-   Request,
-   Result,
-} from "@modelcontextprotocol/sdk/types.js";
-import http from "http";
-import path from "path";
-import { fileURLToPath } from "url";
-import { URL } from "url";
-
-/**
- * E2E environment descriptor returned by {@link startE2E}.
- */
-export interface E2EEnv {
-   httpServer: http.Server;
-   serverUrl: string;
-   mcpClient: Client<Request, Notification, Result>;
-}
-
-let originalServerRoot: string | undefined;
-
-/**
- * Spin-up the real Express app (via mcp/server.ts), expose its base URL and
- * return a fully-connected MCP client. The caller **must** invoke {@link stop}
- * once its suite finishes.
- */
-export async function startE2E(): Promise<E2EEnv & { stop(): Promise<void> }> {
-   //--------------------------------------------------------------------------
-   // 1.  Set SERVER_ROOT so EnvironmentStore loader finds publisher.config.json
-   //--------------------------------------------------------------------------
-   originalServerRoot = process.env.SERVER_ROOT;
-   // Use import.meta.url for cross-platform compatibility (works on Windows)
-   const __filename = fileURLToPath(import.meta.url);
-   const __dirname = path.dirname(__filename);
-   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");
-
-   //--------------------------------------------------------------------------
-   // 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));
-
-         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}`;
-
-   //--------------------------------------------------------------------------
-   // 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`),
-   );
-
-   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;
-      }
-   };
-
-   return { httpServer, serverUrl, mcpClient, stop };
-}

package/tests/harness/mocks.ts

@@ -1,39 +0,0 @@
-import sinon from "sinon";
-import { EnvironmentStore } from "../../src/service/environment_store";
-
-/** Return a stubbed EnvironmentStore where every lookup throws or returns minimal objects. */
-export function fakeEnvironmentStore(): sinon.SinonStubbedInstance<EnvironmentStore> {
-   const es = sinon.createStubInstance(EnvironmentStore);
-   // For now just have getEnvironment reject; suites can stub more.
-   es.getEnvironment.rejects(
-      new Error("fakeEnvironmentStore: getEnvironment not stubbed"),
-   );
-   return es;
-}
-
-// The runtime implementation of `McpServer` lives in the MCP SDK package, which
-// is **not** required for unit/integration tests that only need a stubbed
-// instance. Importing it at runtime would fail when the dependency is not
-// present in the local workspace. Instead we define a minimal dummy class that
-// satisfies Sinon while keeping the public type surface the same for tests.
-//
-// NOTE: If we later add the real SDK as a dependency we can simply replace this
-// dummy class with:
-//   import { McpServer } from "@modelcontextprotocol/sdk";
-class DummyMcpServer {}
-
-// Re-export the symbol so downstream test files can continue to refer to the
-// name `McpServer` without changes.
-export type McpServer = DummyMcpServer;
-
-/** Convenience helper mimicking the old mocks used in integration specs. */
-export function createMalloyServiceMocks() {
-   return {
-      environmentStore: fakeEnvironmentStore(),
-   } as const;
-}
-
-/** Create a Sinon spy wrapper around a new DummyMcpServer instance. */
-export function spyMcpServer(): sinon.SinonStubbedInstance<DummyMcpServer> {
-   return sinon.createStubInstance(DummyMcpServer);
-}

package/tests/harness/uris.ts

@@ -1,31 +0,0 @@
-export interface FixtureUris {
-   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 = "malloy-samples",
-   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`,
-   };
-}