@deepagents/text2sql 2.1.0 → 2.2.0

package/dist/lib/adapters/sqlite/index.js

@@ -174,6 +174,13 @@ function createGroundingContext(options = {}) {
 import nodeSqlParser from "node-sql-parser";
 var { Parser } = nodeSqlParser;
 var parser = new Parser();
+function parseStatementTypes(sql, dialect) {
+  const ast = parser.astify(sql, { database: dialect });
+  const statements = Array.isArray(ast) ? ast : [ast];
+  return statements.flatMap(
+    (statement) => isAstLike(statement) && typeof statement.type === "string" ? [statement.type] : []
+  );
+}
 function extractBaseEntityReferences(sql, dialect) {
   const ast = parser.astify(sql, { database: dialect });
   const state = {
@@ -299,6 +306,22 @@ function caseFold(value) {
 }
 
 // packages/text2sql/src/lib/adapters/adapter.ts
+var PARSER_DIALECTS_BY_FORMATTER_LANGUAGE = {
+  sqlite: ["sqlite", "mysql"],
+  postgresql: ["postgresql"],
+  bigquery: ["bigquery"],
+  transactsql: ["transactsql"],
+  mysql: ["mysql"]
+};
+function parserDialectsFor(formatterLanguage) {
+  const candidates = PARSER_DIALECTS_BY_FORMATTER_LANGUAGE[formatterLanguage];
+  if (!candidates) {
+    throw new TypeError(
+      `No scope dialect mapping for formatter language "${formatterLanguage}". Add it to PARSER_DIALECTS_BY_FORMATTER_LANGUAGE in adapter.ts.`
+    );
+  }
+  return candidates;
+}
 var Adapter = class {
   /**
    * Introspect the database schema and return context fragments.
@@ -520,10 +543,49 @@ var Adapter = class {
     return sql.replace(/\\n/g, "\n").replace(/\\t/g, "	").replace(/\\([().*])/g, "$1").replace(/\\(?=$)/gm, "");
   }
   #checkReadOnly(sql) {
-    const upper = sql.trimStart().toUpperCase();
-    if (!upper.startsWith("SELECT") && !upper.startsWith("WITH")) {
+    const statementTypes = this.#readParsedStatementTypes(sql);
+    if (statementTypes) {
+      if (statementTypes.length === 1 && statementTypes[0] === "select") {
+        return null;
+      }
       return "only SELECT or WITH queries allowed";
     }
+    const keyword = this.#firstStatementKeyword(sql);
+    if (keyword === "SELECT" || keyword === "WITH") return null;
+    return "only SELECT or WITH queries allowed";
+  }
+  #readParsedStatementTypes(sql) {
+    for (const dialect of parserDialectsFor(this.formatterLanguage)) {
+      try {
+        return parseStatementTypes(sql, dialect);
+      } catch {
+      }
+    }
+    return null;
+  }
+  #firstStatementKeyword(sql) {
+    let offset = 0;
+    while (offset < sql.length) {
+      if (/\s/.test(sql[offset])) {
+        offset++;
+        continue;
+      }
+      if (sql.startsWith("--", offset)) {
+        offset += 2;
+        while (offset < sql.length && sql[offset] !== "\n" && sql[offset] !== "\r") {
+          offset++;
+        }
+        continue;
+      }
+      if (sql.startsWith("/*", offset)) {
+        const commentEnd = sql.indexOf("*/", offset + 2);
+        if (commentEnd === -1) return null;
+        offset = commentEnd + 2;
+        continue;
+      }
+      const keyword = /^[A-Za-z]+/.exec(sql.slice(offset));
+      return keyword ? keyword[0].toUpperCase() : null;
+    }
     return null;
   }
   #cachedAllowedEntities = null;
@@ -533,36 +595,21 @@ var Adapter = class {
     return this.#cachedAllowedEntities;
   }
   async #checkScope(sql, allowedEntities) {
-    const dialect = this.formatterLanguage;
-    const scopeDialects = {
-      sqlite: ["sqlite", "mysql"],
-      postgresql: ["postgresql"],
-      bigquery: ["bigquery"],
-      transactsql: ["transactsql"],
-      mysql: ["mysql"]
-    };
-    const candidates = scopeDialects[dialect];
-    if (!candidates) {
-      throw new TypeError(
-        `No scope dialect mapping for formatter language "${dialect}". Add it to the scopeDialects map in Adapter.#checkScope.`
-      );
-    }
+    const candidates = parserDialectsFor(this.formatterLanguage);
     let references = null;
     let lastError;
+    let lastDialect = candidates[0];
     for (const candidate of candidates) {
       try {
         references = extractBaseEntityReferences(sql, candidate);
         break;
       } catch (error) {
+        lastDialect = candidate;
         lastError = error;
       }
     }
     if (references === null) {
-      return buildScopeParseErrorPayload(
-        sql,
-        dialect,
-        lastError
-      );
+      return buildScopeParseErrorPayload(sql, lastDialect, lastError);
     }
     if (references.length === 0) return null;
     const allowedQualified = new Set(