@mapbox/mcp-server 0.2.1-dev.3 → 0.2.2

package/dist/utils/requestUtils.test.js

@@ -0,0 +1,115 @@
+import { patchGlobalFetch, cleanup } from './requestUtils.js';
+describe('requestUtils', () => {
+    let originalGlobalFetch;
+    beforeEach(() => {
+        // Save original fetch
+        originalGlobalFetch = global.fetch;
+    });
+    afterEach(() => {
+        // Restore original fetch
+        global.fetch = originalGlobalFetch;
+        cleanup();
+    });
+    describe('patchGlobalFetch', () => {
+        it('should handle case when global.fetch is undefined at module load time', () => {
+            // Simulate scenario where global.fetch doesn't exist initially
+            delete global.fetch;
+            delete globalThis.fetch;
+            // This should throw because no fetch is available
+            expect(() => {
+                patchGlobalFetch({
+                    name: 'TestServer',
+                    version: '1.0.0',
+                    sha: 'abcdef',
+                    tag: 'no-tag',
+                    branch: 'default'
+                });
+            }).toThrow('No fetch implementation available');
+        });
+        it('should properly initialize originalFetch before patching', async () => {
+            // Mock fetch function
+            const mockFetch = jest.fn().mockResolvedValue({
+                ok: true,
+                status: 200,
+                json: async () => ({ success: true })
+            });
+            global.fetch = mockFetch;
+            // Patch global fetch
+            patchGlobalFetch({
+                name: 'TestServer',
+                version: '1.0.0',
+                sha: 'abcdef',
+                tag: 'no-tag',
+                branch: 'default'
+            });
+            // Make a fetch call
+            await global.fetch('https://example.com', {
+                headers: { 'Custom-Header': 'test' }
+            });
+            // Verify that the original fetch was called with User-Agent added
+            expect(mockFetch).toHaveBeenCalledWith('https://example.com', {
+                headers: {
+                    'Custom-Header': 'test',
+                    'User-Agent': 'TestServer/1.0.0 (default, no-tag, abcdef)'
+                }
+            });
+        });
+        it('should not throw originalFetch is not a function error', async () => {
+            // Mock a scenario where fetch might be called before proper initialization
+            const mockFetch = jest.fn().mockResolvedValue({
+                ok: true,
+                status: 200,
+                json: async () => ({ success: true })
+            });
+            global.fetch = mockFetch;
+            patchGlobalFetch({
+                name: 'TestServer',
+                version: '1.0.0',
+                sha: 'abcdef',
+                tag: 'no-tag',
+                branch: 'default'
+            });
+            // This should not throw "originalFetch is not a function"
+            await expect(global.fetch('https://example.com')).resolves.toBeDefined();
+        });
+        it('should handle multiple patch calls without breaking', () => {
+            const mockFetch = jest.fn();
+            global.fetch = mockFetch;
+            // First patch
+            patchGlobalFetch({
+                name: 'TestServer',
+                version: '1.0.0',
+                sha: 'abcdef',
+                tag: 'no-tag',
+                branch: 'default'
+            });
+            // Second patch (should not break)
+            patchGlobalFetch({
+                name: 'TestServer2',
+                version: '2.0.0',
+                sha: 'abcdef2',
+                tag: 'v2',
+                branch: 'main'
+            });
+            // Should still work
+            expect(typeof global.fetch).toBe('function');
+        });
+        it('should restore original fetch on cleanup', () => {
+            const mockFetch = jest.fn();
+            global.fetch = mockFetch;
+            patchGlobalFetch({
+                name: 'TestServer',
+                version: '1.0.0',
+                sha: 'abcdef',
+                tag: 'no-tag',
+                branch: 'default'
+            });
+            // Verify fetch was patched
+            expect(global.fetch).not.toBe(mockFetch);
+            // Cleanup should restore original
+            cleanup();
+            expect(global.fetch).toBe(mockFetch);
+        });
+    });
+});
+//# sourceMappingURL=requestUtils.test.js.map

package/dist/utils/requestUtils.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"requestUtils.test.js","sourceRoot":"","sources":["../../src/utils/requestUtils.test.ts"],"names":[],"mappings":"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"}

package/dist/utils/schemaUtils.d.ts

@@ -0,0 +1,9 @@
+import { ZodTypeAny } from 'zod';
+/**
+ * Converts a Zod schema to a JSON Schema 2020-12 format
+ * This is required for MCP tools compatibility
+ * @param zodSchema The Zod schema to convert
+ * @returns JSON Schema compatible with draft 2020-12
+ */
+export declare function zodToMcpJsonSchema(zodSchema: ZodTypeAny): any;
+//# sourceMappingURL=schemaUtils.d.ts.map

package/dist/utils/schemaUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"schemaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/schemaUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,KAAK,CAAC;AAGjC;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,UAAU,GAAG,GAAG,CAoB7D"}

package/dist/utils/schemaUtils.js

@@ -0,0 +1,25 @@
+import { zodToJsonSchema } from 'zod-to-json-schema';
+/**
+ * Converts a Zod schema to a JSON Schema 2020-12 format
+ * This is required for MCP tools compatibility
+ * @param zodSchema The Zod schema to convert
+ * @returns JSON Schema compatible with draft 2020-12
+ */
+export function zodToMcpJsonSchema(zodSchema) {
+    // Generate JSON Schema compatible with Claude (draft 2020-12)
+    const jsonSchema = zodToJsonSchema(zodSchema, {
+        target: 'jsonSchema2019-09', // Use closest available target to 2020-12
+        $refStrategy: 'none'
+    });
+    // Convert to 2020-12 format by updating the $schema field and converting definitions
+    const result = { ...jsonSchema };
+    // Update $schema to 2020-12
+    result['$schema'] = 'https://json-schema.org/draft/2020-12/schema#';
+    // Convert definitions to $defs for 2020-12 compatibility
+    if ('definitions' in result && typeof result['definitions'] === 'object') {
+        result['$defs'] = result['definitions'];
+        delete result['definitions'];
+    }
+    return result;
+}
+//# sourceMappingURL=schemaUtils.js.map

package/dist/utils/schemaUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schemaUtils.js","sourceRoot":"","sources":["../../src/utils/schemaUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAAC,SAAqB;IACtD,8DAA8D;IAC9D,MAAM,UAAU,GAAG,eAAe,CAAC,SAAS,EAAE;QAC5C,MAAM,EAAE,mBAAmB,EAAE,0CAA0C;QACvE,YAAY,EAAE,MAAM;KACrB,CAAC,CAAC;IAEH,qFAAqF;IACrF,MAAM,MAAM,GAAG,EAAE,GAAG,UAAU,EAA6B,CAAC;IAE5D,4BAA4B;IAC5B,MAAM,CAAC,SAAS,CAAC,GAAG,+CAA+C,CAAC;IAEpE,yDAAyD;IACzD,IAAI,aAAa,IAAI,MAAM,IAAI,OAAO,MAAM,CAAC,aAAa,CAAC,KAAK,QAAQ,EAAE,CAAC;QACzE,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;QACxC,OAAO,MAAM,CAAC,aAAa,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO,MAA2B,CAAC;AACrC,CAAC"}

package/dist/utils/versionUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"versionUtils.d.ts","sourceRoot":"","sources":["../../src/utils/versionUtils.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,wBAAgB,cAAc,IAAI,WAAW,CAmB5C"}
+{"version":3,"file":"versionUtils.d.ts","sourceRoot":"","sources":["../../src/utils/versionUtils.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,wBAAgB,cAAc,IAAI,WAAW,CAoC5C"}

package/dist/utils/versionUtils.js

@@ -5,11 +5,27 @@ export function getVersionInfo() {
     const name = 'Mapbox MCP server';
     try {
         const dirname = path.dirname(fileURLToPath(import.meta.url));
-        const filePath = path.resolve(dirname, '..', 'version.json');
-        const data = readFileSync(filePath, 'utf-8');
-        let info = JSON.parse(data);
-        info['name'] = name;
-        return info;
+        // Try to read from version.json first (for build artifacts)
+        const versionJsonPath = path.resolve(dirname, '..', 'version.json');
+        try {
+            const versionData = readFileSync(versionJsonPath, 'utf-8');
+            let info = JSON.parse(versionData);
+            info['name'] = name;
+            return info;
+        }
+        catch {
+            // Fall back to package.json
+            const packageJsonPath = path.resolve(dirname, '..', '..', 'package.json');
+            const packageData = readFileSync(packageJsonPath, 'utf-8');
+            const packageInfo = JSON.parse(packageData);
+            return {
+                name: name,
+                version: packageInfo.version || '0.0.0',
+                sha: 'unknown',
+                tag: 'unknown',
+                branch: 'unknown'
+            };
+        }
     }
     catch (error) {
         console.warn(`Failed to read version info: ${error}`);

package/dist/utils/versionUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"versionUtils.js","sourceRoot":"","sources":["../../src/utils/versionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAClC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAUpC,MAAM,UAAU,cAAc;IAC5B,MAAM,IAAI,GAAG,mBAAmB,CAAC;IACjC,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC7D,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QAC7D,MAAM,IAAI,GAAG,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAgB,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,CAAC,gCAAgC,KAAK,EAAE,CAAC,CAAC;QACtD,OAAO;YACL,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,OAAO;YAChB,GAAG,EAAE,SAAS;YACd,GAAG,EAAE,SAAS;YACd,MAAM,EAAE,SAAS;SAClB,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"versionUtils.js","sourceRoot":"","sources":["../../src/utils/versionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAClC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAUpC,MAAM,UAAU,cAAc;IAC5B,MAAM,IAAI,GAAG,mBAAmB,CAAC;IACjC,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAE7D,4DAA4D;QAC5D,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QACpE,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YAC3D,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAgB,CAAC;YAClD,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;YACpB,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,MAAM,CAAC;YACP,4BAA4B;YAC5B,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;YAC1E,MAAM,WAAW,GAAG,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YAC3D,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAE5C,OAAO;gBACL,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE,WAAW,CAAC,OAAO,IAAI,OAAO;gBACvC,GAAG,EAAE,SAAS;gBACd,GAAG,EAAE,SAAS;gBACd,MAAM,EAAE,SAAS;aAClB,CAAC;QACJ,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,CAAC,gCAAgC,KAAK,EAAE,CAAC,CAAC;QACtD,OAAO;YACL,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,OAAO;YAChB,GAAG,EAAE,SAAS;YACd,GAAG,EAAE,SAAS;YACd,MAAM,EAAE,SAAS;SAClB,CAAC;IACJ,CAAC;AACH,CAAC"}

package/dist/version.json

@@ -1,6 +1,6 @@
 {
-  "sha": "e608d71b48cff145b9dd4412ace0d62b5a3358f2",
-  "tag": "v0.2.1-dev.1",
-  "branch": "add_result_type_option_for_CategorySearchTool",
-  "version": "0.2.1-dev.1"
+  "sha": "379b6827e8ee49822ac1001d1ea9af08e1c636f7",
+  "tag": "v0.2.1-1-g379b682",
+  "branch": "main",
+  "version": "0.2.2"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapbox/mcp-server",
-  "version": "0.2.1-dev.3",
+  "version": "0.2.2",
   "description": "Mapbox MCP server.",
   "main": "dist/index.js",
   "module": "dist/index-esm.js",
@@ -49,7 +49,7 @@
     "trailingComma": "none"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=22"
   },
   "files": [
     "dist"