@pilat/mcp-datalink 1.1.0 → 1.2.0

package/dist/utils/validation.js

@@ -0,0 +1,89 @@
+/**
+ * Validation utilities for database operations
+ */
+import { DbMcpError, ErrorCode } from './errors.js';
+/**
+ * Get a validated database configuration, throwing if not found
+ *
+ * @param database - The database name to look up
+ * @param config - The application configuration
+ * @returns The database configuration
+ * @throws DbMcpError with DATABASE_NOT_FOUND if database not configured
+ */
+export function getValidatedDatabase(database, config) {
+    const dbConfig = config.databases[database];
+    if (!dbConfig) {
+        throw new DbMcpError(ErrorCode.DATABASE_NOT_FOUND, `Database "${database}" not found in configuration`, { database, available: Object.keys(config.databases) });
+    }
+    return dbConfig;
+}
+/**
+ * Count placeholder parameters in SQL query
+ *
+ * Counts PostgreSQL-style placeholders ($1, $2, etc.) in SQL.
+ * Ignores placeholders inside string literals (single or double quoted).
+ *
+ * Note: LLM always uses $N style placeholders. For MySQL/SQLite,
+ * adapters convert $N to ? via convertPlaceholders() after validation.
+ *
+ * @param sql - SQL query to analyze
+ * @returns Number of unique placeholders found
+ */
+export function countPlaceholders(sql) {
+    const placeholders = new Set();
+    let inString = false;
+    let stringChar = '';
+    let i = 0;
+    while (i < sql.length) {
+        // Handle string literal start
+        if (!inString && (sql[i] === "'" || sql[i] === '"')) {
+            inString = true;
+            stringChar = sql[i];
+            i++;
+            continue;
+        }
+        // Handle string literal end (with escaped quote support)
+        if (inString && sql[i] === stringChar) {
+            if (i + 1 < sql.length && sql[i + 1] === stringChar) {
+                // Escaped quote, skip both characters
+                i += 2;
+                continue;
+            }
+            else {
+                inString = false;
+                i++;
+                continue;
+            }
+        }
+        // Look for $N placeholders outside strings
+        if (!inString && sql[i] === '$') {
+            let j = i + 1;
+            while (j < sql.length && /\d/.test(sql[j])) {
+                j++;
+            }
+            if (j > i + 1) {
+                const num = parseInt(sql.slice(i + 1, j), 10);
+                placeholders.add(num);
+                i = j;
+                continue;
+            }
+        }
+        i++;
+    }
+    return placeholders.size;
+}
+/**
+ * Validate that the number of parameters matches the placeholder count in SQL
+ *
+ * @param sql - SQL query with $1, $2, etc. placeholders
+ * @param params - Array of parameter values
+ * @throws DbMcpError with INVALID_SQL if counts don't match
+ */
+export function validateParamCount(sql, params) {
+    const placeholderCount = countPlaceholders(sql);
+    const paramCount = params.length;
+    if (placeholderCount !== paramCount) {
+        throw new DbMcpError(ErrorCode.INVALID_SQL, `Query has ${placeholderCount} placeholder${placeholderCount !== 1 ? 's' : ''} but ${paramCount} parameter${paramCount !== 1 ? 's' : ''} provided`, { sql, placeholderCount, paramCount });
+    }
+}
+//# sourceMappingURL=validation.js.map

package/dist/utils/validation.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pilat/mcp-datalink",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "MCP server for secure database access (PostgreSQL, MySQL, SQLite)",
   "type": "module",
   "main": "dist/index.js",
@@ -9,15 +9,10 @@
   },
   "scripts": {
     "build": "tsc",
-    "dev": "tsc --watch",
-    "start": "node dist/index.js",
-    "test": "vitest",
-    "test:unit": "vitest --run --exclude 'src/__integration__/**'",
+    "test": "vitest --run --exclude 'src/__integration__/**'",
+    "test:coverage": "vitest --coverage --run --exclude 'src/__integration__/**'",
     "test:integration": "vitest run --config vitest.config.integration.ts",
-    "test:integration:watch": "vitest --config vitest.config.integration.ts",
-    "test:coverage": "vitest --coverage",
-    "lint": "eslint src",
-    "typecheck": "tsc --noEmit"
+    "lint": "eslint src"
   },
   "keywords": [
     "mcp",
@@ -48,17 +43,21 @@
     "@modelcontextprotocol/sdk": "^1.0.0",
     "better-sqlite3": "^11.7.0",
     "mysql2": "^3.6.0",
-    "pg": "^8.11.0",
-    "pgsql-ast-parser": "^12.0.0"
+    "node-sql-parser": "^5.3.13",
+    "pg": "^8.11.0"
   },
   "devDependencies": {
+    "@eslint/js": "^9.39.2",
     "@testcontainers/mysql": "^11.11.0",
     "@testcontainers/postgresql": "^11.11.0",
     "@types/better-sqlite3": "^7.6.0",
     "@types/node": "^20.0.0",
     "@types/pg": "^8.11.0",
+    "@vitest/coverage-v8": "^1.6.1",
+    "eslint": "^9.39.2",
     "testcontainers": "^11.11.0",
     "typescript": "^5.3.0",
+    "typescript-eslint": "^8.51.0",
     "vitest": "^1.0.0"
   }
 }