Fixes dereference arrays

mcandeia · mcandeia · commit d00a2b451ba4 · 2025-07-24T12:39:12.000-03:00
Signed-off-by: Marcos Candeia &lt;marrcooos@gmail.com&gt;
diff --git a/deno.json b/deno.json
@@ -1,6 +1,6 @@
 {
   "name": "@deco/mcp",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "exports": {
     ".": "./mod.ts",
     "./http": "./mcp/http.ts"
diff --git a/mcp/server.ts b/mcp/server.ts
@@ -339,22 +339,33 @@ export function mcpServer<TManifest extends AppManifest>(
       // Check if this is a browser request (HTML acceptance)
       const acceptHeader = c.req.header("accept") || "";
       const isHTMLRequest = acceptHeader.includes("text/html");
-      
+
       if (isHTMLRequest) {
         // Return HTML page for browser requests
-        const currentUrl = c.req.url.replace(/^http:/, 'https:');
-        
+        const currentUrl = c.req.url.replace(/^http:/, "https:");
+
         // Get tools data directly
         const meta = await deco.meta().then((v) => v?.value);
-        const tools = meta ? getTools(new Map<string, string>(), meta.schema, options, meta?.manifest?.blocks?.apps) : [];
-        const toolsHtml = tools.length > 0 
+        const tools = meta
+          ? getTools(
+            new Map<string, string>(),
+            meta.schema,
+            options,
+            meta?.manifest?.blocks?.apps,
+          )
+          : [];
+        const toolsHtml = tools.length > 0
           ? tools.map((tool: Tool) => `
               <div class="tool-card">
                 <div class="tool-name">${tool.name}</div>
-                <div class="tool-description">${tool.description || 'No description available'}</div>
-                ${tool.appName ? `<div class="tool-app">${tool.appName}</div>` : ''}
+                <div class="tool-description">${
+            tool.description || "No description available"
+          }</div>
+                ${
+            tool.appName ? `<div class="tool-app">${tool.appName}</div>` : ""
+          }
               </div>
-            `).join('')
+            `).join("")
           : '<div class="no-tools">No tools available</div>';
         const htmlResponse = `
 <!DOCTYPE html>
@@ -763,7 +774,7 @@ export function mcpServer<TManifest extends AppManifest>(
     </script>
 </body>
 </html>`;
-        
+
         return new Response(htmlResponse, {
           headers: {
             "Content-Type": "text/html; charset=utf-8",
diff --git a/mcp/utils.ts b/mcp/utils.ts
@@ -44,13 +44,21 @@ export function dereferenceSchema(
 
   const result: JSONSchema7 = { ...schema };
 
-  // Handle arrays with items
+  // Handle arrays with items (including tuple types)
   if (result.type === "array" && result.items) {
-    result.items = dereferenceSchema(
-      result.items as JSONSchema7,
-      definitions,
-      visited,
-    ) as JSONSchema7;
+    if (Array.isArray(result.items)) {
+      // Handle tuple types
+      result.items = result.items.map((item) =>
+        dereferenceSchema(item as JSONSchema7, definitions, visited)
+      ).filter(Boolean) as JSONSchema7[];
+    } else {
+      // Handle single item schema
+      result.items = dereferenceSchema(
+        result.items as JSONSchema7,
+        definitions,
+        visited,
+      ) as JSONSchema7;
+    }
   }
 
   // Handle and merge allOf into the main schema
@@ -141,6 +149,8 @@ export function dereferenceSchema(
 }
 
 function idFromDefinition(definition: string): string {
-  const [_, __, id] = definition.split("/");
-  return id;
+  // Handle complex definition patterns like:
+  // "#/definitions/ZmlsZTovLy9hcHAvZGVjby9jbGllbnRzL3BsYXVzaWJsZS52Mi50cw==@FilterOperator"
+  // Just remove the "#/definitions/" prefix and return the rest
+  return definition.replace("#/definitions/", "");
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@deco/mcp",`
`3`		`- "version": "0.7.1",`
	`3`	`+ "version": "0.7.2",`
`4`	`4`	`"exports": {`
`5`	`5`	`".": "./mod.ts",`
`6`	`6`	`"./http": "./mcp/http.ts"`