@neverinfamous/mysql-mcp 2.1.0 → 2.3.0

package/dist/adapters/mysql/tools/shell/restore.js

@@ -3,32 +3,35 @@
  *
  * Tools for restoring dumps and running custom scripts.
  */
-import { ShellLoadDumpInputSchema, ShellRunScriptInputSchema } from '../../types/shell-types.js';
-import { getShellConfig, execShellJS, execMySQLShell } from './common.js';
+import { promises as fs } from "fs";
+import { tmpdir } from "os";
+import { join } from "path";
+import { ShellLoadDumpInputSchema, ShellRunScriptInputSchema, } from "../../types/shell-types.js";
+import { getShellConfig, execShellJS, execMySQLShell } from "./common.js";
 /**
  * Load dump to instance
  */
 export function createShellLoadDumpTool() {
     return {
-        name: 'mysqlsh_load_dump',
-        title: 'MySQL Shell Load Dump',
-        description: 'Load a MySQL Shell dump using util.loadDump(). Restores data from a dump created by dumpInstance, dumpSchemas, or dumpTables. Supports parallel loading.',
-        group: 'shell',
+        name: "mysqlsh_load_dump",
+        title: "MySQL Shell Load Dump",
+        description: "Load a MySQL Shell dump using util.loadDump(). Restores data from a dump created by dumpInstance, dumpSchemas, or dumpTables. Supports parallel loading.",
+        group: "shell",
         inputSchema: ShellLoadDumpInputSchema,
-        requiredScopes: ['admin'],
+        requiredScopes: ["admin"],
         annotations: {
             readOnlyHint: false,
-            openWorldHint: true
+            openWorldHint: true,
         },
         handler: async (params, _context) => {
-            const { inputDir, threads, dryRun, includeSchemas, excludeSchemas, includeTables, excludeTables, ignoreExistingObjects, ignoreVersion, resetProgress, updateServerSettings } = ShellLoadDumpInputSchema.parse(params);
-            const escapedPath = inputDir.replace(/\\/g, '\\\\');
+            const { inputDir, threads, dryRun, includeSchemas, excludeSchemas, includeTables, excludeTables, ignoreExistingObjects, ignoreVersion, resetProgress, updateServerSettings, } = ShellLoadDumpInputSchema.parse(params);
+            const escapedPath = inputDir.replace(/\\/g, "\\\\");
             const options = [];
             if (threads) {
                 options.push(`threads: ${threads}`);
             }
             if (dryRun) {
-                options.push('dryRun: true');
+                options.push("dryRun: true");
             }
             if (includeSchemas && includeSchemas.length > 0) {
                 options.push(`includeSchemas: ${JSON.stringify(includeSchemas)}`);
@@ -43,15 +46,15 @@ export function createShellLoadDumpTool() {
                 options.push(`excludeTables: ${JSON.stringify(excludeTables)}`);
             }
             if (ignoreExistingObjects) {
-                options.push('ignoreExistingObjects: true');
+                options.push("ignoreExistingObjects: true");
             }
             if (ignoreVersion) {
-                options.push('ignoreVersion: true');
+                options.push("ignoreVersion: true");
             }
             if (resetProgress) {
-                options.push('resetProgress: true');
+                options.push("resetProgress: true");
             }
-            const optionsStr = options.length > 0 ? `, { ${options.join(', ')} }` : '';
+            const optionsStr = options.length > 0 ? `, { ${options.join(", ")} }` : "";
             // Build JavaScript code that optionally enables local_infile
             let jsCode;
             if (updateServerSettings) {
@@ -64,25 +67,84 @@ export function createShellLoadDumpTool() {
                 jsCode = `return util.loadDump("${escapedPath}"${optionsStr});`;
             }
             try {
+                if (dryRun) {
+                    // For dry runs, use execMySQLShell directly to capture stderr
+                    // where MySQL Shell outputs the summary of what would be loaded
+                    const config = getShellConfig();
+                    const dryRunJsCode = `
+            var __result__;
+            try {
+                __result__ = (function() { ${jsCode} })();
+                print(JSON.stringify({ success: true, result: __result__ }));
+            } catch (e) {
+                print(JSON.stringify({ success: false, error: e.message }));
+            }
+          `;
+                    const rawResult = await execMySQLShell(["--uri", config.connectionUri, "--js", "-e", dryRunJsCode], { timeout: 3600000 });
+                    // Parse stderr for dry run summary, filtering out common warnings
+                    const stderrClean = rawResult.stderr
+                        .replace(/WARNING: Using a password on the command line interface can be insecure\.\s*/gi, "")
+                        .trim();
+                    // Check for errors in the JSON output
+                    const lines = rawResult.stdout.trim().split("\n");
+                    for (let i = lines.length - 1; i >= 0; i--) {
+                        const line = lines[i];
+                        if (!line)
+                            continue;
+                        const trimmedLine = line.trim();
+                        if (trimmedLine.startsWith("{")) {
+                            let parsed;
+                            try {
+                                parsed = JSON.parse(trimmedLine);
+                            }
+                            catch {
+                                continue;
+                            }
+                            if (!parsed.success) {
+                                throw new Error(parsed.error ?? "Unknown MySQL Shell error");
+                            }
+                            break;
+                        }
+                    }
+                    return {
+                        success: true,
+                        inputDir,
+                        dryRun: true,
+                        localInfileEnabled: updateServerSettings,
+                        dryRunOutput: stderrClean || undefined,
+                    };
+                }
                 const result = await execShellJS(jsCode, { timeout: 3600000 });
                 return {
                     success: true,
                     inputDir,
-                    dryRun: dryRun ?? false,
+                    dryRun: false,
                     localInfileEnabled: updateServerSettings,
-                    result
+                    result,
                 };
             }
             catch (error) {
                 const errorMessage = error instanceof Error ? error.message : String(error);
-                if (errorMessage.includes('local_infile') || errorMessage.includes('Loading local data is disabled')) {
-                    throw new Error(`Load failed: local_infile is disabled on the server. ` +
-                        `Either set updateServerSettings: true (requires SUPER or SYSTEM_VARIABLES_ADMIN privilege), ` +
-                        `or manually run: SET GLOBAL local_infile = ON`);
+                if (errorMessage.includes("local_infile") ||
+                    errorMessage.includes("Loading local data is disabled")) {
+                    return {
+                        success: false,
+                        inputDir,
+                        error: "Load failed: local_infile is disabled on the server.",
+                        hint: "Set updateServerSettings: true (requires SUPER or SYSTEM_VARIABLES_ADMIN privilege), or manually run: SET GLOBAL local_infile = ON",
+                    };
                 }
-                throw error;
+                if (errorMessage.includes("Duplicate objects")) {
+                    return {
+                        success: false,
+                        inputDir,
+                        error: errorMessage,
+                        hint: "Use ignoreExistingObjects: true to skip existing objects",
+                    };
+                }
+                return { success: false, inputDir, error: errorMessage };
             }
-        }
+        },
     };
 }
 /**
@@ -90,15 +152,15 @@ export function createShellLoadDumpTool() {
  */
 export function createShellRunScriptTool() {
     return {
-        name: 'mysqlsh_run_script',
-        title: 'MySQL Shell Run Script',
-        description: 'Execute a JavaScript, Python, or SQL script via MySQL Shell. Provides access to X DevAPI, AdminAPI, and all MySQL Shell features.',
-        group: 'shell',
+        name: "mysqlsh_run_script",
+        title: "MySQL Shell Run Script",
+        description: "Execute a JavaScript, Python, or SQL script via MySQL Shell. Provides access to X DevAPI, AdminAPI, and all MySQL Shell features.",
+        group: "shell",
         inputSchema: ShellRunScriptInputSchema,
-        requiredScopes: ['admin'],
+        requiredScopes: ["admin"],
         annotations: {
             readOnlyHint: false,
-            openWorldHint: true
+            openWorldHint: true,
         },
         handler: async (params, _context) => {
             const { script, language, timeout } = ShellRunScriptInputSchema.parse(params);
@@ -106,30 +168,53 @@ export function createShellRunScriptTool() {
             // Build command based on language
             let langFlag;
             switch (language) {
-                case 'js':
-                    langFlag = '--js';
+                case "js":
+                    langFlag = "--js";
                     break;
-                case 'py':
-                    langFlag = '--py';
+                case "py":
+                    langFlag = "--py";
                     break;
-                case 'sql':
-                    langFlag = '--sql';
+                case "sql":
+                    langFlag = "--sql";
                     break;
             }
-            const args = [
-                '--uri', config.connectionUri,
-                langFlag,
-                '-e', script
-            ];
-            const result = await execMySQLShell(args, { timeout });
+            let result;
+            // SQL scripts with comments or multi-line content break when passed via -e
+            // Use --file approach for SQL to properly handle all syntax
+            if (language === "sql") {
+                // Create a secure temp directory via mkdtemp (restrictive permissions,
+                // unique path) to avoid CodeQL js/insecure-temporary-file alert.
+                const tempDir = await fs.mkdtemp(join(tmpdir(), `mysqlsh_script_`));
+                const tempFile = join(tempDir, "script.sql");
+                try {
+                    await fs.writeFile(tempFile, script, "utf8");
+                    const args = [
+                        "--uri",
+                        config.connectionUri,
+                        langFlag,
+                        "--file",
+                        tempFile,
+                    ];
+                    result = await execMySQLShell(args, { timeout });
+                }
+                finally {
+                    // Cleanup temp directory and its contents
+                    await fs.rm(tempDir, { recursive: true }).catch(() => void 0);
+                }
+            }
+            else {
+                // JS and Python work fine with -e
+                const args = ["--uri", config.connectionUri, langFlag, "-e", script];
+                result = await execMySQLShell(args, { timeout });
+            }
             return {
                 success: result.exitCode === 0,
                 language,
                 exitCode: result.exitCode,
                 stdout: result.stdout,
-                stderr: result.stderr
+                stderr: result.stderr,
             };
-        }
+        },
     };
 }
 //# sourceMappingURL=restore.js.map

package/dist/adapters/mysql/tools/shell/restore.js.map

@@ -1 +1 @@
-{"version":3,"file":"restore.js","sourceRoot":"","sources":["../../../../../src/adapters/mysql/tools/shell/restore.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"restore.js","sourceRoot":"","sources":["../../../../../src/adapters/mysql/tools/shell/restore.ts"],"names":[],"mappings":"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"}

package/dist/adapters/mysql/tools/shell/utilities.d.ts

@@ -3,7 +3,7 @@
  *
  * Tools for server maintenance and upgrade compatibility checking.
  */
-import type { ToolDefinition } from '../../../../types/index.js';
+import type { ToolDefinition } from "../../../../types/index.js";
 /**
  * Check server upgrade compatibility
  */

package/dist/adapters/mysql/tools/shell/utilities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utilities.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/mysql/tools/shell/utilities.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAkB,MAAM,4BAA4B,CAAC;AAIjF;;GAEG;AACH,wBAAgB,2BAA2B,IAAI,cAAc,CA0C5D"}
+{"version":3,"file":"utilities.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/mysql/tools/shell/utilities.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EACV,cAAc,EAEf,MAAM,4BAA4B,CAAC;AAIpC;;GAEG;AACH,wBAAgB,2BAA2B,IAAI,cAAc,CAgF5D"}

package/dist/adapters/mysql/tools/shell/utilities.js

@@ -3,22 +3,22 @@
  *
  * Tools for server maintenance and upgrade compatibility checking.
  */
-import { ShellCheckUpgradeInputSchema } from '../../types/shell-types.js';
-import { getShellConfig, escapeForJS, execShellJS } from './common.js';
+import { ShellCheckUpgradeInputSchema } from "../../types/shell-types.js";
+import { getShellConfig, escapeForJS, execShellJS } from "./common.js";
 /**
  * Check server upgrade compatibility
  */
 export function createShellCheckUpgradeTool() {
     return {
-        name: 'mysqlsh_check_upgrade',
-        title: 'MySQL Shell Check Upgrade',
-        description: 'Check MySQL server upgrade compatibility using util.checkForServerUpgrade(). Identifies potential issues before upgrading to a newer MySQL version.',
-        group: 'shell',
+        name: "mysqlsh_check_upgrade",
+        title: "MySQL Shell Check Upgrade",
+        description: "Check MySQL server upgrade compatibility using util.checkForServerUpgrade(). Identifies potential issues before upgrading to a newer MySQL version.",
+        group: "shell",
         inputSchema: ShellCheckUpgradeInputSchema,
-        requiredScopes: ['read'],
+        requiredScopes: ["read"],
         annotations: {
             readOnlyHint: true,
-            openWorldHint: true
+            openWorldHint: true,
         },
         handler: async (params, _context) => {
             const { targetVersion, outputFormat } = ShellCheckUpgradeInputSchema.parse(params);
@@ -26,24 +26,48 @@ export function createShellCheckUpgradeTool() {
             // Use connection URI string instead of session object
             // The util.checkForServerUpgrade() accepts a URI string as first arg
             const escapedUri = escapeForJS(config.connectionUri);
-            let jsCode = `return util.checkForServerUpgrade("${escapedUri}"`;
-            const options = [];
+            // Force JSON output format to ensure parseable results
+            const options = ['outputFormat: "JSON"'];
             if (targetVersion) {
                 options.push(`targetVersion: "${targetVersion}"`);
             }
-            if (outputFormat) {
-                options.push(`outputFormat: "${outputFormat}"`);
+            const jsCode = `return util.checkForServerUpgrade("${escapedUri}", { ${options.join(", ")} });`;
+            let result;
+            try {
+                result = await execShellJS(jsCode, { timeout: 120000 });
             }
-            if (options.length > 0) {
-                jsCode += `, { ${options.join(', ')} }`;
+            catch (error) {
+                const errorMessage = error instanceof Error ? error.message : String(error);
+                return { success: false, error: errorMessage };
+            }
+            // Parse the upgrade check result
+            // util.checkForServerUpgrade returns { errorCount, warningCount, noticeCount, ... }
+            if (result !== null &&
+                result !== undefined &&
+                typeof result === "object") {
+                const checkResult = result;
+                return {
+                    success: true,
+                    targetVersion: checkResult.targetVersion ?? targetVersion,
+                    serverVersion: checkResult.serverVersion,
+                    errorCount: checkResult.errorCount ?? 0,
+                    warningCount: checkResult.warningCount ?? 0,
+                    noticeCount: checkResult.noticeCount ?? 0,
+                    checksPerformed: checkResult.checksPerformed?.length ?? 0,
+                    upgradeCheck: outputFormat === "TEXT"
+                        ? "Use outputFormat: JSON for detailed results"
+                        : checkResult,
+                };
             }
-            jsCode += ');';
-            const result = await execShellJS(jsCode, { timeout: 120000 });
             return {
                 success: true,
-                upgradeCheck: result
+                targetVersion: targetVersion ?? "latest",
+                errorCount: 0,
+                warningCount: 0,
+                noticeCount: 0,
+                upgradeCheck: result,
             };
-        }
+        },
     };
 }
 //# sourceMappingURL=utilities.js.map

package/dist/adapters/mysql/tools/shell/utilities.js.map

@@ -1 +1 @@
-{"version":3,"file":"utilities.js","sourceRoot":"","sources":["../../../../../src/adapters/mysql/tools/shell/utilities.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,4BAA4B,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAEvE;;GAEG;AACH,MAAM,UAAU,2BAA2B;IACvC,OAAO;QACH,IAAI,EAAE,uBAAuB;QAC7B,KAAK,EAAE,2BAA2B;QAClC,WAAW,EAAE,qJAAqJ;QAClK,KAAK,EAAE,OAAO;QACd,WAAW,EAAE,4BAA4B;QACzC,cAAc,EAAE,CAAC,MAAM,CAAC;QACxB,WAAW,EAAE;YACT,YAAY,EAAE,IAAI;YAClB,aAAa,EAAE,IAAI;SACtB;QACD,OAAO,EAAE,KAAK,EAAE,MAAe,EAAE,QAAwB,EAAE,EAAE;YACzD,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,GAAG,4BAA4B,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACnF,MAAM,MAAM,GAAG,cAAc,EAAE,CAAC;YAEhC,sDAAsD;YACtD,qEAAqE;YACrE,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;YACrD,IAAI,MAAM,GAAG,sCAAsC,UAAU,GAAG,CAAC;YAEjE,MAAM,OAAO,GAAa,EAAE,CAAC;YAC7B,IAAI,aAAa,EAAE,CAAC;gBAChB,OAAO,CAAC,IAAI,CAAC,mBAAmB,aAAa,GAAG,CAAC,CAAC;YACtD,CAAC;YACD,IAAI,YAAY,EAAE,CAAC;gBACf,OAAO,CAAC,IAAI,CAAC,kBAAkB,YAAY,GAAG,CAAC,CAAC;YACpD,CAAC;YAED,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACrB,MAAM,IAAI,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YAC5C,CAAC;YACD,MAAM,IAAI,IAAI,CAAC;YAEf,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;YAE9D,OAAO;gBACH,OAAO,EAAE,IAAI;gBACb,YAAY,EAAE,MAAM;aACvB,CAAC;QACN,CAAC;KACJ,CAAC;AACN,CAAC"}
+{"version":3,"file":"utilities.js","sourceRoot":"","sources":["../../../../../src/adapters/mysql/tools/shell/utilities.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,EAAE,4BAA4B,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAEvE;;GAEG;AACH,MAAM,UAAU,2BAA2B;IACzC,OAAO;QACL,IAAI,EAAE,uBAAuB;QAC7B,KAAK,EAAE,2BAA2B;QAClC,WAAW,EACT,qJAAqJ;QACvJ,KAAK,EAAE,OAAO;QACd,WAAW,EAAE,4BAA4B;QACzC,cAAc,EAAE,CAAC,MAAM,CAAC;QACxB,WAAW,EAAE;YACX,YAAY,EAAE,IAAI;YAClB,aAAa,EAAE,IAAI;SACpB;QACD,OAAO,EAAE,KAAK,EAAE,MAAe,EAAE,QAAwB,EAAE,EAAE;YAC3D,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,GACnC,4BAA4B,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC7C,MAAM,MAAM,GAAG,cAAc,EAAE,CAAC;YAEhC,sDAAsD;YACtD,qEAAqE;YACrE,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;YAErD,uDAAuD;YACvD,MAAM,OAAO,GAAa,CAAC,sBAAsB,CAAC,CAAC;YACnD,IAAI,aAAa,EAAE,CAAC;gBAClB,OAAO,CAAC,IAAI,CAAC,mBAAmB,aAAa,GAAG,CAAC,CAAC;YACpD,CAAC;YAED,MAAM,MAAM,GAAG,sCAAsC,UAAU,QAAQ,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;YAEhG,IAAI,MAAM,CAAC;YACX,IAAI,CAAC;gBACH,MAAM,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;YAC1D,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,YAAY,GAChB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACzD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;YACjD,CAAC;YAED,iCAAiC;YACjC,oFAAoF;YACpF,IACE,MAAM,KAAK,IAAI;gBACf,MAAM,KAAK,SAAS;gBACpB,OAAO,MAAM,KAAK,QAAQ,EAC1B,CAAC;gBACD,MAAM,WAAW,GAAG,MAOnB,CAAC;gBAEF,OAAO;oBACL,OAAO,EAAE,IAAI;oBACb,aAAa,EAAE,WAAW,CAAC,aAAa,IAAI,aAAa;oBACzD,aAAa,EAAE,WAAW,CAAC,aAAa;oBACxC,UAAU,EAAE,WAAW,CAAC,UAAU,IAAI,CAAC;oBACvC,YAAY,EAAE,WAAW,CAAC,YAAY,IAAI,CAAC;oBAC3C,WAAW,EAAE,WAAW,CAAC,WAAW,IAAI,CAAC;oBACzC,eAAe,EAAE,WAAW,CAAC,eAAe,EAAE,MAAM,IAAI,CAAC;oBACzD,YAAY,EACV,YAAY,KAAK,MAAM;wBACrB,CAAC,CAAC,6CAA6C;wBAC/C,CAAC,CAAC,WAAW;iBAClB,CAAC;YACJ,CAAC;YAED,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,aAAa,EAAE,aAAa,IAAI,QAAQ;gBACxC,UAAU,EAAE,CAAC;gBACb,YAAY,EAAE,CAAC;gBACf,WAAW,EAAE,CAAC;gBACd,YAAY,EAAE,MAAM;aACrB,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/adapters/mysql/tools/spatial/geometry.d.ts

@@ -4,8 +4,8 @@
  * Tools for creating basic geometry objects.
  * 2 tools: point and polygon creation.
  */
-import type { MySQLAdapter } from '../../MySQLAdapter.js';
-import type { ToolDefinition } from '../../../../types/index.js';
+import type { MySQLAdapter } from "../../MySQLAdapter.js";
+import type { ToolDefinition } from "../../../../types/index.js";
 /**
  * Create a POINT geometry
  */

package/dist/adapters/mysql/tools/spatial/geometry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometry.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/mysql/tools/spatial/geometry.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAkB,MAAM,4BAA4B,CAAC;AAiBjF;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,YAAY,GAAG,cAAc,CAiC5E;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,YAAY,GAAG,cAAc,CAsC9E"}
+{"version":3,"file":"geometry.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/mysql/tools/spatial/geometry.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,EACV,cAAc,EAEf,MAAM,4BAA4B,CAAC;AA+CpC;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,YAAY,GAAG,cAAc,CAmC5E;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,YAAY,GACpB,cAAc,CA+ChB"}

package/dist/adapters/mysql/tools/spatial/geometry.js

@@ -4,50 +4,80 @@
  * Tools for creating basic geometry objects.
  * 2 tools: point and polygon creation.
  */
-import { z } from 'zod';
+import { z } from "zod";
+// =============================================================================
+// Helpers
+// =============================================================================
+/**
+ * Parse GeoJSON result from MySQL.
+ * MySQL returns ST_AsGeoJSON as a string, but mysql2 driver may auto-parse JSON.
+ * This handles both cases.
+ */
+function parseGeoJsonResult(value) {
+    if (value === null || value === undefined) {
+        return null;
+    }
+    if (typeof value === "string") {
+        try {
+            return JSON.parse(value);
+        }
+        catch {
+            return null;
+        }
+    }
+    if (typeof value === "object") {
+        return value;
+    }
+    return null;
+}
 // =============================================================================
 // Zod Schemas
 // =============================================================================
 const PointSchema = z.object({
-    longitude: z.number().describe('Longitude coordinate'),
-    latitude: z.number().describe('Latitude coordinate'),
-    srid: z.number().default(4326).describe('SRID')
+    longitude: z.number().describe("Longitude coordinate"),
+    latitude: z.number().describe("Latitude coordinate"),
+    srid: z.number().default(4326).describe("SRID"),
 });
 const PolygonSchema = z.object({
-    coordinates: z.array(z.array(z.array(z.number()).min(2).max(2))).describe('Polygon coordinates as array of rings, each ring is array of [lon, lat] pairs'),
-    srid: z.number().default(4326).describe('SRID')
+    coordinates: z
+        .array(z.array(z.array(z.number()).min(2).max(2)))
+        .describe("Polygon coordinates as array of rings, each ring is array of [lon, lat] pairs"),
+    srid: z.number().default(4326).describe("SRID"),
 });
 /**
  * Create a POINT geometry
  */
 export function createSpatialPointTool(adapter) {
     return {
-        name: 'mysql_spatial_point',
-        title: 'MySQL Create Point',
-        description: 'Create a POINT geometry from longitude/latitude coordinates.',
-        group: 'spatial',
+        name: "mysql_spatial_point",
+        title: "MySQL Create Point",
+        description: "Create a POINT geometry from longitude/latitude coordinates.",
+        group: "spatial",
         inputSchema: PointSchema,
-        requiredScopes: ['read'],
+        requiredScopes: ["read"],
         annotations: {
             readOnlyHint: true,
-            idempotentHint: true
+            idempotentHint: true,
         },
         handler: async (params, _context) => {
             const { longitude, latitude, srid } = PointSchema.parse(params);
-            // Use 'axis-order=long-lat' to accept natural longitude-latitude order
-            // MySQL 8.0+ defaults to EPSG standard (latitude-longitude) for SRID 4326
-            const result = await adapter.executeQuery(`SELECT ST_AsText(ST_SRID(ST_GeomFromText('POINT(${String(longitude)} ${String(latitude)})', ${String(srid)}, 'axis-order=long-lat'), ${String(srid)})) as wkt,
+            try {
+                const result = await adapter.executeQuery(`SELECT ST_AsText(ST_SRID(ST_GeomFromText('POINT(${String(longitude)} ${String(latitude)})', ${String(srid)}, 'axis-order=long-lat'), ${String(srid)})) as wkt,
                         ST_AsGeoJSON(ST_SRID(ST_GeomFromText('POINT(${String(longitude)} ${String(latitude)})', ${String(srid)}, 'axis-order=long-lat'), ${String(srid)})) as geoJson`);
-            const row = result.rows?.[0];
-            const geoJsonStr = row?.['geoJson'];
-            return {
-                wkt: row?.['wkt'],
-                geoJson: typeof geoJsonStr === 'string' ? JSON.parse(geoJsonStr) : null,
-                srid,
-                longitude,
-                latitude
-            };
-        }
+                const row = result.rows?.[0];
+                return {
+                    wkt: row?.["wkt"],
+                    geoJson: parseGeoJsonResult(row?.["geoJson"]),
+                    srid,
+                    longitude,
+                    latitude,
+                };
+            }
+            catch (error) {
+                const msg = error instanceof Error ? error.message : String(error);
+                return { success: false, error: msg };
+            }
+        },
     };
 }
 /**
@@ -55,33 +85,42 @@ export function createSpatialPointTool(adapter) {
  */
 export function createSpatialPolygonTool(adapter) {
     return {
-        name: 'mysql_spatial_polygon',
-        title: 'MySQL Create Polygon',
-        description: 'Create a POLYGON geometry from coordinates.',
-        group: 'spatial',
+        name: "mysql_spatial_polygon",
+        title: "MySQL Create Polygon",
+        description: "Create a POLYGON geometry from coordinates.",
+        group: "spatial",
         inputSchema: PolygonSchema,
-        requiredScopes: ['read'],
+        requiredScopes: ["read"],
         annotations: {
             readOnlyHint: true,
-            idempotentHint: true
+            idempotentHint: true,
         },
         handler: async (params, _context) => {
             const { coordinates, srid } = PolygonSchema.parse(params);
-            // Build WKT polygon
-            const rings = coordinates.map(ring => '(' + ring.map(([lon, lat]) => `${String(lon)} ${String(lat)}`).join(', ') + ')');
-            const wkt = `POLYGON(${rings.join(', ')})`;
-            const result = await adapter.executeQuery(`SELECT ST_AsText(ST_SRID(ST_GeomFromText(?), ${String(srid)})) as wkt,
-                        ST_AsGeoJSON(ST_SRID(ST_GeomFromText(?), ${String(srid)})) as geoJson,
-                        ST_Area(ST_SRID(ST_GeomFromText(?), ${String(srid)})) as area`, [wkt, wkt, wkt]);
-            const row = result.rows?.[0];
-            const geoJsonStr = row?.['geoJson'];
-            return {
-                wkt: row?.['wkt'],
-                geoJson: typeof geoJsonStr === 'string' ? JSON.parse(geoJsonStr) : null,
-                area: row?.['area'],
-                srid
-            };
-        }
+            try {
+                // Build WKT polygon
+                const rings = coordinates.map((ring) => "(" +
+                    ring
+                        .map(([lon, lat]) => `${String(lon)} ${String(lat)}`)
+                        .join(", ") +
+                    ")");
+                const wkt = `POLYGON(${rings.join(", ")})`;
+                const result = await adapter.executeQuery(`SELECT ST_AsText(ST_GeomFromText(?, ${String(srid)}, 'axis-order=long-lat')) as wkt,
+                        ST_AsGeoJSON(ST_GeomFromText(?, ${String(srid)}, 'axis-order=long-lat')) as geoJson,
+                        ST_Area(ST_GeomFromText(?, ${String(srid)}, 'axis-order=long-lat')) as area`, [wkt, wkt, wkt]);
+                const row = result.rows?.[0];
+                return {
+                    wkt: row?.["wkt"],
+                    geoJson: parseGeoJsonResult(row?.["geoJson"]),
+                    area: row?.["area"],
+                    srid,
+                };
+            }
+            catch (error) {
+                const msg = error instanceof Error ? error.message : String(error);
+                return { success: false, error: msg };
+            }
+        },
     };
 }
 //# sourceMappingURL=geometry.js.map

package/dist/adapters/mysql/tools/spatial/geometry.js.map

@@ -1 +1 @@
-{"version":3,"file":"geometry.js","sourceRoot":"","sources":["../../../../../src/adapters/mysql/tools/spatial/geometry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"geometry.js","sourceRoot":"","sources":["../../../../../src/adapters/mysql/tools/spatial/geometry.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB,gFAAgF;AAChF,UAAU;AACV,gFAAgF;AAEhF;;;;GAIG;AACH,SAAS,kBAAkB,CAAC,KAAc;IACxC,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC1C,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAA4B,CAAC;QACtD,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAgC,CAAC;IAC1C,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,gFAAgF;AAChF,cAAc;AACd,gFAAgF;AAEhF,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,sBAAsB,CAAC;IACtD,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,qBAAqB,CAAC;IACpD,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;CAChD,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7B,WAAW,EAAE,CAAC;SACX,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;SACjD,QAAQ,CACP,+EAA+E,CAChF;IACH,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;CAChD,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,UAAU,sBAAsB,CAAC,OAAqB;IAC1D,OAAO;QACL,IAAI,EAAE,qBAAqB;QAC3B,KAAK,EAAE,oBAAoB;QAC3B,WAAW,EAAE,8DAA8D;QAC3E,KAAK,EAAE,SAAS;QAChB,WAAW,EAAE,WAAW;QACxB,cAAc,EAAE,CAAC,MAAM,CAAC;QACxB,WAAW,EAAE;YACX,YAAY,EAAE,IAAI;YAClB,cAAc,EAAE,IAAI;SACrB;QACD,OAAO,EAAE,KAAK,EAAE,MAAe,EAAE,QAAwB,EAAE,EAAE;YAC3D,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAEhE,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,CACvC,mDAAmD,MAAM,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,MAAM,CAAC,IAAI,CAAC,6BAA6B,MAAM,CAAC,IAAI,CAAC;sEACxF,MAAM,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,MAAM,CAAC,IAAI,CAAC,6BAA6B,MAAM,CAAC,IAAI,CAAC,eAAe,CAC7K,CAAC;gBAEF,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC7B,OAAO;oBACL,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;oBACjB,OAAO,EAAE,kBAAkB,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;oBAC7C,IAAI;oBACJ,SAAS;oBACT,QAAQ;iBACT,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,GAAG,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACnE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;YACxC,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,wBAAwB,CACtC,OAAqB;IAErB,OAAO;QACL,IAAI,EAAE,uBAAuB;QAC7B,KAAK,EAAE,sBAAsB;QAC7B,WAAW,EAAE,6CAA6C;QAC1D,KAAK,EAAE,SAAS;QAChB,WAAW,EAAE,aAAa;QAC1B,cAAc,EAAE,CAAC,MAAM,CAAC;QACxB,WAAW,EAAE;YACX,YAAY,EAAE,IAAI;YAClB,cAAc,EAAE,IAAI;SACrB;QACD,OAAO,EAAE,KAAK,EAAE,MAAe,EAAE,QAAwB,EAAE,EAAE;YAC3D,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAE1D,IAAI,CAAC;gBACH,oBAAoB;gBACpB,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAC3B,CAAC,IAAI,EAAE,EAAE,CACP,GAAG;oBACH,IAAI;yBACD,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;yBACpD,IAAI,CAAC,IAAI,CAAC;oBACb,GAAG,CACN,CAAC;gBACF,MAAM,GAAG,GAAG,WAAW,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;gBAE3C,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,CACvC,uCAAuC,MAAM,CAAC,IAAI,CAAC;0DACH,MAAM,CAAC,IAAI,CAAC;qDACjB,MAAM,CAAC,IAAI,CAAC,mCAAmC,EAC1F,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAChB,CAAC;gBAEF,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC7B,OAAO;oBACL,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;oBACjB,OAAO,EAAE,kBAAkB,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;oBAC7C,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC;oBACnB,IAAI;iBACL,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,GAAG,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACnE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;YACxC,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/adapters/mysql/tools/spatial/index.d.ts

@@ -4,8 +4,8 @@
  * Tools for geospatial data operations in MySQL 8.0+.
  * 12 tools total (2 setup + 2 geometry + 4 queries + 4 operations).
  */
-import type { MySQLAdapter } from '../../MySQLAdapter.js';
-import type { ToolDefinition } from '../../../../types/index.js';
+import type { MySQLAdapter } from "../../MySQLAdapter.js";
+import type { ToolDefinition } from "../../../../types/index.js";
 /**
  * Get all spatial tools
  */