fix: eszip module resolution during bundling for tests

Author: gregnr

packages/mcp-server-supabase/src/edge-function.ts

@@ -1,3 +1,5 @@
+import { codeBlock } from 'common-tags';
+
 /**
  * Gets the deployment ID for an Edge Function.
  */
@@ -15,3 +17,20 @@ export function getDeploymentId(
 export function getPathPrefix(deploymentId: string) {
   return `/tmp/user_fn_${deploymentId}/`;
 }
+
+export const edgeFunctionExample = codeBlock`
+  import "jsr:@supabase/functions-js/edge-runtime.d.ts";
+
+  Deno.serve(async (req: Request) => {
+    const data = {
+      message: "Hello there!"
+    };
+    
+    return new Response(JSON.stringify(data), {
+      headers: {
+        'Content-Type': 'application/json',
+        'Connection': 'keep-alive'
+      }
+    });
+  });
+`;

packages/mcp-server-supabase/src/eszip.ts

@@ -84,23 +84,59 @@ export async function bundleFiles(files: File[], pathPrefix: string = '/') {
     (file) => `file://${join(pathPrefix, file.name)}`
   );
   const eszip = await build(specifiers, async (specifier: string) => {
-    if (specifier.startsWith('file://')) {
-      const file = files.find(
-        (file) => `file://${join(pathPrefix, file.name)}` === specifier
-      );
+    const url = new URL(specifier);
+    const scheme = url.protocol;
 
-      if (!file) {
-        throw new Error(`File not found: ${specifier}`);
-      }
+    switch (scheme) {
+      case 'file:': {
+        const file = files.find(
+          (file) => `file://${join(pathPrefix, file.name)}` === specifier
+        );
+
+        if (!file) {
+          throw new Error(`File not found: ${specifier}`);
+        }
 
-      return {
-        kind: 'module',
-        specifier,
-        headers: {
+        const headers = {
           'content-type': file.type,
-        },
-        content: await file.text(),
-      };
+        };
+
+        const content = await file.text();
+
+        return {
+          kind: 'module',
+          specifier,
+          headers,
+          content,
+        };
+      }
+      case 'http:':
+      case 'https:': {
+        const response = await fetch(specifier);
+        if (!response.ok) {
+          throw new Error(`Failed to fetch ${specifier}: ${response.status}`);
+        }
+
+        // Header keys must be lower case
+        const headers = Object.fromEntries(
+          Array.from(response.headers.entries()).map(([key, value]) => [
+            key.toLowerCase(),
+            value,
+          ])
+        );
+
+        const content = await response.text();
+
+        return {
+          kind: 'module',
+          specifier,
+          headers,
+          content,
+        };
+      }
+      default: {
+        throw new Error(`Unsupported scheme: ${scheme}`);
+      }
     }
   });
 

packages/mcp-server-supabase/src/server.ts

@@ -2,7 +2,11 @@ import { createMcpServer, tool } from '@supabase/mcp-utils';
 import { fileURLToPath } from 'node:url';
 import { z } from 'zod';
 import packageJson from '../package.json' with { type: 'json' };
-import { getDeploymentId, getPathPrefix } from './edge-function.js';
+import {
+  edgeFunctionExample,
+  getDeploymentId,
+  getPathPrefix,
+} from './edge-function.js';
 import { extractFiles } from './eszip.js';
 import { getLogQuery } from './logs.js';
 import {
@@ -465,8 +469,7 @@ export function createSupabaseMcpServer(options: SupabaseMcpServerOptions) {
         },
       }),
       deploy_edge_function: tool({
-        description:
-          'Deploys an Edge Function to a Supabase project. If the function already exists, this will create a new version.',
+        description: `Deploys an Edge Function to a Supabase project. If the function already exists, this will create a new version. Example:\n\n${edgeFunctionExample}`,
         parameters: z.object({
           project_id: z.string(),
           name: z.string().describe('The name of the function'),

packages/mcp-server-supabase/test/llm.e2e.ts

@@ -89,10 +89,11 @@ describe('llm tests', () => {
       .sql`create table inventory (id serial, name text)`;
 
     const toolCalls: ToolCallUnion<ToolSet>[] = [];
+    const tools = await client.tools();
 
     const { text } = await generateText({
       model,
-      tools: await client.tools(),
+      tools,
       messages: [
         {
           role: 'system',
@@ -104,7 +105,7 @@ describe('llm tests', () => {
           content: 'What tables do I have?',
         },
       ],
-      maxSteps: 2,
+      maxSteps: 3,
       async onStepFinish({ toolCalls: tools }) {
         toolCalls.push(...tools);
       },
@@ -140,10 +141,11 @@ describe('llm tests', () => {
     });
 
     const toolCalls: ToolCallUnion<ToolSet>[] = [];
+    const tools = await client.tools();
 
     const { text } = await generateText({
       model,
-      tools: await client.tools(),
+      tools,
       messages: [
         {
           role: 'system',
@@ -156,7 +158,7 @@ describe('llm tests', () => {
         },
       ],
       maxSteps: 2,
-      async onStepFinish({ text, toolCalls: tools, toolResults }) {
+      async onStepFinish({ toolCalls: tools }) {
         toolCalls.push(...tools);
       },
     });
@@ -206,10 +208,11 @@ describe('llm tests', () => {
     );
 
     const toolCalls: ToolCallUnion<ToolSet>[] = [];
+    const tools = await client.tools();
 
     const { text } = await generateText({
       model,
-      tools: await client.tools(),
+      tools,
       messages: [
         {
           role: 'system',
@@ -222,11 +225,8 @@ describe('llm tests', () => {
         },
       ],
       maxSteps: 3,
-      async onStepFinish({ text, toolCalls: tools, toolResults }) {
+      async onStepFinish({ toolCalls: tools }) {
         toolCalls.push(...tools);
-        console.dir(text, { depth: null });
-        console.dir(tools, { depth: null });
-        console.dir(toolResults, { depth: null });
       },
     });